[Debian-l10n-commits] [translate-toolkit] 01/15: Imported Upstream version 1.11.0

Stuart Prescott stuart at moszumanska.debian.org
Sun Feb 23 14:02:15 UTC 2014


This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository translate-toolkit.

commit 72577cbf4aeba2b809e67cb9be4ad567c05153e2
Author: Stuart Prescott <stuart at debian.org>
Date:   Sat Feb 1 10:45:10 2014 +1100

    Imported Upstream version 1.11.0
---
 PKG-INFO                                           |    4 +-
 README.rst                                         |   22 +-
 docs/_build/doctrees/api/convert.doctree           |  Bin 656319 -> 667808 bytes
 docs/_build/doctrees/api/filters.doctree           |  Bin 336007 -> 336179 bytes
 docs/_build/doctrees/api/index.doctree             |  Bin 14923 -> 14949 bytes
 docs/_build/doctrees/api/lang.doctree              |  Bin 1138903 -> 1139382 bytes
 docs/_build/doctrees/api/misc.doctree              |  Bin 598858 -> 441832 bytes
 docs/_build/doctrees/api/search.doctree            |  Bin 223333 -> 260605 bytes
 docs/_build/doctrees/api/services.doctree          |  Bin 7074 -> 7092 bytes
 docs/_build/doctrees/api/storage.doctree           |  Bin 5025706 -> 5399791 bytes
 docs/_build/doctrees/api/tools.doctree             |  Bin 590013 -> 590014 bytes
 docs/_build/doctrees/changelog.doctree             |  Bin 129505 -> 128961 bytes
 docs/_build/doctrees/commands/csv2po.doctree       |  Bin 44569 -> 43678 bytes
 docs/_build/doctrees/commands/csv2tbx.doctree      |  Bin 31116 -> 30714 bytes
 .../_build/doctrees/commands/general_usage.doctree |  Bin 16880 -> 16901 bytes
 docs/_build/doctrees/commands/html2po.doctree      |  Bin 38987 -> 38931 bytes
 docs/_build/doctrees/commands/ical2po.doctree      |  Bin 40652 -> 40904 bytes
 docs/_build/doctrees/commands/index.doctree        |  Bin 50222 -> 50236 bytes
 docs/_build/doctrees/commands/ini2po.doctree       |  Bin 45717 -> 45673 bytes
 docs/_build/doctrees/commands/json2po.doctree      |  Bin 39924 -> 39873 bytes
 docs/_build/doctrees/commands/junitmsgfmt.doctree  |  Bin 4603 -> 4867 bytes
 .../doctrees/commands/levenshtein_distance.doctree |  Bin 15345 -> 18669 bytes
 .../doctrees/commands/moz-l10n-builder.doctree     |  Bin 31072 -> 30681 bytes
 docs/_build/doctrees/commands/moz2po.doctree       |  Bin 62416 -> 58266 bytes
 .../doctrees/commands/mozilla_l10n_scripts.doctree |  Bin 68219 -> 69547 bytes
 docs/_build/doctrees/commands/odf2xliff.doctree    |  Bin 33085 -> 32372 bytes
 docs/_build/doctrees/commands/oo2po.doctree        |  Bin 63507 -> 62797 bytes
 .../doctrees/commands/option_accelerator.doctree   |  Bin 9471 -> 9556 bytes
 .../doctrees/commands/option_duplicates.doctree    |  Bin 10891 -> 10909 bytes
 .../doctrees/commands/option_errorlevel.doctree    |  Bin 10136 -> 10154 bytes
 .../doctrees/commands/option_filteraction.doctree  |  Bin 7078 -> 7096 bytes
 .../doctrees/commands/option_multifile.doctree     |  Bin 6394 -> 6412 bytes
 .../doctrees/commands/option_personality.doctree   |  Bin 10699 -> 10717 bytes
 .../doctrees/commands/option_progress.doctree      |  Bin 13941 -> 13962 bytes
 docs/_build/doctrees/commands/option_psyco.doctree |  Bin 8570 -> 0 bytes
 .../doctrees/commands/option_rewrite.doctree       |  Bin 21700 -> 22354 bytes
 docs/_build/doctrees/commands/phase.doctree        |  Bin 26872 -> 26890 bytes
 docs/_build/doctrees/commands/php2po.doctree       |  Bin 43023 -> 40704 bytes
 docs/_build/doctrees/commands/po2tmx.doctree       |  Bin 30384 -> 30634 bytes
 docs/_build/doctrees/commands/po2wordfast.doctree  |  Bin 21389 -> 20713 bytes
 docs/_build/doctrees/commands/poclean.doctree      |  Bin 20749 -> 19501 bytes
 .../doctrees/commands/pocommentclean.doctree       |  Bin 10617 -> 10635 bytes
 docs/_build/doctrees/commands/pocompendium.doctree |  Bin 28396 -> 28417 bytes
 docs/_build/doctrees/commands/pocompile.doctree    |  Bin 20268 -> 18983 bytes
 docs/_build/doctrees/commands/poconflicts.doctree  |  Bin 30462 -> 29174 bytes
 docs/_build/doctrees/commands/pocount.doctree      |  Bin 35873 -> 36633 bytes
 docs/_build/doctrees/commands/podebug.doctree      |  Bin 47263 -> 45623 bytes
 docs/_build/doctrees/commands/pofilter.doctree     |  Bin 42284 -> 40996 bytes
 .../doctrees/commands/pofilter_tests.doctree       |  Bin 143186 -> 143615 bytes
 docs/_build/doctrees/commands/pogrep.doctree       |  Bin 31716 -> 31259 bytes
 docs/_build/doctrees/commands/pomerge.doctree      |  Bin 31114 -> 29826 bytes
 docs/_build/doctrees/commands/pomigrate2.doctree   |  Bin 19658 -> 19679 bytes
 docs/_build/doctrees/commands/popuretext.doctree   |  Bin 12513 -> 12531 bytes
 docs/_build/doctrees/commands/poreencode.doctree   |  Bin 10606 -> 10624 bytes
 .../_build/doctrees/commands/porestructure.doctree |  Bin 20547 -> 19287 bytes
 docs/_build/doctrees/commands/posegment.doctree    |  Bin 28311 -> 27014 bytes
 docs/_build/doctrees/commands/posplit.doctree      |  Bin 8968 -> 8986 bytes
 docs/_build/doctrees/commands/poswap.doctree       |  Bin 26392 -> 25077 bytes
 docs/_build/doctrees/commands/pot2po.doctree       |  Bin 33583 -> 32707 bytes
 .../_build/doctrees/commands/poterminology.doctree |  Bin 79429 -> 77784 bytes
 .../commands/poterminology_stopword_file.doctree   |  Bin 35749 -> 36031 bytes
 docs/_build/doctrees/commands/pretranslate.doctree |  Bin 29541 -> 27806 bytes
 docs/_build/doctrees/commands/prop2po.doctree      |  Bin 59047 -> 59800 bytes
 docs/_build/doctrees/commands/rc2po.doctree        |  Bin 46321 -> 45421 bytes
 docs/_build/doctrees/commands/sub2po.doctree       |  Bin 38406 -> 38452 bytes
 docs/_build/doctrees/commands/symb2po.doctree      |  Bin 48736 -> 48166 bytes
 docs/_build/doctrees/commands/tiki2po.doctree      |  Bin 27697 -> 29675 bytes
 docs/_build/doctrees/commands/tmserver.doctree     |  Bin 21202 -> 22563 bytes
 docs/_build/doctrees/commands/ts2po.doctree        |  Bin 39552 -> 38781 bytes
 docs/_build/doctrees/commands/txt2po.doctree       |  Bin 54819 -> 54811 bytes
 docs/_build/doctrees/commands/web2py2po.doctree    |  Bin 35091 -> 35055 bytes
 docs/_build/doctrees/commands/xliff2po.doctree     |  Bin 36587 -> 35712 bytes
 .../{development => developers}/building.doctree   |  Bin 12987 -> 12935 bytes
 .../doctrees/developers/contributing.doctree       |  Bin 0 -> 28141 bytes
 docs/_build/doctrees/developers/developers.doctree |  Bin 0 -> 58844 bytes
 docs/_build/doctrees/developers/releasing.doctree  |  Bin 0 -> 58134 bytes
 docs/_build/doctrees/developers/styleguide.doctree |  Bin 0 -> 97810 bytes
 docs/_build/doctrees/developers/testing.doctree    |  Bin 0 -> 21823 bytes
 .../doctrees/development/contributing.doctree      |  Bin 28425 -> 0 bytes
 .../_build/doctrees/development/developers.doctree |  Bin 54407 -> 0 bytes
 docs/_build/doctrees/environment.pickle            |  Bin 2963329 -> 3384733 bytes
 docs/_build/doctrees/features.doctree              |  Bin 17409 -> 17430 bytes
 docs/_build/doctrees/formats/android.doctree       |  Bin 0 -> 8714 bytes
 docs/_build/doctrees/formats/base_classes.doctree  |  Bin 37925 -> 37972 bytes
 docs/_build/doctrees/formats/catkeys.doctree       |  Bin 6498 -> 6730 bytes
 docs/_build/doctrees/formats/conformance.doctree   |  Bin 11264 -> 11285 bytes
 docs/_build/doctrees/formats/csv.doctree           |  Bin 11368 -> 11051 bytes
 docs/_build/doctrees/formats/dtd.doctree           |  Bin 9396 -> 9417 bytes
 docs/_build/doctrees/formats/flex.doctree          |  Bin 6670 -> 6937 bytes
 docs/_build/doctrees/formats/gsi.doctree           |  Bin 6125 -> 6146 bytes
 docs/_build/doctrees/formats/html.doctree          |  Bin 7716 -> 7953 bytes
 docs/_build/doctrees/formats/ical.doctree          |  Bin 20844 -> 20126 bytes
 docs/_build/doctrees/formats/index.doctree         |  Bin 82242 -> 75220 bytes
 docs/_build/doctrees/formats/ini.doctree           |  Bin 9552 -> 9280 bytes
 docs/_build/doctrees/formats/json.doctree          |  Bin 0 -> 4407 bytes
 docs/_build/doctrees/formats/l20n.doctree          |  Bin 29706 -> 29626 bytes
 docs/_build/doctrees/formats/mo.doctree            |  Bin 7071 -> 7346 bytes
 docs/_build/doctrees/formats/odf.doctree           |  Bin 8616 -> 7967 bytes
 .../doctrees/formats/omegat_glossary.doctree       |  Bin 9280 -> 9555 bytes
 docs/_build/doctrees/formats/php.doctree           |  Bin 15217 -> 29213 bytes
 docs/_build/doctrees/formats/po.doctree            |  Bin 13065 -> 10925 bytes
 docs/_build/doctrees/formats/properties.doctree    |  Bin 14154 -> 14274 bytes
 docs/_build/doctrees/formats/qm.doctree            |  Bin 8006 -> 8027 bytes
 .../_build/doctrees/formats/qt_phrase_book.doctree |  Bin 9232 -> 9517 bytes
 .../doctrees/formats/quoting_and_escaping.doctree  |  Bin 13650 -> 13509 bytes
 docs/_build/doctrees/formats/rc.doctree            |  Bin 13529 -> 13538 bytes
 docs/_build/doctrees/formats/strings.doctree       |  Bin 8640 -> 8940 bytes
 docs/_build/doctrees/formats/subtitles.doctree     |  Bin 12287 -> 11988 bytes
 docs/_build/doctrees/formats/tbx.doctree           |  Bin 116673 -> 20636 bytes
 docs/_build/doctrees/formats/text.doctree          |  Bin 6094 -> 6115 bytes
 docs/_build/doctrees/formats/tmx.doctree           |  Bin 7132 -> 8357 bytes
 docs/_build/doctrees/formats/ts.doctree            |  Bin 18368 -> 18465 bytes
 docs/_build/doctrees/formats/utx.doctree           |  Bin 10223 -> 10664 bytes
 docs/_build/doctrees/formats/wiki.doctree          |  Bin 12746 -> 12767 bytes
 docs/_build/doctrees/formats/wml.doctree           |  Bin 4844 -> 4385 bytes
 docs/_build/doctrees/formats/wordfast.doctree      |  Bin 8019 -> 7724 bytes
 docs/_build/doctrees/formats/xliff.doctree         |  Bin 20922 -> 23642 bytes
 .../guides/checking_for_inconsistencies.doctree    |  Bin 32691 -> 32709 bytes
 .../guides/cleanup_translator_comments.doctree     |  Bin 11690 -> 11711 bytes
 ...gy_list_from_your_existing_translations.doctree |  Bin 37081 -> 37102 bytes
 .../guides/creating_mozilla_pot_files.doctree      |  Bin 17124 -> 14642 bytes
 .../doctrees/guides/document_translation.doctree   |  Bin 12241 -> 12259 bytes
 docs/_build/doctrees/guides/index.doctree          |  Bin 11608 -> 10928 bytes
 .../doctrees/guides/migrating_to_firefox.doctree   |  Bin 35416 -> 0 bytes
 .../doctrees/guides/migrating_translations.doctree |  Bin 36400 -> 36421 bytes
 .../running_the_tools_on_microsoft_windows.doctree |  Bin 11397 -> 11415 bytes
 docs/_build/doctrees/guides/using_csv2po.doctree   |  Bin 44051 -> 44068 bytes
 docs/_build/doctrees/guides/using_oo2po.doctree    |  Bin 17453 -> 17474 bytes
 docs/_build/doctrees/guides/using_pofilter.doctree |  Bin 41137 -> 41158 bytes
 docs/_build/doctrees/history.doctree               |  Bin 24008 -> 24091 bytes
 docs/_build/doctrees/index.doctree                 |  Bin 7302 -> 7464 bytes
 docs/_build/doctrees/installation.doctree          |  Bin 26658 -> 26675 bytes
 docs/_build/doctrees/license.doctree               |  Bin 4470 -> 4485 bytes
 docs/_build/doctrees/releases/1.10.0.doctree       |  Bin 0 -> 24352 bytes
 docs/_build/doctrees/releases/1.11.0-rc1.doctree   |  Bin 0 -> 33715 bytes
 docs/_build/doctrees/releases/1.11.0.doctree       |  Bin 0 -> 35538 bytes
 docs/_build/doctrees/releases/1.11.1.doctree       |  Bin 0 -> 62078 bytes
 docs/_build/doctrees/releases/1.8.1.doctree        |  Bin 0 -> 20448 bytes
 docs/_build/doctrees/releases/1.9.0.doctree        |  Bin 0 -> 18950 bytes
 docs/_build/doctrees/releases/index.doctree        |  Bin 0 -> 3873 bytes
 docs/_build/doctrees/styleguide.doctree            |  Bin 74249 -> 0 bytes
 docs/_build/html/.buildinfo                        |    4 +-
 docs/_build/html/_images/tbx_levels_structure.png  |  Bin 36960 -> 0 bytes
 docs/_build/html/_sources/api/misc.txt             |   16 -
 docs/_build/html/_sources/api/storage.txt          |    9 +-
 docs/_build/html/_sources/changelog.txt            |   29 +-
 docs/_build/html/_sources/commands/csv2po.txt      |    6 +-
 docs/_build/html/_sources/commands/csv2tbx.txt     |    3 +-
 docs/_build/html/_sources/commands/html2po.txt     |    7 +-
 docs/_build/html/_sources/commands/ical2po.txt     |   14 +-
 docs/_build/html/_sources/commands/index.txt       |    1 -
 docs/_build/html/_sources/commands/ini2po.txt      |    7 +-
 docs/_build/html/_sources/commands/json2po.txt     |   15 +-
 .../_sources/commands/levenshtein_distance.txt     |   60 +-
 .../html/_sources/commands/moz-l10n-builder.txt    |   12 +-
 docs/_build/html/_sources/commands/moz2po.txt      |   46 +-
 .../_sources/commands/mozilla_l10n_scripts.txt     |   36 +-
 docs/_build/html/_sources/commands/odf2xliff.txt   |    8 +-
 docs/_build/html/_sources/commands/oo2po.txt       |   15 +-
 .../html/_sources/commands/option_accelerator.txt  |    8 +-
 .../_build/html/_sources/commands/option_psyco.txt |   44 -
 .../html/_sources/commands/option_rewrite.txt      |    4 +-
 docs/_build/html/_sources/commands/php2po.txt      |   48 +-
 docs/_build/html/_sources/commands/po2tmx.txt      |   11 +-
 docs/_build/html/_sources/commands/po2wordfast.txt |    6 +-
 docs/_build/html/_sources/commands/poclean.txt     |    2 -
 docs/_build/html/_sources/commands/pocompile.txt   |    2 -
 docs/_build/html/_sources/commands/poconflicts.txt |    2 -
 docs/_build/html/_sources/commands/pocount.txt     |   14 +-
 docs/_build/html/_sources/commands/podebug.txt     |    5 +-
 docs/_build/html/_sources/commands/pofilter.txt    |    2 -
 .../html/_sources/commands/pofilter_tests.txt      |   57 +-
 docs/_build/html/_sources/commands/pogrep.txt      |    4 +-
 docs/_build/html/_sources/commands/pomerge.txt     |    2 -
 .../html/_sources/commands/porestructure.txt       |    2 -
 docs/_build/html/_sources/commands/posegment.txt   |    2 -
 docs/_build/html/_sources/commands/poswap.txt      |    2 -
 docs/_build/html/_sources/commands/pot2po.txt      |   13 +-
 .../html/_sources/commands/poterminology.txt       |    5 +-
 .../_build/html/_sources/commands/pretranslate.txt |    7 +-
 docs/_build/html/_sources/commands/prop2po.txt     |   10 +-
 docs/_build/html/_sources/commands/rc2po.txt       |    6 +-
 docs/_build/html/_sources/commands/sub2po.txt      |    7 +-
 docs/_build/html/_sources/commands/symb2po.txt     |    6 +-
 docs/_build/html/_sources/commands/tiki2po.txt     |    4 +-
 docs/_build/html/_sources/commands/tmserver.txt    |    5 +-
 docs/_build/html/_sources/commands/ts2po.txt       |   10 +-
 docs/_build/html/_sources/commands/txt2po.txt      |    7 +-
 docs/_build/html/_sources/commands/web2py2po.txt   |   13 +-
 docs/_build/html/_sources/commands/xliff2po.txt    |    8 +-
 .../{development => developers}/building.txt       |    2 +-
 .../{development => developers}/contributing.txt   |   10 +-
 .../{development => developers}/developers.txt     |   41 +-
 docs/_build/html/_sources/developers/releasing.txt |  272 ++
 .../_build/html/_sources/developers/styleguide.txt |  630 ++++
 docs/_build/html/_sources/developers/testing.txt   |  142 +
 docs/_build/html/_sources/formats/android.txt      |   24 +
 docs/_build/html/_sources/formats/base_classes.txt |    9 +-
 docs/_build/html/_sources/formats/catkeys.txt      |    2 +-
 docs/_build/html/_sources/formats/csv.txt          |    4 +-
 docs/_build/html/_sources/formats/html.txt         |    2 +-
 docs/_build/html/_sources/formats/ical.txt         |    8 +-
 docs/_build/html/_sources/formats/index.txt        |   58 +-
 docs/_build/html/_sources/formats/ini.txt          |    8 +-
 docs/_build/html/_sources/formats/json.txt         |   32 +
 docs/_build/html/_sources/formats/l20n.txt         |    2 +-
 docs/_build/html/_sources/formats/odf.txt          |    9 +-
 docs/_build/html/_sources/formats/php.txt          |  239 +-
 docs/_build/html/_sources/formats/po.txt           |   61 +-
 docs/_build/html/_sources/formats/properties.txt   |    8 +-
 .../html/_sources/formats/quoting_and_escaping.txt |    3 +-
 docs/_build/html/_sources/formats/rc.txt           |    6 +-
 docs/_build/html/_sources/formats/strings.txt      |    8 +-
 docs/_build/html/_sources/formats/subtitles.txt    |   10 +-
 docs/_build/html/_sources/formats/tbx.txt          |  627 +---
 docs/_build/html/_sources/formats/tmx.txt          |   11 +-
 docs/_build/html/_sources/formats/ts.txt           |    6 +-
 docs/_build/html/_sources/formats/utx.txt          |    3 +-
 docs/_build/html/_sources/formats/wiki.txt         |    2 +-
 docs/_build/html/_sources/formats/wml.txt          |    7 +-
 docs/_build/html/_sources/formats/wordfast.txt     |    5 +-
 docs/_build/html/_sources/formats/xliff.txt        |   16 +-
 .../_sources/guides/creating_mozilla_pot_files.txt |   22 +-
 docs/_build/html/_sources/guides/index.txt         |    3 -
 .../html/_sources/guides/migrating_to_firefox.txt  |  169 -
 docs/_build/html/_sources/guides/using_csv2po.txt  |    2 +-
 docs/_build/html/_sources/history.txt              |   15 +-
 docs/_build/html/_sources/installation.txt         |    2 +-
 docs/_build/html/_sources/releases/1.10.0.txt      |  118 +
 docs/_build/html/_sources/releases/1.11.0-rc1.txt  |  140 +
 docs/_build/html/_sources/releases/1.11.0.txt      |  148 +
 docs/_build/html/_sources/releases/1.11.1.txt      |  364 ++
 docs/_build/html/_sources/releases/1.8.1.txt       |   74 +
 docs/_build/html/_sources/releases/1.9.0.txt       |   56 +
 docs/_build/html/_sources/releases/index.txt       |   16 +
 docs/_build/html/_sources/styleguide.txt           |  370 --
 docs/_build/html/_static/README.txt                |    1 +
 docs/_build/html/_static/basic.css                 |    7 +-
 docs/_build/html/_static/doctools.js               |   19 +-
 .../html/_static/font/fontawesome-webfont.eot      |  Bin
 .../html/_static/font/fontawesome-webfont.svg      |    0
 .../html/_static/font/fontawesome-webfont.ttf      |  Bin
 .../html/_static/font/fontawesome-webfont.woff     |  Bin
 docs/_build/html/_static/pygments.css              |    4 +-
 docs/_build/html/_static/searchtools.js            |  362 +-
 docs/_build/html/_static/tbx_levels_structure.png  |  Bin 36960 -> 0 bytes
 docs/_build/html/_static/underscore.js             |   50 +-
 docs/_build/html/_static/websupport.js             |    2 +-
 docs/_build/html/api/convert.html                  |  116 +-
 docs/_build/html/api/filters.html                  |   57 +-
 docs/_build/html/api/index.html                    |   58 +-
 docs/_build/html/api/lang.html                     |  338 +-
 docs/_build/html/api/misc.html                     |  461 +--
 docs/_build/html/api/search.html                   |  222 +-
 docs/_build/html/api/services.html                 |   35 +-
 docs/_build/html/api/storage.html                  | 3826 ++++++++++++++------
 docs/_build/html/api/tools.html                    |   52 +-
 docs/_build/html/changelog.html                    |  130 +-
 docs/_build/html/commands/csv2po.html              |   65 +-
 docs/_build/html/commands/csv2tbx.html             |   58 +-
 docs/_build/html/commands/general_usage.html       |   47 +-
 docs/_build/html/commands/html2po.html             |   66 +-
 docs/_build/html/commands/ical2po.html             |   80 +-
 docs/_build/html/commands/index.html               |   47 +-
 docs/_build/html/commands/ini2po.html              |   86 +-
 docs/_build/html/commands/json2po.html             |   77 +-
 docs/_build/html/commands/junitmsgfmt.html         |   43 +-
 .../_build/html/commands/levenshtein_distance.html |   84 +-
 docs/_build/html/commands/moz-l10n-builder.html    |   51 +-
 docs/_build/html/commands/moz2po.html              |  115 +-
 .../_build/html/commands/mozilla_l10n_scripts.html |   89 +-
 docs/_build/html/commands/odf2xliff.html           |   64 +-
 docs/_build/html/commands/oo2po.html               |   89 +-
 docs/_build/html/commands/option_accelerator.html  |   39 +-
 docs/_build/html/commands/option_duplicates.html   |   50 +-
 docs/_build/html/commands/option_errorlevel.html   |   56 +-
 docs/_build/html/commands/option_filteraction.html |   35 +-
 docs/_build/html/commands/option_multifile.html    |   41 +-
 docs/_build/html/commands/option_personality.html  |   47 +-
 docs/_build/html/commands/option_progress.html     |   45 +-
 docs/_build/html/commands/option_psyco.html        |  166 -
 docs/_build/html/commands/option_rewrite.html      |   58 +-
 docs/_build/html/commands/phase.html               |   40 +-
 docs/_build/html/commands/php2po.html              |  103 +-
 docs/_build/html/commands/po2tmx.html              |   57 +-
 docs/_build/html/commands/po2wordfast.html         |   52 +-
 docs/_build/html/commands/poclean.html             |   51 +-
 docs/_build/html/commands/pocommentclean.html      |   38 +-
 docs/_build/html/commands/pocompendium.html        |   38 +-
 docs/_build/html/commands/pocompile.html           |   48 +-
 docs/_build/html/commands/poconflicts.html         |   54 +-
 docs/_build/html/commands/pocount.html             |   75 +-
 docs/_build/html/commands/podebug.html             |   44 +-
 docs/_build/html/commands/pofilter.html            |   54 +-
 docs/_build/html/commands/pofilter_tests.html      |   94 +-
 docs/_build/html/commands/pogrep.html              |   55 +-
 docs/_build/html/commands/pomerge.html             |   48 +-
 docs/_build/html/commands/pomigrate2.html          |   38 +-
 docs/_build/html/commands/popuretext.html          |   44 +-
 docs/_build/html/commands/poreencode.html          |   38 +-
 docs/_build/html/commands/porestructure.html       |   42 +-
 docs/_build/html/commands/posegment.html           |   48 +-
 docs/_build/html/commands/posplit.html             |   38 +-
 docs/_build/html/commands/poswap.html              |   54 +-
 docs/_build/html/commands/pot2po.html              |   60 +-
 docs/_build/html/commands/poterminology.html       |   76 +-
 .../html/commands/poterminology_stopword_file.html |   82 +-
 docs/_build/html/commands/pretranslate.html        |   49 +-
 docs/_build/html/commands/prop2po.html             |   96 +-
 docs/_build/html/commands/rc2po.html               |   65 +-
 docs/_build/html/commands/sub2po.html              |   66 +-
 docs/_build/html/commands/symb2po.html             |   76 +-
 docs/_build/html/commands/tiki2po.html             |   59 +-
 docs/_build/html/commands/tmserver.html            |   51 +-
 docs/_build/html/commands/ts2po.html               |   66 +-
 docs/_build/html/commands/txt2po.html              |   76 +-
 docs/_build/html/commands/web2py2po.html           |   66 +-
 docs/_build/html/commands/xliff2po.html            |   64 +-
 .../html/{development => developers}/building.html |   50 +-
 .../{development => developers}/contributing.html  |   46 +-
 .../{development => developers}/developers.html    |  106 +-
 docs/_build/html/developers/releasing.html         |  429 +++
 docs/_build/html/developers/styleguide.html        |  729 ++++
 docs/_build/html/developers/testing.html           |  252 ++
 docs/_build/html/features.html                     |   37 +-
 .../html/formats/{strings.html => android.html}    |   75 +-
 docs/_build/html/formats/base_classes.html         |   48 +-
 docs/_build/html/formats/catkeys.html              |   48 +-
 docs/_build/html/formats/conformance.html          |   35 +-
 docs/_build/html/formats/csv.html                  |   39 +-
 docs/_build/html/formats/dtd.html                  |   35 +-
 docs/_build/html/formats/flex.html                 |   40 +-
 docs/_build/html/formats/gsi.html                  |   35 +-
 docs/_build/html/formats/html.html                 |   37 +-
 docs/_build/html/formats/ical.html                 |   52 +-
 docs/_build/html/formats/index.html                |  112 +-
 docs/_build/html/formats/ini.html                  |   39 +-
 docs/_build/html/formats/{odf.html => json.html}   |   91 +-
 docs/_build/html/formats/l20n.html                 |   37 +-
 docs/_build/html/formats/mo.html                   |   40 +-
 docs/_build/html/formats/odf.html                  |   48 +-
 docs/_build/html/formats/omegat_glossary.html      |   40 +-
 docs/_build/html/formats/php.html                  |  260 +-
 docs/_build/html/formats/po.html                   |  120 +-
 docs/_build/html/formats/properties.html           |   41 +-
 docs/_build/html/formats/qm.html                   |   35 +-
 docs/_build/html/formats/qt_phrase_book.html       |   40 +-
 docs/_build/html/formats/quoting_and_escaping.html |   42 +-
 docs/_build/html/formats/rc.html                   |   46 +-
 docs/_build/html/formats/strings.html              |   46 +-
 docs/_build/html/formats/subtitles.html            |   48 +-
 docs/_build/html/formats/tbx.html                  |  599 +--
 docs/_build/html/formats/text.html                 |   40 +-
 docs/_build/html/formats/tmx.html                  |   50 +-
 docs/_build/html/formats/ts.html                   |   41 +-
 docs/_build/html/formats/utx.html                  |   43 +-
 docs/_build/html/formats/wiki.html                 |   37 +-
 docs/_build/html/formats/wml.html                  |   41 +-
 docs/_build/html/formats/wordfast.html             |   39 +-
 docs/_build/html/formats/xliff.html                |   77 +-
 docs/_build/html/genindex.html                     | 1270 +++++--
 .../html/guides/checking_for_inconsistencies.html  |   57 +-
 .../html/guides/cleanup_translator_comments.html   |   41 +-
 ...ology_list_from_your_existing_translations.html |   69 +-
 .../html/guides/creating_mozilla_pot_files.html    |   76 +-
 docs/_build/html/guides/document_translation.html  |   41 +-
 docs/_build/html/guides/index.html                 |   40 +-
 docs/_build/html/guides/migrating_to_firefox.html  |  280 --
 .../_build/html/guides/migrating_translations.html |   53 +-
 .../running_the_tools_on_microsoft_windows.html    |   44 +-
 docs/_build/html/guides/using_csv2po.html          |   63 +-
 docs/_build/html/guides/using_oo2po.html           |   46 +-
 docs/_build/html/guides/using_pofilter.html        |   58 +-
 docs/_build/html/history.html                      |   56 +-
 docs/_build/html/index.html                        |   90 +-
 docs/_build/html/installation.html                 |   77 +-
 docs/_build/html/license.html                      |   40 +-
 docs/_build/html/objects.inv                       |  Bin 45795 -> 44228 bytes
 docs/_build/html/py-modindex.html                  |   65 +-
 docs/_build/html/releases/1.10.0.html              |  248 ++
 docs/_build/html/releases/1.11.0-rc1.html          |  275 ++
 docs/_build/html/releases/1.11.0.html              |  285 ++
 docs/_build/html/releases/1.11.1.html              |  435 +++
 docs/_build/html/releases/1.8.1.html               |  191 +
 docs/_build/html/releases/1.9.0.html               |  187 +
 .../html/{formats/gsi.html => releases/index.html} |   80 +-
 docs/_build/html/search.html                       |   39 +-
 docs/_build/html/searchindex.js                    |    2 +-
 docs/_build/html/styleguide.html                   |  501 ---
 docs/_ext/translate_docs.pyc                       |  Bin 543 -> 543 bytes
 docs/_static/README.txt                            |    1 +
 docs/_static/tbx_levels_structure.png              |  Bin 36960 -> 0 bytes
 docs/_themes/sphinx-bootstrap/layout.html          |    5 +-
 docs/_themes/sphinx-bootstrap/sourcelink.html      |    5 +-
 docs/api/misc.rst                                  |   16 -
 docs/api/storage.rst                               |    9 +-
 docs/changelog.rst                                 |   29 +-
 docs/commands/csv2po.rst                           |    6 +-
 docs/commands/csv2tbx.rst                          |    3 +-
 docs/commands/html2po.rst                          |    7 +-
 docs/commands/ical2po.rst                          |   14 +-
 docs/commands/index.rst                            |    1 -
 docs/commands/ini2po.rst                           |    7 +-
 docs/commands/json2po.rst                          |   15 +-
 docs/commands/levenshtein_distance.rst             |   60 +-
 docs/commands/moz-l10n-builder.rst                 |   12 +-
 docs/commands/moz2po.rst                           |   46 +-
 docs/commands/mozilla_l10n_scripts.rst             |   36 +-
 docs/commands/odf2xliff.rst                        |    8 +-
 docs/commands/oo2po.rst                            |   15 +-
 docs/commands/option_accelerator.rst               |    8 +-
 docs/commands/option_psyco.rst                     |   44 -
 docs/commands/option_rewrite.rst                   |    4 +-
 docs/commands/php2po.rst                           |   48 +-
 docs/commands/po2tmx.rst                           |   11 +-
 docs/commands/po2wordfast.rst                      |    6 +-
 docs/commands/poclean.rst                          |    2 -
 docs/commands/pocompile.rst                        |    2 -
 docs/commands/poconflicts.rst                      |    2 -
 docs/commands/pocount.rst                          |   14 +-
 docs/commands/podebug.rst                          |    5 +-
 docs/commands/pofilter.rst                         |    2 -
 docs/commands/pofilter_tests.rst                   |   57 +-
 docs/commands/pogrep.rst                           |    4 +-
 docs/commands/pomerge.rst                          |    2 -
 docs/commands/porestructure.rst                    |    2 -
 docs/commands/posegment.rst                        |    2 -
 docs/commands/poswap.rst                           |    2 -
 docs/commands/pot2po.rst                           |   13 +-
 docs/commands/poterminology.rst                    |    5 +-
 docs/commands/pretranslate.rst                     |    7 +-
 docs/commands/prop2po.rst                          |   10 +-
 docs/commands/rc2po.rst                            |    6 +-
 docs/commands/sub2po.rst                           |    7 +-
 docs/commands/symb2po.rst                          |    6 +-
 docs/commands/tiki2po.rst                          |    4 +-
 docs/commands/tmserver.rst                         |    5 +-
 docs/commands/ts2po.rst                            |   10 +-
 docs/commands/txt2po.rst                           |    7 +-
 docs/commands/web2py2po.rst                        |   13 +-
 docs/commands/xliff2po.rst                         |    8 +-
 docs/conf.py                                       |   31 +-
 docs/contents.rst.inc                              |   38 +-
 docs/{development => developers}/building.rst      |    2 +-
 docs/{development => developers}/contributing.rst  |   10 +-
 docs/{development => developers}/developers.rst    |   41 +-
 docs/developers/releasing.rst                      |  272 ++
 docs/developers/styleguide.rst                     |  630 ++++
 docs/developers/testing.rst                        |  142 +
 docs/formats/android.rst                           |   24 +
 docs/formats/base_classes.rst                      |    9 +-
 docs/formats/catkeys.rst                           |    2 +-
 docs/formats/csv.rst                               |    4 +-
 docs/formats/html.rst                              |    2 +-
 docs/formats/ical.rst                              |    8 +-
 docs/formats/index.rst                             |   58 +-
 docs/formats/ini.rst                               |    8 +-
 docs/formats/json.rst                              |   32 +
 docs/formats/l20n.rst                              |    2 +-
 docs/formats/odf.rst                               |    9 +-
 docs/formats/php.rst                               |  239 +-
 docs/formats/po.rst                                |   61 +-
 docs/formats/properties.rst                        |    8 +-
 docs/formats/quoting_and_escaping.rst              |    3 +-
 docs/formats/rc.rst                                |    6 +-
 docs/formats/strings.rst                           |    8 +-
 docs/formats/subtitles.rst                         |   10 +-
 docs/formats/tbx.rst                               |  627 +---
 docs/formats/tmx.rst                               |   11 +-
 docs/formats/ts.rst                                |    6 +-
 docs/formats/utx.rst                               |    3 +-
 docs/formats/wiki.rst                              |    2 +-
 docs/formats/wml.rst                               |    7 +-
 docs/formats/wordfast.rst                          |    5 +-
 docs/formats/xliff.rst                             |   16 +-
 docs/guides/creating_mozilla_pot_files.rst         |   22 +-
 docs/guides/index.rst                              |    3 -
 docs/guides/migrating_to_firefox.rst               |  169 -
 docs/guides/using_csv2po.rst                       |    2 +-
 docs/history.rst                                   |   15 +-
 docs/installation.rst                              |    2 +-
 docs/releases/1.10.0.rst                           |  118 +
 docs/releases/1.11.0-rc1.rst                       |  140 +
 docs/releases/1.11.0.rst                           |  148 +
 docs/releases/1.8.1.rst                            |   74 +
 docs/releases/1.9.0.rst                            |   56 +
 docs/releases/README.rst                           |   29 +
 docs/releases/index.rst                            |   16 +
 docs/styleguide.rst                                |  370 --
 min-required.txt                                   |    9 +
 requirements.txt                                   |    3 +
 requirements/dev.txt                               |    4 +
 requirements/optional.txt                          |   19 +
 requirements/recommended.txt                       |    9 +
 setup.py                                           |   42 +-
 tools/mozilla/buildxpi.py                          |  284 ++
 tools/mozilla/get_moz_enUS.py                      |  145 +
 tools/pocommentclean                               |    3 +-
 tools/pocompendium                                 |    3 +-
 tools/pomigrate2                                   |    3 +-
 tools/popuretext                                   |    3 +-
 tools/poreencode                                   |    3 +-
 tools/posplit                                      |    3 +-
 translate/__version__.py                           |   16 +-
 translate/convert/convert.py                       |   66 +-
 translate/convert/csv2po.py                        |   29 +-
 translate/convert/ical2po.py                       |    5 +-
 translate/convert/ini2po.py                        |    5 +-
 translate/convert/json2po.py                       |    5 +-
 translate/convert/moz2po.py                        |    8 +-
 translate/convert/oo2po.py                         |   16 +-
 translate/convert/oo2xliff.py                      |   21 +-
 translate/convert/php2po.py                        |   59 +-
 translate/convert/po2dtd.py                        |   46 +-
 translate/convert/po2html.py                       |   12 +-
 translate/convert/po2ical.py                       |   10 +-
 translate/convert/po2ini.py                        |   16 +-
 translate/convert/po2json.py                       |   10 +-
 translate/convert/po2moz.py                        |   51 +-
 translate/convert/po2mozlang.py                    |   10 +-
 translate/convert/po2oo.py                         |   25 +-
 translate/convert/po2php.py                        |   10 +-
 translate/convert/po2prop.py                       |   24 +-
 translate/convert/po2rc.py                         |    9 +-
 translate/convert/po2sub.py                        |   10 +-
 translate/convert/po2tmx                           |    4 +-
 translate/convert/po2tmx.py                        |   45 +-
 translate/convert/po2txt.py                        |   10 +-
 translate/convert/po2web2py.py                     |   11 +-
 translate/convert/prop2mozfunny.py                 |   27 +-
 translate/convert/prop2po.py                       |   16 +-
 translate/convert/rc2po.py                         |    5 +-
 translate/convert/sub2po.py                        |    5 +-
 translate/convert/test_convert.py                  |   13 +-
 translate/convert/test_dtd2po.py                   |    2 +-
 translate/convert/test_html2po.py                  |    2 +-
 translate/convert/test_mozlang2po.py               |    2 +-
 translate/convert/test_po2dtd.py                   |  108 +-
 translate/convert/test_po2html.py                  |   16 +-
 translate/convert/test_po2ical.py                  |    1 +
 translate/convert/test_po2ini.py                   |    6 +-
 translate/convert/test_po2moz.py                   |    3 +-
 translate/convert/test_po2mozlang.py               |    1 +
 translate/convert/test_po2oo.py                    |    3 +-
 translate/convert/test_po2php.py                   |    3 +-
 translate/convert/test_po2prop.py                  |   47 +
 translate/convert/test_po2sub.py                   |    7 +
 translate/convert/test_po2tmx.py                   |   53 +-
 translate/convert/test_po2txt.py                   |    1 +
 translate/convert/test_pot2po.py                   |    2 +-
 translate/convert/test_prop2po.py                  |    2 +-
 translate/convert/test_xliff2po.py                 |   95 +-
 translate/convert/xliff2oo.py                      |   15 +-
 translate/convert/xliff2po.py                      |    7 +-
 translate/filters/checks.py                        |   80 +-
 translate/filters/pofilter                         |    1 -
 translate/filters/pofilter.py                      |   12 +-
 translate/filters/spelling.py                      |   28 +-
 translate/filters/test_checks.py                   |   25 +-
 translate/filters/test_decoration.py               |    1 +
 translate/lang/af.py                               |    2 +
 translate/lang/{fi.py => ak.py}                    |   14 +-
 translate/lang/{fi.py => az.py}                    |   15 +-
 translate/lang/common.py                           |   23 +-
 translate/lang/data.py                             |   14 +-
 translate/lang/{fi.py => dz.py}                    |   15 +-
 translate/lang/fi.py                               |    4 +-
 translate/lang/{fi.py => gd.py}                    |   14 +-
 translate/lang/hy.py                               |    3 +
 translate/lang/km.py                               |    3 +
 translate/lang/{fi.py => kw.py}                    |   15 +-
 translate/lang/{fi.py => lo.py}                    |   15 +-
 translate/lang/{fi.py => ms.py}                    |   15 +-
 translate/lang/{vi.py => nqo.py}                   |   42 +-
 translate/lang/{fi.py => nso.py}                   |   14 +-
 translate/lang/poedit.py                           |    5 +-
 translate/lang/{fi.py => son.py}                   |   14 +-
 translate/lang/{fi.py => su.py}                    |   15 +-
 translate/lang/test_common.py                      |    2 +-
 translate/lang/test_identify.py                    |    2 +-
 translate/lang/test_nqo.py                         |   32 +
 translate/lang/test_tr.py                          |   12 +
 translate/{__version__.py => lang/tr.py}           |   14 +-
 translate/lang/{fi.py => ve.py}                    |   14 +-
 translate/lang/vi.py                               |    3 +
 translate/{convert/po2tmx => lang/zh_cn.py}        |   20 +-
 translate/lang/{fi.py => zh_hk.py}                 |   16 +-
 translate/lang/{fi.py => zh_tw.py}                 |   16 +-
 translate/misc/dictutils.py                        |    2 +-
 translate/misc/optrecurse.py                       |   70 +-
 translate/misc/profiling.py                        |    3 +-
 translate/misc/test_autoencode.py                  |    4 +-
 translate/misc/test_dictutils.py                   |    9 +
 translate/misc/test_multistring.py                 |    4 +-
 translate/misc/test_optrecurse.py                  |    4 +-
 translate/misc/test_zipfileext.py                  |  169 -
 translate/misc/textwrap.py                         |  187 +-
 translate/misc/xmlwrapper.py                       |    9 +-
 translate/misc/zipfileext.py                       |  128 -
 translate/search/indexing/CommonIndexer.py         |    2 +-
 translate/search/indexing/PyLuceneIndexer.py       |    3 +
 translate/search/indexing/test_indexers.py         |   41 +
 translate/search/lshtein.py                        |   10 +-
 translate/search/match.py                          |    4 +-
 translate/services/tmserver.py                     |    6 -
 translate/storage/aresource.py                     |   68 +-
 translate/storage/base.py                          |   60 +-
 translate/storage/benchmark.py                     |   74 +-
 translate/storage/catkeys.py                       |    8 -
 translate/storage/cpo.py                           |  200 +-
 translate/storage/dtd.py                           |    6 +-
 translate/storage/factory.py                       |    0
 translate/storage/fpo.py                           |    2 +-
 translate/storage/lisa.py                          |    1 -
 translate/storage/mozilla_lang.py                  |    6 +-
 translate/storage/omegat.py                        |    8 -
 translate/storage/oo.py                            |    6 +-
 translate/storage/php.py                           |  130 +-
 translate/storage/placeables/general.py            |    2 +-
 translate/storage/placeables/interfaces.py         |   19 +-
 translate/storage/placeables/strelem.py            |   47 +-
 translate/storage/placeables/test_base.py          |    2 +-
 translate/storage/placeables/xliff.py              |    7 +-
 translate/storage/properties.py                    |   87 +-
 translate/storage/pypo.py                          |   67 +-
 translate/storage/qm.py                            |    9 +-
 translate/storage/statsdb.py                       |    8 +-
 translate/storage/test_aresource.py                |  226 +-
 translate/storage/test_base.py                     |    6 +-
 translate/storage/test_cpo.py                      |    4 +-
 translate/storage/test_dtd.py                      |   13 +-
 translate/storage/test_html.py                     |    2 +-
 translate/storage/test_mo.py                       |   14 +-
 translate/storage/test_monolingual.py              |   24 +-
 translate/storage/test_mozilla_lang.py             |   18 +
 translate/storage/test_omegat.py                   |    2 +-
 translate/storage/test_php.py                      |   37 +-
 translate/storage/test_po.py                       |   99 +-
 translate/storage/test_properties.py               |    9 +-
 translate/storage/test_pypo.py                     |   13 +-
 translate/storage/test_qm.py                       |   10 +-
 translate/storage/test_statsdb.py                  |    2 +-
 translate/storage/test_tmx.py                      |    9 +
 translate/storage/test_trados.py                   |    3 +-
 translate/storage/test_xliff.py                    |   16 +
 translate/storage/test_zipfile.py                  |  156 -
 translate/storage/tiki.py                          |    6 +-
 translate/storage/tmdb.py                          |   40 +-
 translate/storage/tmx.py                           |    6 +-
 translate/storage/trados.py                        |    4 +-
 translate/storage/ts.py                            |    6 +-
 translate/storage/ts2.py                           |   12 +-
 translate/storage/utx.py                           |   12 +-
 translate/storage/versioncontrol/__init__.py       |   13 +-
 translate/storage/versioncontrol/hg.py             |    2 +-
 translate/storage/wordfast.py                      |    9 -
 translate/storage/xliff.py                         |   12 +-
 translate/storage/xpi.py                           |  597 ---
 translate/storage/zip.py                           |    2 -
 translate/tools/build_tmdb.py                      |   16 +-
 translate/tools/poconflicts.py                     |    1 -
 translate/tools/pocount.py                         |   15 +-
 translate/tools/pogrep.py                          |   10 +-
 translate/tools/poterminology.py                   |   22 +-
 translate/tools/test_pocount.py                    |    2 +-
 translate/tools/test_pomerge.py                    |   10 +-
 translate/tools/test_pretranslate.py               |    2 +-
 667 files changed, 19220 insertions(+), 12550 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 47fb954..647b960 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: translate-toolkit
-Version: 1.10.0
+Version: 1.11.0
 Summary: Tools and API for translation and localization engineering.
 Home-page: http://toolkit.translatehouse.org/
 Author: Translate
 Author-email: translate-devel at lists.sourceforge.net
 License: GNU General Public License (GPL)
-Download-URL: http://sourceforge.net/projects/translate/files/Translate Toolkit/1.10.0
+Download-URL: http://sourceforge.net/projects/translate/files/Translate Toolkit/1.11.0
 Description: 
         The `Translate Toolkit <http://toolkit.translatehouse.org/>`_ is created by
         localizers for localizers. It contains several utilities, as well as an API for
diff --git a/README.rst b/README.rst
index b6b4f18..ae384e6 100644
--- a/README.rst
+++ b/README.rst
@@ -74,6 +74,14 @@ software.
 
 Requirements
 ------------
+
+.. note:: Please check ``requirements/*.txt``::
+
+       pip install -r requirements/recommended.txt
+
+   Will install all recommended requirements, while ``optional.txt`` will also
+   install support for all other formats.
+
 Python 2.4 or later is recommended.
 
 The Toolkit should still work with Python 2.4 but is now most extensively
@@ -99,22 +107,11 @@ site for the recommended versions of these libraries if you need to install
 them separately at all. Most packaged versions of lxml will already contain
 these dependencies.
 
-Python 2.5 includes pysqlite, but pysqlite2 needs to be installed if you are
-using an older version of Python.
-<http://trac.edgewall.org/wiki/PySqlite>
-
 When the environment variable USECPO is set to 1, the toolkit will attempt to
 use libgettextpo from the gettext-tools package (it might have a slightly
 different name on your distribution). This can greatly speed up access to PO
 files, but has not yet been tested as extensively. Feedback is most welcome.
 
-Psyco can help to speed up several of the programs in the toolkit. It is
-optional, but highly recommended.
-<http://psyco.sourceforge.net/>
-
-The python wrapper to htmltidy is needed for po2html.
-http://utidylib.berlios.de/
-
 The package iniparse is necessary for ini2po and po2ini.
 http://code.google.com/p/iniparse/
 
@@ -227,8 +224,7 @@ Use ``--help`` to find the syntax and options for all programs.
 
         oo2po    - convert between OpenOffice.org GSI files and PO
         oo2xliff - convert between OpenOffice.org GSI files and XLIFF
-        moz2po   - convert from a Mozilla XPI file and PO.  Including
-                   unpacking and building a translated XPI.
+        moz2po   - convert between Mozilla files and PO
         csv2po   - convert PO format to CSV for editing in a spreadsheet program
         php2po   - PHP localisable string arrays converter.
         ts2po    - convert Qt Linguist (.ts) files to PO
diff --git a/docs/_build/doctrees/api/convert.doctree b/docs/_build/doctrees/api/convert.doctree
index f266e31..02af2bd 100644
Binary files a/docs/_build/doctrees/api/convert.doctree and b/docs/_build/doctrees/api/convert.doctree differ
diff --git a/docs/_build/doctrees/api/filters.doctree b/docs/_build/doctrees/api/filters.doctree
index ce21bb7..b44db21 100644
Binary files a/docs/_build/doctrees/api/filters.doctree and b/docs/_build/doctrees/api/filters.doctree differ
diff --git a/docs/_build/doctrees/api/index.doctree b/docs/_build/doctrees/api/index.doctree
index 34dd02f..739edc0 100644
Binary files a/docs/_build/doctrees/api/index.doctree and b/docs/_build/doctrees/api/index.doctree differ
diff --git a/docs/_build/doctrees/api/lang.doctree b/docs/_build/doctrees/api/lang.doctree
index 3ea5174..aff154b 100644
Binary files a/docs/_build/doctrees/api/lang.doctree and b/docs/_build/doctrees/api/lang.doctree differ
diff --git a/docs/_build/doctrees/api/misc.doctree b/docs/_build/doctrees/api/misc.doctree
index 52d28b8..62d9a10 100644
Binary files a/docs/_build/doctrees/api/misc.doctree and b/docs/_build/doctrees/api/misc.doctree differ
diff --git a/docs/_build/doctrees/api/search.doctree b/docs/_build/doctrees/api/search.doctree
index 896311f..cbb3708 100644
Binary files a/docs/_build/doctrees/api/search.doctree and b/docs/_build/doctrees/api/search.doctree differ
diff --git a/docs/_build/doctrees/api/services.doctree b/docs/_build/doctrees/api/services.doctree
index 7eb394a..903d62b 100644
Binary files a/docs/_build/doctrees/api/services.doctree and b/docs/_build/doctrees/api/services.doctree differ
diff --git a/docs/_build/doctrees/api/storage.doctree b/docs/_build/doctrees/api/storage.doctree
index 258c469..7eb9b01 100644
Binary files a/docs/_build/doctrees/api/storage.doctree and b/docs/_build/doctrees/api/storage.doctree differ
diff --git a/docs/_build/doctrees/api/tools.doctree b/docs/_build/doctrees/api/tools.doctree
index daca946..37a6fb9 100644
Binary files a/docs/_build/doctrees/api/tools.doctree and b/docs/_build/doctrees/api/tools.doctree differ
diff --git a/docs/_build/doctrees/changelog.doctree b/docs/_build/doctrees/changelog.doctree
index f6c192e..0505dda 100644
Binary files a/docs/_build/doctrees/changelog.doctree and b/docs/_build/doctrees/changelog.doctree differ
diff --git a/docs/_build/doctrees/commands/csv2po.doctree b/docs/_build/doctrees/commands/csv2po.doctree
index 5b50dba..d7fe666 100644
Binary files a/docs/_build/doctrees/commands/csv2po.doctree and b/docs/_build/doctrees/commands/csv2po.doctree differ
diff --git a/docs/_build/doctrees/commands/csv2tbx.doctree b/docs/_build/doctrees/commands/csv2tbx.doctree
index ee39573..02f3e16 100644
Binary files a/docs/_build/doctrees/commands/csv2tbx.doctree and b/docs/_build/doctrees/commands/csv2tbx.doctree differ
diff --git a/docs/_build/doctrees/commands/general_usage.doctree b/docs/_build/doctrees/commands/general_usage.doctree
index b7aa918..aa04bb3 100644
Binary files a/docs/_build/doctrees/commands/general_usage.doctree and b/docs/_build/doctrees/commands/general_usage.doctree differ
diff --git a/docs/_build/doctrees/commands/html2po.doctree b/docs/_build/doctrees/commands/html2po.doctree
index ef0c59f..691d3c7 100644
Binary files a/docs/_build/doctrees/commands/html2po.doctree and b/docs/_build/doctrees/commands/html2po.doctree differ
diff --git a/docs/_build/doctrees/commands/ical2po.doctree b/docs/_build/doctrees/commands/ical2po.doctree
index 3f246fc..788c7db 100644
Binary files a/docs/_build/doctrees/commands/ical2po.doctree and b/docs/_build/doctrees/commands/ical2po.doctree differ
diff --git a/docs/_build/doctrees/commands/index.doctree b/docs/_build/doctrees/commands/index.doctree
index d687e09..748590e 100644
Binary files a/docs/_build/doctrees/commands/index.doctree and b/docs/_build/doctrees/commands/index.doctree differ
diff --git a/docs/_build/doctrees/commands/ini2po.doctree b/docs/_build/doctrees/commands/ini2po.doctree
index aa43488..208fd43 100644
Binary files a/docs/_build/doctrees/commands/ini2po.doctree and b/docs/_build/doctrees/commands/ini2po.doctree differ
diff --git a/docs/_build/doctrees/commands/json2po.doctree b/docs/_build/doctrees/commands/json2po.doctree
index 8fb313a..4961e76 100644
Binary files a/docs/_build/doctrees/commands/json2po.doctree and b/docs/_build/doctrees/commands/json2po.doctree differ
diff --git a/docs/_build/doctrees/commands/junitmsgfmt.doctree b/docs/_build/doctrees/commands/junitmsgfmt.doctree
index da6ef8d..1061df8 100644
Binary files a/docs/_build/doctrees/commands/junitmsgfmt.doctree and b/docs/_build/doctrees/commands/junitmsgfmt.doctree differ
diff --git a/docs/_build/doctrees/commands/levenshtein_distance.doctree b/docs/_build/doctrees/commands/levenshtein_distance.doctree
index 9e72517..12845ea 100644
Binary files a/docs/_build/doctrees/commands/levenshtein_distance.doctree and b/docs/_build/doctrees/commands/levenshtein_distance.doctree differ
diff --git a/docs/_build/doctrees/commands/moz-l10n-builder.doctree b/docs/_build/doctrees/commands/moz-l10n-builder.doctree
index 91b1fb8..ae73292 100644
Binary files a/docs/_build/doctrees/commands/moz-l10n-builder.doctree and b/docs/_build/doctrees/commands/moz-l10n-builder.doctree differ
diff --git a/docs/_build/doctrees/commands/moz2po.doctree b/docs/_build/doctrees/commands/moz2po.doctree
index ba99cea..7bb397e 100644
Binary files a/docs/_build/doctrees/commands/moz2po.doctree and b/docs/_build/doctrees/commands/moz2po.doctree differ
diff --git a/docs/_build/doctrees/commands/mozilla_l10n_scripts.doctree b/docs/_build/doctrees/commands/mozilla_l10n_scripts.doctree
index 1d7c422..a937166 100644
Binary files a/docs/_build/doctrees/commands/mozilla_l10n_scripts.doctree and b/docs/_build/doctrees/commands/mozilla_l10n_scripts.doctree differ
diff --git a/docs/_build/doctrees/commands/odf2xliff.doctree b/docs/_build/doctrees/commands/odf2xliff.doctree
index c5f5871..f0c2878 100644
Binary files a/docs/_build/doctrees/commands/odf2xliff.doctree and b/docs/_build/doctrees/commands/odf2xliff.doctree differ
diff --git a/docs/_build/doctrees/commands/oo2po.doctree b/docs/_build/doctrees/commands/oo2po.doctree
index 73a226e..cdc350d 100644
Binary files a/docs/_build/doctrees/commands/oo2po.doctree and b/docs/_build/doctrees/commands/oo2po.doctree differ
diff --git a/docs/_build/doctrees/commands/option_accelerator.doctree b/docs/_build/doctrees/commands/option_accelerator.doctree
index 5795fc6..74770a4 100644
Binary files a/docs/_build/doctrees/commands/option_accelerator.doctree and b/docs/_build/doctrees/commands/option_accelerator.doctree differ
diff --git a/docs/_build/doctrees/commands/option_duplicates.doctree b/docs/_build/doctrees/commands/option_duplicates.doctree
index c747231..2cea6da 100644
Binary files a/docs/_build/doctrees/commands/option_duplicates.doctree and b/docs/_build/doctrees/commands/option_duplicates.doctree differ
diff --git a/docs/_build/doctrees/commands/option_errorlevel.doctree b/docs/_build/doctrees/commands/option_errorlevel.doctree
index c70af34..47c0dd1 100644
Binary files a/docs/_build/doctrees/commands/option_errorlevel.doctree and b/docs/_build/doctrees/commands/option_errorlevel.doctree differ
diff --git a/docs/_build/doctrees/commands/option_filteraction.doctree b/docs/_build/doctrees/commands/option_filteraction.doctree
index e0f6652..3c33c51 100644
Binary files a/docs/_build/doctrees/commands/option_filteraction.doctree and b/docs/_build/doctrees/commands/option_filteraction.doctree differ
diff --git a/docs/_build/doctrees/commands/option_multifile.doctree b/docs/_build/doctrees/commands/option_multifile.doctree
index a51df3c..21a313e 100644
Binary files a/docs/_build/doctrees/commands/option_multifile.doctree and b/docs/_build/doctrees/commands/option_multifile.doctree differ
diff --git a/docs/_build/doctrees/commands/option_personality.doctree b/docs/_build/doctrees/commands/option_personality.doctree
index 365ebaa..5841005 100644
Binary files a/docs/_build/doctrees/commands/option_personality.doctree and b/docs/_build/doctrees/commands/option_personality.doctree differ
diff --git a/docs/_build/doctrees/commands/option_progress.doctree b/docs/_build/doctrees/commands/option_progress.doctree
index 8bdb6d5..800816e 100644
Binary files a/docs/_build/doctrees/commands/option_progress.doctree and b/docs/_build/doctrees/commands/option_progress.doctree differ
diff --git a/docs/_build/doctrees/commands/option_psyco.doctree b/docs/_build/doctrees/commands/option_psyco.doctree
deleted file mode 100644
index dbea5ed..0000000
Binary files a/docs/_build/doctrees/commands/option_psyco.doctree and /dev/null differ
diff --git a/docs/_build/doctrees/commands/option_rewrite.doctree b/docs/_build/doctrees/commands/option_rewrite.doctree
index 05a0a03..11c3d62 100644
Binary files a/docs/_build/doctrees/commands/option_rewrite.doctree and b/docs/_build/doctrees/commands/option_rewrite.doctree differ
diff --git a/docs/_build/doctrees/commands/phase.doctree b/docs/_build/doctrees/commands/phase.doctree
index 28c8b58..787bffa 100644
Binary files a/docs/_build/doctrees/commands/phase.doctree and b/docs/_build/doctrees/commands/phase.doctree differ
diff --git a/docs/_build/doctrees/commands/php2po.doctree b/docs/_build/doctrees/commands/php2po.doctree
index d1c41da..1d6544d 100644
Binary files a/docs/_build/doctrees/commands/php2po.doctree and b/docs/_build/doctrees/commands/php2po.doctree differ
diff --git a/docs/_build/doctrees/commands/po2tmx.doctree b/docs/_build/doctrees/commands/po2tmx.doctree
index c6e9819..4d276f1 100644
Binary files a/docs/_build/doctrees/commands/po2tmx.doctree and b/docs/_build/doctrees/commands/po2tmx.doctree differ
diff --git a/docs/_build/doctrees/commands/po2wordfast.doctree b/docs/_build/doctrees/commands/po2wordfast.doctree
index 82258f6..157a3c3 100644
Binary files a/docs/_build/doctrees/commands/po2wordfast.doctree and b/docs/_build/doctrees/commands/po2wordfast.doctree differ
diff --git a/docs/_build/doctrees/commands/poclean.doctree b/docs/_build/doctrees/commands/poclean.doctree
index 1a8a592..953c001 100644
Binary files a/docs/_build/doctrees/commands/poclean.doctree and b/docs/_build/doctrees/commands/poclean.doctree differ
diff --git a/docs/_build/doctrees/commands/pocommentclean.doctree b/docs/_build/doctrees/commands/pocommentclean.doctree
index 82ec587..79e7ec4 100644
Binary files a/docs/_build/doctrees/commands/pocommentclean.doctree and b/docs/_build/doctrees/commands/pocommentclean.doctree differ
diff --git a/docs/_build/doctrees/commands/pocompendium.doctree b/docs/_build/doctrees/commands/pocompendium.doctree
index cb0cd4f..3882ed3 100644
Binary files a/docs/_build/doctrees/commands/pocompendium.doctree and b/docs/_build/doctrees/commands/pocompendium.doctree differ
diff --git a/docs/_build/doctrees/commands/pocompile.doctree b/docs/_build/doctrees/commands/pocompile.doctree
index f544281..c850cd5 100644
Binary files a/docs/_build/doctrees/commands/pocompile.doctree and b/docs/_build/doctrees/commands/pocompile.doctree differ
diff --git a/docs/_build/doctrees/commands/poconflicts.doctree b/docs/_build/doctrees/commands/poconflicts.doctree
index 7bce6c6..ed6ec2d 100644
Binary files a/docs/_build/doctrees/commands/poconflicts.doctree and b/docs/_build/doctrees/commands/poconflicts.doctree differ
diff --git a/docs/_build/doctrees/commands/pocount.doctree b/docs/_build/doctrees/commands/pocount.doctree
index 9fa9e85..fae4256 100644
Binary files a/docs/_build/doctrees/commands/pocount.doctree and b/docs/_build/doctrees/commands/pocount.doctree differ
diff --git a/docs/_build/doctrees/commands/podebug.doctree b/docs/_build/doctrees/commands/podebug.doctree
index 20a8373..39916ab 100644
Binary files a/docs/_build/doctrees/commands/podebug.doctree and b/docs/_build/doctrees/commands/podebug.doctree differ
diff --git a/docs/_build/doctrees/commands/pofilter.doctree b/docs/_build/doctrees/commands/pofilter.doctree
index 1152c4c..9db2fdd 100644
Binary files a/docs/_build/doctrees/commands/pofilter.doctree and b/docs/_build/doctrees/commands/pofilter.doctree differ
diff --git a/docs/_build/doctrees/commands/pofilter_tests.doctree b/docs/_build/doctrees/commands/pofilter_tests.doctree
index cd38e1d..abeab61 100644
Binary files a/docs/_build/doctrees/commands/pofilter_tests.doctree and b/docs/_build/doctrees/commands/pofilter_tests.doctree differ
diff --git a/docs/_build/doctrees/commands/pogrep.doctree b/docs/_build/doctrees/commands/pogrep.doctree
index 16acb69..785164b 100644
Binary files a/docs/_build/doctrees/commands/pogrep.doctree and b/docs/_build/doctrees/commands/pogrep.doctree differ
diff --git a/docs/_build/doctrees/commands/pomerge.doctree b/docs/_build/doctrees/commands/pomerge.doctree
index bb9482c..afc663f 100644
Binary files a/docs/_build/doctrees/commands/pomerge.doctree and b/docs/_build/doctrees/commands/pomerge.doctree differ
diff --git a/docs/_build/doctrees/commands/pomigrate2.doctree b/docs/_build/doctrees/commands/pomigrate2.doctree
index b37d1c6..a800786 100644
Binary files a/docs/_build/doctrees/commands/pomigrate2.doctree and b/docs/_build/doctrees/commands/pomigrate2.doctree differ
diff --git a/docs/_build/doctrees/commands/popuretext.doctree b/docs/_build/doctrees/commands/popuretext.doctree
index e993062..5568540 100644
Binary files a/docs/_build/doctrees/commands/popuretext.doctree and b/docs/_build/doctrees/commands/popuretext.doctree differ
diff --git a/docs/_build/doctrees/commands/poreencode.doctree b/docs/_build/doctrees/commands/poreencode.doctree
index 8c8e7cf..6ef717d 100644
Binary files a/docs/_build/doctrees/commands/poreencode.doctree and b/docs/_build/doctrees/commands/poreencode.doctree differ
diff --git a/docs/_build/doctrees/commands/porestructure.doctree b/docs/_build/doctrees/commands/porestructure.doctree
index ce92566..4bac139 100644
Binary files a/docs/_build/doctrees/commands/porestructure.doctree and b/docs/_build/doctrees/commands/porestructure.doctree differ
diff --git a/docs/_build/doctrees/commands/posegment.doctree b/docs/_build/doctrees/commands/posegment.doctree
index da87254..4736a5e 100644
Binary files a/docs/_build/doctrees/commands/posegment.doctree and b/docs/_build/doctrees/commands/posegment.doctree differ
diff --git a/docs/_build/doctrees/commands/posplit.doctree b/docs/_build/doctrees/commands/posplit.doctree
index 833752c..4c6ae86 100644
Binary files a/docs/_build/doctrees/commands/posplit.doctree and b/docs/_build/doctrees/commands/posplit.doctree differ
diff --git a/docs/_build/doctrees/commands/poswap.doctree b/docs/_build/doctrees/commands/poswap.doctree
index 29a040f..8af277a 100644
Binary files a/docs/_build/doctrees/commands/poswap.doctree and b/docs/_build/doctrees/commands/poswap.doctree differ
diff --git a/docs/_build/doctrees/commands/pot2po.doctree b/docs/_build/doctrees/commands/pot2po.doctree
index f3dfce8..37e29af 100644
Binary files a/docs/_build/doctrees/commands/pot2po.doctree and b/docs/_build/doctrees/commands/pot2po.doctree differ
diff --git a/docs/_build/doctrees/commands/poterminology.doctree b/docs/_build/doctrees/commands/poterminology.doctree
index 6422243..d931b78 100644
Binary files a/docs/_build/doctrees/commands/poterminology.doctree and b/docs/_build/doctrees/commands/poterminology.doctree differ
diff --git a/docs/_build/doctrees/commands/poterminology_stopword_file.doctree b/docs/_build/doctrees/commands/poterminology_stopword_file.doctree
index a269700..7959779 100644
Binary files a/docs/_build/doctrees/commands/poterminology_stopword_file.doctree and b/docs/_build/doctrees/commands/poterminology_stopword_file.doctree differ
diff --git a/docs/_build/doctrees/commands/pretranslate.doctree b/docs/_build/doctrees/commands/pretranslate.doctree
index 4158003..7f30364 100644
Binary files a/docs/_build/doctrees/commands/pretranslate.doctree and b/docs/_build/doctrees/commands/pretranslate.doctree differ
diff --git a/docs/_build/doctrees/commands/prop2po.doctree b/docs/_build/doctrees/commands/prop2po.doctree
index f7817ca..e6a108c 100644
Binary files a/docs/_build/doctrees/commands/prop2po.doctree and b/docs/_build/doctrees/commands/prop2po.doctree differ
diff --git a/docs/_build/doctrees/commands/rc2po.doctree b/docs/_build/doctrees/commands/rc2po.doctree
index cc235d0..325151e 100644
Binary files a/docs/_build/doctrees/commands/rc2po.doctree and b/docs/_build/doctrees/commands/rc2po.doctree differ
diff --git a/docs/_build/doctrees/commands/sub2po.doctree b/docs/_build/doctrees/commands/sub2po.doctree
index 09e5a03..35d3b61 100644
Binary files a/docs/_build/doctrees/commands/sub2po.doctree and b/docs/_build/doctrees/commands/sub2po.doctree differ
diff --git a/docs/_build/doctrees/commands/symb2po.doctree b/docs/_build/doctrees/commands/symb2po.doctree
index 8740e00..20c6b2d 100644
Binary files a/docs/_build/doctrees/commands/symb2po.doctree and b/docs/_build/doctrees/commands/symb2po.doctree differ
diff --git a/docs/_build/doctrees/commands/tiki2po.doctree b/docs/_build/doctrees/commands/tiki2po.doctree
index 2348099..1c16005 100644
Binary files a/docs/_build/doctrees/commands/tiki2po.doctree and b/docs/_build/doctrees/commands/tiki2po.doctree differ
diff --git a/docs/_build/doctrees/commands/tmserver.doctree b/docs/_build/doctrees/commands/tmserver.doctree
index e1f2a24..d7edd20 100644
Binary files a/docs/_build/doctrees/commands/tmserver.doctree and b/docs/_build/doctrees/commands/tmserver.doctree differ
diff --git a/docs/_build/doctrees/commands/ts2po.doctree b/docs/_build/doctrees/commands/ts2po.doctree
index 35396f5..ede3a43 100644
Binary files a/docs/_build/doctrees/commands/ts2po.doctree and b/docs/_build/doctrees/commands/ts2po.doctree differ
diff --git a/docs/_build/doctrees/commands/txt2po.doctree b/docs/_build/doctrees/commands/txt2po.doctree
index 6c43098..ede0246 100644
Binary files a/docs/_build/doctrees/commands/txt2po.doctree and b/docs/_build/doctrees/commands/txt2po.doctree differ
diff --git a/docs/_build/doctrees/commands/web2py2po.doctree b/docs/_build/doctrees/commands/web2py2po.doctree
index 7001773..00faa4f 100644
Binary files a/docs/_build/doctrees/commands/web2py2po.doctree and b/docs/_build/doctrees/commands/web2py2po.doctree differ
diff --git a/docs/_build/doctrees/commands/xliff2po.doctree b/docs/_build/doctrees/commands/xliff2po.doctree
index 937adf4..fbfba7a 100644
Binary files a/docs/_build/doctrees/commands/xliff2po.doctree and b/docs/_build/doctrees/commands/xliff2po.doctree differ
diff --git a/docs/_build/doctrees/development/building.doctree b/docs/_build/doctrees/developers/building.doctree
similarity index 86%
rename from docs/_build/doctrees/development/building.doctree
rename to docs/_build/doctrees/developers/building.doctree
index 24eb394..3511e4c 100644
Binary files a/docs/_build/doctrees/development/building.doctree and b/docs/_build/doctrees/developers/building.doctree differ
diff --git a/docs/_build/doctrees/developers/contributing.doctree b/docs/_build/doctrees/developers/contributing.doctree
new file mode 100644
index 0000000..da3c6d9
Binary files /dev/null and b/docs/_build/doctrees/developers/contributing.doctree differ
diff --git a/docs/_build/doctrees/developers/developers.doctree b/docs/_build/doctrees/developers/developers.doctree
new file mode 100644
index 0000000..516939f
Binary files /dev/null and b/docs/_build/doctrees/developers/developers.doctree differ
diff --git a/docs/_build/doctrees/developers/releasing.doctree b/docs/_build/doctrees/developers/releasing.doctree
new file mode 100644
index 0000000..d1aa1f2
Binary files /dev/null and b/docs/_build/doctrees/developers/releasing.doctree differ
diff --git a/docs/_build/doctrees/developers/styleguide.doctree b/docs/_build/doctrees/developers/styleguide.doctree
new file mode 100644
index 0000000..21557b7
Binary files /dev/null and b/docs/_build/doctrees/developers/styleguide.doctree differ
diff --git a/docs/_build/doctrees/developers/testing.doctree b/docs/_build/doctrees/developers/testing.doctree
new file mode 100644
index 0000000..70952e8
Binary files /dev/null and b/docs/_build/doctrees/developers/testing.doctree differ
diff --git a/docs/_build/doctrees/development/contributing.doctree b/docs/_build/doctrees/development/contributing.doctree
deleted file mode 100644
index 3c4d22b..0000000
Binary files a/docs/_build/doctrees/development/contributing.doctree and /dev/null differ
diff --git a/docs/_build/doctrees/development/developers.doctree b/docs/_build/doctrees/development/developers.doctree
deleted file mode 100644
index c4122c2..0000000
Binary files a/docs/_build/doctrees/development/developers.doctree and /dev/null differ
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
index 3d9341e..7245a3a 100644
Binary files a/docs/_build/doctrees/environment.pickle and b/docs/_build/doctrees/environment.pickle differ
diff --git a/docs/_build/doctrees/features.doctree b/docs/_build/doctrees/features.doctree
index bca6b03..d69139e 100644
Binary files a/docs/_build/doctrees/features.doctree and b/docs/_build/doctrees/features.doctree differ
diff --git a/docs/_build/doctrees/formats/android.doctree b/docs/_build/doctrees/formats/android.doctree
new file mode 100644
index 0000000..e1a3255
Binary files /dev/null and b/docs/_build/doctrees/formats/android.doctree differ
diff --git a/docs/_build/doctrees/formats/base_classes.doctree b/docs/_build/doctrees/formats/base_classes.doctree
index 2afc8f7..56fd267 100644
Binary files a/docs/_build/doctrees/formats/base_classes.doctree and b/docs/_build/doctrees/formats/base_classes.doctree differ
diff --git a/docs/_build/doctrees/formats/catkeys.doctree b/docs/_build/doctrees/formats/catkeys.doctree
index 8cfe958..654e1cc 100644
Binary files a/docs/_build/doctrees/formats/catkeys.doctree and b/docs/_build/doctrees/formats/catkeys.doctree differ
diff --git a/docs/_build/doctrees/formats/conformance.doctree b/docs/_build/doctrees/formats/conformance.doctree
index b0f76dc..193e647 100644
Binary files a/docs/_build/doctrees/formats/conformance.doctree and b/docs/_build/doctrees/formats/conformance.doctree differ
diff --git a/docs/_build/doctrees/formats/csv.doctree b/docs/_build/doctrees/formats/csv.doctree
index 9e40505..5b4412b 100644
Binary files a/docs/_build/doctrees/formats/csv.doctree and b/docs/_build/doctrees/formats/csv.doctree differ
diff --git a/docs/_build/doctrees/formats/dtd.doctree b/docs/_build/doctrees/formats/dtd.doctree
index b5a8d55..f1ab597 100644
Binary files a/docs/_build/doctrees/formats/dtd.doctree and b/docs/_build/doctrees/formats/dtd.doctree differ
diff --git a/docs/_build/doctrees/formats/flex.doctree b/docs/_build/doctrees/formats/flex.doctree
index 6d84cee..47b92c1 100644
Binary files a/docs/_build/doctrees/formats/flex.doctree and b/docs/_build/doctrees/formats/flex.doctree differ
diff --git a/docs/_build/doctrees/formats/gsi.doctree b/docs/_build/doctrees/formats/gsi.doctree
index b52653c..bc6c73a 100644
Binary files a/docs/_build/doctrees/formats/gsi.doctree and b/docs/_build/doctrees/formats/gsi.doctree differ
diff --git a/docs/_build/doctrees/formats/html.doctree b/docs/_build/doctrees/formats/html.doctree
index 3aeb9e4..2192c75 100644
Binary files a/docs/_build/doctrees/formats/html.doctree and b/docs/_build/doctrees/formats/html.doctree differ
diff --git a/docs/_build/doctrees/formats/ical.doctree b/docs/_build/doctrees/formats/ical.doctree
index 52e75a2..53d7fc6 100644
Binary files a/docs/_build/doctrees/formats/ical.doctree and b/docs/_build/doctrees/formats/ical.doctree differ
diff --git a/docs/_build/doctrees/formats/index.doctree b/docs/_build/doctrees/formats/index.doctree
index 9ea18b6..a77cf20 100644
Binary files a/docs/_build/doctrees/formats/index.doctree and b/docs/_build/doctrees/formats/index.doctree differ
diff --git a/docs/_build/doctrees/formats/ini.doctree b/docs/_build/doctrees/formats/ini.doctree
index 7345e90..ebd8a24 100644
Binary files a/docs/_build/doctrees/formats/ini.doctree and b/docs/_build/doctrees/formats/ini.doctree differ
diff --git a/docs/_build/doctrees/formats/json.doctree b/docs/_build/doctrees/formats/json.doctree
new file mode 100644
index 0000000..79cc733
Binary files /dev/null and b/docs/_build/doctrees/formats/json.doctree differ
diff --git a/docs/_build/doctrees/formats/l20n.doctree b/docs/_build/doctrees/formats/l20n.doctree
index 0d0213c..8e22dda 100644
Binary files a/docs/_build/doctrees/formats/l20n.doctree and b/docs/_build/doctrees/formats/l20n.doctree differ
diff --git a/docs/_build/doctrees/formats/mo.doctree b/docs/_build/doctrees/formats/mo.doctree
index 6105b70..97b9b82 100644
Binary files a/docs/_build/doctrees/formats/mo.doctree and b/docs/_build/doctrees/formats/mo.doctree differ
diff --git a/docs/_build/doctrees/formats/odf.doctree b/docs/_build/doctrees/formats/odf.doctree
index 084b097..ce7e2f4 100644
Binary files a/docs/_build/doctrees/formats/odf.doctree and b/docs/_build/doctrees/formats/odf.doctree differ
diff --git a/docs/_build/doctrees/formats/omegat_glossary.doctree b/docs/_build/doctrees/formats/omegat_glossary.doctree
index a3d7bbf..02baf55 100644
Binary files a/docs/_build/doctrees/formats/omegat_glossary.doctree and b/docs/_build/doctrees/formats/omegat_glossary.doctree differ
diff --git a/docs/_build/doctrees/formats/php.doctree b/docs/_build/doctrees/formats/php.doctree
index 19aa11f..1c0b395 100644
Binary files a/docs/_build/doctrees/formats/php.doctree and b/docs/_build/doctrees/formats/php.doctree differ
diff --git a/docs/_build/doctrees/formats/po.doctree b/docs/_build/doctrees/formats/po.doctree
index 323ee65..14cc9d0 100644
Binary files a/docs/_build/doctrees/formats/po.doctree and b/docs/_build/doctrees/formats/po.doctree differ
diff --git a/docs/_build/doctrees/formats/properties.doctree b/docs/_build/doctrees/formats/properties.doctree
index 13cd267..ce0f10d 100644
Binary files a/docs/_build/doctrees/formats/properties.doctree and b/docs/_build/doctrees/formats/properties.doctree differ
diff --git a/docs/_build/doctrees/formats/qm.doctree b/docs/_build/doctrees/formats/qm.doctree
index 76830e5..a56b5ad 100644
Binary files a/docs/_build/doctrees/formats/qm.doctree and b/docs/_build/doctrees/formats/qm.doctree differ
diff --git a/docs/_build/doctrees/formats/qt_phrase_book.doctree b/docs/_build/doctrees/formats/qt_phrase_book.doctree
index e285242..c7fd3c1 100644
Binary files a/docs/_build/doctrees/formats/qt_phrase_book.doctree and b/docs/_build/doctrees/formats/qt_phrase_book.doctree differ
diff --git a/docs/_build/doctrees/formats/quoting_and_escaping.doctree b/docs/_build/doctrees/formats/quoting_and_escaping.doctree
index e6bc546..9a019d1 100644
Binary files a/docs/_build/doctrees/formats/quoting_and_escaping.doctree and b/docs/_build/doctrees/formats/quoting_and_escaping.doctree differ
diff --git a/docs/_build/doctrees/formats/rc.doctree b/docs/_build/doctrees/formats/rc.doctree
index b0780d7..33a4a6d 100644
Binary files a/docs/_build/doctrees/formats/rc.doctree and b/docs/_build/doctrees/formats/rc.doctree differ
diff --git a/docs/_build/doctrees/formats/strings.doctree b/docs/_build/doctrees/formats/strings.doctree
index 66a1b66..322c44e 100644
Binary files a/docs/_build/doctrees/formats/strings.doctree and b/docs/_build/doctrees/formats/strings.doctree differ
diff --git a/docs/_build/doctrees/formats/subtitles.doctree b/docs/_build/doctrees/formats/subtitles.doctree
index b7558e7..212f8c2 100644
Binary files a/docs/_build/doctrees/formats/subtitles.doctree and b/docs/_build/doctrees/formats/subtitles.doctree differ
diff --git a/docs/_build/doctrees/formats/tbx.doctree b/docs/_build/doctrees/formats/tbx.doctree
index 1d69f3b..8557545 100644
Binary files a/docs/_build/doctrees/formats/tbx.doctree and b/docs/_build/doctrees/formats/tbx.doctree differ
diff --git a/docs/_build/doctrees/formats/text.doctree b/docs/_build/doctrees/formats/text.doctree
index 49d8c36..e039b19 100644
Binary files a/docs/_build/doctrees/formats/text.doctree and b/docs/_build/doctrees/formats/text.doctree differ
diff --git a/docs/_build/doctrees/formats/tmx.doctree b/docs/_build/doctrees/formats/tmx.doctree
index 0a37660..8fa77ee 100644
Binary files a/docs/_build/doctrees/formats/tmx.doctree and b/docs/_build/doctrees/formats/tmx.doctree differ
diff --git a/docs/_build/doctrees/formats/ts.doctree b/docs/_build/doctrees/formats/ts.doctree
index 91b08fb..12afcba 100644
Binary files a/docs/_build/doctrees/formats/ts.doctree and b/docs/_build/doctrees/formats/ts.doctree differ
diff --git a/docs/_build/doctrees/formats/utx.doctree b/docs/_build/doctrees/formats/utx.doctree
index 196940c..df5091e 100644
Binary files a/docs/_build/doctrees/formats/utx.doctree and b/docs/_build/doctrees/formats/utx.doctree differ
diff --git a/docs/_build/doctrees/formats/wiki.doctree b/docs/_build/doctrees/formats/wiki.doctree
index 44c28fe..0e1031e 100644
Binary files a/docs/_build/doctrees/formats/wiki.doctree and b/docs/_build/doctrees/formats/wiki.doctree differ
diff --git a/docs/_build/doctrees/formats/wml.doctree b/docs/_build/doctrees/formats/wml.doctree
index d8f6d8b..9416a23 100644
Binary files a/docs/_build/doctrees/formats/wml.doctree and b/docs/_build/doctrees/formats/wml.doctree differ
diff --git a/docs/_build/doctrees/formats/wordfast.doctree b/docs/_build/doctrees/formats/wordfast.doctree
index bec16b3..96d933b 100644
Binary files a/docs/_build/doctrees/formats/wordfast.doctree and b/docs/_build/doctrees/formats/wordfast.doctree differ
diff --git a/docs/_build/doctrees/formats/xliff.doctree b/docs/_build/doctrees/formats/xliff.doctree
index 8bb8db7..4492ab2 100644
Binary files a/docs/_build/doctrees/formats/xliff.doctree and b/docs/_build/doctrees/formats/xliff.doctree differ
diff --git a/docs/_build/doctrees/guides/checking_for_inconsistencies.doctree b/docs/_build/doctrees/guides/checking_for_inconsistencies.doctree
index 4100f36..6ff4eea 100644
Binary files a/docs/_build/doctrees/guides/checking_for_inconsistencies.doctree and b/docs/_build/doctrees/guides/checking_for_inconsistencies.doctree differ
diff --git a/docs/_build/doctrees/guides/cleanup_translator_comments.doctree b/docs/_build/doctrees/guides/cleanup_translator_comments.doctree
index dd63b31..47eb079 100644
Binary files a/docs/_build/doctrees/guides/cleanup_translator_comments.doctree and b/docs/_build/doctrees/guides/cleanup_translator_comments.doctree differ
diff --git a/docs/_build/doctrees/guides/creating_a_terminology_list_from_your_existing_translations.doctree b/docs/_build/doctrees/guides/creating_a_terminology_list_from_your_existing_translations.doctree
index f859249..9cf5e16 100644
Binary files a/docs/_build/doctrees/guides/creating_a_terminology_list_from_your_existing_translations.doctree and b/docs/_build/doctrees/guides/creating_a_terminology_list_from_your_existing_translations.doctree differ
diff --git a/docs/_build/doctrees/guides/creating_mozilla_pot_files.doctree b/docs/_build/doctrees/guides/creating_mozilla_pot_files.doctree
index a15d85d..56b060b 100644
Binary files a/docs/_build/doctrees/guides/creating_mozilla_pot_files.doctree and b/docs/_build/doctrees/guides/creating_mozilla_pot_files.doctree differ
diff --git a/docs/_build/doctrees/guides/document_translation.doctree b/docs/_build/doctrees/guides/document_translation.doctree
index 2323627..bbc752d 100644
Binary files a/docs/_build/doctrees/guides/document_translation.doctree and b/docs/_build/doctrees/guides/document_translation.doctree differ
diff --git a/docs/_build/doctrees/guides/index.doctree b/docs/_build/doctrees/guides/index.doctree
index 56ab682..7a28d2e 100644
Binary files a/docs/_build/doctrees/guides/index.doctree and b/docs/_build/doctrees/guides/index.doctree differ
diff --git a/docs/_build/doctrees/guides/migrating_to_firefox.doctree b/docs/_build/doctrees/guides/migrating_to_firefox.doctree
deleted file mode 100644
index 866b86d..0000000
Binary files a/docs/_build/doctrees/guides/migrating_to_firefox.doctree and /dev/null differ
diff --git a/docs/_build/doctrees/guides/migrating_translations.doctree b/docs/_build/doctrees/guides/migrating_translations.doctree
index b4deead..93d898c 100644
Binary files a/docs/_build/doctrees/guides/migrating_translations.doctree and b/docs/_build/doctrees/guides/migrating_translations.doctree differ
diff --git a/docs/_build/doctrees/guides/running_the_tools_on_microsoft_windows.doctree b/docs/_build/doctrees/guides/running_the_tools_on_microsoft_windows.doctree
index 491e72e..7f48873 100644
Binary files a/docs/_build/doctrees/guides/running_the_tools_on_microsoft_windows.doctree and b/docs/_build/doctrees/guides/running_the_tools_on_microsoft_windows.doctree differ
diff --git a/docs/_build/doctrees/guides/using_csv2po.doctree b/docs/_build/doctrees/guides/using_csv2po.doctree
index 44ef72f..70b6eb6 100644
Binary files a/docs/_build/doctrees/guides/using_csv2po.doctree and b/docs/_build/doctrees/guides/using_csv2po.doctree differ
diff --git a/docs/_build/doctrees/guides/using_oo2po.doctree b/docs/_build/doctrees/guides/using_oo2po.doctree
index 37991e6..6e024b5 100644
Binary files a/docs/_build/doctrees/guides/using_oo2po.doctree and b/docs/_build/doctrees/guides/using_oo2po.doctree differ
diff --git a/docs/_build/doctrees/guides/using_pofilter.doctree b/docs/_build/doctrees/guides/using_pofilter.doctree
index 94b228e..9f3e20e 100644
Binary files a/docs/_build/doctrees/guides/using_pofilter.doctree and b/docs/_build/doctrees/guides/using_pofilter.doctree differ
diff --git a/docs/_build/doctrees/history.doctree b/docs/_build/doctrees/history.doctree
index 6859a2a..4cf9291 100644
Binary files a/docs/_build/doctrees/history.doctree and b/docs/_build/doctrees/history.doctree differ
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
index 9dca889..51d1113 100644
Binary files a/docs/_build/doctrees/index.doctree and b/docs/_build/doctrees/index.doctree differ
diff --git a/docs/_build/doctrees/installation.doctree b/docs/_build/doctrees/installation.doctree
index 69d63fc..1cb1397 100644
Binary files a/docs/_build/doctrees/installation.doctree and b/docs/_build/doctrees/installation.doctree differ
diff --git a/docs/_build/doctrees/license.doctree b/docs/_build/doctrees/license.doctree
index e4dafe8..9d4d39b 100644
Binary files a/docs/_build/doctrees/license.doctree and b/docs/_build/doctrees/license.doctree differ
diff --git a/docs/_build/doctrees/releases/1.10.0.doctree b/docs/_build/doctrees/releases/1.10.0.doctree
new file mode 100644
index 0000000..117b2fe
Binary files /dev/null and b/docs/_build/doctrees/releases/1.10.0.doctree differ
diff --git a/docs/_build/doctrees/releases/1.11.0-rc1.doctree b/docs/_build/doctrees/releases/1.11.0-rc1.doctree
new file mode 100644
index 0000000..f2ad9bf
Binary files /dev/null and b/docs/_build/doctrees/releases/1.11.0-rc1.doctree differ
diff --git a/docs/_build/doctrees/releases/1.11.0.doctree b/docs/_build/doctrees/releases/1.11.0.doctree
new file mode 100644
index 0000000..5176ead
Binary files /dev/null and b/docs/_build/doctrees/releases/1.11.0.doctree differ
diff --git a/docs/_build/doctrees/releases/1.11.1.doctree b/docs/_build/doctrees/releases/1.11.1.doctree
new file mode 100644
index 0000000..9b42f64
Binary files /dev/null and b/docs/_build/doctrees/releases/1.11.1.doctree differ
diff --git a/docs/_build/doctrees/releases/1.8.1.doctree b/docs/_build/doctrees/releases/1.8.1.doctree
new file mode 100644
index 0000000..4fb2c16
Binary files /dev/null and b/docs/_build/doctrees/releases/1.8.1.doctree differ
diff --git a/docs/_build/doctrees/releases/1.9.0.doctree b/docs/_build/doctrees/releases/1.9.0.doctree
new file mode 100644
index 0000000..11d076b
Binary files /dev/null and b/docs/_build/doctrees/releases/1.9.0.doctree differ
diff --git a/docs/_build/doctrees/releases/index.doctree b/docs/_build/doctrees/releases/index.doctree
new file mode 100644
index 0000000..8df292c
Binary files /dev/null and b/docs/_build/doctrees/releases/index.doctree differ
diff --git a/docs/_build/doctrees/styleguide.doctree b/docs/_build/doctrees/styleguide.doctree
deleted file mode 100644
index 06b6a04..0000000
Binary files a/docs/_build/doctrees/styleguide.doctree and /dev/null differ
diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo
index 99166f5..2b861fe 100644
--- a/docs/_build/html/.buildinfo
+++ b/docs/_build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 49d73555ca340a476fd646fc8b845064
-tags: fbb0d17656682115ca4d033fb2f83ba1
+config: 9880a754f1682b1132f9683bbb3bc914
+tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_build/html/_images/tbx_levels_structure.png b/docs/_build/html/_images/tbx_levels_structure.png
deleted file mode 100644
index 16d10d2..0000000
Binary files a/docs/_build/html/_images/tbx_levels_structure.png and /dev/null differ
diff --git a/docs/_build/html/_sources/api/misc.txt b/docs/_build/html/_sources/api/misc.txt
index d1ca4e6..406e1d5 100644
--- a/docs/_build/html/_sources/api/misc.txt
+++ b/docs/_build/html/_sources/api/misc.txt
@@ -125,14 +125,6 @@ quote
    :inherited-members:
 
 
-selector
---------
-
-.. automodule:: translate.misc.selector
-   :members:
-   :inherited-members:
-
-
 sparse
 ------
 
@@ -226,11 +218,3 @@ xmlwrapper
 .. automodule:: translate.misc.xmlwrapper
    :members:
    :inherited-members:
-
-
-zipfileext
-----------
-
-.. automodule:: translate.misc.zipfileext
-   :members:
-   :inherited-members:
diff --git a/docs/_build/html/_sources/api/storage.txt b/docs/_build/html/_sources/api/storage.txt
index 7583aa7..212ebf9 100644
--- a/docs/_build/html/_sources/api/storage.txt
+++ b/docs/_build/html/_sources/api/storage.txt
@@ -442,6 +442,7 @@ ts
 .. automodule:: translate.storage.ts
    :members:
    :inherited-members:
+   :deprecated:
 
 
 txt
@@ -595,14 +596,6 @@ xml_name
    :inherited-members:
 
 
-xpi
----
-
-.. automodule:: translate.storage.xpi
-   :members:
-   :inherited-members:
-
-
 zip
 ---
 
diff --git a/docs/_build/html/_sources/changelog.txt b/docs/_build/html/_sources/changelog.txt
index cea3fae..2199162 100644
--- a/docs/_build/html/_sources/changelog.txt
+++ b/docs/_build/html/_sources/changelog.txt
@@ -1,15 +1,25 @@
 
 .. _changelog:
-.. _important_changes:
 
-Important Changes
-*****************
+Changelog
+*********
 
 The Translate Toolkit might have changed how it functions in certain cases.
 This page lists what has changed, how it might affect you and how to work
 around the change either to bring your files in line or to use the old
 behaviour if required.
 
+.. _changelog#1.11:
+
+1.11
+====
+
+- Dropped support for Python 2.5 since it is no longer supported by the Python
+  Foundation. Also sticking to it was preventing us from using features that
+  are not supported on Python 2.5 but they are on later versions.
+- Properties will no longer drop entries where source and translation are
+  identical.
+
 .. _changelog#1.10:
 
 1.10
@@ -142,10 +152,10 @@ Valid accelerators
 The :doc:`/commands/pofilter` accelerator test is now able to make use of a
 list of valid accelerators.  This allows translators to control the behaviour
 of the test for their language and add or remove characters that can be used as
-accelerators.  Please define :doc:`l10n/valid accelerators` for your language
-and these will then be included in future releases of the toolkit.  By default
-the old process if followed so if you take no action then this check will
-continue to work as expected.
+accelerators.  Please define the :ref:`valid accelerators
+<guide:valid-accelerators>` for your language and these will then be included
+in future releases of the toolkit.  By default the old process is followed so
+that if you take no action then this check will continue to work as expected.
 
 .. _changelog#branches:
 
@@ -653,8 +663,3 @@ use Unicode in UTF-8 encoding for these files.  Thus in 0.9 of the Toolkit we
 now output UTF-8 encoded properties files. :bug:`Bug 114 <114>` tracks the
 status of this and we hope to add a feature to prop2po to restore the correct
 Java convention as an option.
-
-.. _changelog#0.8:
-
-0.8
-===
diff --git a/docs/_build/html/_sources/commands/csv2po.txt b/docs/_build/html/_sources/commands/csv2po.txt
index 51d255b..eaeb05f 100644
--- a/docs/_build/html/_sources/commands/csv2po.txt
+++ b/docs/_build/html/_sources/commands/csv2po.txt
@@ -45,8 +45,7 @@ Options (csv2po):
 -xEXCLUDE, --exclude=EXCLUDE    exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in pot, po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 --charset=CHARSET     set charset to decode from csv files
 --columnorder=COLUMNORDER   specify the order and position of columns (location,source,target)
 --duplicates=DUPLICATESTYLE
@@ -66,8 +65,7 @@ Options (po2csv):
 -iINPUT, --input=INPUT    read from INPUT in po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in csv format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot             output PO Templates (.pot) rather than PO files (.po)
 --columnorder=COLUMNORDER    specify the order and position of columns (location,source,target)
 
diff --git a/docs/_build/html/_sources/commands/csv2tbx.txt b/docs/_build/html/_sources/commands/csv2tbx.txt
index 9c9998f..debd1b0 100644
--- a/docs/_build/html/_sources/commands/csv2tbx.txt
+++ b/docs/_build/html/_sources/commands/csv2tbx.txt
@@ -36,8 +36,7 @@ Options (csv2tbx):
 -iINPUT, --input=INPUT    read from INPUT in csv format
 -xEXCLUDE, --exclude=EXCLUDE    exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in tbx format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 --charset=CHARSET    set charset to decode from csv files
 --columnorder=COLUMNORDER   specify the order and position of columns (comment,source,target)
 
diff --git a/docs/_build/html/_sources/commands/html2po.txt b/docs/_build/html/_sources/commands/html2po.txt
index ebe673c..e6821f8 100644
--- a/docs/_build/html/_sources/commands/html2po.txt
+++ b/docs/_build/html/_sources/commands/html2po.txt
@@ -37,8 +37,7 @@ Options (html2po):
 -iINPUT, --input=INPUT   read from INPUT in htm, html, xhtml formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 -u, --untagged       include untagged sections
 --duplicates=DUPLICATESTYLE
@@ -59,10 +58,10 @@ Options (po2html):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in htm, html formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in htm, html formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -wWRAP, --wrap=WRAP  set number of columns to wrap html at
 --notidy             don't use tidy to clean up HTML, even if installed (new in version 1.2.1)
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/_build/html/_sources/commands/ical2po.txt b/docs/_build/html/_sources/commands/ical2po.txt
index 3ce76d1..c777a75 100644
--- a/docs/_build/html/_sources/commands/ical2po.txt
+++ b/docs/_build/html/_sources/commands/ical2po.txt
@@ -40,8 +40,7 @@ Options (ical2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -61,8 +60,8 @@ Options (po2ical):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -112,7 +111,6 @@ The converter does not make use of the LANGUAGE attribute which is permitted in
 the format.  The LANGUAGE attribute does not aid multilingualism in this
 context so is ignored.
 
-The converter could conceivably also process `vCard
-<https://en.wikipedia.org/wiki/Vcard>`_ files, but this has not been
-implemented for lack of a clear need.  Please raise a bug with an example if
-you have such a file that could benefit from localisation.
+The converter could conceivably also process :wp:`vCard <Vcard>` files, but
+this has not been implemented for lack of a clear need.  Please raise a bug
+with an example if you have such a file that could benefit from localisation.
diff --git a/docs/_build/html/_sources/commands/index.txt b/docs/_build/html/_sources/commands/index.txt
index cec4e7e..6b9a948 100644
--- a/docs/_build/html/_sources/commands/index.txt
+++ b/docs/_build/html/_sources/commands/index.txt
@@ -42,7 +42,6 @@ Converters
    option_progress
    option_filteraction
    option_multifile
-   option_psyco
    option_personality
    option_accelerator
 
diff --git a/docs/_build/html/_sources/commands/ini2po.txt b/docs/_build/html/_sources/commands/ini2po.txt
index 4ccab8f..bd75a11 100644
--- a/docs/_build/html/_sources/commands/ini2po.txt
+++ b/docs/_build/html/_sources/commands/ini2po.txt
@@ -38,8 +38,7 @@ Options (ini2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -59,8 +58,8 @@ Options (po2ini):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/_build/html/_sources/commands/json2po.txt b/docs/_build/html/_sources/commands/json2po.txt
index 9774307..c466be4 100644
--- a/docs/_build/html/_sources/commands/json2po.txt
+++ b/docs/_build/html/_sources/commands/json2po.txt
@@ -34,12 +34,11 @@ Options (json2po):
 --errorlevel=ERRORLEVEL
                       show errorlevel as: :doc:`none, message, exception,
                       traceback <option_errorlevel>`
--i INPUT, --input=INPUT      read from INPUT in php format
+-i INPUT, --input=INPUT      read from INPUT in JSON format
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
--t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in JSON format
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --filter=FILTER  leaves to extract e.g. 'name,desc': (default: extract everything)
 --duplicates=DUPLICATESTYLE
@@ -58,10 +57,10 @@ Options (po2json):
                       traceback <option_errorlevel>`
 -i INPUT, --input=INPUT  read from INPUT in po, pot formats
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
--o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
--t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-o OUTPUT, --output=OUTPUT      write to OUTPUT in JSON format
+-t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in JSON format
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/_build/html/_sources/commands/levenshtein_distance.txt b/docs/_build/html/_sources/commands/levenshtein_distance.txt
index 9a671d6..1d1792f 100644
--- a/docs/_build/html/_sources/commands/levenshtein_distance.txt
+++ b/docs/_build/html/_sources/commands/levenshtein_distance.txt
@@ -3,35 +3,39 @@
 
 Levenshtein distance
 ********************
-The `levenshtein distance
-<https://en.wikipedia.org/wiki/Levenshtein_distance>`_ is used for measuring
-the "distance" or similarity of two character strings. Other similarity
-algorithms can be supplied to the code that does the matching.
+The :wp:`levenshtein distance <Levenshtein_distance>` is used for measuring the
+*"distance"* or similarity of two character strings. Other similarity algorithms
+can be supplied to the code that does the matching.
 
 This code is used in :doc:`pot2po`, :doc:`tmserver` and `Virtaal
-<http://virtaal.org>`_. It is implemented in the toolkit, but can optionally
-use the fast C implementation provided by `python-Levenshtein
-<http://sourceforge.net/projects/translate/files/python-Levenshtein/>`_ if it
-is installed. It is strongly recommended that python-levenshtein be installed.
+<http://virtaal.org>`_. It is implemented in the toolkit, but can optionally use
+the fast C implementation provided by `python-Levenshtein
+<https://pypi.python.org/pypi/python-Levenshtein>`_ if it is installed. It is
+strongly recommended to have **python-levenshtein** installed.
 
-To exercise the code the classfile "Levenshtein.py" can be executed directly
-with::
+To exercise the code the classfile *"Levenshtein.py"* can be executed directly
+with:
+
+.. code-block:: bash
+
+    $ python Levenshtein.py "The first string." "The second string"
 
-  python Levenshtein.py "The first string." "The second string"
 
 .. note:: Remember to quote the two parameters.
 
+
 The following things should be noted:
 
-*  Only the first MAX_LEN characters are considered. Long strings differing at
-   the end will therefore seem to match better than they should. A penalty is
-   awarded if strings are shortened.
+* Only the first ``MAX_LEN`` characters are considered. Long strings differing
+  at the end will therefore seem to match better than they should. A penalty is
+  awarded if strings are shortened.
 * The calculation can stop prematurely as soon as it realise that the supplied
   minimum required similarity can not be reached. Strings with widely different
   lengths give the opportunity for this shortcut. This is by definition of the
   Levenshtein distance: the distance will be at least as much as the difference
   in string length. Similarities lower than your supplied minimum (or the
-  default) should therefore not be considered authoritive.
+  default) should therefore not be considered authoritative.
+
 
 .. _levenshtein_distance#shortcommings:
 
@@ -40,17 +44,17 @@ Shortcommings
 
 The following shortcommings have been identified:
 
-* Cases sensitivity: 'E' and 'e' are considered different characters and
-  according differ as much as 'z' and 'e'. This is not ideal, as case
+* **Cases sensitivity:** *'E'* and *'e'* are considered different characters and
+  according differ as much as *'z'* and *'e'*. This is not ideal, as case
   differences should be considered less of a difference.
-* Diacritics: 'ê' and 'e' are considered different characters and according
-  differ as much as 'z' and 'e'. This is not ideal, as missing diacritics could
-  be due to small input errors, or even input data that simply do not have the
-  correct diacritics.
-* Words that have similar characters, but are different, could increase the
-  similarity beyond what is wanted. The sentences "It is though." and "It is
-  dough." differ markedly semantically, but score similarity of almost 85%. A
-  possible solution is to do an additional calculation based on words, instead
-  of characters.
-* Whitespace: Differences in tabs, newlines, and space usage should perhaps be
-  considered as a special case.
+* **Diacritics:** *'ê'* and *'e'* are considered different characters and
+  according differ as much as *'z'* and *'e'*. This is not ideal, as missing
+  diacritics could be due to small input errors, or even input data that simply
+  do not have the correct diacritics.
+* **Similar but different words:** Words that have similar characters, but are
+  different, could increase the similarity beyond what is wanted. The sentences
+  *"It is though."* and *"It is dough."* differ markedly semantically, but score
+  similarity of almost 85%. A possible solution is to do an additional
+  calculation based on words, instead of characters.
+* **Whitespace:** Differences in tabs, newlines, and space usage should perhaps
+  be considered as a special case.
diff --git a/docs/_build/html/_sources/commands/moz-l10n-builder.txt b/docs/_build/html/_sources/commands/moz-l10n-builder.txt
index a48c841..6afdf27 100644
--- a/docs/_build/html/_sources/commands/moz-l10n-builder.txt
+++ b/docs/_build/html/_sources/commands/moz-l10n-builder.txt
@@ -9,14 +9,14 @@ migrate them to the latest Mozilla source, building XPIs and repackaging hte
 Windows .exe file as needed.
 
 Please also check the page on `creating a language pack
-<http://developer.mozilla.org/en/docs/Creating_a_Language_Pack>`_ on the
+<https://developer.mozilla.org/en/docs/Creating_a_Language_Pack>`_ on the
 Mozilla wiki, to stay abreast of the latest Mozilla way of doing things.
 
 .. note:: This page is only applicable to Mozilla products with its source
    hosted in CVS. This includes Firefox versions before 3.1 and Thunderbird
-    versions before 3.0.
+   versions before 3.0.
 
-    For information about working with the new source trees in Mercurial, see the :doc:`mozilla_l10n_scripts` page.
+   For information about working with the new source trees in Mercurial, see the :doc:`mozilla_l10n_scripts` page.
 
 .. _moz-l10n-builder#prerequisites:
 
@@ -28,9 +28,9 @@ Prerequisites
   * :doc:`Translate Toolkit </installation>`
   * Existing Mozilla translations in PO format
   * A checkout of `Mozilla sources
-    <http://developer.mozilla.org/en/docs/Mozilla_Source_Code_Via_CVS>`_
+    <https://developer.mozilla.org/en-US/docs/Developer_Guide/Source_Code/CVS>`_
     updated to the correct `BRANCH or RELEASE
-    <http://developer.mozilla.org/en/docs/CVS_Tags>`_
+    <https://developer.mozilla.org/en/docs/CVS_Tags>`_
 
 * Building Windows executables
 
@@ -42,7 +42,7 @@ Prerequisites
   * `Nullsoft installer <http://nsis.sourceforge.net/Main_Page>`_ to package
     the installer.
   * `7zip <http://www.7-zip.org/>`_ for various compression
-  * Linux: `WINE <http://winehq.com/>`_ to run the Nullsoft installer
+  * Linux: `WINE <http://www.winehq.org/>`_ to run the Nullsoft installer
 
 * Directory structure under the directory you want to run moz-l10n-builder in:
 
diff --git a/docs/_build/html/_sources/commands/moz2po.txt b/docs/_build/html/_sources/commands/moz2po.txt
index 480e891..48bd220 100644
--- a/docs/_build/html/_sources/commands/moz2po.txt
+++ b/docs/_build/html/_sources/commands/moz2po.txt
@@ -6,8 +6,8 @@ moz2po
 ******
 
 moz2po converts Mozilla files to PO files.  It wraps converters that handle
-.properties, .dtd and some strange Mozilla files.  The tool can extract from an
-XPI file or work with files from Mozilla's Mercurial repository.  The tools
+.properties, .dtd and some strange Mozilla files.  The tool can work with files
+from Mozilla's Mercurial repository.  The tools
 thus provides a complete roundtrip for Mozilla localisation using PO files and
 PO editors.
 
@@ -16,10 +16,6 @@ PO editors.
    and PO files for translating Mozilla products, please see the page on
    :doc:`mozilla_l10n_scripts`.
 
-.. warning:: The conversion to and from XPI files is no longer actively
-   supported.  The preffered method is to work directly with files in Mozilla's
-   Mercurial version control system.
-
 .. _moz2po#usage:
 
 Usage
@@ -27,19 +23,19 @@ Usage
 
 ::
 
-  moz2po [options] <xpi|dir> <po>
-  po2moz [options] <po> <xpi|dir>
+  moz2po [options] <dir> <po>
+  po2moz [options] <po> <dir>
 
 Where:
 
 +---------+---------------------------------------------------+
-| <xpi>   | is a Mozilla language pack                        |
-+---------+---------------------------------------------------+
 | <dir>   | is a directory containing valid Mozilla files     |
 +---------+---------------------------------------------------+
 | <po>    | is a directory of PO or POT files                 |
 +---------+---------------------------------------------------+
 
+.. program:: moz2po
+
 Options (moz2po):
 
 --version            show program's version number and exit
@@ -53,14 +49,15 @@ Options (moz2po):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in it.po, it.pot, manifest, xhtml.po, xhtml.pot, ini.po, ini.pot, rdf, js, \*, html.po, html.pot, inc.po, inc.pot, dtd.po, dtd.pot, properties.po, properties.pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in it, \*, properties, dtd, inc formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
                       text): :doc:`merge, msgctxt <option_duplicates>`
                       (default: 'msgctxt')
 
+.. program:: po2moz
+
 Options (po2moz):
 
 --version            show program's version number and exit
@@ -74,10 +71,10 @@ Options (po2moz):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in dtd, \*, inc, it, properties formats
 -tTEMPLATE, --template=TEMPLATE  read from TEMPLATE in dtd, \*, inc, it, properties formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -lLOCALE, --locale=LOCALE  set output locale (required as this sets the directory names)
---clonexpi=CLONEXPI  clone xpi structure from the given xpi file
+--removeuntranslated  remove untranslated strings from output
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -99,17 +96,12 @@ After extracting the en-US l10n files, you can run the following command::
   moz2po -P l10n/en-US pot
 
 This creates a set of POT (:opt:`-P`) files in the ``pot`` directory from the
-Mozilla files in ``l10n/en-US``. ::
-
-  moz2po -P en-US.xpi pot
-
-Creating set of POT (:opt:`-P`) files from the American English XPI
-(``en-US.xpi``) and placing them in ``pot`` for use as PO Templates.
+Mozilla files in ``l10n/en-US`` for use as PO Templates.
 
 If you want to create a set of POT files with another base language try the
 following::
 
-  moz2po -P fr-FR.xpi fr-pot
+  moz2po -P l10n/fr-FR fr-pot
 
 This will create a set of POT files in ``fr-pot`` that have French as your
 source language.
@@ -138,19 +130,13 @@ languages is not English but French, Spanish or Portuguese.  Please make sure
 that the source languages i.e. the ``msgid`` language is fully translated as
 against en-US.
 
-.. _moz2po#creating_an_xpi_or_cvs_ready_translations:
+.. _moz2po#creating_mercurial_ready_translations:
 
-Creating an XPI or CVS ready translations
+Creating Mercurial ready translations
 -----------------------------------------
 
 ::
 
-  po2moz -lzu-ZA -t en-US.xpi zu zu-ZA.xpi
-
-Create a Zulu language (:opt:`-lzu-ZA`) XPI called ``zu-ZA.xpi`` from translations
-found in ``zu`` using ``en-US.xpi`` as a template.  We use a template to ensure
-that our DTD and .properties files appear exactly as those in en-US::
-
   po2moz -t l10n/en-US po/xh l10n/xh
 
 Create Mozilla files using the templates files in ``l10n/en-US`` (see above for
diff --git a/docs/_build/html/_sources/commands/mozilla_l10n_scripts.txt b/docs/_build/html/_sources/commands/mozilla_l10n_scripts.txt
index 33b917b..d3ffc1f 100644
--- a/docs/_build/html/_sources/commands/mozilla_l10n_scripts.txt
+++ b/docs/_build/html/_sources/commands/mozilla_l10n_scripts.txt
@@ -34,12 +34,12 @@ Requirements
 * All scripts in the ``tools/mozilla`` directory (from the project sources)
   should be executable and in your ``PATH``.
 
-.. _mozilla_l10n_scripts#build_ff3.1_langs.sh:
+.. _build_ff3.1_langs.sh:
 
 build_ff3.1_langs.sh
 ====================
 
-.. _mozilla_l10n_scripts#description:
+.. _build_ff3.1_langs.sh#description:
 
 Description
 -----------
@@ -51,7 +51,7 @@ does the following:
    <http://hg.mozilla.org/l10n-central>`_ Mercurial repository.
 #. Replace old l10n en-US files with a fresh copy from the updated source tree.
 #. :doc:`Create new POT files </guides/creating_mozilla_pot_files>` from the
-   :ref:`en-US <mozilla_l10n_scripts#get_moz_enus.py>` l10n files.
+   :ref:`en-US <get_moz_enus.py>` l10n files.
 #. Create archives of the POT files.
 #. For each language:
 
@@ -62,7 +62,7 @@ does the following:
    #. :doc:`Create Mozilla l10n files <moz2po>` for the language based on the
       migrated PO files.
    #. Create archives of the PO files.
-   #. :ref:`Build langpack <mozilla_l10n_scripts#buildxpi.py>` for the
+   #. :ref:`Build langpack <buildxpi.py>` for the
       language.
 
 This script is used on the l10n.mozilla.org server to create most (if not all)
@@ -71,7 +71,7 @@ written as a stable way to provide these files and as such making it as general
 as possible was not the biggest requirement. This is evident in the script's
 very narrow focus.
 
-.. _mozilla_l10n_scripts#usage:
+.. _build_ff3.1_langs.sh#usage:
 
 Usage
 -----
@@ -127,7 +127,7 @@ The variables are used in the following ways:
    ``popacks``, ``potpacks``, ``po-updated`` and ``xpi`` (if used). This way
    the only variable that need to be changed is ``BUILD_DIR``.
 
-.. _mozilla_l10n_scripts#build_tb3_langs.sh:
+.. _build_tb3_langs.sh:
 
 build_tb3_langs.sh
 ==================
@@ -136,21 +136,21 @@ adapted from. It is 90% similar with the obvious exception that it is aimed at
 building Thunderbird 3.0 packages in stead of Firefox 3.1. Also note that this
 script uses the comm-central repository in stead of mozilla-central.
 
-.. _mozilla_l10n_scripts#buildxpi.py:
+.. _buildxpi.py:
 
 buildxpi.py
 ===========
 
-.. _mozilla_l10n_scripts#description:
+.. _buildxpi.py#description:
 
 Description
 -----------
-Creats a XPI language pack from Mozilla sources and translated l10n files. This
+Creates XPI language packs from Mozilla sources and translated l10n files. This
 script has only been tested with Firefox 3.1 beta sources.
 
 It is basically the scripted version of the process described on Mozilla's
 `"Creating a language pack"
-<https://developer.mozilla.org/en/creating_a_language_pack>`_ page.
+<https://developer.mozilla.org/en-US/docs/Creating_a_Language_Pack>`_ page.
 
 This script is used by ``build_ff3.1_langs.sh`` to build language packs in its
 final step.
@@ -159,17 +159,17 @@ final step.
    existing ``.mozconfig`` is renamed to ``.mozconfig.bak`` during operation
    and copied back afterwards.
 
-.. _mozilla_l10n_scripts#usage:
+.. _buildxpi.py#usage:
 
 Usage
 -----
 ::
 
-  buildxpi.py [<options>] <lang>
+  buildxpi.py [<options>] <lang> [<lang2> ...]
 
 Example::
 
-  buildxpi.py -L /path/to/l10n -s /path/to/mozilla-central -o /path/to/xpi_output af
+  buildxpi.py -L /path/to/l10n -s /path/to/mozilla-central -o /path/to/xpi_output af ar
 
 Options:
 
@@ -186,12 +186,12 @@ Options:
 -d, --delete-dest     Delete output XPI if it already exists.
 -v, --verbose         Be more noisy
 
-.. _mozilla_l10n_scripts#get_moz_enus.py:
+.. _get_moz_enus.py:
 
 get_moz_enUS.py
 ===============
 
-.. _mozilla_l10n_scripts#description:
+.. _get_moz_enus.py#description:
 
 Description
 -----------
@@ -199,7 +199,7 @@ A simple script to collect the en-US l10n files from a Mozilla source tree
 (``'comm-central``' or ``'mozilla-central``') by traversing the product's
 ``l10n.ini`` file.
 
-.. _mozilla_l10n_scripts#usage:
+.. _get_moz_enus.py#usage:
 
 Usage
 -----
@@ -221,7 +221,7 @@ Options:
 --delete-dest         Delete the destination directory (if it exists).
 -v, --verbose         Be more noisy
 
-.. _mozilla_l10n_scripts#moz-l10n-builder:
+.. _moz-l10n-builder#deprecated:
 
 moz-l10n-builder
 ================
@@ -234,7 +234,7 @@ Mozilla l10n.
 For more information about this script see its :doc:`dedicated page
 <moz-l10n-builder>`.
 
-.. _mozilla_l10n_scripts#moz_l10n_builder.py:
+.. _moz_l10n_builder.py:
 
 moz_l10n_builder.py
 ===================
diff --git a/docs/_build/html/_sources/commands/odf2xliff.txt b/docs/_build/html/_sources/commands/odf2xliff.txt
index a4508d4..a1e1ab6 100644
--- a/docs/_build/html/_sources/commands/odf2xliff.txt
+++ b/docs/_build/html/_sources/commands/odf2xliff.txt
@@ -10,7 +10,7 @@ ODF files by combining the original ODF files with XLIFF files containing
 translations of strings in the original document.
 
 XLIFF is the XML Localization Interchange File Format developed by `OASIS
-<http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_ (The
+<https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_ (The
 Organization for the Advancement of Structured Information Standards) to allow
 translation work to be standardised no matter what the source format and to
 allow the work to be freely moved from tool to tool.
@@ -52,8 +52,7 @@ Options (odf2xliff):
                       traceback <option_errorlevel>`
 -i INPUT, --input=INPUT   read from INPUT in ODF format
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in XLIFF format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 Options (xliff2odf):
 
@@ -67,8 +66,7 @@ Options (xliff2odf):
 -i INPUT, --input=INPUT     read from INPUT in XLIFF formats
 -o OUTPUT, --output=OUTPUT  write to OUTPUT in ODF format
 -t TEMPLATE, --template=TEMPLATE   read from TEMPLATE in ODF format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 .. _odf2xliff#examples:
 
diff --git a/docs/_build/html/_sources/commands/oo2po.txt b/docs/_build/html/_sources/commands/oo2po.txt
index 8ae2cc0..1002625 100644
--- a/docs/_build/html/_sources/commands/oo2po.txt
+++ b/docs/_build/html/_sources/commands/oo2po.txt
@@ -37,8 +37,8 @@ Where:
 +--------------+-----------------------------------------------------------+
 | <input>      | is a directory of translated PO/XLIFF files               |
 +--------------+-----------------------------------------------------------+
-| <targetlang> | is the `ISO 639 <https://en.wikipedia.org/wiki/ISO_639>`_ |
-|              | language code used in the sdf file, e.g. af               |
+| <targetlang> | is the :wp:`ISO 639 <ISO_639>` language code used in the  |
+|              | sdf file, e.g. af                                         |
 +--------------+-----------------------------------------------------------+
 
 Options (oo2po and oo2xliff):
@@ -53,8 +53,7 @@ Options (oo2po and oo2xliff):
 -iINPUT, --input=INPUT   read from INPUT in oo format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po) (only available in oo2po
 -lLANG, --language=LANG  set target language to extract from oo file (e.g. af-ZA) (required for oo2xliff)
 --source-language=LANG   set source language code (default en-US)
@@ -80,8 +79,7 @@ Options (po2oo and xliff2oo):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in oo format
 -tTEMPLATE, --template=TEMPLATE  read from TEMPLATE in oo format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp          skip conversion if the output file has newer timestamp
 -lLANG, --language=LANG  set target language code (e.g. af-ZA) [required]
 --source-language=LANG   set source language code (default en-US)
 -T, --keeptimestamp      don't change the timestamps of the strings
@@ -90,6 +88,7 @@ Options (po2oo and xliff2oo):
 --filteraction=ACTION
                       action on pofilter failure: :doc:`none (default), warn,
                       exclude-serious, exclude-all <option_filteraction>`
+--threshold=PERCENT      only convert files where the translation completion is above PERCENT
 --fuzzy                  use translations marked fuzzy
 --nofuzzy                don't use translations marked fuzzy (default)
 --multifile=MULTIFILESTYLE
@@ -137,8 +136,8 @@ them into a single message (This is the default behaviour for traditional PO
 files).  You might want to use :doc:`pomigrate2` to ensure that your PO files
 match the latest POT files.::
 
-  cat GSI_af.sdf GSI_xh.sdf > GSI_af-xh.sdf oo2po --source-language=af -l xh
-GSI_af-xh.sdf af-xh-po
+  cat GSI_af.sdf GSI_xh.sdf > GSI_af-xh.sdf
+  oo2po --source-language=af -l xh GSI_af-xh.sdf af-xh-po
 
 Here we are creating PO files with your existing translations but a different
 source language.  Firstly we combine the two SDF files.  Then oo2po creates a
diff --git a/docs/_build/html/_sources/commands/option_accelerator.txt b/docs/_build/html/_sources/commands/option_accelerator.txt
index c41e582..a06c518 100644
--- a/docs/_build/html/_sources/commands/option_accelerator.txt
+++ b/docs/_build/html/_sources/commands/option_accelerator.txt
@@ -12,9 +12,9 @@
 |              | <http://mozilla.org>`_ (when using :doc:`moz2po           |
 |              | <moz2po>`)                                                |
 +--------------+-----------------------------------------------------------+
-|  _           | `GNOME Desktop <http://gnome.org>`_ and other `GTK+       |
-|              | <http://gtk.org>`_ based applications                     |
+|  _           | `GNOME Desktop <http://www.gnome.org>`_ and other `GTK+   |
+|              | <http://www.gtk.org>`_ based applications                 |
 +--------------+-----------------------------------------------------------+
-|  ~           | `LibreOffice <http://libreoffice.org>`_ and `Apache       |
-|              | OpenOffice <http://openoffice.org>`_                      |
+|  ~           | `LibreOffice <http://www.libreoffice.org>`_ and `Apache   |
+|              | OpenOffice <http://www.openoffice.org>`_                  |
 +--------------+-----------------------------------------------------------+
diff --git a/docs/_build/html/_sources/commands/option_psyco.txt b/docs/_build/html/_sources/commands/option_psyco.txt
deleted file mode 100644
index 0693ebc..0000000
--- a/docs/_build/html/_sources/commands/option_psyco.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-
-.. _option_psyco:
-
---psyco=MODE
-************
-
-Psyco is an optimiser for Python programs.  It takes the sections that are run
-often or that could benefit from being compiled and compiles them into machine
-language.  This machine code is executed instead of the Python code.
-
-If you didn't understand any of that then simply understand that it makes you
-program run faster if it is installed.
-
-By default it is switched on, so you can safely ignore this option and benefit
-from psyco optimisations anyway.
-
-.. note:: psyco only works on i386 architectures.
-
-To install psyco, you can look for it in your distribution's packages, or
-obtain it here: http://psyco.sourceforge.net/
-
-.. _option_psyco#none:
-
-none
-====
-
-Switch psyco optimisation off.
-
-.. _option_psyco#full_default:
-
-full (default)
-==============
-
-This is the default option, even if no :opt:`--psyco` command line options is
-specified. It will try to optimise everything, so potentially it might consume
-more memory.
-
-.. _option_psyco#profile:
-
-profile
-=======
-
-This tries to selectively compile certain program parts, and therefore should
-consume less memory.
diff --git a/docs/_build/html/_sources/commands/option_rewrite.txt b/docs/_build/html/_sources/commands/option_rewrite.txt
index af635de..5666e81 100644
--- a/docs/_build/html/_sources/commands/option_rewrite.txt
+++ b/docs/_build/html/_sources/commands/option_rewrite.txt
@@ -80,8 +80,8 @@ chef
 
 .. versionadded:: 1.2
 
-Rewrites the source text using mock Swedish as popularised by the `Swedish Chef
-<https://en.wikipedia.org/wiki/Swedish_Chef>`_.
+Rewrites the source text using mock Swedish as popularised by the :wp:`Swedish
+Chef <Swedish_Chef>`.
 
 .. code-block:: po
 
diff --git a/docs/_build/html/_sources/commands/php2po.txt b/docs/_build/html/_sources/commands/php2po.txt
index 11d974f..477a569 100644
--- a/docs/_build/html/_sources/commands/php2po.txt
+++ b/docs/_build/html/_sources/commands/php2po.txt
@@ -39,8 +39,7 @@ Options (php2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -60,8 +59,8 @@ Options (po2php):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -70,45 +69,8 @@ Options (po2php):
 Formats Supported
 =================
 
-PHP files need to be organized into separate languages per file and in the
-following format:
-
-.. code-block:: php
-
-    $variable = 'string';
-    $another_variable = "another string";
-
-If $variable is an array it can be declared with the square bracket syntax:
-
-.. code-block:: php
-
-    $lang['item'] = 'string';
-    $lang['another_item'] = "another string";
-
-The converter also supports arrays in the form:
-
-.. code-block:: php
-
-    $variable = array(
-       name => 'value',
-       other => "other value",
-    )
-
-Finally, the converter also supports the define syntax:
-
-.. code-block:: php
-
-    define('item', 'string');
-    define("another_item", "another string");
-
-Gettext notations are also not supported, use the Gettext tools for those
-files.
-
-.. note:: Nested arrays are not supported:
-
-.. code-block:: php
-
-    $lang = array(array('key' => 'value')); #NOT SUPPORTED
+Check :doc:`PHP format </formats/php>` document to see to which extent the PHP
+format is supported.
 
 .. _php2po#examples:
 
diff --git a/docs/_build/html/_sources/commands/po2tmx.txt b/docs/_build/html/_sources/commands/po2tmx.txt
index 50df42b..87477df 100644
--- a/docs/_build/html/_sources/commands/po2tmx.txt
+++ b/docs/_build/html/_sources/commands/po2tmx.txt
@@ -6,8 +6,13 @@ po2tmx
 
 Convert :doc:`Gettext PO </formats/po>` files to a :doc:`/formats/tmx`
 translation memory file.  TMX is the Translation Memory eXchange format
-developed by `LISA <http://lisa.org/>`_ (Localization Industry Standards
-Association).
+developed by OSCAR.
+
+.. [*] OSCAR (Open Standards for Container/Content Allowing Re-use), a special
+   interest group of the now defunct LISA (Localization Industry Standards
+   Association). The Gala `LISA OSCAR Standards
+   <http://www.gala-global.org/lisa-oscar-standards>`_ page has more details on
+   the possble future for the standards.
 
 If you are interested in po2tmx, you might also be interested in
 :doc:`posegment` that can be used to perform some automated segmentation on
@@ -42,8 +47,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in tmx format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -lLANG, --language=LANG  set target language code (e.g. af-ZA) [required]
 --source-language=LANG   set source language code (default: en)
 
diff --git a/docs/_build/html/_sources/commands/po2wordfast.txt b/docs/_build/html/_sources/commands/po2wordfast.txt
index ae40f78..036bc98 100644
--- a/docs/_build/html/_sources/commands/po2wordfast.txt
+++ b/docs/_build/html/_sources/commands/po2wordfast.txt
@@ -6,8 +6,7 @@ po2wordfast
 
 Convert Gettext PO files to a :doc:`/formats/wordfast` translation memory file.
 
-`Wordfast <https://en.wikipedia.org/wiki/Wordfast>`_ is a popular Windows based
-computer-assisted translation tool.
+:wp:`Wordfast` is a popular Windows based computer-assisted translation tool.
 
 .. _po2wordfast#usage:
 
@@ -38,8 +37,7 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in tmx format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -lLANG, --language=LANG  set target language code (e.g. af-ZA) [required]
 --source-language=LANG   set source language code (default: en)
 
diff --git a/docs/_build/html/_sources/commands/poclean.txt b/docs/_build/html/_sources/commands/poclean.txt
index 3c32a98..2ccd020 100644
--- a/docs/_build/html/_sources/commands/poclean.txt
+++ b/docs/_build/html/_sources/commands/poclean.txt
@@ -37,8 +37,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 
 .. _poclean#examples:
 
diff --git a/docs/_build/html/_sources/commands/pocompile.txt b/docs/_build/html/_sources/commands/pocompile.txt
index 7dc2e2f..6f0507e 100644
--- a/docs/_build/html/_sources/commands/pocompile.txt
+++ b/docs/_build/html/_sources/commands/pocompile.txt
@@ -37,8 +37,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in xlf, po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in mo format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/_build/html/_sources/commands/poconflicts.txt b/docs/_build/html/_sources/commands/poconflicts.txt
index 0709a3c..bfd1810 100644
--- a/docs/_build/html/_sources/commands/poconflicts.txt
+++ b/docs/_build/html/_sources/commands/poconflicts.txt
@@ -46,8 +46,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -I, --ignore-case    ignore case distinctions
 -v, --invert         invert the conflicts thus extracting conflicting destination words
 --accelerator=ACCELERATORS
diff --git a/docs/_build/html/_sources/commands/pocount.txt b/docs/_build/html/_sources/commands/pocount.txt
index f30acd1..05950c9 100644
--- a/docs/_build/html/_sources/commands/pocount.txt
+++ b/docs/_build/html/_sources/commands/pocount.txt
@@ -35,13 +35,13 @@ Where:
 
 Options:
 
--h, --help      show this help message and exit
---incomplete    skip 100% translated files
---full          (default) statistics in full, verbose format
---csv           statistics in CSV format
---short         same as --short-strings
---short-strings statistics of strings in short format -- one line per file
---short-words   statistics of words in short format -- one line per file
+-h, --help       show this help message and exit
+--incomplete     skip 100% translated files
+--full           (default) statistics in full, verbose format
+--csv            statistics in CSV format
+--short          same as --short-strings
+--short-strings  statistics of strings in short format -- one line per file
+--short-words    statistics of words in short format -- one line per file
 
 .. _pocount#examples:
 
diff --git a/docs/_build/html/_sources/commands/podebug.txt b/docs/_build/html/_sources/commands/podebug.txt
index 800906c..3cc6a6a 100644
--- a/docs/_build/html/_sources/commands/podebug.txt
+++ b/docs/_build/html/_sources/commands/podebug.txt
@@ -4,8 +4,7 @@
 podebug
 *******
 
-Insert `pseudo translations
-<https://en.wikipedia.org/wiki/Pseudolocalization>`_ or debug markers into
+Insert :wp:`pseudo translations <Pseudolocalization>` or debug markers into
 target text in XLIFF, Gettex PO and other localization files.
 
 The pseudo translation or debug markers make it easy to reference and locate
@@ -56,8 +55,6 @@ Options:
                        exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT
                        write to OUTPUT in po, pot formats
---psyco=MODE           use psyco to speed up the operation, modes: :doc:`none,
-                       full, profile <option_psyco>`
 -P, --pot              output PO Templates (.pot) rather than PO files (.po)
 -fFORMAT, --format=FORMAT     specify format string
 --rewrite=STYLE        the translation rewrite style: :doc:`xxx, en, blank,
diff --git a/docs/_build/html/_sources/commands/pofilter.txt b/docs/_build/html/_sources/commands/pofilter.txt
index 4b23a8b..a6cfd5f 100644
--- a/docs/_build/html/_sources/commands/pofilter.txt
+++ b/docs/_build/html/_sources/commands/pofilter.txt
@@ -44,8 +44,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in pot, po, xlf, tmx formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot, xlf, tmx formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -l, --listfilters    list filters available
 --review             include elements marked for review (default)
 --noreview           exclude elements marked for review
diff --git a/docs/_build/html/_sources/commands/pofilter_tests.txt b/docs/_build/html/_sources/commands/pofilter_tests.txt
index 99c7d7d..2395b1f 100644
--- a/docs/_build/html/_sources/commands/pofilter_tests.txt
+++ b/docs/_build/html/_sources/commands/pofilter_tests.txt
@@ -43,7 +43,7 @@ you determine which to run first.
 
 * Critical -- can break a program
 
-  * :ref:`pofilter_tests#accelerators`, :ref:`pofilter_tests#escapes`,
+  * :ref:`pofilter_tests#escapes`,
     :ref:`pofilter_tests#newlines`, :ref:`pofilter_tests#nplurals`,
     :ref:`pofilter_tests#printf`, :ref:`pofilter_tests#tabs`,
     :ref:`pofilter_tests#variables`, :ref:`pofilter_tests#xmltags`,
@@ -51,7 +51,8 @@ you determine which to run first.
 
 * Functional -- may confuse the user
 
-  * :ref:`pofilter_tests#acronyms`, :ref:`pofilter_tests#blank`,
+  * :ref:`pofilter_tests#accelerators`,
+    :ref:`pofilter_tests#acronyms`, :ref:`pofilter_tests#blank`,
     :ref:`pofilter_tests#emails`, :ref:`pofilter_tests#filepaths`,
     :ref:`pofilter_tests#functions`, :ref:`pofilter_tests#gconf`,
     :ref:`pofilter_tests#kdecomments`, :ref:`pofilter_tests#long`,
@@ -88,8 +89,8 @@ Test Description
 accelerators
 ------------
 
-Checks whether :doc:`guide/translation/accelerators` are consistent between the
-two strings.
+Checks whether :ref:`accelerators <guide:accelerators>` are consistent between
+the two strings.
 
 Make sure you use the :opt:`--mozilla`, :opt:`--kde`, etc options so that
 pofilter knows which type of accelerator it is looking for.  The test will pick
@@ -126,17 +127,17 @@ brackets
 
 Checks that the number of brackets in both strings match.
 
-If ([{ or }]) appear in the original this will check that the same number
-appear in the translation.
+If ``([{`` or ``}])`` appear in the original this will check that the same
+number appear in the translation.
 
 .. _pofilter_tests#compendiumconflicts:
 
 compendiumconflicts
 -------------------
 
-Checks for Gettext compendium conflicts (#-#-#-#-#).
+Checks for Gettext compendium conflicts (``#-#-#-#-#``).
 
-When you use msgcat to create a PO compendium it will insert #-#-#-#-# into
+When you use msgcat to create a PO compendium it will insert ``#-#-#-#-#`` into
 entries that are not consistent.  If the compendium is used later in a message
 merge then these conflicts will appear in your translations.  This test quickly
 extracts those for correction.
@@ -178,9 +179,10 @@ doublequoting
 
 Checks whether doublequoting is consistent between the two strings.
 
-Checks on double quotes " to ensure that you have the same number in both the
-original and the translated string. This tests takes into account that several
-languages use different quoting characters, and will test for them instead.
+Checks on double quotes ``"`` to ensure that you have the same number in both
+the original and the translated string. This tests takes into account that
+several languages use different quoting characters, and will test for them
+instead.
 
 .. _pofilter_tests#doublespacing:
 
@@ -453,7 +455,7 @@ test can also manage variables-reordering using the ``%1$s`` syntax.  The
 variables' type and details following data are tested to ensure that they are
 strictly identical, but they may be reordered.
 
-.. seealso:: `printf Format String <https://en.wikipedia.org/wiki/Printf_format_string>`_
+.. seealso:: :wp:`printf Format String <Printf_format_string>`
 
 .. _pofilter_tests#puncspacing:
 
@@ -528,11 +530,11 @@ Checks for English style plural(s) for you to review.
 
 This test will extract any message that contains words with a final "(s)" in
 the source text.  You can then inspect the message, to check that the correct
-`plural form <http://qooxdoo.org/l10n/pluralforms>`_ has been used for your
-language.  In some languages, plurals are made by adding text at the beginning
-of words, making the English style messy.  In this case, they often revert to
-the plural form.  This test allows an editor to check that the plurals used are
-correct.  Be aware that this test may create a number of false positives.
+plural form has been used for your language.  In some languages, plurals are
+made by adding text at the beginning of words, making the English style messy.
+In this case, they often revert to the plural form.  This test allows an editor
+to check that the plurals used are correct.  Be aware that this test may create
+a number of false positives.
 
 For languages with no plural forms (only one noun form) this test will simply
 test that nothing like "(s)" was used in the translation.
@@ -544,11 +546,11 @@ singlequoting
 
 Checks whether singlequoting is consistent between the two strings.
 
-The same as doublequoting but checks for the ' character.  Because this is used
-in contractions like it's and in possessive forms like user's, this test can
-output spurious errors if your language doesn't use such forms.  If a quote
-appears at the end of a sentence in the translation, i.e. '[full-stop], this
-might not be detected properly by the check.
+The same as doublequoting but checks for the ``'`` character.  Because this is
+used in contractions like it's and in possessive forms like user's, this test
+can output spurious errors if your language doesn't use such forms.  If a quote
+appears at the end of a sentence in the translation, i.e. ``'.``, this might
+not be detected properly by the check.
 
 .. _pofilter_tests#spellcheck:
 
@@ -563,12 +565,11 @@ those to an exclusion list. The advantage of this exclusion is that many words
 that are specific to the application will not raise errors e.g. program names,
 brand names, function names.
 
-The checker works with `PyEnchant <http://pyenchant.sourceforge.net/>`_. You
+The checker works with `PyEnchant <http://pythonhosted.org/pyenchant/>`_. You
 need to have PyEnchant installed as well as a dictionary for your language (for
-example, one of the `Hunspell
-<http://wiki.services.openoffice.org/wiki/Dictionaries>`_ or `aspell
-<http://ftp.gnu.org/gnu/aspell/dict/>`_ dictionaries).  This test will only
-work if you have specified the :opt:`--language` option.
+example, one of the `Hunspell <https://wiki.openoffice.org/wiki/Dictionaries>`_
+or `aspell <http://ftp.gnu.org/gnu/aspell/dict/>`_ dictionaries).  This test
+will only work if you have specified the :opt:`--language` option.
 
 The pofilter error that is created, lists the misspelled word, plus
 suggestions returned from the spell checker.  That makes it easy for you to
@@ -688,7 +689,7 @@ files.
 xmltags
 -------
 
-Checks that :doc:`XML/HTML <guide/translation/html>` tags have not been
+Checks that :wiki:`XML/HTML <guide/translation/html>` tags have not been
 translated.
 
 This check finds the number of tags in the source string and checks that the
diff --git a/docs/_build/html/_sources/commands/pogrep.txt b/docs/_build/html/_sources/commands/pogrep.txt
index f598a85..543b5fb 100644
--- a/docs/_build/html/_sources/commands/pogrep.txt
+++ b/docs/_build/html/_sources/commands/pogrep.txt
@@ -37,14 +37,14 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po, pot, xlf formats (XLIFF since version 1.0)
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot, xlf formats (XLIFF since version 1.0)
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --search=SEARCHPARTS  searches the given parts (source, target, notes, locations)
 -I, --ignore-case    ignore case distinctions
 -e, --regexp         use regular expression matching
 -v, --invert-match   select non-matching lines
 --accelerator=ACCELERATORS
                       ignores the given :doc:`accelerator characters <option_accelerator>` when matching
+-k, --keep-translations
+                      always extract units with translations
 
 .. _pogrep#example:
 
diff --git a/docs/_build/html/_sources/commands/pomerge.txt b/docs/_build/html/_sources/commands/pomerge.txt
index 6de7a23..94ed5cc 100644
--- a/docs/_build/html/_sources/commands/pomerge.txt
+++ b/docs/_build/html/_sources/commands/pomerge.txt
@@ -52,8 +52,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in po, pot, xlf, tmx formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot, xlf, tmx formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --mergeblanks=MERGEBLANKS  whether to overwrite existing translations with blank translations (yes/no). Default is yes.
 --mergefuzzy=MERGEFUZZY  whether to overwrite existing translations with fuzzy translations (yes/no). Default is yes. (new in version 1.9)
 --mergecomments=MERGECOMMENTS  whether to merge comments as well as translations (yes/no). Default is yes.
diff --git a/docs/_build/html/_sources/commands/porestructure.txt b/docs/_build/html/_sources/commands/porestructure.txt
index 619e602..c533e4f 100644
--- a/docs/_build/html/_sources/commands/porestructure.txt
+++ b/docs/_build/html/_sources/commands/porestructure.txt
@@ -45,8 +45,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 
 .. _porestructure#examples:
 
diff --git a/docs/_build/html/_sources/commands/posegment.txt b/docs/_build/html/_sources/commands/posegment.txt
index 09fd24e..bef68fc 100644
--- a/docs/_build/html/_sources/commands/posegment.txt
+++ b/docs/_build/html/_sources/commands/posegment.txt
@@ -47,8 +47,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in pot format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -P, --pot             output PO Templates (.pot) rather than PO files (.po)
 -l LANG, --language=LANG
                       the target language code
diff --git a/docs/_build/html/_sources/commands/poswap.txt b/docs/_build/html/_sources/commands/poswap.txt
index badbd9f..0b884b9 100644
--- a/docs/_build/html/_sources/commands/poswap.txt
+++ b/docs/_build/html/_sources/commands/poswap.txt
@@ -49,8 +49,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --reverse  Do the inverse operation (converting back to a normal English based file). See the examples.
 
 .. _poswap#examples:
diff --git a/docs/_build/html/_sources/commands/pot2po.txt b/docs/_build/html/_sources/commands/pot2po.txt
index 89c88aa..9256264 100644
--- a/docs/_build/html/_sources/commands/pot2po.txt
+++ b/docs/_build/html/_sources/commands/pot2po.txt
@@ -39,8 +39,7 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot formats (old translations)
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --tm=TM              The file to use as translation memory when fuzzy matching
 -sMIN_SIMILARITY, --similarity=MIN_SIMILARITY   The minimum similarity for inclusion (default: 75%)
@@ -92,13 +91,9 @@ Performance
 ===========
 
 Fuzzy matches are usually of good quality. Installation of the
-`python-Levenshtein
-<https://sourceforge.net/project/showfiles.php?group_id=91920&package_id=260161>`_
-package will speed up fuzzy matching. Without this a Python based matcher is
-used which is considerably slower.
-
-Install psyco for additional speedup (it is used by most toolkit tools if it is
-installed.)
+`python-Levenshtein <https://pypi.python.org/pypi/python-Levenshtein>`_ package
+will speed up fuzzy matching. Without this a Python based matcher is used which
+is considerably slower.
 
 .. _pot2po#bugs:
 
diff --git a/docs/_build/html/_sources/commands/poterminology.txt b/docs/_build/html/_sources/commands/poterminology.txt
index c2143fb..9c17256 100644
--- a/docs/_build/html/_sources/commands/poterminology.txt
+++ b/docs/_build/html/_sources/commands/poterminology.txt
@@ -18,8 +18,7 @@ target language.
 The more separate PO files you use to generate terminology, the better your
 results will be, but poterminology can be used with just a single input file.
 
-Read more about `terminology extraction
-<http://en.wikipedia.org/wiki/Terminology_extraction>`_
+Read more about :wp:`terminology extraction <Terminology_extraction>`
 
 .. _poterminology#usage:
 
@@ -51,8 +50,6 @@ Options:
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -u UPDATEFILE, --update=UPDATEFILE  update terminology in UPDATEFILE
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -S STOPFILE, --stopword-list=STOPFILE  read stopword (term exclusion) list from STOPFILE (default site-packages/translate/share/stoplist-en)
 -F, --fold-titlecase  fold "Title Case" to lowercase (default)
 -C, --preserve-case   preserve all uppercase/lowercase
diff --git a/docs/_build/html/_sources/commands/pretranslate.txt b/docs/_build/html/_sources/commands/pretranslate.txt
index 9e598c7..101c163 100644
--- a/docs/_build/html/_sources/commands/pretranslate.txt
+++ b/docs/_build/html/_sources/commands/pretranslate.txt
@@ -43,8 +43,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read old translations from TEMPLATE
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --tm=TM              The file to use as translation memory when fuzzy matching
 -sMIN_SIMILARITY, --similarity=MIN_SIMILARITY   The minimum similarity for inclusion (default: 75%)
 --nofuzzymatching    Disable all fuzzy matching
@@ -87,9 +85,6 @@ Performance
 
 Fuzzy matches are usually of good quality. Installation of the
 `python-Levenshtein
-<https://sourceforge.net/project/showfiles.php?group_id=91920&package_id=260161>`_
+<https://pypi.python.org/pypi/python-Levenshtein>`_
 package will speed up fuzzy matching. Without this a Python based matcher is
 used which is considerably slower.
-
-Install psyco for additional speedup (it is used by most toolkit tools if it is
-installed.)
diff --git a/docs/_build/html/_sources/commands/prop2po.txt b/docs/_build/html/_sources/commands/prop2po.txt
index e932d44..23fb32a 100644
--- a/docs/_build/html/_sources/commands/prop2po.txt
+++ b/docs/_build/html/_sources/commands/prop2po.txt
@@ -55,8 +55,7 @@ Options (prop2po):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in properties format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --personality=TYPE    override the input file format: :doc:`flex, java, mozilla,
                       java-utf8, skype, gaia, strings <option_personality>`
@@ -80,12 +79,13 @@ Options (po2prop):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in properties format
 -tTEMPLATE, --template=TEMPLATE  read from TEMPLATE in properties format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 --personality=TYPE    override the input file format: :doc:`flex, java, mozilla,
                       java-utf8, skype, gaia, strings <option_personality>`
                       (for .properties files, default: java)
 --encoding=ENCODING  override the encoding set by the personality (since 1.8.0)
+--removeuntranslated  remove key value from output if it is untranslated
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -165,7 +165,7 @@ Doing away with native2ascii
 ============================
 
 The `native2ascii
-<http://docs.oracle.com/javase/1.4.2/docs/tooldocs/windows/native2ascii.html>`_
+<http://docs.oracle.com/javase/7/docs/technotes/tools/windows/native2ascii.html>`_
 command is the traditional tool of property file localisers.  With prop2po
 there is no need to use this command or to ever work directly with the escaped
 Unicode.
diff --git a/docs/_build/html/_sources/commands/rc2po.txt b/docs/_build/html/_sources/commands/rc2po.txt
index 7529fec..91653c6 100644
--- a/docs/_build/html/_sources/commands/rc2po.txt
+++ b/docs/_build/html/_sources/commands/rc2po.txt
@@ -38,8 +38,6 @@ Options (rc2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in rc format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --charset=CHARSET    charset to use to decode the RC files (default:                        cp1252)
 --duplicates=DUPLICATESTYLE
@@ -60,11 +58,11 @@ Options (po2rc):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in rc format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in rc format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 --charset=CHARSET    charset to use to decode the RC files (default: utf-8)
 -l LANG, --lang=LANG  LANG entry
 --sublang=SUBLANG     SUBLANG entry (default: SUBLANG_DEFAULT)
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/_build/html/_sources/commands/sub2po.txt b/docs/_build/html/_sources/commands/sub2po.txt
index bb12b88..3f15288 100644
--- a/docs/_build/html/_sources/commands/sub2po.txt
+++ b/docs/_build/html/_sources/commands/sub2po.txt
@@ -44,8 +44,7 @@ Options (sub2po):
 -iINPUT, --input=INPUT    read from INPUT in .srt format
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -65,8 +64,8 @@ Options (po2sub):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in srt format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in txt format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/_build/html/_sources/commands/symb2po.txt b/docs/_build/html/_sources/commands/symb2po.txt
index dad73cf..0060216 100644
--- a/docs/_build/html/_sources/commands/symb2po.txt
+++ b/docs/_build/html/_sources/commands/symb2po.txt
@@ -46,8 +46,7 @@ Options (symb2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in the Symbian translation format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -67,8 +66,7 @@ Options (po2symb):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in the Symbian translation format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 .. _symb2po#examples:
 
diff --git a/docs/_build/html/_sources/commands/tiki2po.txt b/docs/_build/html/_sources/commands/tiki2po.txt
index 6645a2e..7a0865c 100644
--- a/docs/_build/html/_sources/commands/tiki2po.txt
+++ b/docs/_build/html/_sources/commands/tiki2po.txt
@@ -38,7 +38,8 @@ Options (tiki2po):
 -i INPUT, --input=INPUT      read from INPUT in php format
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---include-unused When converting, include strings in the "unused" section?
+-S, --timestamp       skip conversion if the output file has newer timestamp
+--include-unused      When converting, include strings in the "unused" section?
 
 Options (po2tiki):
 
@@ -52,6 +53,7 @@ Options (po2tiki):
 -i INPUT, --input=INPUT  read from INPUT in po, pot formats
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 .. _tiki2po#examples:
 
diff --git a/docs/_build/html/_sources/commands/tmserver.txt b/docs/_build/html/_sources/commands/tmserver.txt
index c55382b..bcafa6f 100644
--- a/docs/_build/html/_sources/commands/tmserver.txt
+++ b/docs/_build/html/_sources/commands/tmserver.txt
@@ -5,7 +5,10 @@ tmserver
 ********
 tmserver is a Translation Memory service that can be queried via HTTP using a
 simple REST like URL/http and data is exchanged between server and client
-encoded in JSON
+encoded in JSON.
+
+.. note:: If you are searching for an enterprise Translation Memory server then
+   rather use `amaGama <http://amagama.translatehouse.org/>`_.
 
 .. _tmserver#usage:
 
diff --git a/docs/_build/html/_sources/commands/ts2po.txt b/docs/_build/html/_sources/commands/ts2po.txt
index c5c2ccb..a2b1728 100644
--- a/docs/_build/html/_sources/commands/ts2po.txt
+++ b/docs/_build/html/_sources/commands/ts2po.txt
@@ -14,13 +14,13 @@ might wish to standardise on one localization tool.  ts2po allows you to
 standardise on the PO format and PO related tools.
 
 .. note:: `Virtaal <http://virtaal.org>`_ and `Pootle
-   <http://pootle.tramslatehouse.org>`_ can edit .ts files directly without the
+   <http://pootle.translatehouse.org>`_ can edit .ts files directly without the
    need for any conversion.
 
 .. warning:: po2ts uses our older .ts support.  Thus many of the newer features
    in .ts are not supported.  To support those features rather edit directly in
    `Virtaal <http://virtaal.org>`_ or `Pootle
-   <http://pootle.tramslatehouse.org>`_.
+   <http://pootle.translatehouse.org>`_.
 
 .. _ts2po#usage:
 
@@ -52,8 +52,7 @@ Options (ts2po):
 -iINPUT, --input=INPUT   read from INPUT in ts format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -73,8 +72,7 @@ Options (po2ts):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in ts format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in ts format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 
 .. _ts2po#examples:
 
diff --git a/docs/_build/html/_sources/commands/txt2po.txt b/docs/_build/html/_sources/commands/txt2po.txt
index 7687f5a..248f6e8 100644
--- a/docs/_build/html/_sources/commands/txt2po.txt
+++ b/docs/_build/html/_sources/commands/txt2po.txt
@@ -43,8 +43,7 @@ Options (txt2po):
 -iINPUT, --input=INPUT    read from INPUT in \*, txt formats
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --encoding=ENCODING    The encoding of the input file (default: UTF-8)
 --flavour=FLAVOUR      The flavour of text file: plain (default), dokuwiki, mediawiki
@@ -66,9 +65,9 @@ Options (po2txt):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in txt format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in txt format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -wWRAP, --wrap=WRAP  set number of columns to wrap text at
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 --encoding           encoding of the template file
diff --git a/docs/_build/html/_sources/commands/web2py2po.txt b/docs/_build/html/_sources/commands/web2py2po.txt
index 9b5fb96..d39c0f5 100644
--- a/docs/_build/html/_sources/commands/web2py2po.txt
+++ b/docs/_build/html/_sources/commands/web2py2po.txt
@@ -7,9 +7,9 @@ web2py2po
 
 Converts web2py translation files to PO files and vice versa.
 
-`Web2py <http://mdp.cti.depaul.edu>`_, formerly known as Gluon) is an
-open-source, Python-based web application framework by Massimo Di Pierro
-(inspired by Django and Rails).
+`Web2py <http://web2py.com/>`_, formerly known as Gluon) is an open-source,
+Python-based web application framework by Massimo Di Pierro (inspired by Django
+and Rails).
 
 Web2py uses an internal localization engine based on Python dictionaries, which
 is applied with the T() lookup function. Web2py provides a built-in translation
@@ -51,8 +51,7 @@ Options (web2py2po):
 -i INPUT, --input=INPUT      read from INPUT in php format
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
                       text): :doc:`merge, msgctxt <option_duplicates>`
@@ -70,8 +69,8 @@ Options (po2web2py):
 -i INPUT, --input=INPUT  read from INPUT in po, pot formats
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/_build/html/_sources/commands/xliff2po.txt b/docs/_build/html/_sources/commands/xliff2po.txt
index 29a2fc3..9a77ed1 100644
--- a/docs/_build/html/_sources/commands/xliff2po.txt
+++ b/docs/_build/html/_sources/commands/xliff2po.txt
@@ -7,7 +7,7 @@ xliff2po
 
 Converts XLIFF localization files to Gettext PO files.  XLIFF is the XML
 Localization Interchange File Format developed by `OASIS
-<http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_
+<https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_
 (Organization for the Advancement of Structured Information Standards) to allow
 translation work to be standardised no matter what the source format and to
 allow the work to be freely moved from tool to tool.
@@ -42,8 +42,7 @@ Options (xliff2po):
 -iINPUT, --input=INPUT   read from INPUT in xliff format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -63,8 +62,7 @@ Options (po2xliff):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in xliff format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in xliff format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 
 .. _xliff2po#examples:
diff --git a/docs/_build/html/_sources/development/building.txt b/docs/_build/html/_sources/developers/building.txt
similarity index 93%
rename from docs/_build/html/_sources/development/building.txt
rename to docs/_build/html/_sources/developers/building.txt
index 141c484..1014435 100644
--- a/docs/_build/html/_sources/development/building.txt
+++ b/docs/_build/html/_sources/developers/building.txt
@@ -31,7 +31,7 @@ Building Python packages with C extensions under Windows
 
 In order to build modules which have C extensions, you will need either the
 Visual Studio C++ compiler or `MinGW
-<http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=240780>`_.
+<http://sourceforge.net/projects/mingw/files/MSYS/Extension/>`_.
 
 Make sure that your Visual Studio C++ or MinGW program path is part of your
 system's program path, since the Python build system requires this.
diff --git a/docs/_build/html/_sources/development/contributing.txt b/docs/_build/html/_sources/developers/contributing.txt
similarity index 91%
rename from docs/_build/html/_sources/development/contributing.txt
rename to docs/_build/html/_sources/developers/contributing.txt
index 5c22c52..d99766b 100644
--- a/docs/_build/html/_sources/development/contributing.txt
+++ b/docs/_build/html/_sources/developers/contributing.txt
@@ -37,7 +37,7 @@ Compile and install the software to see if we have any platform issues::
 
 Check for any files that are missing, tools that were not installed, etc.
 
-:ref:`Run unit tests <developers/testing_guidelines#running tests>` to see if
+:wiki:`Run unit tests <developers/testing_guidelines#running_tests>` to see if
 there are any issues.  Please report any failures.
 
 Finally, simply work with the software.  Checking all your current usage
@@ -48,7 +48,7 @@ patterns and report problems.
 Debugging
 =========
 
-- Make sure your familiar with the :doc:`bug reporting guidelines
+- Make sure your familiar with the :wiki:`bug reporting guidelines
   <developers/reporting_bugs>`.
 - Create a login for yourself at http://bugs.locamotion.org
 - Then choose a bug
@@ -92,9 +92,9 @@ Here are some ideas to get you going:
   </formats/conformance>`
 
 You will definitely need to be on the `Development
-<http://lists.sourceforge.net/lists/listinfo/translate-devel>`_ and probably on
-the `Subversion checkin
-<http://lists.sourceforge.net/lists/listinfo/translate-cvs>`_ lists.
+<https://lists.sourceforge.net/lists/listinfo/translate-devel>`_ and probably
+on the `Subversion checkin
+<https://lists.sourceforge.net/lists/listinfo/translate-cvs>`_ lists.
 
 Now is the time to familiarise yourself with the :doc:`developers guide
 <developers>`.
diff --git a/docs/_build/html/_sources/development/developers.txt b/docs/_build/html/_sources/developers/developers.txt
similarity index 88%
rename from docs/_build/html/_sources/development/developers.txt
rename to docs/_build/html/_sources/developers/developers.txt
index 224c035..1da6917 100644
--- a/docs/_build/html/_sources/development/developers.txt
+++ b/docs/_build/html/_sources/developers/developers.txt
@@ -56,9 +56,39 @@ Bugzilla
 Communication
 -------------
 
-* IRC channel -- irc://irc.freenode.net/#pootle Developers mailing list --
-* https://lists.sourceforge.net/lists/listinfo/translate-devel Commits to
-* version control -- https://lists.sourceforge.net/lists/listinfo/translate-cvs
+* `IRC channel <irc://irc.freenode.net/#pootle>`_
+* `Developers mailing list <https://lists.sourceforge.net/lists/listinfo/translate-devel>`_
+* `Commits to version control <https://lists.sourceforge.net/lists/listinfo/translate-cvs>`_
+
+.. _developers#working_with_bugzilla:
+
+Working with Bugzilla
+=====================
+When you close bugs ensure that you give a description and git hash for the
+fix.  This ensures that the reporter or code reviewer can see your work and has
+an easy method of finding your fix.  This is made easier by GitHub's Bugzilla
+integration.
+
+Automated Bugzilla update from commits
+--------------------------------------
+
+Github will post comments on Bugzilla bugs when the commit messages make
+references to the bug by its bug number.
+
+- Bugs are recognised by the following format (which are case-insensitive)::
+
+    Bug 123
+
+- Multiple bugs can be specified by separating them with a comma, ampersand,
+  plus or "and"::
+
+    Bug 123, 124 and 125
+
+- Commits to all branches will be processed.
+- If there is a "fix", "close", or "address" before the bug then that bug is
+  closed. ::
+
+    Fix bug 123
 
 .. _developers#source_code_map:
 
@@ -94,10 +124,6 @@ As root
 
 The various setup options are yours to explore
 
-To run / test things without installing, see the :doc:`instructions for Pootle
-<pootle:no_install>`. Those instructions sets your environment for both Pootle
-and the toolkit
-
 .. _developers#general_overview_of_the_programs:
 
 General overview of the programs
@@ -217,6 +243,7 @@ defined:
   e.g. PO message, CSV records, DTD elements
 * XXfile -- handles the document or file level of the format.  Eg a PO file, a
   CSV file a DTD file
+
   * fromlines -- read in a file and initialise the various elements
   * tolines -- convert the elements stored in XXelements and portions in XXfile
     to a raw file in that format
diff --git a/docs/_build/html/_sources/developers/releasing.txt b/docs/_build/html/_sources/developers/releasing.txt
new file mode 100644
index 0000000..f8060b4
--- /dev/null
+++ b/docs/_build/html/_sources/developers/releasing.txt
@@ -0,0 +1,272 @@
+==================================
+Making a Translate Toolkit Release
+==================================
+
+Summary
+=======
+#. Git clone git at github.com:translate/translate.git translate-release
+#. Create release notes
+#. Up version number
+#. make build
+#. Test install and other tests
+#. Tag the release
+#. Publish on PyPI
+#. Upload to Sourceforge
+#. Release documentation
+#. Update translate website
+#. Unstage sourceforge
+#. Announce to the world
+#. Cleanup
+
+Other possible steps
+--------------------
+We need to check and document these if needed:
+
+- Build docs: we need to check if e need to build the docs for the release
+- Change URLs to point to the correct docs: do we want to change URLs to point
+  to the $version docs rather then 'latest'
+- Building on Windows, building for other Linux distros. We have produced 
+- Communicating to upstream packagers
+
+
+Detailed instructions
+=====================
+
+Get a clean checkout
+--------------------
+We work from a clean checkout to esnure that everything you are adding to the
+build is what is in VC and doesn't contain any of your uncommitted changes.  It
+also ensure that someone else could relicate your process. ::
+
+    git clone git at github.com:translate/translate.git translate-release
+
+Create release notes
+--------------------
+The release notes will be used in these places:
+
+- Toolkit website - `download page
+  <http://toolkit.translatehouse.org/download.html>`_ (used in gh-pages)
+- Sourceforge download - README.rst (used to give user info)
+- Email announcements - text version
+
+We create our release notes in reStructured Text, since we use that elsewhere
+and since it can be rendered well in some of our key sites.
+
+First we need to create a log of changes in the Translate Toolkit, which is
+done generically like this::
+
+    git log $version-1..HEAD > docs/release/$version.rst
+
+Or a more specific example::
+
+    git log 1.10.0..HEAD > docs/releases/1.10.0.rst
+
+Edit this file.  You can use the commits as a guide to build up the release
+notes.  You should remove all log messages before the release.
+
+.. note:: Since the release notes will be used in places that allow linking we
+   use links within the notes.  These should link back to products websites
+   (`Virtaal <http://virtaal.org>`_, `Pootle
+   <http://pootle.translatehouse.org>`_, etc), references to `Translate
+   <http://translatehouse.org>`_ and possibly bug numbers, etc.
+
+Read for grammar and spelling errors.
+
+.. note:: When writing the notes please remember:
+
+   #. The voice is active. 'Translate has released a new version of the
+      toolkit', not 'A new version of the toolkit was release by Translate'.
+   #. The connection to the users is human not distant.
+   #. We speak in familiar terms e.g. "I know you've been waiting for this
+      release" instead of formal.
+
+We create a list of contributors using this command::
+
+   git log 1.10.0..HEAD --format='%aN, ' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn | cut -d\  -f2-
+
+
+Up version numbers
+------------------
+Update the version number in:
+
+- ``translate/__version__.py``
+- ``docs/conf.py```
+
+In ``__version__.py``, bump the build number if anybody used the toolkit with
+the previous number, and there have been any changes to code touching stats or
+quality checks.  An increased build number will force a toolkit user, like
+Pootle, to regenerate the stats and checks.
+
+For ``conf.py`` change ``version`` and ``release``
+
+.. note:: FIXME - We might want to consolidate the version and release info so
+   that we can update it in one place.
+
+The version string should follow the pattern::
+
+    $MAJOR-$MINOR-$MICRO[-$EXTRA]
+
+E.g. ::
+
+    1.10.0
+    0.9.1-rc1 
+
+``$EXTRA`` is optional but all the three others are required.  The first
+release of a ``$MINOR`` version will always have a ``$MICRO`` of ``.0``. So
+``1.10.0`` and never just ``1.10``.
+
+
+Build the package
+-----------------
+Building is the first step to testing that things work.  From your clean
+checkout run::
+
+    make build
+
+This will create a tarball in ``dist/`` which you can use for further testing.
+
+.. note:: We use a clean checkout just to make sure that no inadvertant changes
+   make it into the release.
+
+
+Test install and other tests
+----------------------------
+The easiest way to test is in a virtualenv.  You can install the new toolkit
+using::
+
+    pip install path/to/dist/translate-toolkit-$version.tar.bz2
+
+This will allow you test installation of the software.
+
+You can then proceed with other tests such as checking
+
+#. Documentation is available
+#. Converters and scripts are installed and run correctly
+#. Meta information about the package is correct. See pypy section of reviewing
+   meta data.
+
+
+Tag the release
+---------------
+You should only tag once you are happy with your release as there are some
+things that we can't undo. ::
+
+    git tag -a 1.10.0 -m "Tag version 1.10.0"
+    git push --tags
+
+
+Publish on PyPI
+---------------
+Publish the package on the `Python Package Index
+<https://pypi.python.org/pypi>`_ (PyPI)
+
+- `Submitting Packages to the Package Index
+  <http://wiki.python.org/moin/CheeseShopTutorial#Submitting_Packages_to_the_Package_Index>`_
+
+.. note:: You need a username and password on https://pypi.python.org and have
+   rights to the project before you can proceed with this step.
+
+   These can be stored in ``$HOME/.pypirc`` and will contain your username and
+   password. A first run of ``./setup.py register`` will create such a file.
+   It will also actually publish the meta-data so only do it when you are
+   actually ready.
+
+Review the meta data. This is stored in ``setup.py``, use ``./setup.py --help``
+to se some options to display meta-data. The actual descriptions are taken from
+``translate/__init__.py``.
+
+To test before publishing run::
+
+    make test-publish-pypi
+
+Then to actually publish::
+
+    make publish-pypi
+
+
+Copy files to sourceforge
+-------------------------
+Publishing files to the Translate Sourceforge project.
+
+.. note:: You need to have release permissions on sourceforge to perform this
+   step.
+
+- http://sourceforge.net/projects/translate/files/Translate%20Toolkit/
+
+You will need:
+
+- Tarball of the release
+- Release notes in reStructured Text
+
+#. Create a new folder in the `Translate Toolkit
+   <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/>`_
+   release folder using the 'Add Folder' button.  The folder must have the same
+   name as the release version e.g.  ``1.10.0-rc1``.  Mark this as being for
+   staging for the moment.
+#. ``make publish-sourceforge`` will give you the command to upload your
+   tarball and ``README.rst``.
+
+   #. Upload tarball for release.
+   #. Upload release notes as ``README.rst``.
+   #. Click on the info icon for ``README.rst`` and tick "Exclude Stats" to
+      exlude the README from stats counting.
+
+#. Check that the README.rst for the parent ``Translate Toolkit`` folder is
+   still appropriate, this is the text from ``translate/__info__.py``.
+#. Check all links for ``README.rst`` files, new release and parent.
+
+
+Release documentation
+---------------------
+We need a tagged release before we can do this.  The docs are published on Read
+The Docs.
+
+- https://readthedocs.org/dashboard/translate-toolkit/versions/
+
+Use the admin pages to flag a version that should be published
+
+.. note:: FIXME we might need to do this before publishing so that we can
+   update doc references to point to the tagged version as apposed to the
+   latest version.
+
+
+Update translate website
+------------------------
+We use github pages for the website. First we need to checkout the pages::
+
+    git checkout gh-pages
+
+#. In ``_posts/`` add a new release posting.  This is in Markdown format (for
+   now), so we need to change the release notes .rst to .md, which mostly means
+   changing URL links from ```xxx <link>`_`` to ``[xxx](link)``.
+#. Change $version as needed. See ``download.html``, ``_config.yml`` and
+   ``egrep -r $old_release *``
+#. :command:`git commit` and :command:`git push` - changes are quite quick so
+   easy to review.
+
+
+Unstage on sourceforge
+----------------------
+If you have created a staged release folder, then unstage it now.
+
+
+Announce to the world
+---------------------
+Let people know that there is a new version:
+
+#. Announce on mailing lists:
+   Send the announcement to the translate-announce mailing lists on
+   translate-announce at lists.sourceforge.net
+#. Adjust the #pootle channel notice. Use ``/topic`` to change the topic.
+#. Email important users
+#. Tweet about it
+
+
+Cleanup
+-------
+Some possible cleanup tasks:
+
+- Remove any RC builds from the sourceforge download pages (maybe?).
+- Commit any release notes and such (or maybe do that before tagging).
+- Remove your translate-release checkout.
+- Update and fix these release notes.
diff --git a/docs/_build/html/_sources/developers/styleguide.txt b/docs/_build/html/_sources/developers/styleguide.txt
new file mode 100644
index 0000000..3fb20b3
--- /dev/null
+++ b/docs/_build/html/_sources/developers/styleguide.txt
@@ -0,0 +1,630 @@
+.. _styleguide:
+
+Translate Styleguide
+====================
+
+The Translate styleguide is the styleguide for all Translate projects,
+including Translate Toolkit, Pootle, Virtaal and others.  Patches are required
+to follow these guidelines.
+
+This Styleguide follows :pep:`8` with some clarifications. It is based almost
+verbatim on the `Flask Styleguide`_.
+
+
+.. _styleguide-general:
+
+General
+-------
+
+Indentation
+^^^^^^^^^^^
+
+4 real spaces, no tabs. Exceptions: modules that have been copied into the
+source that don't follow this guideline.
+
+
+Maximum line length
+^^^^^^^^^^^^^^^^^^^
+
+79 characters with a soft limit for 84 if absolutely necessary. Try to avoid
+too nested code by cleverly placing `break`, `continue` and `return`
+statements.
+
+
+Continuing long statements
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To continue a statement you can use backslashes (preceeded by a space) in which
+case you should align the next line with the last dot or equal sign, or indent
+four spaces:
+
+.. code-block:: python
+
+    MyModel.query.filter(MyModel.scalar > 120) \
+                 .order_by(MyModel.name.desc()) \
+                 .limit(10)
+
+    my_long_assignment = MyModel.query.filter(MyModel.scalar > 120) \
+                         .order_by(MyModel.name.desc()) \
+                         .limit(10)
+
+    this_is_a_very_long(function_call, 'with many parameters') \
+        .that_returns_an_object_with_an_attribute
+
+
+If you break in a statement with parentheses or braces, align to the braces:
+
+.. code-block:: python
+
+    this_is_a_very_long(function_call, 'with many parameters',
+                        23, 42, 'and even more')
+
+
+If you need to break long strings, on function calls or when assigning to
+variables, try to use implicit string continuation:
+
+.. code-block:: python
+
+    this_holds_a_very_long_string("Very long string with a lot of characters "
+                                  "and words on it, so many that it is "
+                                  "necessary to break it in several lines to "
+                                  "improve readability.")
+    long_string_var = ("Very long string with a lot of characters and words on "
+                       "it, so many that it is necessary to break it in "
+                       "several lines to improve readability.")
+
+
+For lists or tuples with many items, break immediately after the opening brace:
+
+.. code-block:: python
+
+    items = [
+        'this is the first', 'set of items', 'with more items',
+        'to come in this line', 'like this'
+    ]
+
+
+Blank lines
+^^^^^^^^^^^
+
+Top level functions and classes are separated by two lines, everything else
+by one. Do not use too many blank lines to separate logical segments in code.
+Example:
+
+.. code-block:: python
+
+    def hello(name):
+        print 'Hello %s!' % name
+
+
+    def goodbye(name):
+        print 'See you %s.' % name
+
+
+    class MyClass(object):
+        """This is a simple docstring"""
+
+        def __init__(self, name):
+            self.name = name
+
+        @property
+        def annoying_name(self):
+            return self.name.upper() + '!!!!111'
+
+
+.. _styleguide-imports:
+
+Imports
+^^^^^^^
+
+Like in :pep:`8`, but:
+
+- Imports should be grouped in the following order:
+
+  1) __future__ library imports
+  2) Python standard library imports
+  3) Third party libraries imports
+  4) Translate Toolkit imports
+  5) Current package imports, using explicit relative imports (See `PEP 328
+     <http://www.python.org/dev/peps/pep-0328/#guido-s-decision>`_)
+
+- A blank line must be present between each group of imports (like in PEP8).
+- Imports on each group must be arranged alphabetically by module name:
+
+  - Shortest module names must be before longer ones:
+    ``from django.db import ...`` before ``from django.db.models import ...``.
+
+- ``import ...`` calls must precede ``from ... import`` ones on each group:
+
+  - On each of these subgroups the entries should be alphabetically arranged.
+  - No blank lines between subgroups.
+
+- On ``from ... import``
+
+  - Use a ``CONSTANT``, ``Class``, ``function`` order, where the constants,
+    classes and functions are in alphabetical order inside of its respective
+    groups.
+  - If the import line exceeds the 80 chars, then split it using parentheses to
+    continue the import on the next line (aligning the imported items with the
+    opening parenthesis).
+
+.. code-block:: python
+
+    from __future__ import absolute_import
+
+    import re
+    import sys.path as sys_path
+    import time
+    from datetime import timedelta
+    from os import path
+
+    from lxml.html import fromstring
+
+    from translate.filters import checks
+    from translate.storage import versioncontrol
+    from translate.storage.aresource import (EOF, WHITESPACE, AndroidFile,
+                                             AndroidUnit, android_decode,
+                                             android_encode)
+
+    from . import php2po
+
+
+Properties
+^^^^^^^^^^
+
+- Never use ``lambda`` functions:
+
+  .. code-block:: python
+
+    # Good.
+    @property
+    def stores(self):
+      return self.child.stores
+
+
+    # Bad.
+    stores = property(lambda self: self.child.stores)
+
+
+- Try to use ``@property`` instead of ``get_*`` or ``is_*`` methods that don't
+  require passing any parameter:
+
+  .. code-block:: python
+
+    # Good.
+    @property
+    def terminology(self):
+      ...
+
+    @property
+    def is_monolingual(self):
+      ...
+
+
+    # Also good.
+    def get_stores_for_language(self, language):
+      ...
+
+
+    # Bad.
+    def get_terminology(self):
+      ...
+
+    def is_monolingual(self):
+      ...
+
+
+- Always use ``@property`` instead of ``property(...)``, even for properties
+  that also have a setter or a deleter:
+
+  .. code-block:: python
+
+    # Good.
+    @property
+    def units(self):
+      ...
+
+
+    # Also good.
+    @property
+    def x(self):
+      """I'm the 'x' property."""
+      return self._x
+
+    @x.setter
+    def x(self, value):  # Note: Method must be named 'x' too.
+      self._x = value
+
+    @x.deleter
+    def x(self):  # Note: Method must be named 'x' too.
+      del self._x
+
+
+    # Bad.
+    def _get_units(self):
+      ...
+    units = property(_get_units)
+
+
+    # Also bad.
+    def getx(self):
+      return self._x
+    def setx(self, value):
+      self._x = value
+    def delx(self):
+      del self._x
+    x = property(getx, setx, delx, "I'm the 'x' property.")
+
+
+Expressions and Statements
+--------------------------
+
+General whitespace rules
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+- No whitespace for unary operators that are not words (e.g.: ``-``, ``~``
+  etc.) as well on the inner side of parentheses.
+- Whitespace is placed between binary operators.
+
+.. code-block:: python
+
+    # Good.
+    exp = -1.05
+    value = (item_value / item_count) * offset / exp
+    value = my_list[index]
+    value = my_dict['key']
+
+
+    # Bad.
+    exp = - 1.05
+    value = ( item_value / item_count ) * offset / exp
+    value = (item_value/item_count)*offset/exp
+    value=( item_value/item_count ) * offset/exp
+    value = my_list[ index ]
+    value = my_dict ['key']
+
+
+Slice notation
+^^^^^^^^^^^^^^
+
+While :pep:`8` calls for spaces around operators ``a = b + c`` this results in
+flags when you use ``a[b+1:c-1]`` but would allow the rather unreadable
+``a[b + 1:c - 1]`` to pass. :pep:`8` is rather quiet on slice notation.
+
+- Don't use spaces with simple variables or numbers
+- Use brackets for expressions with spaces between binary operators
+
+  .. code-block:: python
+
+    # Good.
+    a[1:2]
+    a[start:end]
+    a[(start - 1):(end + var + 2)]  # Brackets help group things and don't hide the slice
+    a[-1:(end + 1)]
+
+
+    # Bad.
+    a[start: end]  # No spaces around :
+    a[start-1:end+var+2]  # Insanely hard to read, especially when your expressions are more complex
+    a[start - 1:end + 2]  # You lose sight of the fact that it is a slice
+    a[- 1:end]  # -1 is unary, no space
+
+
+.. note::
+
+   String slice formatting is still under discussion.
+
+Comparisons
+^^^^^^^^^^^
+
+- Against arbitrary types: ``==`` and ``!=``
+- Against singletons with ``is`` and ``is not`` (e.g.: ``foo is not None``)
+- Never compare something with `True` or `False` (for example never do ``foo ==
+  False``, do ``not foo`` instead)
+
+
+Negated containment checks
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Use ``foo not in bar`` instead of ``not foo in bar``
+
+
+Instance checks
+^^^^^^^^^^^^^^^
+
+- ``isinstance(a, C)`` instead of ``type(A) is C``, but try to avoid instance
+  checks in general.  Check for features.
+
+
+If statements
+^^^^^^^^^^^^^
+
+- Use ``()`` brackets around complex if statements to allow easy wrapping,
+  don't use backslash to wrap an if statement.
+- Wrap between ``and``, ``or``, etc.
+- Keep ``not`` with the expression
+- Use ``()`` alignment between expressions
+- Use extra ``()`` to eliminate ambiguity, don't rely on an understanding of
+  Python operator precedence rules.
+
+  .. code-block:: python
+
+    # Good.
+    if length >= (upper + 2):
+        ...
+
+    if (length >= 25 and
+        string != "Something" and
+        not careful):
+        do_something()
+
+
+    # Bad.
+    if length >= upper + 2:
+        ...
+
+    if (length...
+        and string !=...
+
+
+Naming Conventions
+------------------
+
+.. note::
+
+   This has not been implemented or discussed.  The Translate code 
+   is not at all consistent with these conventions.
+
+
+- Class names: ``CamelCase``, with acronyms kept uppercase (``HTTPWriter`` and
+  not ``HttpWriter``)
+- Variable names: ``lowercase_with_underscores``
+- Method and function names: ``lowercase_with_underscores``
+- Constants: ``UPPERCASE_WITH_UNDERSCORES``
+- precompiled regular expressions: ``name_re``
+
+Protected members are prefixed with a single underscore.  Double underscores
+are reserved for mixin classes.
+
+To prevent name clashes with keywords, one trailing underscore may be appended.
+Clashes with builtins are allowed and **must not** be resolved by appending an
+underline to the name.  If your code needs to access a shadowed builtin, rebind
+the builtin to a different name instead.  Consider using a different name to
+avoid having to deal with either type of name clash, but don't complicate names
+with prefixes or suffixes.
+
+
+Function and method arguments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Class methods: ``cls`` as first parameter
+- Instance methods: ``self`` as first parameter
+
+
+.. _styleguide-docs:
+
+Documentation
+=============
+
+We use Sphinx_ to generate our API and user documentation. Read the
+`reStructuredText primer`_ and `Sphinx documentation`_ as needed.
+
+
+Special roles
+-------------
+
+We introduce a number of special roles for documentation:
+
+* ``:bug:`` -- links to a bug in Translate's Bugzilla.
+
+  * ``:bug:`123``` gives: :bug:`123`
+  * ``:bug:`broken <123>``` gives: :bug:`broken <123>`
+
+* ``:opt:`` -- mark command options and command values.
+
+  * ``:opt:`-P``` gives :opt:`-P`
+  * ``:opt:`--progress=dots``` gives :opt:`--progress=dots`
+  * ``:opt:`dots``` gives :opt:`dots`
+
+* ``:man:`` -- link to a Linux man page.
+
+  * ``:man:`msgfmt``` gives :man:`msgfmt`
+
+
+Code and command line highlighting
+----------------------------------
+
+All code examples and format snippets should be highlighted to make them easier
+to read.  By default Sphinx uses Python highlighting of code snippets (but it
+doesn't always work).  You will want to change that in these situations:
+
+.. highlight:: rest
+
+* The examples are not Python e.g. talking about INI file parsing.  In which
+  case set the file level highlighting using::
+
+     .. highlight:: ini
+
+* There are multiple different code examples in the document, then use::
+
+    .. code-block:: ruby
+
+  before each code block.
+
+* Python code highlighting isn't working, then force Python highlighting using::
+
+    .. code-block:: python
+
+.. note:: Generally we prefer explicit markup as this makes it easier for those
+   following you to know what you intended.  So use ``.. code-block:: python``
+   even though in some cases this is not required.
+
+With bash *command line examples*, to improve readability use::
+
+    .. code-block:: bash
+
+Add ``$`` command prompt markers and ``#`` comments as required, as shown in
+this example:
+
+.. code-block:: bash
+
+   $ cd docs
+   $ make html  # Build all Sphinx documentation
+   $ make linkcheck  # Report broken links
+
+
+.. highlight:: python
+
+
+User documentation
+------------------
+
+This is documentation found in ``docs/`` and that is published on Read the
+Docs. The target is the end user so our primary objective is to make accesible,
+readable and beautiful documents for them.
+
+
+Docstrings
+----------
+
+Docstring conventions:
+  All docstrings are formatted with reStructuredText as understood by
+  Sphinx.  Depending on the number of lines in the docstring, they are
+  laid out differently.  If it's just one line, the closing triple
+  quote is on the same line as the opening, otherwise the text is on
+  the same line as the opening quote and the triple quote that closes
+  the string on its own line:
+
+  .. code-block:: python
+
+    def foo():
+        """This is a simple docstring."""
+
+
+    def bar():
+        """This is a longer docstring with so much information in there
+        that it spans three lines.  In this case the closing triple quote
+        is on its own line.
+        """
+
+
+Please read :pep:`257` (Docstring Conventions) for a general overview,
+the important parts though are:
+
+- A docstring should have a brief one-line summary, ending with a period. Use
+  ``Do this``, ``Return that`` rather than ``Does ...``, ``Returns ...``.
+- If there are more details there should be a blank line between the one-line
+  summary and the rest of the text.  Use paragraphs and formatting as needed.
+- Use `reST field lists`_ to describe the input parameters and/or return types
+  as the last part of the docstring.
+- Use proper capitalisation and punctuation.
+- Don't restate things that would appear in parameter descriptions.
+
+.. code-block:: python
+
+    def addunit(self, unit):
+        """Append the given unit to the object's list of units.
+
+        This method should always be used rather than trying to modify the
+        list manually.
+
+        :type unit: TranslationUnit
+        :param unit: Any object that inherits from :class:`TranslationUnit`.
+        """
+        self.units.append(unit)
+
+
+Parameter documentation:
+  Document parameters using `reST field lists`_ as follows:
+
+  .. code-block:: python
+
+    def foo(bar):
+        """Simple docstring.
+
+        :param bar: Something
+        :type bar: Some type
+        :return: Returns something
+        :rtype: Return type 
+        """
+
+
+Cross referencing code:
+   When talking about other objects, methods, functions and variables
+   it is good practice to cross-reference them with Sphinx's `Python
+   cross-referencing`_.
+
+Other directives:
+   Use `paragraph-level markup`_ when needed.
+
+.. note::
+
+   We still need to gather the useful ones that we want you to use and how to use
+   them.  E.g. how to talk about a parameter in the docstring.  How to reference
+   classes in the module.  How to reference other modules, etc.
+
+
+Module header:
+  The module header consists of an utf-8 encoding declaration, copyright
+  attribution, license block and a standard docstring:
+
+  .. code-block:: python
+
+    # -*- coding: utf-8 -*-
+    #
+    ... LICENSE BLOCK...
+
+    """A brief description"""
+
+..    """
+        package.module
+        ~~~~~~~~~~~~~~
+
+..        A brief description goes here.
+
+..        :copyright: (c) YEAR by AUTHOR.
+        :license: LICENSE_NAME, see LICENSE_FILE for more details.
+    """
+
+
+Comments
+--------
+
+General:
+  - The ``#`` symbol (pound or hash) is used to start comments.
+  - A space must follow the ``#`` between any written text.
+  - Line length must be observed.
+  - Inline comments are preceded by two spaces.
+  - Write sentences correctly: proper capitalisation and punctuation.
+
+  .. code-block:: python
+
+    # Good comment with space before and full sentence.
+    statement  # Good comment with two spaces
+
+
+    #Bad comment no space before
+    statement # Bad comment, needs two spaces
+
+
+Docstring comments:
+  Rules for comments are similar to docstrings.  Both are formatted with
+  reStructuredText.  If a comment is used to document an attribute, put a
+  colon after the opening pound sign (``#``):
+
+  .. code-block:: python
+
+    class User(object):
+        #: the name of the user as unicode string
+        name = Column(String)
+        #: the sha1 hash of the password + inline salt
+        pw_hash = Column(String)
+
+
+.. _Flask Styleguide: http://flask.pocoo.org/docs/styleguide/
+.. _reST field lists: http://sphinx-doc.org/domains.html#info-field-lists
+.. _Python cross-referencing: http://sphinx-doc.org/domains.html#cross-referencing-python-objects
+.. _Sphinx: http://sphinx-doc.org/
+.. _reStructuredText primer: http://sphinx-doc.org/rest.html
+.. _Sphinx documentation: http://sphinx-doc.org/contents.html
+.. _paragraph-level markup: http://sphinx-doc.org/markup/para.html#paragraph-level-markup
diff --git a/docs/_build/html/_sources/developers/testing.txt b/docs/_build/html/_sources/developers/testing.txt
new file mode 100644
index 0000000..ce7a5d8
--- /dev/null
+++ b/docs/_build/html/_sources/developers/testing.txt
@@ -0,0 +1,142 @@
+.. _testing:
+
+Testing
+=======
+
+Our aim is that all new functionality is adequately tested. Adding tests for
+existing functionality is highly recommended before any major reimplementation
+(refactoring, etcetera).
+
+We use `py.test`_ for (unit) testing. You need at least pytest >= 1.0.0, but
+pytest >= 2.1 is strongly recommended.
+
+To run tests in the current directory and its subdirectories:
+
+.. code-block:: bash
+
+    $ py.test  # runs all tests
+    $ py.test storage/test_dtd.py  # runs just a single test module
+
+We use several py.test features to simplify testing, and to suppress errors in
+circumstances where the tests cannot possibly succeed (limitations of
+tests and missing dependencies).
+
+
+Skipping tests
+--------------
+
+Pytest allows tests, test classes, and modules to be skipped or marked as
+"expected to fail" (xfail).
+Generally you should *skip* only if the test cannot run at all (throws uncaught
+exception); otherwise *xfail* is preferred as it provides more test coverage.
+
+importorskip
+^^^^^^^^^^^^
+
+.. the ~ in this :func: reference suppresses all but the last component
+
+Use the builtin :func:`~pytest:_pytest.runner.importorskip` function
+to skip a test module if a dependency cannot be imported:
+
+.. code-block:: python
+
+    from pytest import importorskip
+    importorskip("vobject")
+
+If *vobject* can be imported, it will be; otherwise it raises an exception
+that causes pytest to skip the entire module rather than failing.
+
+skipif
+^^^^^^
+
+Use the ``skipif`` decorator to :ref:`mark tests to be skipped <pytest:skipif>`
+unless certain criteria are met.  The following skips a test if the version of
+*mymodule* is too old:
+
+.. code-block:: python
+
+    import mymodule
+
+    @pytest.mark.skipif("mymodule.__version__ < '1.2'")
+    def test_function():
+        ...
+
+In Python 2.6 and later, you can apply this decorator to classes as well as
+functions and methods.
+
+It is also possible to skip an entire test module by creating a ``pytestmark``
+static variable in the module:
+
+.. code-block:: python
+
+    # mark entire module as skipped for py.test if no indexer available
+    pytestmark = pytest.mark.skipif("noindexer")
+
+xfail
+^^^^^
+
+Use the ``xfail`` decorator to :ref:`mark tests as expected to fail
+<pytest:xfail>`. This allows you to do the following:
+
+* Build tests for functionality that we haven't implemented yet
+* Mark tests that will fail on certain platforms or Python versions
+* Mark tests that we should fix but haven't got round to fixing yet
+
+The simplest form is the following:
+
+.. code-block:: python
+
+    from pytest import pytest.mark
+    
+    @mark.xfail
+    def test_function():
+        ...
+
+You can also pass parameters to the decorator to mark expected failure only
+under some condition (like *skipif*), to document the reason failure is
+expected, or to actually skip the test:
+
+.. code-block:: python
+
+    @mark.xfail("sys.version_info >= (3,0)")  # only expect failure for Python 3
+    @mark.xfail(..., reason="Not implemented")  # provide a reason for the xfail
+    @mark.xfail(..., run=False)  # skip the test but still regard it as xfailed
+
+
+Testing for Warnings
+--------------------
+
+deprecated_call
+^^^^^^^^^^^^^^^
+
+The builtin :func:`~pytest:pytest.deprecated_call` function checks that a
+function that we run raises a DeprecationWarning:
+
+.. code-block:: python
+
+    from pytest import deprecated_call
+ 
+    def test_something():
+        deprecated_call(function_to_run, arguments_for_function)
+
+recwarn
+^^^^^^^
+
+The |recwarn plugin|_ allows us to test for other warnings. Note that
+``recwarn`` is a funcargs plugin, which means that you need it in your test
+function parameters:
+
+.. code-block:: python
+
+    def test_example(recwarn):
+        # do something
+        w = recwarn.pop()
+        # w.{message,category,filename,lineno}
+        assert 'something' in str(w.message)
+
+
+.. _py.test: http://pytest.org/
+
+.. _recwarn plugin: http://pytest.org/latest/recwarn.html
+.. |recwarn plugin| replace:: *recwarn plugin*
+.. we use |recwarn plugin| here and in ref above for italics like :ref:
diff --git a/docs/_build/html/_sources/formats/android.txt b/docs/_build/html/_sources/formats/android.txt
new file mode 100644
index 0000000..24a21ad
--- /dev/null
+++ b/docs/_build/html/_sources/formats/android.txt
@@ -0,0 +1,24 @@
+.. _android:
+
+Android string resources
+************************
+
+:wp:`Android <Android_%28operating_system%29>` programs make use of localisable
+string resources.
+
+.. note:: The toolkit supports this format, but still doesn't provide any
+   converter.
+
+
+.. _android#references:
+
+References
+==========
+
+* Android `Resource files reference
+  <http://developer.android.com/guide/topics/resources/resources-i18n.html>`_
+* Android `String resources reference
+  <http://developer.android.com/guide/topics/resources/available-resources.html#stringresources>`_
+* `Localizing Android Applications <http://www.linux-mag.com/id/7794>`_ tutorial
+* Reference for `translatable attribute
+  <http://tools.android.com/recent/non-translatablestrings>`_
diff --git a/docs/_build/html/_sources/formats/base_classes.txt b/docs/_build/html/_sources/formats/base_classes.txt
index af01f59..169f5d2 100644
--- a/docs/_build/html/_sources/formats/base_classes.txt
+++ b/docs/_build/html/_sources/formats/base_classes.txt
@@ -3,8 +3,9 @@
 
 Base classes
 ************
-NOTE: This page is mostly useful for :doc:`developers` as it describes some
-programming detail of the :doc:`toolkit <index>`.
+NOTE: This page is mostly useful for :doc:`developers
+</developers/developers>` as it describes some programming detail of the
+:doc:`toolkit <index>`.
 
 For the implementation of the different storage classes that the toolkit
 supports, we want to define a set of base classes to form a common API for all
@@ -37,7 +38,7 @@ Other possibilities:
 * Support for variable number of languages in the format. Examples: .txt and
   .properties support one language, PO supports two, :doc:`tmx` supports many.
 * Support for "multifiles", in other words a file that contain other entities
-  that corresponds to files in other formats. Examples: ZIP, XPI and
+  that corresponds to files in other formats. Examples: ZIP and
   :doc:`xliff`. In reality this is only used by some of the converters. This
   isn't present in the base class yet.
 
@@ -118,7 +119,7 @@ Multifile
 This abstraction is only used by a few converters.
 
 This class represents a storage format that contains other files or file like
-objects. Examples include ZIP, XPI and XLIFF, and OpenOffice SDF files. It must
+objects. Examples include ZIP, XLIFF, and OpenOffice SDF files. It must
 give access to the contained files, and possibly give access to the translation
 units contained in those files, as if they are contained natively.
 
diff --git a/docs/_build/html/_sources/formats/catkeys.txt b/docs/_build/html/_sources/formats/catkeys.txt
index f3ae05a..71ab8b0 100644
--- a/docs/_build/html/_sources/formats/catkeys.txt
+++ b/docs/_build/html/_sources/formats/catkeys.txt
@@ -17,4 +17,4 @@ Links
 * `Some notes about the format
   <http://www.haiku-os.org/blog/pulkomandy/2009-09-24_haiku_locale_kit_translator_handbook>`_
 * `Some example files
-  <http://dev.haiku-os.org/browser/haiku/trunk/data/catalogs/>`_
+  <http://cgit.haiku-os.org/haiku/tree/data/catalogs/>`_
diff --git a/docs/_build/html/_sources/formats/csv.txt b/docs/_build/html/_sources/formats/csv.txt
index 9a587b5..504a681 100644
--- a/docs/_build/html/_sources/formats/csv.txt
+++ b/docs/_build/html/_sources/formats/csv.txt
@@ -6,8 +6,8 @@ CSV
 CSV (Comma Separated Values) is a simple file format for general data
 interchange. It can be used in the toolkit for simple data interchange, and can
 be edited with most spreadsheet programs. There is no formal specification for
-the CSV file format, but more information can be acquired from `Comma-Separated
-Values <https://en.wikipedia.org/wiki/Comma-separated_values>`_
+the CSV file format, but more information can be acquired from
+:wp:`Comma-Separated Values <Comma-separated_values>`
 
 .. _csv#conformance:
 
diff --git a/docs/_build/html/_sources/formats/html.txt b/docs/_build/html/_sources/formats/html.txt
index a123cc4..321c892 100644
--- a/docs/_build/html/_sources/formats/html.txt
+++ b/docs/_build/html/_sources/formats/html.txt
@@ -15,7 +15,7 @@ Conformance
 ===========
 
 * Can identify almost all tags and attributes that are localisable.
-* Does not convert HTML entities (e.g. ©) to normal strings
+* Does not convert HTML entities (e.g. ``©``) to normal strings
 * It does not handle inline elements well and will drop them, so complicated
   HTML might not make it through the filter
 
diff --git a/docs/_build/html/_sources/formats/ical.txt b/docs/_build/html/_sources/formats/ical.txt
index 3023690..5a9cb02 100644
--- a/docs/_build/html/_sources/formats/ical.txt
+++ b/docs/_build/html/_sources/formats/ical.txt
@@ -5,8 +5,8 @@
 iCalendar
 *********
 
-Support for `iCalendar <https://en.wikipedia.org/wiki/ICalendar>`_ (\*.ics)
-files.  This allows calendars to be localised.
+Support for :wp:`iCalendar <ICalendar>` (\*.ics) files.  This allows calendars
+to be localised.
 
 The format extracts certain properties from VEVENT objects.  The properties are
 limited to textual entries that would need to be localised, it does not include
@@ -25,9 +25,9 @@ Resources
 * `VObject <http://vobject.skyhouseconsulting.com/>`_ -- the python library
   used to read the iCal file.
 * `iCalender validator <http://severinghaus.org/projects/icv/>`_
-* `iCalendar <https://en.wikipedia.org/wiki/ICalendar>`_
+* :wp:`iCalendar <ICalendar>`
 * `Components and their properties
-  <http://upload.wikimedia.org/wikipedia/en/c/c0/ICalendarSpecification.png>`_
+  <https://upload.wikimedia.org/wikipedia/commons/c/c0/ICalendarSpecification.png>`_
 
 .. _ical#conformance:
 
diff --git a/docs/_build/html/_sources/formats/index.txt b/docs/_build/html/_sources/formats/index.txt
index 2c226c1..ac9d566 100644
--- a/docs/_build/html/_sources/formats/index.txt
+++ b/docs/_build/html/_sources/formats/index.txt
@@ -43,6 +43,7 @@ Other translation formats
    strings
    flex
    catkeys
+   android
 
 * :doc:`csv`
 * :doc:`ini` (including Inno Setup .isl dialect)
@@ -56,6 +57,7 @@ Other translation formats
 * Mac OSX :doc:`strings` files (also used on the iPhone) (from version 1.8)
 * Adobe :doc:`flex` files (from version 1.8)
 * Haiku :doc:`catkeys` (from version 1.8)
+* :doc:`android` (supports storage, not conversion)
 
 .. _formats#translation_memory_formats:
 
@@ -103,6 +105,7 @@ Formats of translatable documents
 
    html
    ical
+   json
    odf
    text
    wiki
@@ -110,12 +113,10 @@ Formats of translatable documents
 
 * :doc:`html`
 * :doc:`ical`
-* `JSON <https://en.wikipedia.org/wiki/JSON>`_ (from v1.9.0)
-* `OpenDocument <https://en.wikipedia.org/wiki/OpenDocument>`_ -- all ODF file
-  types
+* :doc:`json`
+* :wp:`OpenDocument` -- all ODF file types
 * :doc:`Text <text>` -- plain text with blocks separated by whitespace
-* :doc:`Wiki <wiki>` -- `DokuWiki <https://en.wikipedia.org/wiki/DokuWiki>`_
-  and `MediaWiki <https://en.wikipedia.org/wiki/MediaWiki>`_ supported
+* :doc:`Wiki <wiki>` -- :wp:`DokuWiki` and :wp:`MediaWiki` supported
 * :doc:`subtitles` -- various formats (v1.4)
 
 .. _formats#machine_readable_formats:
@@ -163,7 +164,7 @@ Formats that we would like to support but don't currently support:
 
   * `AppleGlot <ftp://ftp.apple.com/developer/tool_chest/localization_tools/appleglot/appleglot_3.2_usersguide.pdf>`_
   * .plist -- see :bug:`633` and `plistlib
-    <http://docs.python.org/library/plistlib.html>`_ for Python
+    <http://docs.python.org/2/library/plistlib.html>`_ for Python
 
 * Adobe:
 
@@ -178,36 +179,28 @@ Formats that we would like to support but don't currently support:
 * Microsoft
 
   * Word, Excel, etc (probably through usage of OpenOffice.org)
-  * `OOXML <https://en.wikipedia.org/wiki/OOXML>`_ (at least at the text level
-    we don't have to deal with much of the mess inside OOXML).  See also: `Open
-    XML SDK v1 <http://go.microsoft.com/fwlink/?LinkId=120908>`_
-  * `Rich Text Format <https://en.wikipedia.org/wiki/Rich_Text_Format>`_ (RTF)
-    see also `pyrtf-ng <http://code.google.com/p/pyrtf-ng/>`_
-  * `Open XML Paper Specification
-    <https://en.wikipedia.org/wiki/Open_XML_Paper_Specification>`_
+  * :wp:`OOXML` (at least at the text level we don't have to deal with much of
+    the mess inside OOXML).  See also: `Open XML SDK v1
+    <http://go.microsoft.com/fwlink/?LinkId=120908>`_
+  * :wp:`Rich Text Format <Rich_Text_Format>` (RTF) see also `pyrtf-ng
+    <http://code.google.com/p/pyrtf-ng/>`_
+  * :wp:`Open XML Paper Specification <Open_XML_Paper_Specification>`
   * .NET Resource files (.resx) -- :bug:`Bug 396 <396>`
 
 * XML related
 
   * Generic XML
-  * `DocBook <https://en.wikipedia.org/wiki/DocBook>`_ (can be handled by KDE's
-    :man:`xml2pot`)
+  * :wp:`DocBook` (can be handled by KDE's :man:`xml2pot`)
   * `SVG <http://www.w3.org/TR/SVG/>`_
-  * `Android <https://en.wikipedia.org/wiki/Android_%28operating_system%29>`_
-    `resource files
-    <http://code.google.com/android/devel/resources-i18n.html>`_ specifically
-    `string resources
-    <http://code.google.com/android/reference/available-resources.html#stringresources>`_
-    (`more background <http://www.linux-mag.com/id/7794>`_)
-
-* `DITA <https://en.wikipedia.org/wiki/Darwin_Information_Typing_Architecture>`_
-* `PDF <https://en.wikipedia.org/wiki/Portable_Document_Format>`_ see `spec
+
+* :wp:`DITA <Darwin_Information_Typing_Architecture>`
+* :wp:`PDF <Portable_Document_Format>` see `spec
   <http://www.adobe.com/devnet/pdf/pdf_reference.html>`_, `PDFedit
-  <http://pdfedit.petricek.net/en/index.html>`_
-* `LaTeX <https://en.wikipedia.org/wiki/LaTeX>`_ -- see `plasTeX
+  <http://pdfedit.cz/en/index.html>`_
+* :wp:`LaTeX` -- see `plasTeX
   <http://plastex.sourceforge.net/plastex/index.html>`_, a Python framework for
   processing LaTeX documents
-* `unoconv <http://dag.wieers.com/home-made/unoconv/>`_ -- Python bindings to
+* `unoconv <http://dag.wiee.rs/home-made/unoconv/>`_ -- Python bindings to
   OpenOffice.org UNO which could allow manipulation of all formats understood
   by OpenOffice.org.
 * Trados:
@@ -215,12 +208,15 @@ Formats that we would like to support but don't currently support:
   * TTX (`Reverse Engineered DTD
     <http://www.tracom.de/04/EN/techdoccenter/download/TRADOS_TTX-DTD.zip>`_,
     `other discussion
-    <http://blogs.sun.com/timf/entry/beds_mattresses_and_open_standards>`_)
+    <http://timsfoster.wordpress.com/2005/07/05/beds-mattresses-and-open-standards/>`_)
   * Multiterm XML `TSV to MiltiTerm conversion script
     <http://syntax.biz.pl/multiterm.html>`_ or `XLST
     <http://translationzone.eu/mtxml2txt.html>`_
   * .tmw
-  * .txt (You can interchange using TMX) `Format explanation <http://uk.dir.groups.yahoo.com/group/Tradosuser/message/2318?o=1&d=-1>`_ and `2 <http://translate.google.com/translate?js=y&prev=_t&hl=en&ie=UTF-8&layout=1&eotf=1&u=http%3A%2F%2Fwww.diemohrs.de%2Ftipps2_neu.html&sl=auto&tl=en>`_ with some `examples <http://slaci.komarom.net/roli/Trados/TRADOS%206.5.5.439%20Freelance%20+%20TRADOS%20MultiTerm%20iX%206.0.1.209/TRADOS%206.5.5.439%20Freelance/Program%20Files/TRADOS/T65_FL/Samples/T [...]
+  * .txt (You can interchange using TMX) `Format explanation
+    <http://translate.google.com/translate?js=y&prev=_t&hl=en&ie=UTF-8&layout=1&eotf=1&u=http%3A%2F%2Fwww.diemohrs.de%2Ftipps2_neu.html&sl=auto&tl=en>`_
+    with some `examples
+    <http://slaci.komarom.net/roli/Trados/TRADOS%206.5.5.439%20Freelance%20+%20TRADOS%20MultiTerm%20iX%206.0.1.209/TRADOS%206.5.5.439%20Freelance/Program%20Files/TRADOS/T65_FL/Samples/TW4Win/>`_.
 
 * Tcl: .msg files.  `Good documentation
   <http://www.google.com/codesearch?hl=en&q=show:XvsRBDCljVk:M2kzUbm70Ts:D5EHICz0aaQ&sa=N&ct=rd&cs_p=http://www.scilab.org/download/4.0/scilab-4.0-src.tar.gz&cs_f=scilab-4.0/tcl/scipadsources/msg_files/AddingTranslations.txt>`_
@@ -235,10 +231,10 @@ Formats that we would like to support but don't currently support:
     This is a custom XML format, another one!
 
 * catgets/`gencat
-  <http://www.opengroup.org/onlinepubs/009695399/utilities/gencat.html>`_:
+  <http://pubs.opengroup.org/onlinepubs/009695399/utilities/gencat.html>`_:
   precedes gettext, looking in man packages is the best information I could
   find.  Also `LSB requires it
-  <http://dev.linuxfoundation.org/navigator/browse/cmd_single.php?cmd=list-by-name&Cname=gencat>`_.
+  <http://www.linuxbase.org/navigator/browse/cmd_single.php?cmd=list-by-name&Cname=gencat>`_.
   There is some info about the source (msgfile) format on `GNU website
   <http://www.gnu.org/software/libc/manual/html_node/The-message-catalog-files.html#The-message-catalog-files>`_
 * :doc:`wml`
diff --git a/docs/_build/html/_sources/formats/ini.txt b/docs/_build/html/_sources/formats/ini.txt
index a03b347..3e3dda9 100644
--- a/docs/_build/html/_sources/formats/ini.txt
+++ b/docs/_build/html/_sources/formats/ini.txt
@@ -23,8 +23,8 @@ Dialects
 
 The format supports two dialects:
 
-* default: standard iniparse handling of INI files
-* inno: follows `Inno <http://www.innosetup.com/files/istrans/>`_ escaping
+- default: standard iniparse handling of INI files
+- inno: follows `Inno <http://www.innosetup.com/files/istrans/>`_ escaping
   conventions
 
 .. _ini#references:
@@ -34,5 +34,5 @@ References
 
 Further information is available on .ini files:
 
-* Wikipedia `INI file format <https://en.wikipedia.org/wiki/INI_file>`_ article
-* `Unofficial specification <http://www.cloanto.com/specs/ini.html>`_
+- Wikipedia :wp:`INI file format <INI_file>` article
+- `Unofficial specification <http://www.cloanto.com/specs/ini/>`_
diff --git a/docs/_build/html/_sources/formats/json.txt b/docs/_build/html/_sources/formats/json.txt
new file mode 100644
index 0000000..eb9a682
--- /dev/null
+++ b/docs/_build/html/_sources/formats/json.txt
@@ -0,0 +1,32 @@
+JSON
+====
+
+.. versionadded:: 1.9.0
+
+:wp:`JSON` is a common format for web data interchange.
+
+Example:
+
+.. code-block:: json
+
+   {
+       "firstName": "John",
+       "lastName": "Smith",
+       "age": 25,
+       "address": {
+           "streetAddress": "21 2nd Street",
+           "city": "New York",
+           "state": "NY",
+           "postalCode": 10021
+       },
+       "phoneNumbers": [
+           {
+               "type": "home",
+               "number": "212 555-1234"
+           },
+           {
+               "type": "fax",
+               "number": "646 555-4567"
+           }
+       ]
+   }
diff --git a/docs/_build/html/_sources/formats/l20n.txt b/docs/_build/html/_sources/formats/l20n.txt
index 1d817eb..c5e71e0 100644
--- a/docs/_build/html/_sources/formats/l20n.txt
+++ b/docs/_build/html/_sources/formats/l20n.txt
@@ -17,7 +17,7 @@ Our tools are based on the idea of units. Each unit has an associated (source,
 target) pair, possibly containing more, like comments, state, etc. We prefer to
 build our richer tools against bilingual formats like :doc:`po`, :doc:`xliff`,
 :doc:`ts`, etc. and provide converters to these formats when we want to support
-:doc:`guide/monolingual` formats. Pootle also implements its own bilingual
+:wiki:`guide/monolingual` formats. Pootle also implements its own bilingual
 format in its database.
 
 l20n is based on the idea of entity soup, or object soup. Files are (at least
diff --git a/docs/_build/html/_sources/formats/odf.txt b/docs/_build/html/_sources/formats/odf.txt
index aba8942..32f923d 100644
--- a/docs/_build/html/_sources/formats/odf.txt
+++ b/docs/_build/html/_sources/formats/odf.txt
@@ -4,10 +4,9 @@
 
 OpenDocument Format
 *******************
-This page summarises the support for the `OpenDocument format
-<http://en.wikipedia.org/wiki/OpenDocument>`_ (ODF) in the Translate Toolkit.
-This currently involves only the :doc:`odf2xliff </commands/odf2xliff>` and
-xliff2odf converters.
+This page summarises the support for the :wp:`OpenDocument` format (ODF) in the
+Translate Toolkit.  This currently involves only the :doc:`odf2xliff
+</commands/odf2xliff>` and xliff2odf converters.
 
 The Translate Toolkit aims to support version 1.1 of the ODF standard, although
 it should work reasonably well with older or newer files to the extent that
@@ -23,5 +22,5 @@ released versions of the Translate Toolkit are not aware of their existence.
   <https://github.com/translate/translate/blob/master/translate/storage/odf_shared.py#L23>`_
 
 More complex tag uses are still needed to extract 100% correctly in some
-complex cases. For more information, see the list of :doc:`issues from testing
+complex cases. For more information, see the list of :wiki:`issues from testing
 <odf/testing>`.
diff --git a/docs/_build/html/_sources/formats/php.txt b/docs/_build/html/_sources/formats/php.txt
index 58983fc..5ead7c8 100644
--- a/docs/_build/html/_sources/formats/php.txt
+++ b/docs/_build/html/_sources/formats/php.txt
@@ -4,21 +4,10 @@
 PHP
 ***
 
-Many `PHP <https://en.wikipedia.org/wiki/PHP>`_ programs make use of a
-localisable string array.  The toolkit supports the full localisation of such
-files with :doc:`/commands/php2po` and po2php.
+Many :wp:`PHP` programs make use of a localisable string array.  The toolkit
+supports the full localisation of such files with :doc:`/commands/php2po` and
+po2php.
 
-.. _php#example:
-
-Example
-=======
-
-The localisable string arrays appear like this:
-
-.. code-block:: php
-
-    <?php
-    $string['name'] = 'value'
 
 .. _php#conformance:
 
@@ -27,50 +16,179 @@ Conformance
 
 Our format support allows:
 
-* PHP escaping (both for `single
+* `Single
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single>`_
   and `double
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double>`_
-  quoted strings)
-* Multiline entries
+  quoted strings (both for keys and values)
+
+  .. code-block:: php
+
+      <?php
+      $variable = 'string';
+      $messages["language"] = 'Language';
+      define('item', "another string");
+
+
 * PHP simple variable syntax
 
-.. code-block:: php
+  .. code-block:: php
 
-    $variable = 'string';
-    $another_variable = "another string";
+      <?php
+      $variable = 'string';
+      $another_variable = "another string";
 
-* Various layouts of the id
+
+* PHP square bracket array syntax
 
   .. code-block:: php
-  
-      $string['name'];
-      $string['name'] ;
-      $string[name];
-      $string[ 'name' ];
 
-* PHP array syntax for localisation (since > 1.6.0)
+      <?php
+      $messages['language'] = 'Language';
+      $messages['file'] = "File";
+      $messages["window"] = 'Window';
+      $messages["firewall"] = "Firewall";
+
+
+* PHP array syntax
+
+  .. versionadded:: 1.7.0
 
   .. code-block:: php
 
+      <?php
+      // Can be 'array', 'Array' or 'ARRAY'.
       $lang = array(
          'name' => 'value',
-         'name2' => 'value2',
+         'name2' => "value2",
+         "key1" => 'value3',
+         "key2" => "value4",
       );
 
+
 * PHP define syntax
 
-.. code-block:: php
+  .. versionadded:: 1.10.0
+
+  .. code-block:: php
+
+      <?php
+      define('item', 'string');
+      define('another_item', "another string");
+      define("key", 'and another string');
+      define("another_key", "yet another string");
+
+
+* Escape sequences (both for `single
+  <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single>`_
+  and `double
+  <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double>`_
+  quoted strings)
+
+  .. code-block:: php
+
+      <?php
+      $variable = 'He said: "I\'ll be back"';
+      $another_variable = "First line \n second line";
+      $key = "\tIndented string";
+
+
+* Multiline entries
+
+  .. code-block:: php
+
+      <?php
+      $lang = array(
+         'name' => 'value',
+         'info' => 'Some hosts disable automated mail sending
+	        on their servers. In this case the following features
+	        cannot be implemented.',
+         'name2' => 'value2',
+      );
+
+
+* Various layouts of the id
+
+  .. code-block:: php
+
+      <?php
+      $string['name'] = 'string';
+      $string[name] = 'string';
+      $string[ 'name' ] = 'string';
+
+
+* Comments
+
+  .. versionchanged:: 1.10.0
+
+  .. code-block:: php
+
+      <?php
+      # Hash one-line comment
+      $messages['language'] = 'Language';
+
+      // Double slash one-line comment
+      $messages['file'] = 'File';
+
+      /*
+         Multi-line
+         comment
+      */
+      $messages['help'] = 'Help';
 
-    define('item', 'string');
-    define("another_item", "another string");
 
 * Whitespace before end delimiter
 
+  .. versionadded:: 1.10.0
+
+  .. code-block:: php
+
+      <?php
+      $variable = 'string'     ;
+
+      $string['name'] = 'string'     ;
+
+      $lang = array(
+         'name' => 'value'           ,
+      );
+
+      define('item', 'string'    );
+
+
+* Nested arrays with any number of nesting levels
+
+  .. versionadded:: 1.11.0
+
   .. code-block:: php
 
-      $string['name']     ;
-      $string['name'] ;
+      <?php
+      $lang = array(
+         'name' => 'value',
+         'datetime' => array(
+            'TODAY' => 'Today',
+            'YESTERDAY'	=> 'Yesterday',
+            'AGO' => array(
+                0 => 'less than a minute ago',
+                2 => '%d minutes ago',
+                60 => '1 hour ago',
+            ),
+            'Converted' => 'Converted',
+            'LAST' => 'last',
+         ),
+      );
+
+* Whitespace in the array declaration
+
+  .. versionadded:: 1.11.0
+
+  .. code-block:: php
+
+      <?php
+      $variable = array    (
+         "one" => "this",
+         "two" => "that",
+      );
+
 
 .. _php#non-conformance:
 
@@ -79,8 +197,57 @@ Non-Conformance
 
 The following are not yet supported:
 
-* `herdoc
+* Keyless arrays:
+
+  .. code-block:: php
+
+      <?php
+      $days = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+
+      $messages['days_short'] = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
+
+
+* Nested arrays without key for a nested array:
+
+  .. code-block:: php
+
+      <?php
+      $lang = array(array("key" => "value"));
+
+
+* Array entries without ending comma:
+
+  .. code-block:: php
+
+      <?php
+      $variable = array(
+         "one" => "this",
+         "two" => "that"
+      );
+
+
+* String concatenation:
+
+  .. code-block:: php
+
+      <?php
+      $messages['welcome'] = 'Welcome ' . $name . '!';
+      $messages['greeting'] = 'Hi ' . $name;
+
+
+* Assignment in the same line a multiline comment ends:
+
+  .. code-block:: php
+
+      <?php
+      /*
+         Multi-line
+         comment
+      */ $messages['help'] = 'Help';
+
+
+* `Heredoc
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.heredoc>`_
-  and `nowdoc
+* `Nowdoc
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.nowdoc>`_
-  are not managed
+
diff --git a/docs/_build/html/_sources/formats/po.txt b/docs/_build/html/_sources/formats/po.txt
index 147caf2..3947db4 100644
--- a/docs/_build/html/_sources/formats/po.txt
+++ b/docs/_build/html/_sources/formats/po.txt
@@ -5,8 +5,8 @@ PO Files
 ********
 PO files use the file format of the Gettext tools.
 
-.. seealso:: `Gettext manual <http://www.gnu.org/software/gettext/>`_ and `KDE
-   style PO files <http://public.planetmirror.com/pub/kde/devel/gettext-kde/>`_
+.. seealso:: `Gettext manual <http://www.gnu.org/software/gettext/>`_
+
 
 .. _po#supported_features:
 
@@ -14,68 +14,67 @@ Supported Features
 ==================
 
 * Headers
-* Plural forms and plural form handling
-* Obsolete messages
-* Message Context (msgctxt)
 * Language header (since gettext version 0.17)
-* Previous message ID and context (#| msgid and #| msgctxt)
+* Plural forms and plural form handling
+* Message context
 
-.. _po#supported_comments:
+  .. code-block:: po
 
-Supported comments
-==================
+    msgctxt "noun"
+    msgid "View"
+    msgstr ""
 
-* normal comments
+* Normal comments
 
-.. code-block:: po
+  .. code-block:: po
 
     # this is another comment
 
-* automatic comments
+* Automatic comments
 
-.. code-block:: po
+  .. code-block:: po
 
     #. comment extracted from the source code
 
-* source location comments
+* Source location comments
 
-.. code-block:: po
+  .. code-block:: po
 
     #: sourcefile.xxx:35
 
-* typecomments
+* Typecomments
 
-.. code-block:: po
+  .. code-block:: po
 
     #, fuzzy
 
-* msgidcomments
+* Msgidcomments, also known as KDE style comments as they are used by KDE for
+  message disambiguation and comments to translators.
 
-.. code-block:: po
+  .. note:: Support for this is being phased out in favor of ``msgctxt``.
+
+  .. code-block:: po
 
     msgid "_: comment\n"
     "translation"
 
-Also know as KDE style comments as they are used by KDE for message
-disambiguation and comments to translators. (support for this is being phased
-out)
-
-* obsolete messages
+* Obsolete messages
 
-.. code-block:: po
+  .. code-block:: po
 
     #~ msgid "Blah"
     #~ msgstr "Bleeh"
 
-* previous msgid and msgctxt
+* Previous msgid
 
-.. code-block:: po
+  .. code-block:: po
 
     #| msgid "previous message"
 
-.. _po#unsupported_features:
+* Previous msgctxt
+
+  .. code-block:: po
+
+    #| msgctxt "previous context"
 
-Unsupported Features
-====================
 
-None
diff --git a/docs/_build/html/_sources/formats/properties.txt b/docs/_build/html/_sources/formats/properties.txt
index 77e9e8c..b4d2506 100644
--- a/docs/_build/html/_sources/formats/properties.txt
+++ b/docs/_build/html/_sources/formats/properties.txt
@@ -47,8 +47,8 @@ Examples
 References
 ==========
 
-* Java Properties Class `load method
-  <http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#load(java.io.InputStream)>`_
+- Java Properties Class's `load()
+  <http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Properties.html#load(java.io.InputStream)>`_
   describes the properties format.
-* http://java.sun.com/dtd/properties.dtd -- alternate XML based property
-  representation
+- http://www.oracle.com/webfolder/technetwork/jsc/dtd/properties.dtd --
+  alternate XML based property representation
diff --git a/docs/_build/html/_sources/formats/quoting_and_escaping.txt b/docs/_build/html/_sources/formats/quoting_and_escaping.txt
index d59f991..316fd22 100644
--- a/docs/_build/html/_sources/formats/quoting_and_escaping.txt
+++ b/docs/_build/html/_sources/formats/quoting_and_escaping.txt
@@ -22,7 +22,8 @@ Escaping is done with a backslash. An escaped double quote (``\"``) corresponds
 to a double quote in the original string. ``\n`` for newline, ``\t`` for tabs
 etc are used. Backslashes can be escaped to to give a native backslash.
 
-See also `escaping <guide/translation/escaping>`_ in the translation guide.
+See also :wiki:`escaping <guide/translation/escaping>` in the translation
+guide.
 
 Example:
 
diff --git a/docs/_build/html/_sources/formats/rc.txt b/docs/_build/html/_sources/formats/rc.txt
index b0631a1..e45e372 100644
--- a/docs/_build/html/_sources/formats/rc.txt
+++ b/docs/_build/html/_sources/formats/rc.txt
@@ -17,9 +17,9 @@ Conformance
 ===========
 
 The actual specification of .rc files is hard to come by.  The parser was built
-using `WINE <https://en.wikipedia.org/wiki/Wine_%28software%29>`_ .rc files as
-a reference.  This was done as WINE is a good target for .rc translations.  We
-are confident though that the extraction will prove robust for all .rc files.
+using :wp:`WINE <Wine_%28software%29>` .rc files as a reference.  This was done
+as WINE is a good target for .rc translations.  We are confident though that
+the extraction will prove robust for all .rc files.
 
 .. _rc#useful_resource:
 
diff --git a/docs/_build/html/_sources/formats/strings.txt b/docs/_build/html/_sources/formats/strings.txt
index d830a0d..cd91e69 100644
--- a/docs/_build/html/_sources/formats/strings.txt
+++ b/docs/_build/html/_sources/formats/strings.txt
@@ -17,8 +17,8 @@ References
 ==========
 
 * `Localising string resources
-  <http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html#//apple_ref/doc/uid/20000005-SW1>`_
-* `manual creation of .strings files
-  <http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html#//apple_ref/doc/uid/10000051i-CH6-SW10>`_
+  <https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html#//apple_ref/doc/uid/20000005-SW1>`_
+* `Manual creation of .strings files
+  <https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html#//apple_ref/doc/uid/10000051i-CH6-SW10>`_
 * `String format specifiers
-  <http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html>`_
+  <https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html>`_
diff --git a/docs/_build/html/_sources/formats/subtitles.txt b/docs/_build/html/_sources/formats/subtitles.txt
index 7562f6f..2952d5d 100644
--- a/docs/_build/html/_sources/formats/subtitles.txt
+++ b/docs/_build/html/_sources/formats/subtitles.txt
@@ -7,21 +7,21 @@ Subtitles
 .. versionadded:: 1.4
 
 The translation of subtitles are supported in the toolkit with the commands
-:doc:`suc2po </commands/sub2po>` and po2sub.
+:doc:`sub2po </commands/sub2po>` and po2sub.
 
 The following formats are supported for subtitles:
 
 * MicroDVD
 * MPL2
 * MPsub
-* `SubRip <https://en.wikipedia.org/wiki/SubRip>`_ (.srt)
-* `SubViewer <https://en.wikipedia.org/wiki/SubViewer>`_ 2.0 (.sub)
+* :wp:`SubRip` (.srt)
+* :wp:`SubViewer` 2.0 (.sub)
 * TMPlayer
 * Sub Station Alpha
 * Advanced Sub Station Alpha
 
-Both .sub and .srt are the main formats `supported by YouTube
-<http://help.youtube.com/support/youtube/bin/answer.py?answer=100077>`_
+YouTube supports `a number of formats
+<https://support.google.com/youtube/answer/2734698?hl=en&ref_topic=2734694>`_
 
 .. _subtitles#implementation_details:
 
diff --git a/docs/_build/html/_sources/formats/tbx.txt b/docs/_build/html/_sources/formats/tbx.txt
index f9820c9..e170a76 100644
--- a/docs/_build/html/_sources/formats/tbx.txt
+++ b/docs/_build/html/_sources/formats/tbx.txt
@@ -3,613 +3,72 @@
 
 TBX
 ***
-TBX is the LISA standard for terminology and term exchange.
+TBX is the `LISA OSCAR standard
+<http://www.gala-global.org/lisa-oscar-standards>`_ for terminology and term
+exchange.
 
 For information on more file formats, see :doc:`conformance`.
 
+
 .. _tbx#references:
 
 References
 ==========
 
-* `Standard home page <http://www.lisa.org/Term-Base-eXchange.32.0.html>`_
-* `Specification <http://www.lisa.org/TBX-Specification.33.0.html>`_
+* `Standard home page <http://www.gala-global.org/lisa-oscar-standards>`_
+* `Specification
+  <http://www.gala-global.org/oscarStandards/tbx/tbx_oscar.pdf>`_
 * `ISO 30042
   <http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=45797>`_
   -- TBX is an approved ISO standard
+* `Additional TBX resources <http://www.tbxconvert.gevterm.net/>`_
 
 You might also be interested in reading about `TBX-Basic
-<http://www.lisa.org/TBX-Basic.926.0.html>`_ -- a simpler, reduced version of
-TBX with most of the useful features included.
-
-.. _tbx#standard_conformance:
-
-Standard conformance
-====================
-
-.. _tbx#done:
-
-Done
-----
-* Basic file creation
-* Creating a bilingual list from CSV with :doc:`/commands/csv2tbx`
-* Using <tig> tags, not ntig
-
-.. _tbx#todo:
-
-Todo
-----
-* id attributes for termEntry tags
-* ntig, read and write
-* multiple languages
-* synonyms
-* cross references
-* abbreviations
-* definitions
-* context
-* parts of speech
-
-.. _tbx#implementation_notes_for_missing_features:
-
-Implementation notes for missing features
-=========================================
-
-Note here:
-
-* NLS -- South African National Language Services -- Multilingual Maths
-  Dictionary
-
-.. _tbx#synonyms:
-
-Synonyms
---------
-NLS: Extra listing
-
-TBX:
-
-.. code-block:: xml
-
-    <termNote type="termNote">synonym</termNote>
-
-according to this TBX documentation. In another place:
-
-.. code-block:: xml
-
-    <termNote type="termType">synonym</termNote>
-
-inside a <termGrp>, following <term>
-
-.. _tbx#definition:
-
-Definition
-----------
-NLS: term {definition/contextual information}
-
-TBX:
-
-.. code-block:: xml
-
-    <descripGrp>
-       <descrip type="definition">The longish definition of the term</descrip>
-    </descripGrp>
-
-inside langSet <descript> can probably be used directly under langSet
-
-.. _tbx#context:
+<http://www.gala-global.org/oscarStandards/tbx/tbx-basic.html>`_ -- a simpler,
+reduced version of TBX with most of the useful features included.
 
-Context
--------
-NLS: term {definition/contextual information} (see above)
+Additionally notes and examples about TBX are available in `Terminator TBX
+conformance notes
+<http://terminator.readthedocs.org/en/latest/tbx_conformance.html>`_ which might
+help understanding this format.
 
-TBX:
+Also you might want to use `TBXChecker
+<http://sourceforge.net/projects/tbxutil/>`_ in order to check that TBX files
+are valid. Check the `TBXChecker explanation
+<http://www.tbxconvert.gevterm.net/tbx_checker_explanation.html>`_.
 
-.. code-block:: xml
 
-    <descrip type="context">A usually somewhat longer contextual sentence.</descrip>
+.. _tbx#conformance:
 
-inside <ntig>
+Conformance
+===========
 
-.. _tbx#parts_of_speech:
+Translate Toolkit TBX format support allows:
 
-Parts of speech
----------------
-NLS: term v.  (or adj, or n.)
+* Basic TBX file creation
+* Creating a bilingual TBX from CSV using :doc:`/commands/csv2tbx`
+* Using ``<tig>`` tags only
 
-TBX:
 
-.. code-block:: xml
+.. _tbx#non-conformance:
 
-    <termNote type="partOfSpeech" >noun</termNote>
-
-following <term>
-
-.. _tbx#cross_reference:
-
-Cross reference
----------------
-NLS: alternate term -> real lemma
-
-TBX: <ref> TODO
-
-.. _tbx#abbreviations:
-
-Abbreviations
--------------
-NLS: same as alternate term: a.m. -> before noon
-
-TBX: TODO
-
-.. _tbx#tbx_cheat_sheet:
-
-TBX cheat sheet
+Non-Conformance
 ===============
 
-- source word in English
-- definition in English
-- translation of source word to XX
-- definition in XX
-- comment
-- syntactic group
-- one or more tags
-- a reference number
-
-.. code-block:: xml
-
-    <termEntry id="4324 (8)">
-        <note>tag1, tag2, tag3 (7) -
-    (Actually not clear what the best mapping to TBX is in this case.)</note>
-        <langSet xml:lang="en">
-            <tig>
-                <term>sound (1)</term>
-                <termNote type="partOfSpeech">noun (6)</termNote>
-            </tig>
-            <descripGrp>
-                <descrip type="definition">Something you can hear (2) -
-    definition with an associated external source)</descrip>
-                <xref type="xSource" target="http://www.something.org/?id=234">Glossmaster</xref>
-            </descripGrp>
-            <note>Any random note about the term. (5)
-    (Actually there are ways of storing pretty specific stuff in specific spaces,
-    but while it seems the comment could be a more verbose definition, examples,
-    usage notes or anything else, we'll use this generic way.)
-            </note>
-        </langSet>
-        <langSet xml:lang="af">
-            <tig>
-                <term>klank (3)</term>
-            </tig>
-            <descrip type="definition">Iets wat jy kan hoor (4) -
-    definition without an external source)</descrip>
-            <note>A note in the target language (5).</note>
-        </langSet>
-    </termEntry>
-
-Note that the <xref> tags are optional (as are just about everything except
-termEntry, langSet and tig). They allow to link to an external source. An
-internal source can also be specified, or the definition can be specified
-without a source as shown for the term "klank".
-
-.. _tbx#tbx_requirements_by_galician_translation_team_proxecto_trasno:
-
-TBX requirements by Galician translation team (Proxecto Trasno)
-***************************************************************
-
-Here you have a list of `TBX requirements
-<http://www.certima.net/glosima/?28-xustificacion-das-escollas-de>`_ needed by
-the `Galician translation team (Proxecto Trasno) <http://www.trasno.net>`_. Its
-translation to english is below. You can see a terminology management system
-software specification draft in
-http://translate.sourceforge.net/wiki/developers/terminology_management_system
-
-A very important feature is to allow the exporting using pretty printing (like
-in the first example below) since the exported glossaries should be able to be
-read both by humans and software.
-
-Before the example you can see a list priorizing the features from more
-interesting and needed to less interesting and needed.
-
-The chosen TBX tags are determined by the needs of our terminology management
-system (the galician translation team one). That terminology management system
-needs several glossaries, each glossary has several concepts, and each concept
-can have several definitions (only one definition per language in a given
-concept), and also can have several translations for each concept (several
-translations per language in a given concept). The concepts will also have
-associated some links to get more information (several links per language in a
-given concept). Also is needed to have defined several languages.
-
-Now we have a list of all the needed entities lets go with the list of
-attributes for each of that entities:
-
-Each glossary has a name and a description.
-
-Each concept has an unique id, a subject field (which is another concept in the
-same glossary), it can have several concepts that people may wish to see (lets
-call it related concepts), and it can also have a parent concept (broader
-concept).
-
-Each link has a type (image, Wikipedia page,...), the address of the link, and
-a tiny description.
-
-Each definition has a definition text.
-
-We want to save the ISO 639 code of each language.
-
-Each translation can have a translation text, it has an unique id, the part of
-speech, the grammatical genre (if applicable), the grammatical number (if
-applicable), a field that indicates if the translation is an abbreviation or an
-acronym, an explaining note, examples of use (created by the people that make
-the terminology), links to examples of real use (a corpus or translation
-database), a field that indicates if the translation is completed or if it is
-still incomplete (completion status), and we also need to save the translation
-administrative status (if it is a recommedend translation, a not recommended
-one, or if it is a forbidden translation) and the reason why the translation
-has the actual administrative status (a simple text string) that only applies
-when the administrative status is other than "recommended".
-
-Once listed the needs we proceeded with reading the TBX ISO 300042 standard in
-search of the elements that support these needs, and we found at least one tag
-(or attribute) for every need, except for only a few that doesn't have. We
-should comment that TBX stores the information grouping it by concepts, and
-within each concept part of the information is stored at the beginning of the
-concept and other part of that information (the language-dependant information)
-is splited between the different languages, and within every language section
-it is splited another time between the translations of that language. This way
-it has a three level structure: concept level, language level and translation
-level (also called term level).
-
-Next we list the needs and the tag chosen for that need, indicating the level
-in which the tag goes:
-
-* **Glossary name:** if we match glossary with TBX file, then the glossary name
-  is the TBX file title, the label <title>. It goes on the file header.
-
-* **Glossary description:** if we match glossary with TBX file then we can use
-  a <p> tag inside <sourceDesc> tag. It goes on the file header.
-
-* **Concept:** the <termEntry> tag from TBX standard represents a concept. This
-  tag encloses the concept level.
-
-* **Concept identifier:** the <termEntry> tag has an attribute named "id".
-
-* **Concept subject field:** the TBX standard defines the <descrip> tag with
-  "subjectField" in its "type" attribute to represent the concept subject field
-  (***<descrip type="subjectField">subject field name</descrip>***). Since
-  there is no way to refer to another concept we should use some of the
-  translations of the subject field concept (the concept that is the subject
-  field of the current concept) to put inside the subject field tag. It goes in
-  concept level. **The lack of a way in TBX standard to refer to another
-  concept within the same glossary as subject field to make self-contained
-  glossaries is a real lack or we haven't identified the way to do this using
-  TBX??**
-
-* **Related concepts:** the TBX standard suggest the use of the tag ***<ref
-  type="crossReference" target="cid­23">some text...</ref>*** where “cid­23” is
-  the value of the related concept id, and "some text..." is one of the related
-  concept translations (the first english recommended one, for example). It
-  goes on concept level.
-
-* **Broader concept:** TBX defines the use of the tag <descrip> with the value
-  "broaderConceptGeneric" in its "type" attribute and a text between its
-  opening and closing tags. Also it allows the use of the "target" attribute to
-  refer to the broader concept. It goes on concept level. Example ***<descrip
-  type="broaderConceptGeneric" target="cid­23">broader concept
-  name</descrip>***
-
-* **Link:** according to TBX standard the tag that defines external links to
-  outside the current file is the <xref> tag. This tag has the following
-  structure: ***<xref type="xGraphic" target="sports/cricket/bat.jpg">cricket
-  bat</xref>*** where "type" is the link type, "target" is the link address and
-  the text between the opening and closing tags is a short description. It goes
-  on language level.
-
-* **Link type:** the <xref> tag has an attribute named "type" that defines the
-  link type. This attribute can have the values "xGraphic" if it is an image,
-  "externalCrossReference" if it is a link to an external resource (for example
-  a link to Wikipedia). It can have other values, but for now they are
-  considered not important.
-
-* **Link address:** the <xref> tag has an attribute named "target" which is the
-  link address.
-
-* **Link description:** the link description can go between the opening and
-  closing tags
-
-* **Definition:** to save the definitions it should be used the <descrip> tag
-  with the value "definition" in its "type" attribute. It goes on the language
-  level. Example: ***<descrip type="definition">alternate name for a
-  person...</descrip>*** can be the definition for "nickname".
-
-* **Definition text:** the definition text goes between the opening and closing
-  <descrip> tags.
-
-* **Language:** in TBX the <langSet> tag represents a language, but no language
-  list is stored inside the TBX file. So if there is a <langSet> tag for a
-  given language somewhere inside the TBX file, then this particular language
-  is defined in that TBX file. Inside each concept only can exist one <langSet>
-  per language, but a given language can have a <langSet> in each <termEntry>.
-  It is essential that at least one <langSet> tag is present in every
-  <termEntry> tag. The <langSet> tag encloses the language level. It goes on
-  concept level.
-
-* **Language code:** the <langSet> tag has an attribute named "xml:lang" which
-  stores some ISO 639 code value. Example: ***<langSet xml:lang="gl">***
-
-* **Translation:** the TBX standard defines two different tags to enclose the
-  translation level: <tig> and <ntig>. The <tig> tag provides all the needed
-  functionalities, like also the <ntig> tag does, but the <ntig> also has a lot
-  of undesired and unnecessary functionalities that complicate the TBX file
-  structure in an unnecessary way making its size grow and making dificult to a
-  person read the file with a text editor. Besides the TBX-Basic standard only
-  uses the <tig> tag. So we decided to only use the <tig> tag.
-
-* **Translation text:** the translation text goes between the opening and
-  closing of the <term> tag that goes on the translation level (under the <tig>
-  tag). Example: ***<term>nickname</term>***
-
-* **Translation identifier:** the <tig> tag has an attribute named "id" in
-  which we put the identifier. Example: ***<tig id="tid­59">...</tig>***
-
-* **Part of speech:** for storing the part of speech TBX suggests the use of
-  the <termNote> tag indicating in the "type" attribute the value
-  "partOfSpeech". The TBX standard doesn't defines a part of speech values list
-  (like noun, verb...), but the TBX-Basic standard (a simplified subset of TBX)
-  defines a short list of part of speech values which we can reuse and that can
-  be completed if necessary. It goes on translation level. Example:
-  ***<termNote type="partOfSpeech">noun</termNote>***
-
-* **Grammatical gender:** TBX specifies that the grammatical gender should be
-  specified using the <termNote> tag indicating the value "grammaticalGender"
-  in the "type" attribute. Like in the previous point, TBX doesn't define a
-  gender list so we will have to use the defined in TBX-Basic. It goes on the
-  translation level. Example: ***<termNote
-  type="grammaticalGender">masculine</termNote>***
-
-* **Grammatical number:** TBX says that for saving the grammatical number it
-  should be used a <termNote> tag with the value "grammaticalNumber" in its
-  "type" attribute. For the grammatical number we are going to use the list
-  defined in TBX-Basic. The grammatical should only be put when not putting it
-  could lead to misunderstanding. It goes on the translation level. Example:
-  ***<termNote type="grammaticalNumber">plural</termNote>***
-
-* **Acronym:** to indicate that a translation is an acronym we can use the
-  <termNote> tag with the "termType" value on its attribute "type" and the text
-  "acronym" between its opening and closing tags. It goes on the translation
-  level. Example: ***<termNote type="termType">acronym</termNote>***
-
-* **Abbreviation:** Like in the previous point but putting now "abbreviation"
-  between the opening and the closing tags. It goes on the translation level.
-
-* **Translation explaining note:** for the notes TBX defines the use of the
-  <termNote> tag with the value "usageNote" on its "type" attribute with the
-  explanatory note text between its opening and closing tags. It goes on the
-  translation level. Example: ***<termNote type="usageNote">Don't abuse of that
-  translation...</termNote>***
-
-* **Example of use:** for the examples of use made ad hoc we are going to use
-  the <descrip> tag with the value "context" on its "type" attribute and the
-  example text between its opening and closing tags. It goes on the translation
-  level. We are not going to use <descrip type="sampleSentence"> since it
-  doesn't appear both in TBX and in TBX-Basic, and also we are not going to use
-  <descrip type="example"> since in it is not mandatory to include the
-  translation text in the example. Example: ***<descrip type="context">example
-  text</descrip>***
-
-* **Link to real use example:** it is used for references to corpus
-  (translations databases, like open-tran.eu). TBX says that such references
-  should be indicated using the <xref> tag with the value "corpusTrace" on its
-  "type" attribute. It goes on the translation level. Example: ***<xref
-  type="corpusTrace" target="http:*en.gl.open-tran.eu/suggest/window">Window on
-  open-tran.eu</xref>**//
-
-* **Completion status:** we are going to use the <termNote> tag with the value
-  "processStatus" in its "type" attribute and the text "provisionallyProcessed"
-  between its opening and closing tags to indicate that not all the translation
-  information is not approved or that some of that information are not included
-  on the system yet. In case being completed this tag shouldn't appear, despite
-  TBX defines the values "unprocessed" and "finalized". It goes on the
-  translation level. Example: ***<termNote
-  type="processStatus">provisionallyProcessed</termNote>***
-
-* **Administrative status:** to indicate the administrative status of the
-  translation we are going to do the way TBX specifies and not how TBX-Basic
-  does since we are using a superset of TBX-Basic. TBX specifies the use of the
-  <termNote> tag with the value "administrativeStatus" on its "type" attribute
-  and the text that indicates the status between its opening and closing tags.
-  TBX defines a list of several states but we are only going to use three of
-  them: "preferredTerm­admn­sts" to indicate that this is a recommended
-  translation, "admittedTerm­admn­sts" to indicate that it is a valid
-  translation but that be prefer not to use it since there is another one that
-  is recommended, and "deprecatedTerm­admn­sts" to indicate that this
-  translation is forbidden (for not being a valid translation for a given
-  language for some reasons: false friend,...). It goes on the translation
-  level. Example: ***<termNote
-  type="administrativeStatus">preferredTerm­admn­sts</termNote>***
-
-* **Administrative status reason:** TBX doesn't define any way to save the
-  reason why a translation has a given administrative status. Due to that we
-  decided to use the <note> tag for specifying the reason. Since this tag is
-  also used for saving notes we are considering to use the <termNoteGrp> to
-  group it together with the administrative status tag. Maybe some languages
-  are not going to use that, but in galician it is very very important. Note
-  that the reason is not specified if the administrative status is
-  "preferredTerm­admn­sts". It goes on the translation level. Example:
-  **galicism**
-
-Below you can see a diagram that shows the levels and the data that goes in
-each level. Click on the image to enlarge.
-
-.. image:: /_static/tbx_levels_structure.png
-
-.. _tbx#features_priorization:
-
-Features priorization
-=====================
-
-The upper ones are the most needed and interesting:
-
-* Definition
-* Several translations in the same language for the same concept
-* Part of speech
-* Grammatical gender
-* Grammatical number
-* Concept subject field
-* Pretty printing
-* Use of tig tag by default
-* Link to external resources (including its type, address and description)
-* Completion status
-* Administrative status
-* Administrative status reason
-* Translation explaining note
-* Translation identifier
-* Related concepts
-* Broader concept
-* Acronym
-* Abbreviation
-* Example of use
-* Link to real use example
-
-.. _tbx#example_for_galician_tbx_requirements:
-
-Example for galician TBX requirements
-=====================================
-
-.. code-block:: xml
-
-    <?xml version='1.0' encoding='UTF-8'?>
-    <!DOCTYPE martif SYSTEM 'TBXcoreStructV02.dtd'>
-    <martif type='TBX' xml:lang='en'>
-        <martifHeader>
-            <fileDesc>
-                <titleStmt>
-                    <title>Localization glossary</title>
-                </titleStmt>
-                <sourceDesc>
-                    <p>Test glossary with concepts from software localization...</p>
-                </sourceDesc>
-            </fileDesc>
-            <encodingDesc>
-                <p type='XCSURI'>http://www.lisa.org/fileadmin/standards/tbx/TBXXCSV02.xcs</p>
-            </encodingDesc>
-        </martifHeader>
-        <text>
-            <body>
-
-                <termEntry id="cid-23">
-                    <descrip type="subjectField">computer science</descrip><!-- enclosed text in english since it is the glossary 
-                    language (see martif opening tag) -->
-                    <ref type="crossReference" target="cid-12">microprocessor</ref><!-- enclosed text in english since it is the 
-                    glossary language (see martif opening tag) -->
-                    <ref type="crossReference" target="cid-16">keyboard</ref><!-- enclosed text in english since it is the glossary 
-                    language (see martif opening tag) -->
-                    <descrip type="broaderConceptGeneric" target="cid-7">hardware</descrip><!-- enclosed text in english since it is 
-                    the glossary language (see martif opening tag) -->
-
-                    <langSet xml:lang="en">
-                        <descrip type="definition">A computer is a programmable machine that receives input, stores and manipulates 
-    data, and provides output in a useful format.</descrip>
-                        <xref type="xGraphic" target="http://en.wikipedia.org/wiki/File:HPLaptopzv6000series.jpg">computer image</xref>
-                        <xref type="externalCrossReference" target="http://en.wikipedia.org/wiki/Computer">English Wikipedia computer page</xref>
-
-                        <tig id="tid-59">
-                            <term>computer</term>
-                        </tig>
-                        <tig>
-                            <term>PC</term>
-                            <termNote type="termType">acronym</termNote><!-- "PC" is an acronym of "Personal Computer" -->
-                            <termNote type="administrativeStatus">admittedTerm-admn-sts</termNote>
-                            <termNote type="usageNote">Do not abuse of using this translation.</termNote>
-                        </tig>
-                        <tig>
-                            <term>comp.</term>
-                            <termNote type="termType">abbreviation</termNote><!-- "comp." is an abbreviation of "computer" -->
-                            <termNote type="administrativeStatus">admittedTerm-admn-sts</termNote>
-                        </tig>
-                    </langSet>
-
-                    <langSet xml:lang="es">
-                        <descrip type="definition">Máquina  electrónica que recibe y procesa datos para convertirlos en información 
-    útil</descrip><!-- definition text in spanish -->
-
-                        <tig>
-                            <term>sistema</term>
-                            <termNote type="administrativeStatus">admittedTerm-admn-sts</termNote>
-                        </tig>
-                        <tig>
-                            <term>equipo</term>
-                            <termNote type="administrativeStatus">deprecatedTerm-admn-sts</termNote>
-                            <termNote type="processStatus">provisionallyProcessed</termNote>
-                        </tig>
-                        <tig>
-                            <term>ordenador</term>
-                            <termNote type="partOfSpeech">noun</termNote>
-                            <termNote type="grammaticalGender">masculine</termNote>
-                            <termNote type="grammaticalNumber">singular</termNote>
-                            <termNote type="administrativeStatus">preferredTerm-admn-sts</termNote>
-                            <descrip type="context">El ordenador personal ha supuesto la generalización de la informática.</descrip><!-- example phrase -->
-                            <xref type="corpusTrace" target="http://es.en.open-tran.eu/suggest/ordenador">ordenador en open-tran.eu</xref><!-- enclosed text in spanish -->
-                        </tig>
-                        <tig>
-                            <term>computador</term>
-                            <termNote type="administrativeStatus">deprecatedTerm-admn-sts</termNote>
-                        </tig>
-                        <tig>
-                            <term>computadora</term>
-                            <termNote type="administrativeStatus">deprecatedTerm-admn-sts</termNote>
-                        </tig>
-                    </langSet>
-
-                    <langSet xml:lang="fr">
-                        <descripGrp><!-- Using descripGrp tags for enclosing the definition and its source -->
-                            <descrip type="definition">Un ordinateur est une machine dotée d'une unité de traitement lui permettant 
-    d'exécuter des programmes enregistrés. C'est un ensemble de circuits électroniques permettant de manipuler des données sous forme 
-    binaire, ou bits. Cette machine permet de traiter automatiquement les données, ou informations, selon des séquences d'instructions 
-    prédéfinies appelées aussi programmes.
-                            Elle interagit avec l'environnement grâce à des périphériques comme le moniteur, le clavier, la souris, 
-    l'imprimante, le modem, le lecteur de CD (liste non-exhaustive). Les ordinateurs peuvent être classés selon plusieurs critères 
-    (domaine d'application, taille ou architecture).</descrip>
-                            <xref type="xSource" target="http://fr.wikipedia.org/wiki/Ordinateur">Wikipedia: ordinateur</xref>
-                        </descripGrp>
-
-                        <tig>
-                            <term>ordinateur</term>
-                        </tig>
-                    </langSet>
-                </termEntry>
-
-                <termEntry id="cid-27"><!-- Another concept -->
-                    <descrip type="subjectField">computer science</descrip>
-
-                    <langSet xml:lang="en">
-                        <descrip type="definition">A technical standard is an established norm or requirement. It is usually a formal 
-    document that establishes uniform engineering or technical criteria, methods, processes and practices. In contrast, a custom, 
-    convention, company product, corporate standard, etc. which becomes generally accepted and dominant is often called a de facto standard.</descrip>
-
-                        <tig>
-                            <term>standard</term>
-                            <termNote type="partOfSpeech">noun</termNote>
-                            <termNote type="administrativeStatus">preferredTerm-admn-sts</termNote>
-                        </tig>
-                    </langSet>
-
-                    <langSet xml:lang="gl">
-                        <descrip type="definition">Norma que mediante documentos técnicos fixa a especificación de determinado tema.</descrip>
-
-                        <tig>
-                            <term>estándar</term>
-                            <termNote type="administrativeStatus">preferredTerm-admn-sts</termNote>
-                        </tig>
-
-                        <tig>
-                            <term>standard</term>
-                            <termGrp><!-- Example of administrative status along with its reason -->
-                                <termNote type="administrativeStatus">deprecatedTerm­admn­sts</termNote>
-                                <note>Razón: anglicismo</note><!-- the translation of the enclosed text is: "Reason: anglicism" -->
-                            </termGrp>
-                        </tig>
-                    </langSet>
-                </termEntry>
-
-            </body>
-        </text>
-    </martif>
+The following are not yet supported:
+
+* ``id`` attribute for ``<termEntry>`` tags
+* Definitions
+* Multiple languages
+* Parts of speech
+* Multiple translations in the same language
+* Cross references
+* Context
+* Abbreviations
+* Synonyms
+* ``<ntig>`` tag, read and write
+
+Other features can be picked from the `Terminator TBX conformance notes
+<http://terminator.readthedocs.org/en/latest/tbx_conformance.html>`_ which also
+include examples and notes about the TBX format.
 
diff --git a/docs/_build/html/_sources/formats/tmx.txt b/docs/_build/html/_sources/formats/tmx.txt
index bba8019..b0a1049 100644
--- a/docs/_build/html/_sources/formats/tmx.txt
+++ b/docs/_build/html/_sources/formats/tmx.txt
@@ -3,19 +3,20 @@
 
 TMX
 ***
-TMX is the LISA standard for translation memories. See
-http://www.lisa.org/standards/tmx.
+TMX is the `LISA OSCAR standard
+<http://www.gala-global.org/lisa-oscar-standards>`_ for translation memories.
 
 .. _tmx#standard_conformance:
 
 Standard conformance
 ====================
 
-Summary: TMX version 1.4 conformance to Level 1, except that no markup is
-stripped.
+Summary: `TMX version 1.4
+<http://www.gala-global.org/oscarStandards/tmx/tmx14b.html>`_ conformance to
+Level 1, except that no markup is stripped.
 
 * All required header fields are supplied.
-* The adminlang field in the header is always English.
+* The ``adminlang`` field in the header is always English.
 * None of the optional header fields are supplied.
 * We assume that only two languages are used (source and single target
   language).
diff --git a/docs/_build/html/_sources/formats/ts.txt b/docs/_build/html/_sources/formats/ts.txt
index b91fc89..fa5d4ed 100644
--- a/docs/_build/html/_sources/formats/ts.txt
+++ b/docs/_build/html/_sources/formats/ts.txt
@@ -13,12 +13,12 @@ traditionally edited using Qt Linguist.
 References
 ==========
 
-The format is XML and seems to only have been documented properly in Qt 4.3
+The format is XML and seems to only have been documented properly since Qt 4.3
 
 * `Current DTD Specification
-  <http://doc.trolltech.com/4.5/linguist-ts-file-format.html>`_ for Qt 4.5,
+  <http://qt-project.org/doc/qt-5.0/qtlinguist/linguist-ts-file-format.html>`_ for Wt 5.0,
   older versions; `Qt 4.3
-  <http://doc.trolltech.com/4.3/linguist-ts-file-format.html>`_
+  <http://doc.qt.digia.com/4.3/linguist-ts-file-format.html>`_
 * http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt
 
 .. _ts#complete:
diff --git a/docs/_build/html/_sources/formats/utx.txt b/docs/_build/html/_sources/formats/utx.txt
index d79e95d..f22cda0 100644
--- a/docs/_build/html/_sources/formats/utx.txt
+++ b/docs/_build/html/_sources/formats/utx.txt
@@ -14,7 +14,8 @@ Resources
 =========
 
 * `UTX site <http://www.aamt.info/english/utx/index.htm>`_
-* `Specification <http://www.aamt.info/english/utx/utx-simple-1.00-specification-e.pdf>`_ (v1.0)
+* `Current Specification <http://www.aamt.info/english/utx/#Download>`_
+  (implementation is based on UTX 1.0 which is no longer available)
 
 .. _utx#conformance:
 
diff --git a/docs/_build/html/_sources/formats/wiki.txt b/docs/_build/html/_sources/formats/wiki.txt
index 9ea7319..3b0ea72 100644
--- a/docs/_build/html/_sources/formats/wiki.txt
+++ b/docs/_build/html/_sources/formats/wiki.txt
@@ -25,7 +25,7 @@ Supported Wiki Formats
 The following is a list of the wikis supported together with a list of the
 items that we can process:
 
-* `docuwiki <http://wiki.splitbrain.org/wiki:dokuwiki>`_ -- heading, bullet,
+* `dokuwiki <http://wiki.splitbrain.org/wiki:dokuwiki>`_ -- heading, bullet,
   numbered list
 * `MediaWiki <http://www.mediawiki.org/wiki/MediaWiki>`_ -- heading, bullet,
   numbered list
diff --git a/docs/_build/html/_sources/formats/wml.txt b/docs/_build/html/_sources/formats/wml.txt
index cbaadc5..2d18ef2 100644
--- a/docs/_build/html/_sources/formats/wml.txt
+++ b/docs/_build/html/_sources/formats/wml.txt
@@ -3,9 +3,8 @@
 
 Wireless Markup Language
 ************************
-This page documents the support for `WML
-<https://en.wikipedia.org/wiki/Wireless_Markup_Language>`_ and is used for
-planning our work on it.
+This page documents the support for :wp:`WML <Wireless_Markup_Language>` and is
+used for planning our work on it.
 
 This is implemented as a generic XML document type that is handled similarly to
-the way the :doc:`developers/projects/odf` project handles ODF documents.
+the way the :wiki:`developers/projects/odf` project handles ODF documents.
diff --git a/docs/_build/html/_sources/formats/wordfast.txt b/docs/_build/html/_sources/formats/wordfast.txt
index 55b4acd..a4e9cee 100644
--- a/docs/_build/html/_sources/formats/wordfast.txt
+++ b/docs/_build/html/_sources/formats/wordfast.txt
@@ -4,9 +4,8 @@
 Wordfast Translation Memory
 ***************************
 
-The Wordfast format, as used by the `Wordfast
-<https://en.wikipedia.org/wiki/Wordfast>`_ translation tool, is a simple tab
-delimited file.
+The Wordfast format, as used by the :wp:`Wordfast` translation tool, is a
+simple tab delimited file.
 
 The storage format can read and write Wordfast TM files.
 
diff --git a/docs/_build/html/_sources/formats/xliff.txt b/docs/_build/html/_sources/formats/xliff.txt
index 3e4e22c..7c9f31b 100644
--- a/docs/_build/html/_sources/formats/xliff.txt
+++ b/docs/_build/html/_sources/formats/xliff.txt
@@ -4,8 +4,16 @@
 XLIFF
 *****
 
-XLIFF is the OASIS standard for translation. See
-http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm.
+XLIFF[*] is the `OASIS <https://www.oasis-open.org/>`_ standard for translation.
+
+.. [*] XML Localization Interchange File Format
+
+References
+----------
+- `XLIFF Standard
+  <http://docs.oasis-open.org/xliff/xliff-core/xliff-core.html>`_
+- `OASIS XLIFF Technical Committee
+  <https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_ website
 
 .. _xliff#flavours:
 
@@ -63,5 +71,5 @@ Done
 XLIFF and other tools
 =====================
 
-Here is a small report on the :doc:`guide/tools/xliff support by ms windows
-programs`.
+Here is a small report on :wiki:`XLIFF support by Windows programs
+<guide/tools/xliff_support_by_ms_windows_programs>`.
diff --git a/docs/_build/html/_sources/guides/creating_mozilla_pot_files.txt b/docs/_build/html/_sources/guides/creating_mozilla_pot_files.txt
index 3fe98b6..22e3d4c 100644
--- a/docs/_build/html/_sources/guides/creating_mozilla_pot_files.txt
+++ b/docs/_build/html/_sources/guides/creating_mozilla_pot_files.txt
@@ -4,10 +4,7 @@
 Creating Mozilla POT files
 **************************
 
-You can do this two ways:
-
-- Using Mozilla source (from CVS or Mercurial)
-- Using an en-US XPI file
+You can do this using Mozilla source from CVS or Mercurial
 
 .. _creating_mozilla_pot_files#using_mercurial:
 
@@ -16,10 +13,10 @@ Using Mercurial
 
 Since Firefox 3.1 and Thunderbird 3.0, Mozilla has switched to using Mercurial
 for version control. See the Mozilla's `L10n on Mercurial
-<https://developer.mozilla.org/en/l10n_on_mercurial>`_ page for instructions on
-how to checkout and update your Mozilla sources and l10n files.
+<https://developer.mozilla.org/docs/Localizing_with_Mercurial>`_ page for
+instructions on how to checkout and update your Mozilla sources and l10n files.
 
-You can use :ref:`get_moz_enUS.py <mozilla_l10n_scripts#get_moz_enus.py>` to
+You can use :ref:`get_moz_enUS.py <get_moz_enus.py>` to
 extract an en-US directory from the source tree:
 
 ::
@@ -68,14 +65,3 @@ POT files as follows::
 This will create the POT files in ``l10n/pot`` using the American English files
 from ``en-US``.  You now have a set of POT files that you can use for
 translation or updating your existing PO files.
-
-.. _creating_mozilla_pot_files#using_an_en-us_xpi_file:
-
-Using an en-US XPI file
-=======================
-
-Download an XPI file and run the following::
-
-  moz2po -P en-US.xpi pot
-
-You now have a set of POT files in ``pot``.
diff --git a/docs/_build/html/_sources/guides/index.txt b/docs/_build/html/_sources/guides/index.txt
index ea89bff..332d3c3 100644
--- a/docs/_build/html/_sources/guides/index.txt
+++ b/docs/_build/html/_sources/guides/index.txt
@@ -17,7 +17,6 @@ Use Cases
    running_the_tools_on_microsoft_windows
    cleanup_translator_comments
    creating_mozilla_pot_files
-   migrating_to_firefox
    document_translation
 
 * :doc:`Migrating an older version of your translations to the latest templates
@@ -35,6 +34,4 @@ Use Cases
 * Using ``phase`` for the complete translation roundtrip
 * :doc:`Cleanup translator comments <cleanup_translator_comments>`
 * :doc:`Creating Mozilla POT files <creating_mozilla_pot_files>`
-* :doc:`Migrating older Mozilla XPI based translations to Firefox
-  <migrating_to_firefox>`
 * :doc:`Document translation <document_translation>`
diff --git a/docs/_build/html/_sources/guides/migrating_to_firefox.txt b/docs/_build/html/_sources/guides/migrating_to_firefox.txt
deleted file mode 100644
index d4c52aa..0000000
--- a/docs/_build/html/_sources/guides/migrating_to_firefox.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-
-.. _migrating_to_firefox:
-.. _migrating_mozilla_translations_to_firefox:
-
-Migrating Mozilla Translations to Firefox
-*****************************************
-
-This quickstart shows you how to migrate your existing translations of the
-Mozilla suite to the Firefox web-browser.  The same instructions can be used to
-migrate Thunderbird§.
-
-Note: This guide assumes that you are or will be using PO files.
-
-FIXME this page needs to be rewriten now that Mozilla is using CSV.  The steps
-are more or less the same.  Look at :doc:`creating_mozilla_pot_files` which
-talks about creating POT file from CVS. Then the process is mostly the same
-except swap any reference to XPI to be the translations in Mozilla CVS.
-
-.. _migrating_to_firefox#quick_start:
-
-Quick Start
-===========
-
-#. :doc:`moz2po </commands/moz2po>` -t mozilla-1.7.3-langenus.xpi langXXYY.xpi xxYY-1.7.3
-#. :doc:`moz2po </commands/moz2po>` -P firefox-1.0-en-US.xpi templates-ff-1.0
-#. :doc:`/commands/pomigrate2` xxYY-1.7.3 xxYY-ff-1.0 templates-ff-1.0
-
-.. _migrating_to_firefox#detailed_description:
-
-Detailed Description
-====================
-
-.. _migrating_to_firefox#make_sure_your_mozilla_is_in_po_format:
-
-Make sure your Mozilla is in PO format
---------------------------------------
-
-If you are not currently using PO files to do your translations then you can
-migrate an existing XPI to PO format.
-
-.. _migrating_to_firefox#get_the_correct_en-us_xpi:
-
-Get the correct en-US xpi
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Firstly make sure you have an XPI for your language then download a Mozilla
-English (US) XPI for the same release::
-
-  ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.3/linux-xpi/langenus.xpi
-
-Change 1.7.3 to the release that you need.  Note: Linux and Windows
-langenus.xpi are the same so no need to worry about that.
-
-.. _migrating_to_firefox#create_mozilla_po_files_for_your_language:
-
-Create Mozilla PO files for your language
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Now create the Mozilla PO files for your language using your existing XPI and
-the en-US XPI.
-
-::
-
-    moz2po -t mozilla-1.7.3-langenus.xpi langXXYY.xpi xxYY-1.7.3
-
-Where:
-
-* mozilla-1.7.3-langenus.xpi is the langenus.xpi downloaded above
-* langXXYY.xpi is your existing translated XPI with the same version and the
-  en-US one downloaded.
-* xxYY-1.7.3 is an output directory for the PO files
-
-.. _migrating_to_firefox#create_firefox_pot_files:
-
-Create Firefox POT files
-------------------------
-
-You need to create a set of Firefox PO Template files that you will use as
-templates when you migrate your Mozilla translations.  Template files are
-simply blank PO files.
-
-.. _migrating_to_firefox#getting_the_en-us.xpi:
-
-Getting the en-US.xpi
-^^^^^^^^^^^^^^^^^^^^^
-
-Rumour has it that the en-US XPI files for Firefox are different for Windows
-and Linux.
-
-* Linux -- Firefox 1.0:
-  ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/linux-i686/xpi/en-US.xpi
-* Windows -- Firefox 1.0:
-  ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/win32/xpi/en-US.xpi
-
-.. _migrating_to_firefox#create_the_pot_files:
-
-Create the POT files
-^^^^^^^^^^^^^^^^^^^^
-
-::
-
-    moz2po -P firefox-1.0-en-US.xpi templates-ff-1.0
-
-Where:
-
-* *-P* specifies that you want to create POT files instead of PO files
-* *firefox-1.0-en-US.xpi* is an en-US.xpi for Firefox downloaded earlier
-* *templates-ff-1.0* is the new directory that will contain the POT files
-
-.. _migrating_to_firefox#migrate_the_mozilla_po_files_to_firefox:
-
-Migrate the Mozilla PO files to Firefox
----------------------------------------
-
-We will now take the existing Mozilla PO files and migrate them to Firefox.
-Note that this tool only works on Linux (or an operating environment with bash
-and the gettext tools).  If you need help ask at
-`translate-devel at lists.sourceforge.net
-<mailto:translate-devel at lists.sourceforge.net>`_.
-
-::
-
-  pomigrate2 xxYY-1.7.3 xxYY-ff-1.0 templates-ff-1.0
-
-Where:
-
-* *xxYY-1.7.3* contains your Mozilla PO files
-* *xxYY-ff-1.0* will contain your new Firefox files
-* *templates-ff-1.0* contains the Firefox template files
-
-.. _migrating_to_firefox#how_does_it_do_the_migration:
-
-How does it do the migration?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Things that are fully automated scare most people and justifiably so!  The
-migration will do the following:
-
-#. For each Firefox PO Template file
-
-   * If there is one in your Mozilla folder
-
-     * If there is only one file with that name
-
-       * copy it to the correct Firefox PO location
-
-     * Else
-
-       * combine all the copies you find and then copy them to the Firefox PO
-         location
-
-   * Else
-
-     * Initialise a blank PO file
-
-#. Create a compendium file of all Mozilla PO files
-#. Update all Firefox PO files optionally using the compendium
-
-The result is that all Firefox files are at least initialised.  Many of them
-are populated with conflicting entries clearly highlighted and ready for you to
-fix.
-
-.. _migrating_to_firefox#begin_translating:
-
-Begin translating
------------------
-
-Your PO files are ready.  Begin translating with any of your usual PO editing
-tools.
diff --git a/docs/_build/html/_sources/guides/using_csv2po.txt b/docs/_build/html/_sources/guides/using_csv2po.txt
index f4689b5..df6c606 100644
--- a/docs/_build/html/_sources/guides/using_csv2po.txt
+++ b/docs/_build/html/_sources/guides/using_csv2po.txt
@@ -135,7 +135,7 @@ You can, and should, keep your files as CSV files.  However, many translators
 are not the best wizzes at using their spreadsheet.  In this case many files
 will have been changed to XLS files.  To convert them by hand is tedious and
 error prone.  Rather make use of `xlHtml
-<http://freshmeat.net/projects/xlhtml/>`_ which can do all the work for you.
+<http://freecode.com/projects/xlhtml/>`_ which can do all the work for you.
 
 ::
 
diff --git a/docs/_build/html/_sources/history.txt b/docs/_build/html/_sources/history.txt
index 7cab5fd..3a53a0d 100644
--- a/docs/_build/html/_sources/history.txt
+++ b/docs/_build/html/_sources/history.txt
@@ -70,13 +70,14 @@ tool was created.
 WordForge project
 =================
 
-In 2006 with funding from the `Open Society Institute <http://www.soros.org/>`_
-(OSI) and `IDRC <http://www.idrc.ca/>`_ the toolkit was adapted to allow many
-core changes.  The first being to introduce the concept of a base class from
-which PO and XLIFF storage formats are derived.  This allowed tools to be
-adapted to allow output to XLIFF or PO files.  The tools themselves where
-adapted to allow them to work with the core formats XLIFF and PO as well as all
-base class derived formats.  Thus we can count XLIFF, PO, MO and other formats.
+In 2006 with funding from the `Open Society Institute
+<http://www.opensocietyfoundations.org/>`_ (OSI) and `IDRC
+<http://www.idrc.ca/>`_ the toolkit was adapted to allow many core changes.
+The first being to introduce the concept of a base class from which PO and
+XLIFF storage formats are derived.  This allowed tools to be adapted to allow
+output to XLIFF or PO files.  The tools themselves where adapted to allow them
+to work with the core formats XLIFF and PO as well as all base class derived
+formats.  Thus we can count XLIFF, PO, MO and other formats.
 
 Additional contributions during this phase where the adaptation of Pootle to
 use XLIFF as well as PO.  The creation of tools to manage translation memory
diff --git a/docs/_build/html/_sources/installation.txt b/docs/_build/html/_sources/installation.txt
index 444ca1d..d401a48 100644
--- a/docs/_build/html/_sources/installation.txt
+++ b/docs/_build/html/_sources/installation.txt
@@ -38,7 +38,7 @@ The dollowing advice only applies to manual installation from tar ball.
 Building
 ========
 
-For build instructions, see the :doc:`development/building` page.
+For build instructions, see the :doc:`developers/building` page.
 
 .. _installation#download:
 
diff --git a/docs/_build/html/_sources/releases/1.10.0.txt b/docs/_build/html/_sources/releases/1.10.0.txt
new file mode 100644
index 0000000..0713a1a
--- /dev/null
+++ b/docs/_build/html/_sources/releases/1.10.0.txt
@@ -0,0 +1,118 @@
+.. These notes are used in:
+   1. Our email announcements
+   2. The Translate Tools download page at toolkit.translatehouse.org
+   3. Sourceforge download page in
+      http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.9.0/README.rst/download
+
+Translate Toolkit 1.10.0
+************************
+
+*Released on 12 March 2013*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes for the
+upcoming `Pootle <http://pootle.translatehouse.org/>`_ 2.5.0.
+
+It is just over a year since the last release so there are many improvements
+across the board.  A number of people contributed to this release and we've
+tried to credit them wherever possible (sorry if somehow we missed you).
+
+..
+  This is used for the email and other release notifications
+  Getting it and sharing it
+  =========================
+  * pip install translate-toolkit
+  * `Sourceforge download
+    <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.10.0/>`_
+  * Please share this URL http://toolkit.translatehouse.org/download.html if
+    you'd like to tweet or post about the release.
+
+
+Highlighted improvements
+========================
+* Android format support
+* Version control improvements
+* Source now on Github - all our code is now on github
+* Documentation - migrated all from our wiki into the code and Read The Docs
+* Continuous Integration using Travis
+
+
+Most important for Pootle
+-------------------------
+* Version control improvements
+* Categorize pofilter checks into critical, functional, cosmetic, etc
+
+
+Formats and Converters
+----------------------
+* Android format support [Michal Čihař]
+* Mozilla .lang, many improvements
+* PHP support for defintions, // comments and improved whitespace preservation
+* PO: X-Merge-On header to explicitly demand a conversion strategy instead of
+  guessing
+* .properties: BOMs in messages and C style comments [Roman Imankulov]
+* Mac OS String formatting improved [Roman Imankulov]
+
+
+Version Control improvements
+----------------------------
+* Interface for adding files to a repository & Implement .add() for all VCSs.
+* Caching of VC version info
+* Don't look for VCS if it's not available
+* Stop looking for VCS at a given parent
+* Subversion VC tests
+* Alway pass -m to 'commit' in Subversion to prevent blocking
+
+
+Checks
+------
+* New OpenOffice variables style used in extensions
+* Check for self-closing tags in the xmltags test [Seb M].
+* GConf test fixes
+* Terminology checker type for future terminology features
+* Categorize pofilter checks into critical, functional, cosmetic, etc
+* Added support for Objective-C %@ printf specifiers
+
+
+Language specific fixes
+-----------------------
+* Correct plurals: Scottish Gaelic (gd), Irish
+* Plural rules: Fulah, Brazilian Portuguese
+* Punctuation rules and tests to ignore for: Burmese, Urdu, Afrikaans, Wolof
+
+
+Documentation
+-------------
+* Moved to Git and we are now using reStructured Text and Sphinx
+* Published in Read The Docs (RTD).
+* Old wiki migrated to RTD.
+* New clean theme for documentation and website
+* API and code epydoc moved to reStructured Text.
+* Translate code Style Guide written
+
+
+Mozilla tooling fixes
+---------------------
+* Mozilla specific test for dialog size settings
+* Gaia properties dialect and plural handling
+* Fixes and imporovement to the Firefox build scripts
+* Improved accesskey detection
+* Improved DTD escaping for &quote, %, etc
+* Improvement of DTD to align with Base classes
+* Support new {{xx}} variable style introduced in PDF viewer
+
+
+...and refactoring, PEP8, test coverage and of course many many bugfixes.
+
+
+Contributors
+------------
+This release was made possible by the following people:
+
+Dwayne Bailey, Friedel Wolff, Leandro Regueiro, Julen Ruiz Aizpuru,
+Michal Čihař, Roman Imankulov, Alexander Dupuy, Frank Tetzel,
+Luiz Fernando Ranghetti, Laurette Pretorius, Jiro Matsuzawa, Henrik Saari,
+Luca De Petrillo, Khaled Hosny, Dave Dash & Chris Oelmueller.
+
+And to all our bug finder, testers and `localisers
+<http://pootle.locamotion.org/projects/pootle/>`_, a Very BIG Thank You.
diff --git a/docs/_build/html/_sources/releases/1.11.0-rc1.txt b/docs/_build/html/_sources/releases/1.11.0-rc1.txt
new file mode 100644
index 0000000..87378da
--- /dev/null
+++ b/docs/_build/html/_sources/releases/1.11.0-rc1.txt
@@ -0,0 +1,140 @@
+.. These notes are used in:
+   1. Our email announcements
+   2. The Translate Tools download page at toolkit.translatehouse.org
+   3. Sourceforge download page in
+      http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/README.rst/download
+
+Translate Toolkit 1.11.0-rc1
+****************************
+
+*Released on 28 November 2013*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes and
+optimizations for the upcoming `Pootle <http://pootle.translatehouse.org/>`_
+2.5.1 and `Virtaal <http://virtaal.translatehouse.org>`_ releases.
+
+It is just over a eight months since the last release and there are many
+improvements across the board.  A number of people contributed to this release
+and we've tried to credit them wherever possible (sorry if somehow we missed
+you).
+
+..
+  This is used for the email and other release notifications
+  Getting it and sharing it
+  =========================
+  * pip install translate-toolkit
+  * `Sourceforge download
+    <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/>`_
+  * Please share this URL http://toolkit.translatehouse.org/download.html if
+    you'd like to tweet or post about the release.
+
+Highlighted improvements
+========================
+
+Major changes
+-------------
+- The PO format now matches Gettext more closely
+- PHP format adds a number of new features
+- Support for Python 2.5 has been dropped
+
+Formats and Converters
+----------------------
+- Gettext PO:
+
+  - cPO now handles fuzzy obsolete messages correctly
+  - Line wrapping improvement allow PO files to more closely match Gettext
+  - Optimization to increase performance
+
+- PHP:
+
+  - Warn about duplicate entries
+  - Allow blank spaces in array declaration (:bug:`2646`)
+  - Support nested arrays (:bug:`2240`)
+
+- XLIFF:
+
+  - Correctly parse XLIFF 1.2
+
+- Properties
+  
+  - Blank source text is now always translated
+  - Fuzzy units are discarded with --remove-untranslated
+  - prop2po no longer drops entries that are translated the same as the source
+
+- TMX:
+
+  - po2tmx support comments
+
+- Android:
+
+  - Detect untranslatable resource strings
+  - Various format improvements
+
+- New conversion options:
+
+  - :option:`--timestamp` -- skip conversion if the output file has a newer
+    timestamp (Makefile-alike)
+  - :option:`--threshold` -- in po2* converters this allows you to specify a
+    percentage complete threshold.  If the PO files passes this theshold then
+    the file is output (:bug:`2998`)
+  - :option:`--removeuntranslated` -- Extend this option to po2dtd and thus
+    po2moz -- don't output untranslated text (:bug:`1718`)
+
+Language specific fixes
+-----------------------
+- The toolkit now supports: Sakha, N'ko, Turkish, improvements for Bengali &
+  Hindi
+- Pootle special characters are now stored on Toolkit and available for other
+  tools to use
+- Rules for language ``ab`` are now available for language ``ab_CD``
+
+Checks
+------
+- Spelling test improvements including speed and optimization
+- Reduce false positive for the filepath test in cases of self closing tags
+  e.g. ``<br />``
+- Lowered the accelerator check severity to reduce false positive impact
+
+Mozilla tooling fixes
+---------------------
+- Better decoding of some characters in DTD e.g » and &x0022 (")
+- .lang -- Improved support for untranslated entries
+- ``buildxpi``:
+
+  - Can now build multiple languages at once (:bug:`2999`)
+  - Set a max product version to allow the language pack to continue to work
+    once the browser version has moved out of Aurora channel
+
+- Dropped native XPI building support (untested and no longer used)
+- Add Mozilla plural formulas, in time we'll handle Mozilla plurals correctly
+
+General
+-------
+- Dropped support for Python 2.5 -- 2.5 has reached end-of-life
+- Dropped psyco support -- it is no longer maintained
+- Use logging throught instead of ``sys.stderr``
+- Lots of cleanups on docs: TBX, PHP, added Android and JSON docs
+- Use requirements files for documenting all requirements and make it easy to
+  install Translate Toolkit using ``pip``
+- Added some functional tests
+- Improve searching to find words with hyphens
+- Choose the closest repo in nested VCS
+- Test suite down to zero failing tests
+
+...and loads of internal changes to improve maintainability, remove unused
+imports, remove unused code and general code cleanups, some changes to ensure
+future Python 3 portability and of course many many bugfixes.
+
+
+Contributors
+------------
+This release was made possible by the following people:
+
+Dwayne Bailey, Leandro Regueiro, Alexander Dupuy, Friedel Wolff, Khaled Hosny,
+Michal Čihař, Jordi Mas, Stuart Prescott, Trung Ngo, Ronald Sterckx, Rail
+Aliev, Michael Schlenker, Martin-Zack Mekkaoui, Iskren Chernev, Luiz Fernando
+Ranghetti & Christian Hitz
+
+And to all our bug finders, testers and `localisers
+<http://pootle.locamotion.org/projects/pootle/>`_, a Very BIG Thank You.
diff --git a/docs/_build/html/_sources/releases/1.11.0.txt b/docs/_build/html/_sources/releases/1.11.0.txt
new file mode 100644
index 0000000..480c5b1
--- /dev/null
+++ b/docs/_build/html/_sources/releases/1.11.0.txt
@@ -0,0 +1,148 @@
+.. These notes are used in:
+   1. Our email announcements
+   2. The Translate Tools download page at toolkit.translatehouse.org
+   3. Sourceforge download page in
+      http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/README.rst/download
+
+Translate Toolkit 1.11.0
+************************
+
+*Released on 22 January 2014*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes and
+optimizations for the upcoming `Pootle <http://pootle.translatehouse.org/>`_
+2.5.1 and `Virtaal <http://virtaal.translatehouse.org>`_ releases.
+
+It is just over a ten months since the last release and there are many
+improvements across the board.  A number of people contributed to this release
+and we've tried to credit them wherever possible (sorry if somehow we missed
+you).
+
+..
+  This is used for the email and other release notifications
+  Getting it and sharing it
+  =========================
+  * pip install translate-toolkit
+  * `Sourceforge download
+    <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/>`_
+  * Please share this URL http://toolkit.translatehouse.org/download.html if
+    you'd like to tweet or post about the release.
+
+Highlighted improvements
+========================
+
+1.11.0 vs 1.11.0-rc1
+--------------------
+Changes since 1.11.0 RC1:
+
+- Improve handling of escapes in wrapping
+- Handle a broken version of python-Levenshtein 
+- Output HTML source in po2html when a unit is fuzzy (:bug:`3145`)
+
+Major changes
+-------------
+- The PO format now matches Gettext more closely
+- PHP format adds a number of new features
+- Support for Python 2.5 has been dropped
+
+Formats and Converters
+----------------------
+- Gettext PO:
+
+  - cPO now handles fuzzy obsolete messages correctly
+  - Line wrapping improvement allow PO files to more closely match Gettext
+  - Optimization to increase performance
+
+- PHP:
+
+  - Warn about duplicate entries
+  - Allow blank spaces in array declaration (:bug:`2646`)
+  - Support nested arrays (:bug:`2240`)
+
+- XLIFF:
+
+  - Correctly parse XLIFF 1.2
+
+- Properties
+  
+  - Blank source text is now always translated
+  - Fuzzy units are discarded with --remove-untranslated
+  - prop2po no longer drops entries that are translated the same as the source
+
+- TMX:
+
+  - po2tmx support comments
+
+- Android:
+
+  - Detect untranslatable resource strings
+  - Various format improvements
+
+- New conversion options:
+
+  - :option:`--timestamp` -- skip conversion if the output file has a newer
+    timestamp (Makefile-alike)
+  - :option:`--threshold` -- in po2* converters this allows you to specify a
+    percentage complete threshold.  If the PO files passes this theshold then
+    the file is output (:bug:`2998`)
+  - :option:`--removeuntranslated` -- Extend this option to po2dtd and thus
+    po2moz -- don't output untranslated text (:bug:`1718`)
+
+Language specific fixes
+-----------------------
+- The toolkit now supports: Sakha, N'ko, Turkish, improvements for Bengali &
+  Hindi
+- Pootle special characters are now stored on Toolkit and available for other
+  tools to use
+- Rules for language ``ab`` are now available for language ``ab_CD``
+
+Checks
+------
+- Spelling test improvements including speed and optimization
+- Reduce false positive for the filepath test in cases of self closing tags
+  e.g. ``<br />``
+- Lowered the accelerator check severity to reduce false positive impact
+
+Mozilla tooling fixes
+---------------------
+- Better decoding of some characters in DTD e.g » and &x0022 (")
+- .lang -- Improved support for untranslated entries
+- ``buildxpi``:
+
+  - Can now build multiple languages at once (:bug:`2999`)
+  - Set a max product version to allow the language pack to continue to work
+    once the browser version has moved out of Aurora channel
+
+- Dropped native XPI building support (untested and no longer used)
+- Add Mozilla plural formulas, in time we'll handle Mozilla plurals correctly
+
+General
+-------
+- Dropped support for Python 2.5 -- 2.5 has reached end-of-life
+- Dropped psyco support -- it is no longer maintained
+- Use logging throught instead of ``sys.stderr``
+- Lots of cleanups on docs: TBX, PHP, added Android and JSON docs
+- Use requirements files for documenting all requirements and make it easy to
+  install Translate Toolkit using ``pip``
+- Added some functional tests
+- Improve searching to find words with hyphens
+- Choose the closest repo in nested VCS
+- Test suite down to zero failing tests
+
+...and loads of internal changes to improve maintainability, remove unused
+imports, remove unused code and general code cleanups, some changes to ensure
+future Python 3 portability and of course many many bugfixes.
+
+
+Contributors
+------------
+This release was made possible by the following people:
+
+Dwayne Bailey, Leandro Regueiro, Alexander Dupuy, Friedel Wolff, Khaled Hosny,
+Michal Čihař, Jordi Mas, Stuart Prescott, Trung Ngo, Ronald Sterckx, Rail
+Aliev, Michael Schlenker, Martin-Zack Mekkaoui, Iskren Chernev, Luiz Fernando
+Ranghetti & Christian Hitz
+
+And to all our bug finders, testers and `localisers
+<http://pootle.locamotion.org/projects/pootle/>`_, a Very BIG Thank You.
diff --git a/docs/_build/html/_sources/releases/1.11.1.txt b/docs/_build/html/_sources/releases/1.11.1.txt
new file mode 100644
index 0000000..7c7bacb
--- /dev/null
+++ b/docs/_build/html/_sources/releases/1.11.1.txt
@@ -0,0 +1,364 @@
+commit 14820c4b20ce90cd4e5681d7ee1a8bdcc3dda352
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Jan 29 10:41:07 2014 +0000
+
+    PHP: Another array variant
+    
+    If we see arrray() then we don't assume that the user will be using
+    array synx x => y but rather leave parsing as normal.
+
+commit 589b217e41e952e2f73ac99f48eb00f88c4fd6db
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Fri Jan 24 22:23:45 2014 +0100
+
+    Styleguide: Add guideline on using opposite quoting to avoid escaping
+
+commit 5f12db1efe410d1f895d24c526fc9ecd7dbe3ade
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Fri Jan 24 22:23:07 2014 +0100
+
+    Styleguide: Add guideline on using single quoted strings for dict keys
+
+commit 91d3aa2f3f6dbef89313aa18b236eb88e1ea69c1
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Fri Jan 24 21:52:56 2014 +0000
+
+    Drop obsolete __future__ imports
+    
+    - Generators became mandatory in Python 2.3
+    - with statement mandatory in 2.6
+    
+    Since Python 2.6 is our minimum supported version we can drop these.
+
+commit c06d50d589b53a4df475821b5c089a27cccbcfc7
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Fri Jan 24 22:02:38 2014 +0000
+
+    Clarify that Python 2.6 is our new minimum
+
+commit bef763fea1c399c3a6cd953759d7e2e66f689615
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Fri Jan 24 22:19:35 2014 +0100
+
+    Styleguide: Add section to encompass all Python guidelines
+
+commit ae422ae7435ff44025f53b31662d398e85334951
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 16:22:41 2013 +0000
+
+    pypy: Enable travis testing for pypy
+    
+    Travis allows failures in pypy tests
+    
+    Note: lxml was a blocker but seems to build now
+
+commit e66f77715540c7572493fa6afc5be8f3b86c0961
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Thu Nov 28 03:06:24 2013 +0000
+
+    PEP8: E303 too many blank lines
+
+commit dbbff4612eb8788ad10859ef7aba34e7bd1f3f28
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Thu Nov 28 03:04:06 2013 +0000
+
+    PEP8: W291 trailing whitespace
+
+commit 267c811a4990a2e097fd0bd970a88e3f991dda55
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Thu Nov 28 03:01:33 2013 +0000
+
+    PEP8: E124 closing bracket does not match visual indentation
+
+commit 1ec84e9baa13e417a2bd2c4856fb185114a8e035
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Thu Nov 28 02:41:47 2013 +0000
+
+    PEP8: E501 line too long
+
+commit bd25be2fdc125e968dda29727928fea4593980f8
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Thu Nov 28 02:15:18 2013 +0000
+
+    PEP8: E502 the backslash is redundant between brackets
+
+commit adc1681ce6d093555422c91190438ab786cbe92d
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Thu Nov 28 01:47:23 2013 +0000
+
+    PEP8: E302 expected 2 blank lines, found 1
+
+commit 8380295f2702c73c528329616c7607daa71f7c28
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Thu Nov 28 01:43:01 2013 +0000
+
+    PEP8: E301 expected 1 blank line, found 0
+
+commit d2a26f871863948a536c5d10746889c7ddc41813
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 19:10:39 2013 +0000
+
+    PEP8: W293 blank line contains whitespace
+
+commit 65b6031556881a153e26be465e9a876cc341b60b
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 18:50:01 2013 +0000
+
+    PEP8: E124 closing bracket does not match visual indentation
+
+commit daca9c9cace0eed25f0feea4464043c134cee57e
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 18:45:19 2013 +0000
+
+    PEP8: E123 closing bracket does not match indentation of opening bracket's line
+
+commit 09e9f701994cc649fdcb73cefa34ede319a0b1ac
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 18:35:45 2013 +0000
+
+    PEP8: E122 continuation line missing indentation or outdented
+
+commit 33d969f2502204e5dae216343bc723c005191151
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 18:10:57 2013 +0000
+
+    PEP8: E251 unexpected spaces around keyword / parameter equals
+
+commit fdef31274c46426b9d4ab05767e7209a1550a79d
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:52:29 2013 +0000
+
+    PEP8: E272 multiple spaces before keyword
+
+commit bfe9527b075decf2015ea9e70f1e0284529d630f
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:51:07 2013 +0000
+
+    PEP8: E271 multiple spaces after keyword
+
+commit 0eb9562ea6cc86643f615aef863b32495cc10eef
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:50:14 2013 +0000
+
+    PEP8: E261 at least two spaces before inline comment
+
+commit fcc19cee8107478e0a8e2c21917112793b39ed68
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:48:08 2013 +0000
+
+    PEP8: E712 comparison to True/False
+    
+    Fixes to poheader.py break things so are left out for now
+
+commit f26bf7013836e3167593675e8bc21941790af7d5
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:37:16 2013 +0000
+
+    PEP8: E225 missing whitespace around operator
+
+commit ea2103d71585619a39ebed436249e6b336033391
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:22:32 2013 +0000
+
+    PEP8: W293 blank line contains whitespace
+
+commit 53450c4b98d61e653c0d11d508c2d870816f93b2
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:11:04 2013 +0000
+
+    PEP8: E202 whitespace before ']'
+
+commit 1b1914d0642e792f0443eff3588c7268f33c1a6c
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 17:05:56 2013 +0000
+
+    PEP8: W191 indentation contains tabs
+
+commit 2c36d05aac6eaf0b3131b8026393999ebc8b0b75
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 16:40:42 2013 +0000
+
+    PEP8: E711 comparison to None
+
+commit c39b7aa54138275aa0c40ccd5d058c790cd1e503
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:29:41 2013 +0000
+
+    PEP8: E502 the backslash is redundant between brackets
+
+commit 20d5708f53245f6aaaddc1267660026dfb6c191a
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:19:04 2013 +0000
+
+    PEP8: E302 expected 2 blank lines, found 1
+
+commit 674f5e44426e1cb8a556a409996deaec12c6db15
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:11:31 2013 +0000
+
+    PEP8: W391 blank line at end of file
+
+commit d6306a900928760c2abb82b749293d5dd12e0255
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:10:24 2013 +0000
+
+    PEP8: E225 missing whitespace around operator
+
+commit 0b59be74efbf21a2c7628bd05ef51d26d65eab2a
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:08:53 2013 +0000
+
+    PEP8: E272 multiple spaces before keyword
+
+commit d998eae808223a7f00c71e8e378a1f6465f01a51
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:07:29 2013 +0000
+
+    PEP8: E271 multiple spaces after keyword
+
+commit 87136a6a74a4c3978d8e9f0062604a86aeec04e7
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:04:34 2013 +0000
+
+    PEP8: E261 at least two spaces before inline comment
+
+commit fbb1dfb18458b999872ccd9ffdcfce6b0cdaedc5
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 03:02:20 2013 +0000
+
+    PEP8: W293 blank line contains whitespace
+
+commit d09c9ac1c43a1556e030492496ae6f022c49dc6d
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 02:58:40 2013 +0000
+
+    PEP8: W291 trailing whitespace
+
+commit 6a1f00edba962d6bcc20668d9acd8d95e396f9fa
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sat Nov 23 02:42:17 2013 +0000
+
+    PEP8: E101 indentation contains mixed spaces and tabs
+
+commit 76cb4dc58a551e192c60a862ad447c155deef3c2
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 19:24:10 2013 +0000
+
+    PEP8: Travis runs pep8 checks and builds docs
+
+commit 6be74539ebf89c4c38478f51e17de8c090f5a00f
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Jan 22 14:18:04 2014 +0000
+
+    PEP8: make tool usable by Pootle and Toolkit
+
+commit 5a740909953d86291f6bfe09ef447bb2974ee48a
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Nov 27 19:14:41 2013 +0000
+
+    PEP8: A pep8 test wrapper
+    
+    Has the following features:
+    - Excludes files we don't want to check e.g. those we don't maintain.
+    - Allow you to test all of the Toolkit or just a single file.
+    - Check everything, a type of check or a travis selection, where travis means
+      checks we that are consistent and we think you should pass when you check in
+      code.
+
+commit fca4078bfc819f58f8fe9048e5ae41dfb56ecbac
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Jan 22 21:46:05 2014 +0000
+
+    Bump version to 0.11.0 final
+
+commit deb64f104a8b8b92e71a3a04c689d83d2a9c34ca
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Jan 22 17:02:27 2014 +0000
+
+    Add 1.11.0 release notes
+
+commit f4076e317420373760697dec04a3e399063d65f4
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Jan 22 22:58:38 2014 +0000
+
+    Update releasing docs post 1.11.0
+
+commit 681628f9570c6506edb0ea1ce4d6a28693b610f3
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Jan 22 15:07:55 2014 +0000
+
+    Allow older python-Levenshtein to be used
+    
+    Just prohibit the broken version of python-Levenshtein. But all others
+    are still valid.
+
+commit ed9298bb97e649e2afd6cb7234a84b20aa18b45d
+Author: Khaled Hosny <khaledhosny at eglug.org>
+Date:   Thu Dec 19 15:51:08 2013 +0200
+
+    Exclude ALSA, too
+
+commit 24e7114f49349833658f2bcc0c6eab0922f41db8
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Wed Dec 18 21:32:26 2013 +0000
+
+    Exclude pulse audio when building XPI
+
+commit fb00c82ceb93a71d17f8e8744d1a7d7bb6162bfe
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Wed Dec 4 18:17:42 2013 +0100
+
+    Extend NewlinePlaceable to support more cases
+
+commit e52e6fa1387bd14d403bafc839c576bae2608a70
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Mon Dec 2 14:42:08 2013 +0000
+
+    PEP8: fix some tab whitespace errors
+
+commit d29002e4083e40368f94accfd0bc13b495f48ca9
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Mon Dec 2 14:27:12 2013 +0000
+
+    Improve po2tmx for cPO and fPO
+    
+    Slight changes to code and tests to ensure that the extraction works for other
+    PO parsers.
+
+commit 2cdf3e29496af76a8bd0190be8b1bfa4e08d166f
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sun Dec 1 19:58:01 2013 +0000
+
+    Release: retrieve the releasers sourceforge username
+
+commit c160dff91e1a93c9d0de50f45bbb15d845c8df7f
+Author: Dwayne Bailey <dwayne at translate.org.za>
+Date:   Sun Dec 1 19:56:55 2013 +0000
+
+    Docs: Toolkit born circa 2002
+
+commit 586250c6d57200eae6651fc5db9cdd34ed9c9afd
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Sun Dec 1 20:00:27 2013 +0100
+
+    Minor change in Travis config
+
+commit cbb2435f108b485d1ba6038aaf7193e14dc46ed2
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Sun Dec 1 19:26:52 2013 +0100
+
+    Cleanups
+
+commit a7bbe0602d429e714dc1d1abd7086011cd132904
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Sun Dec 1 18:34:20 2013 +0100
+
+    Cleanups
+
+commit 696821f95b375e036530cdf1915a935392e24103
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Date:   Sat Nov 30 14:44:52 2013 +0100
+
+    Travis: Install the development requirements
+    
+    Previously used requirements was not providing pytest nor Sphinx.
diff --git a/docs/_build/html/_sources/releases/1.8.1.txt b/docs/_build/html/_sources/releases/1.8.1.txt
new file mode 100644
index 0000000..d987e31
--- /dev/null
+++ b/docs/_build/html/_sources/releases/1.8.1.txt
@@ -0,0 +1,74 @@
+Translate Toolkit 1.8.1
+***********************
+
+*Released on 19 Novermber 2010*
+
+Today the Translate team released version 1.8.1 of the Translate Toolkit.  The
+Translate Toolkit contains many useful tools for translation, management, and
+quality control. It is the technology platform for Pootle, Virtaal, and other
+software.
+
+This release contains many improvements and bug fixes. It is a recommended
+upgrade for users of Pootle and Virtaal. There were over 200 commits since
+version 1.8.0.
+
+This work was made possible by volunteers and our funders:
+ - ANLoc_, funded by IDRC
+
+
+Highlighted improvements
+========================
+
+File formats:
+
+- A rewrite and major improvement of the html format and html2po_ converter
+- New JSON format introduced
+- Support for `Universal Terminology Exchange (UTX)`_ format
+- Support for `Java properties`_ files encoded in UTF-8
+- Improvements to CSV_ format, and improved compatibility with Excel exports
+- Bug fixes to `Qt .ts`_
+- Support for XLIFF_'s state attributes (pocount_ now lists detailed state
+  statistics)
+- Minor bug fixes for PHP_ format
+
+Languages and quality checks:
+
+- Support for Persian quotations
+- Major performance improvements to quality checks
+
+Pootle will regenerate all statistics with the new Translate Toolkit installed.
+Read about the `quality checks`_.
+
+Other improvements:
+
+- Improvements to stability of Lucene text indexing (affecting Pootle)
+- Parameter for po2prop_ to ignore untranslated strings
+- Many improvements to pot2po_ including Qt ts support, improved handling of
+  extra XML namespaces in XLIFF, and performance improvements.
+
+Further resources:
+
+* `Full feature list`_
+* Download_
+* Bugs_
+
+
+Happy translating!
+
+The Translate team
+
+.. _ANLoc: http://africanlocalisation.net/
+.. _html2po: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/html2po.html
+.. _Universal Terminology Exchange (UTX): http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/utx.html
+.. _Java properties: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/properties.html
+.. _CSV: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/csv.html
+.. _Qt .ts: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/ts.html
+.. _XLIFF: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/xliff.html
+.. _pocount: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pocount.html
+.. _PHP: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/php.html
+.. _quality checks: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter_tests.html
+.. _po2prop: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/prop2po.html
+.. _pot2po: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pot2po.html
+.. _Full feature list: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/features.html
+.. _Download: http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.8.1/
+.. _Bugs: http://bugs.locamotion.org/
diff --git a/docs/_build/html/_sources/releases/1.9.0.txt b/docs/_build/html/_sources/releases/1.9.0.txt
new file mode 100644
index 0000000..39add52
--- /dev/null
+++ b/docs/_build/html/_sources/releases/1.9.0.txt
@@ -0,0 +1,56 @@
+Translate Toolkit 1.9.0 Released
+********************************
+
+*Released on 12 April 2011*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes for the
+upcoming `Pootle <http://pootle.translatehouse.org>`_ 2.1.6 and `Virtaal
+<http://virtaal.translatehouse.org/>`_ 0.7.
+   
+   
+Highlighted improvements
+========================
+
+- Faster terminology matching
+- Several small optimisations to performance and memory use
+- More advanced state support (visible in `pocount
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pocount.html>`_
+  and `Virtaal <http://virtaal.translatehouse.org/>`_ 0.7)
+- Improved language detection models (+South African languages)
+- Improve handling of printf variable reordering [Jacques Beaurain]
+- Review of the wording of the messages of `pofilter
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter.html>`_
+  checks
+- Better sentence segmentation for some non-Latin languages
+- More supported formats for `podebug
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/podebug.html>`_
+- Extra options for `pomerge
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pomerge.html>`_,
+  `pogrep
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pogrep.html>`_
+  and po2oo/xliff2oo.
+
+The new `pogrep
+<http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pogrep.html>`_
+options made this `possible for GNOME
+<http://translate.org.za/blogs/friedel/en/content/better-lies-about-gnome-localisation>`_.
+
+
+Most relevant for Pootle
+------------------------
+- Support for Xapian 1.2 (:bug:`1766`) [Rimas Kudelis]
+- Work around some changes introduced in Django 1.2.5/1.3
+
+
+Format support
+--------------
+- Always use UNIX line endings for PO (even on Windows)
+- XLIFF and .ts files now shows "fuzzy" only the target present
+- Improved support for .ts comment as context (:bug:`1739`)
+- Support for Java properties in UTF-8 encoding
+- More natural string ordering in json converter
+- Improved handling of trailing spaces in Mozilla DTD files
+- Removed unused support for _old_ KDE plurals in pocount
+
+...and several small bugfixes
diff --git a/docs/_build/html/_sources/releases/index.txt b/docs/_build/html/_sources/releases/index.txt
new file mode 100644
index 0000000..3be0bb4
--- /dev/null
+++ b/docs/_build/html/_sources/releases/index.txt
@@ -0,0 +1,16 @@
+.. _release_notes:
+
+Release Notes
+*************
+
+The following are release notes used on PyPI, Sourceforge and mailing lists for
+Pootle releases.
+
+.. toctree::
+   :maxdepth: 1
+
+   1.11.0 <1.11.0>
+   1.11.0-rc1 <1.11.0-rc1>
+   1.10.0 <1.10.0>
+   1.9.0 <1.9.0>
+   1.8.1 <1.8.1>
diff --git a/docs/_build/html/_sources/styleguide.txt b/docs/_build/html/_sources/styleguide.txt
deleted file mode 100644
index 84ae330..0000000
--- a/docs/_build/html/_sources/styleguide.txt
+++ /dev/null
@@ -1,370 +0,0 @@
-.. _styleguide:
-
-Translate Styleguide
-====================
-
-The Translate styleguide is the styleguide for all Translate projects,
-including Translate Toolkit, Pootle, Virtaal and others.  Patches are required
-to follow these guidelines.
-
-This Styleguide follows :pep:`8` with some clarifications. It is based almost
-verbatim on the `Flask Styleguide`_.
-
-.. _styleguide-general:
-
-General
--------
-
-Indentation:
-  4 real spaces, no tabs. Exceptions, modules that have copied into
-  the source that don't follow this guideline.
-
-Maximum line length:
-  79 characters with a soft limit for 84 if absolutely necessary.  Try
-  to avoid too nested code by cleverly placing `break`, `continue` and
-  `return` statements.
-
-Continuing long statements:
-  To continue a statement you can use backslashes (preceeded by a space)
-  in which case you should align the next line with the last dot or
-  equal sign, or indent four spaces::
-
-    MyModel.query.filter(MyModel.scalar > 120) \
-                 .order_by(MyModel.name.desc()) \
-                 .limit(10)
-
-    my_long_assignment = MyModel.query.filter(MyModel.scalar > 120) \
-                         .order_by(MyModel.name.desc()) \
-                         .limit(10)
-
-    this_is_a_very_long(function_call, 'with many parameters') \
-        .that_returns_an_object_with_an_attribute
-
-  If you break in a statement with parentheses or braces, align to the
-  braces::
-
-    this_is_a_very_long(function_call, 'with many parameters',
-                        23, 42, 'and even more')
-
-  For lists or tuples with many items, break immediately after the
-  opening brace::
-
-    items = [
-        'this is the first', 'set of items', 'with more items',
-        'to come in this line', 'like this'
-    ]
-
-Blank lines:
-  Top level functions and classes are separated by two lines, everything
-  else by one.  Do not use too many blank lines to separate logical
-  segments in code.  Example::
-
-    def hello(name):
-        print 'Hello %s!' % name
-
-
-    def goodbye(name):
-        print 'See you %s.' % name
-
-
-    class MyClass(object):
-        """This is a simple docstring"""
-
-        def __init__(self, name):
-            self.name = name
-
-        def get_annoying_name(self):
-            return self.name.upper() + '!!!!111'
-
-Expressions and Statements
---------------------------
-
-General whitespace rules:
-  - No whitespace for unary operators that are not words
-    (e.g.: ``-``, ``~`` etc.) as well on the inner side of parentheses.
-  - Whitespace is placed between binary operators.
-
-  Good::
-
-    exp = -1.05
-    value = (item_value / item_count) * offset / exp
-    value = my_list[index]
-    value = my_dict['key']
-
-  Bad::
-
-    exp = - 1.05
-    value = ( item_value / item_count ) * offset / exp
-    value = (item_value/item_count)*offset/exp
-    value=( item_value/item_count ) * offset/exp
-    value = my_list[ index ]
-    value = my_dict ['key']
-
-Slice notation:
-  While :pep:`8` calls for spaces around operators ``a = b + c`` this
-  results in flags when you use ``a[b+1:c-1]`` but would allow
-  the rather unreadable ``a[b + 1:c - 1]`` to pass. :pep:`8` is
-  rather quiet on slice notation.
-
-  - Don't use spaces with simple variables or numbers
-  - Use brackets for expressions with spaces between binary operators
-
-  Good::
-
-    a[1:2]
-    a[start:end]
-    a[(start - 1):(end + var + 2)]  # Brackets help group things and don't hide the slice
-    a[-1:(end + 1)]
-
-  Bad::
-
-    a[start: end]  # No spaces around :
-    a[start-1:end+var+2]  # Insanely hard to read, especially when your expressions are more complex
-    a[start - 1:end + 2]  # You lose sight of the fact that it is a slice
-    a[- 1:end]  # -1 is unary, no space
-
-
-.. note::
-
-   String slice formating is still under discussion.
-
-Comparisons:
-  - against arbitrary types: ``==`` and ``!=``
-  - against singletons with ``is`` and ``is not`` (eg: ``foo is not
-    None``)
-  - never compare something with `True` or `False` (for example never
-    do ``foo == False``, do ``not foo`` instead)
-
-Negated containment checks:
-  use ``foo not in bar`` instead of ``not foo in bar``
-
-Instance checks:
-  ``isinstance(a, C)`` instead of ``type(A) is C``, but try to avoid
-  instance checks in general.  Check for features.
-
-If statements:
-  - Use ``()`` brackets around complex if statements to allow easy wrapping,
-    don't use backslash to wrap an if statements.
-  - Wrap between ``and``, ``or``, etc.
-  - Keep ``not`` with the expression
-  - Use ``()`` alignment between expressions 
-  - Use extra ``()`` to eliminate abiguity, don't rely on an understanding of
-    Python operator precedent rules.
-
-  Good::
-
-    if length >= (upper + 2)
-
-    if (length >= 25 and
-        string != "Something" and
-        not careful):
-        do_something()
-
-  Bad::
-
-    if length >= upper + 2:
-
-    if (length...
-        and string !=...
-
-
-Naming Conventions
-------------------
-
-.. note::
-
-   This has not been implemented or discussed.  The Translate code 
-   is not at all consistent with these conventions.
-
-- Class names: ``CamelCase``, with acronyms kept uppercase (``HTTPWriter`` and
-  not ``HttpWriter``)
-- Variable names: ``lowercase_with_underscores``
-- Method and function names: ``lowercase_with_underscores``
-- Constants: ``UPPERCASE_WITH_UNDERSCORES``
-- precompiled regular expressions: ``name_re``
-
-Protected members are prefixed with a single underscore.  Double underscores
-are reserved for mixin classes.
-
-On classes with keywords, trailing underscores are appended.  Clashes with
-builtins are allowed and **must not** be resolved by appending an underline to
-the variable name.  If the function needs to access a shadowed builtin, rebind
-the builtin to a different name instead.
-
-Function and method arguments:
-  - class methods: ``cls`` as first parameter
-  - instance methods: ``self`` as first parameter
-  - lambdas for properties might have the first parameter replaced with ``x``
-    like in ``display_name = property(lambda x: x.real_name or x.username)``
-
-
-.. _styleguide-docs:
-
-Documentation
-=============
-
-We use Sphinx_ to generate our API and user documentation. Read the
-`reStructuredText primer`_ and `Sphinx documentation`_ as needed.
-
-Special roles
--------------
-
-We introduce a number of special roles for documentation:
-
-* ``:bug:`` -- links to a bug in Translate's Bugzilla.
-
-  * ``:bug:`123``` gives: :bug:`123`
-  * ``:bug:`broken <123>``` gives: :bug:`broken <123>`
-
-* ``:opt:`` -- mark command options and command values.
-
-  * ``:opt:`-P``` gives :opt:`-P`
-  * ``:opt:`--progress=dots``` gives :opt:`--proress=dots`
-  * ``:opt:`dots``` gives :opt:`dots`
-
-* ``:man:`` -- link to a Linux man page.
-
-  * ``:man:`msgfmt``` gives :man:msgfmt
-
-Docstrings
-----------
-
-Docstring conventions:
-  All docstrings are formatted with reStructuredText as understood by
-  Sphinx.  Depending on the number of lines in the docstring, they are
-  laid out differently.  If it's just one line, the closing triple
-  quote is on the same line as the opening, otherwise the text is on
-  the same line as the opening quote and the triple quote that closes
-  the string on its own line::
-
-    def foo():
-        """This is a simple docstring."""
-
-
-    def bar():
-        """This is a longer docstring with so much information in there
-        that it spans three lines.  In this case the closing triple quote
-        is on its own line.
-        """
-
-Please read :pep:`257` (Docstring Conventions) for a general overview,
-the important parts though are:
-
-- A docstring should have a brief one-line summary, ending with a period.
-- If there are more details there should be a blank line between the one-line
-  summary and the rest of the text.  Use pragraphs and formating as needed.
-- Use `reST field lists`_ to describe the input parameters and/or return types
-  as the last part of the docstring.
-- Use proper capitalisation and punctuation.
-- Don't restate things that would appear in parameter descriptions.
-
-::
-
-    def foo(bar):
-        """One line description.
-
-        Further explanations that might be needed.
-
-        :param bar: Parameter descriptions.
-        """
-
-::
-
-    def addunit(self, unit):
-        """Appends the given unit to the object's list of units.
-
-        This method should always be used rather than trying to modify the
-        list manually.
-
-        :type unit: TranslationUnit
-        :param unit: Any object that inherits from :class:`TranslationUnit`.
-        """
-        self.units.append(unit)
-
-Parameter documentation:
-  Document parameters using `reST field lists`_ as follows::
-
-    def foo(bar):
-        """Simple docstring
-
-        :param bar: Something
-        :type bar: Some type
-        :return: Returns something
-        :rtype: Return type 
-        """
-
-Cross refencing code:
-   When talking about other objects, methods, functions and variables
-   it is good practice to cross-reference them with Sphinx's `Python
-   cross-referencing`_.
-
-Other directives:
-   Use `paragraph-level markup`_ when needed.
-
-.. note::
-
-   We still Need to gather the useful ones that we want you to use and how to use
-   then.  E.g. how to talk about a paramter in the docstring.  How to reference
-   classes in the module.  How to reference other modules, etc.
-
-
-Module header:
-  The module header consists of an utf-8 encoding declaration, copyright
-  attribution, license block and a standard docstring::
-
-    # -*- coding: utf-8 -*-
-    #
-    ... LICENSE BLOCK...
-
-    """A brief description"""
-
-..    """
-        package.module
-        ~~~~~~~~~~~~~~
-
-..        A brief description goes here.
-
-..        :copyright: (c) YEAR by AUTHOR.
-        :license: LICENSE_NAME, see LICENSE_FILE for more details.
-    """
-
-
-Comments
---------
-
-General:
-  - The ``#`` symbol (pound or hash) is used to start comments.
-  - A space must follow the ``#`` between any written text.
-  - Line length must be observed.
-  - Inline comments are preceeded by two spaces.
-  - Write sentences correctly: proper capitalisation and punctuation.
-
-  Good::
-
-    # Good comment with space before and full sentence.
-    statement  # Good comment with two spaces
-
-  Bad::
-
-    #Bad comment no space before
-    statement # Bad comment, needs two spaces
-
-Docstring comments:
-  Rules for comments are similar to docstrings.  Both are formatted with
-  reStructuredText.  If a comment is used to document an attribute, put a
-  colon after the opening pound sign (``#``)::
-
-    class User(object):
-        #: the name of the user as unicode string
-        name = Column(String)
-        #: the sha1 hash of the password + inline salt
-        pw_hash = Column(String)
-
-
-.. _Flask Styleguide: http://flask.pocoo.org/docs/styleguide/
-.. _reST field lists: http://sphinx.pocoo.org/domains.html#info-field-lists
-.. _Python cross-referencing: http://sphinx.pocoo.org/domains.html#cross-referencing-python-objects
-.. _Sphinx: http://sphinx.pocoo.org/
-.. _reStructuredText primer: http://sphinx.pocoo.org/rest.html
-.. _Sphinx documentation: http://sphinx.pocoo.org/contents.html
-.. _paragraph-level markup: http://sphinx.pocoo.org/markup/para.html#paragraph-level-markup
diff --git a/docs/_build/html/_static/README.txt b/docs/_build/html/_static/README.txt
new file mode 100644
index 0000000..47ec725
--- /dev/null
+++ b/docs/_build/html/_static/README.txt
@@ -0,0 +1 @@
+In this directory go static files, for example images.
diff --git a/docs/_build/html/_static/basic.css b/docs/_build/html/_static/basic.css
index 43e8baf..c959cf0 100644
--- a/docs/_build/html/_static/basic.css
+++ b/docs/_build/html/_static/basic.css
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -89,6 +89,7 @@ div.sphinxsidebar #searchbox input[type="submit"] {
 
 img {
     border: 0;
+    max-width: 100%;
 }
 
 /* -- search page ----------------------------------------------------------- */
@@ -401,10 +402,6 @@ dl.glossary dt {
     margin: 0;
 }
 
-.refcount {
-    color: #060;
-}
-
 .optional {
     font-size: 1.3em;
 }
diff --git a/docs/_build/html/_static/doctools.js b/docs/_build/html/_static/doctools.js
index d4619fd..2036e5f 100644
--- a/docs/_build/html/_static/doctools.js
+++ b/docs/_build/html/_static/doctools.js
@@ -4,7 +4,7 @@
  *
  * Sphinx JavaScript utilities for all documentation.
  *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -32,7 +32,7 @@ if (!window.console || !console.firebug) {
  */
 jQuery.urldecode = function(x) {
   return decodeURIComponent(x).replace(/\+/g, ' ');
-}
+};
 
 /**
  * small helper function to urlencode strings
@@ -62,18 +62,6 @@ jQuery.getQueryParameters = function(s) {
 };
 
 /**
- * small function to check if an array contains
- * a given item.
- */
-jQuery.contains = function(arr, item) {
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i] == item)
-      return true;
-  }
-  return false;
-};
-
-/**
  * highlight a given string on a jquery object by wrapping it in
  * span elements with the given class name.
  */
@@ -180,6 +168,9 @@ var Documentation = {
     var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
     if (terms.length) {
       var body = $('div.body');
+      if (!body.length) {
+        body = $('body');
+      }
       window.setTimeout(function() {
         $.each(terms, function() {
           body.highlightText(this.toLowerCase(), 'highlighted');
diff --git a/docs/_build/html/_static/font/fontawesome-webfont.eot b/docs/_build/html/_static/font/fontawesome-webfont.eot
old mode 100755
new mode 100644
diff --git a/docs/_build/html/_static/font/fontawesome-webfont.svg b/docs/_build/html/_static/font/fontawesome-webfont.svg
old mode 100755
new mode 100644
diff --git a/docs/_build/html/_static/font/fontawesome-webfont.ttf b/docs/_build/html/_static/font/fontawesome-webfont.ttf
old mode 100755
new mode 100644
diff --git a/docs/_build/html/_static/font/fontawesome-webfont.woff b/docs/_build/html/_static/font/fontawesome-webfont.woff
old mode 100755
new mode 100644
diff --git a/docs/_build/html/_static/pygments.css b/docs/_build/html/_static/pygments.css
index 1a14f2a..d79caa1 100644
--- a/docs/_build/html/_static/pygments.css
+++ b/docs/_build/html/_static/pygments.css
@@ -13,11 +13,11 @@
 .highlight .gr { color: #FF0000 } /* Generic.Error */
 .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
 .highlight .gi { color: #00A000 } /* Generic.Inserted */
-.highlight .go { color: #303030 } /* Generic.Output */
+.highlight .go { color: #333333 } /* Generic.Output */
 .highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
 .highlight .gs { font-weight: bold } /* Generic.Strong */
 .highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .gt { color: #0044DD } /* Generic.Traceback */
 .highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
 .highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
 .highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
diff --git a/docs/_build/html/_static/searchtools.js b/docs/_build/html/_static/searchtools.js
index 663be4c..f5c7e5f 100644
--- a/docs/_build/html/_static/searchtools.js
+++ b/docs/_build/html/_static/searchtools.js
@@ -4,38 +4,11 @@
  *
  * Sphinx JavaScript utilties for the full-text search.
  *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
 
-/**
- * helper function to return a node containing the
- * search summary for a given text. keywords is a list
- * of stemmed words, hlwords is the list of normal, unstemmed
- * words. the first one is used to find the occurance, the
- * latter for highlighting it.
- */
-
-jQuery.makeSearchSummary = function(text, keywords, hlwords) {
-  var textLower = text.toLowerCase();
-  var start = 0;
-  $.each(keywords, function() {
-    var i = textLower.indexOf(this.toLowerCase());
-    if (i > -1)
-      start = i;
-  });
-  start = Math.max(start - 120, 0);
-  var excerpt = ((start > 0) ? '...' : '') +
-  $.trim(text.substr(start, 240)) +
-  ((start + 240 - text.length) ? '...' : '');
-  var rv = $('<div class="context"></div>').text(excerpt);
-  $.each(hlwords, function() {
-    rv = rv.highlightText(this, 'highlighted');
-  });
-  return rv;
-}
-
 
 /**
  * Porter Stemmer
@@ -220,6 +193,38 @@ var Stemmer = function() {
 }
 
 
+
+/**
+ * Simple result scoring code.
+ */
+var Scorer = {
+  // Implement the following function to further tweak the score for each result
+  // The function takes a result array [filename, title, anchor, descr, score]
+  // and returns the new score.
+  /*
+  score: function(result) {
+    return result[4];
+  },
+  */
+
+  // query matches the full name of an object
+  objNameMatch: 11,
+  // or matches in the last dotted part of the object name
+  objPartialMatch: 6,
+  // Additive scores depending on the priority of the object
+  objPrio: {0:  15,   // used to be importantResults
+            1:  5,   // used to be objectResults
+            2: -5},  // used to be unimportantResults
+  //  Used when the priority is not in the mapping.
+  objPrioDefault: 0,
+
+  // query found in title
+  title: 15,
+  // query found in terms
+  term: 5
+};
+
+
 /**
  * Search Module
  */
@@ -239,8 +244,13 @@ var Search = {
   },
 
   loadIndex : function(url) {
-    $.ajax({type: "GET", url: url, data: null, success: null,
-            dataType: "script", cache: true});
+    $.ajax({type: "GET", url: url, data: null,
+            dataType: "script", cache: true,
+            complete: function(jqxhr, textstatus) {
+              if (textstatus != "success") {
+                document.getElementById("searchindexloader").src = url;
+              }
+            }});
   },
 
   setIndex : function(index) {
@@ -268,19 +278,20 @@ var Search = {
     if (this._pulse_status >= 0)
         return;
     function pulse() {
+      var i;
       Search._pulse_status = (Search._pulse_status + 1) % 4;
       var dotString = '';
-      for (var i = 0; i < Search._pulse_status; i++)
+      for (i = 0; i < Search._pulse_status; i++)
         dotString += '.';
       Search.dots.text(dotString);
       if (Search._pulse_status > -1)
         window.setTimeout(pulse, 500);
-    };
+    }
     pulse();
   },
 
   /**
-   * perform a search for something
+   * perform a search for something (or wait until index is loaded)
    */
   performSearch : function(query) {
     // create the required interface elements
@@ -300,41 +311,46 @@ var Search = {
       this.deferQuery(query);
   },
 
+  /**
+   * execute search (requires search index to be loaded)
+   */
   query : function(query) {
-    var stopwords = ["and","then","into","it","as","are","in","if","for","no","there","their","was","is","be","to","that","but","they","not","such","with","by","a","on","these","of","will","this","near","the","or","at"];
+    var i;
+    var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
 
-    // Stem the searchterms and add them to the correct list
+    // stem the searchterms and add them to the correct list
     var stemmer = new Stemmer();
     var searchterms = [];
     var excluded = [];
     var hlterms = [];
     var tmp = query.split(/\s+/);
     var objectterms = [];
-    for (var i = 0; i < tmp.length; i++) {
-      if (tmp[i] != "") {
+    for (i = 0; i < tmp.length; i++) {
+      if (tmp[i] !== "") {
           objectterms.push(tmp[i].toLowerCase());
       }
 
-      if ($u.indexOf(stopwords, tmp[i]) != -1 || tmp[i].match(/^\d+$/) ||
-          tmp[i] == "") {
+      if ($u.indexOf(stopwords, tmp[i].toLowerCase()) != -1 || tmp[i].match(/^\d+$/) ||
+          tmp[i] === "") {
         // skip this "word"
         continue;
       }
       // stem the word
-      var word = stemmer.stemWord(tmp[i]).toLowerCase();
+      var word = stemmer.stemWord(tmp[i].toLowerCase());
+      var toAppend;
       // select the correct list
       if (word[0] == '-') {
-        var toAppend = excluded;
+        toAppend = excluded;
         word = word.substr(1);
       }
       else {
-        var toAppend = searchterms;
+        toAppend = searchterms;
         hlterms.push(tmp[i].toLowerCase());
       }
       // only add if not already in the list
-      if (!$.contains(toAppend, word))
+      if (!$u.contains(toAppend, word))
         toAppend.push(word);
-    };
+    }
     var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
 
     // console.debug('SEARCH: searching for:');
@@ -342,89 +358,51 @@ var Search = {
     // console.info('excluded: ', excluded);
 
     // prepare search
-    var filenames = this._index.filenames;
-    var titles = this._index.titles;
     var terms = this._index.terms;
-    var fileMap = {};
-    var files = null;
-    // different result priorities
-    var importantResults = [];
-    var objectResults = [];
-    var regularResults = [];
-    var unimportantResults = [];
+    var titleterms = this._index.titleterms;
+
+    // array of [filename, title, anchor, descr, score]
+    var results = [];
     $('#search-progress').empty();
 
     // lookup as object
-    for (var i = 0; i < objectterms.length; i++) {
-      var others = [].concat(objectterms.slice(0,i),
-                             objectterms.slice(i+1, objectterms.length))
-      var results = this.performObjectSearch(objectterms[i], others);
-      // Assume first word is most likely to be the object,
-      // other words more likely to be in description.
-      // Therefore put matches for earlier words first.
-      // (Results are eventually used in reverse order).
-      objectResults = results[0].concat(objectResults);
-      importantResults = results[1].concat(importantResults);
-      unimportantResults = results[2].concat(unimportantResults);
+    for (i = 0; i < objectterms.length; i++) {
+      var others = [].concat(objectterms.slice(0, i),
+                             objectterms.slice(i+1, objectterms.length));
+      results = results.concat(this.performObjectSearch(objectterms[i], others));
     }
 
-    // perform the search on the required terms
-    for (var i = 0; i < searchterms.length; i++) {
-      var word = searchterms[i];
-      // no match but word was a required one
-      if ((files = terms[word]) == null)
-        break;
-      if (files.length == undefined) {
-        files = [files];
-      }
-      // create the mapping
-      for (var j = 0; j < files.length; j++) {
-        var file = files[j];
-        if (file in fileMap)
-          fileMap[file].push(word);
-        else
-          fileMap[file] = [word];
-      }
-    }
-
-    // now check if the files don't contain excluded terms
-    for (var file in fileMap) {
-      var valid = true;
-
-      // check if all requirements are matched
-      if (fileMap[file].length != searchterms.length)
-        continue;
-
-      // ensure that none of the excluded terms is in the
-      // search result.
-      for (var i = 0; i < excluded.length; i++) {
-        if (terms[excluded[i]] == file ||
-            $.contains(terms[excluded[i]] || [], file)) {
-          valid = false;
-          break;
-        }
-      }
+    // lookup as search terms in fulltext
+    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, Scorer.term))
+                     .concat(this.performTermsSearch(searchterms, excluded, titleterms, Scorer.title));
 
-      // if we have still a valid result we can add it
-      // to the result list
-      if (valid)
-        regularResults.push([filenames[file], titles[file], '', null]);
+    // let the scorer override scores with a custom scoring function
+    if (Scorer.score) {
+      for (i = 0; i < results.length; i++)
+        results[i][4] = Scorer.score(results[i]);
     }
 
-    // delete unused variables in order to not waste
-    // memory until list is retrieved completely
-    delete filenames, titles, terms;
-
-    // now sort the regular results descending by title
-    regularResults.sort(function(a, b) {
-      var left = a[1].toLowerCase();
-      var right = b[1].toLowerCase();
-      return (left > right) ? -1 : ((left < right) ? 1 : 0);
+    // now sort the results by score (in opposite order of appearance, since the
+    // display function below uses pop() to retrieve items) and then
+    // alphabetically
+    results.sort(function(a, b) {
+      var left = a[4];
+      var right = b[4];
+      if (left > right) {
+        return 1;
+      } else if (left < right) {
+        return -1;
+      } else {
+        // same score: sort alphabetically
+        left = a[1].toLowerCase();
+        right = b[1].toLowerCase();
+        return (left > right) ? -1 : ((left < right) ? 1 : 0);
+      }
     });
 
-    // combine all results
-    var results = unimportantResults.concat(regularResults)
-      .concat(objectResults).concat(importantResults);
+    // for debugging
+    //Search.lastresults = results.slice();  // a copy
+    //console.info('search results:', Search.lastresults);
 
     // print the results
     var resultCount = results.length;
@@ -433,7 +411,7 @@ var Search = {
       if (results.length) {
         var item = results.pop();
         var listItem = $('<li style="display:none"></li>');
-        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX == '') {
+        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX === '') {
           // dirhtml builder
           var dirname = item[0] + '/';
           if (dirname.match(/\/index\/$/)) {
@@ -457,16 +435,18 @@ var Search = {
             displayNextItem();
           });
         } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
-          $.get(DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' +
-                item[0] + '.txt', function(data) {
-            if (data != '') {
-              listItem.append($.makeSearchSummary(data, searchterms, hlterms));
-              Search.output.append(listItem);
-            }
-            listItem.slideDown(5, function() {
-              displayNextItem();
-            });
-          }, "text");
+          $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[0] + '.txt',
+                  dataType: "text",
+                  complete: function(jqxhr, textstatus) {
+                    var data = jqxhr.responseText;
+                    if (data !== '') {
+                      listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
+                    }
+                    Search.output.append(listItem);
+                    listItem.slideDown(5, function() {
+                      displayNextItem();
+                    });
+                  }});
         } else {
           // no source available, just display title
           Search.output.append(listItem);
@@ -489,20 +469,32 @@ var Search = {
     displayNextItem();
   },
 
+  /**
+   * search for object names
+   */
   performObjectSearch : function(object, otherterms) {
     var filenames = this._index.filenames;
     var objects = this._index.objects;
     var objnames = this._index.objnames;
     var titles = this._index.titles;
 
-    var importantResults = [];
-    var objectResults = [];
-    var unimportantResults = [];
+    var i;
+    var results = [];
 
     for (var prefix in objects) {
       for (var name in objects[prefix]) {
         var fullname = (prefix ? prefix + '.' : '') + name;
         if (fullname.toLowerCase().indexOf(object) > -1) {
+          var score = 0;
+          var parts = fullname.split('.');
+          // check for different match types: exact matches of full name or
+          // "last name" (i.e. last dotted part)
+          if (fullname == object || parts[parts.length - 1] == object) {
+            score += Scorer.objNameMatch;
+          // matches in last name
+          } else if (parts[parts.length - 1].indexOf(object) > -1) {
+            score += Scorer.objPartialMatch;
+          }
           var match = objects[prefix][name];
           var objname = objnames[match[1]][2];
           var title = titles[match[0]];
@@ -512,7 +504,7 @@ var Search = {
             var haystack = (prefix + ' ' + name + ' ' +
                             objname + ' ' + title).toLowerCase();
             var allfound = true;
-            for (var i = 0; i < otherterms.length; i++) {
+            for (i = 0; i < otherterms.length; i++) {
               if (haystack.indexOf(otherterms[i]) == -1) {
                 allfound = false;
                 break;
@@ -523,37 +515,107 @@ var Search = {
             }
           }
           var descr = objname + _(', in ') + title;
-          anchor = match[3];
-          if (anchor == '')
+
+          var anchor = match[3];
+          if (anchor === '')
             anchor = fullname;
           else if (anchor == '-')
             anchor = objnames[match[1]][1] + '-' + fullname;
-          result = [filenames[match[0]], fullname, '#'+anchor, descr];
-          switch (match[2]) {
-          case 1: objectResults.push(result); break;
-          case 0: importantResults.push(result); break;
-          case 2: unimportantResults.push(result); break;
+          // add custom score for some objects according to scorer
+          if (Scorer.objPrio.hasOwnProperty(match[2])) {
+            score += Scorer.objPrio[match[2]];
+          } else {
+            score += Scorer.objPrioDefault;
           }
+          results.push([filenames[match[0]], fullname, '#'+anchor, descr, score]);
         }
       }
     }
 
-    // sort results descending
-    objectResults.sort(function(a, b) {
-      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
-    });
+    return results;
+  },
 
-    importantResults.sort(function(a, b) {
-      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
-    });
+  /**
+   * search for full-text terms in the index
+   */
+  performTermsSearch : function(searchterms, excluded, terms, score) {
+    var filenames = this._index.filenames;
+    var titles = this._index.titles;
 
-    unimportantResults.sort(function(a, b) {
-      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
-    });
+    var i, j, file, files;
+    var fileMap = {};
+    var results = [];
+
+    // perform the search on the required terms
+    for (i = 0; i < searchterms.length; i++) {
+      var word = searchterms[i];
+      // no match but word was a required one
+      if ((files = terms[word]) === undefined)
+        break;
+      if (files.length === undefined) {
+        files = [files];
+      }
+      // create the mapping
+      for (j = 0; j < files.length; j++) {
+        file = files[j];
+        if (file in fileMap)
+          fileMap[file].push(word);
+        else
+          fileMap[file] = [word];
+      }
+    }
+
+    // now check if the files don't contain excluded terms
+    for (file in fileMap) {
+      var valid = true;
+
+      // check if all requirements are matched
+      if (fileMap[file].length != searchterms.length)
+          continue;
+
+      // ensure that none of the excluded terms is in the search result
+      for (i = 0; i < excluded.length; i++) {
+        if (terms[excluded[i]] == file ||
+          $u.contains(terms[excluded[i]] || [], file)) {
+          valid = false;
+          break;
+        }
+      }
+
+      // if we have still a valid result we can add it to the result list
+      if (valid) {
+        results.push([filenames[file], titles[file], '', null, score]);
+      }
+    }
+    return results;
+  },
 
-    return [importantResults, objectResults, unimportantResults]
+  /**
+   * helper function to return a node containing the
+   * search summary for a given text. keywords is a list
+   * of stemmed words, hlwords is the list of normal, unstemmed
+   * words. the first one is used to find the occurance, the
+   * latter for highlighting it.
+   */
+  makeSearchSummary : function(text, keywords, hlwords) {
+    var textLower = text.toLowerCase();
+    var start = 0;
+    $.each(keywords, function() {
+      var i = textLower.indexOf(this.toLowerCase());
+      if (i > -1)
+        start = i;
+    });
+    start = Math.max(start - 120, 0);
+    var excerpt = ((start > 0) ? '...' : '') +
+      $.trim(text.substr(start, 240)) +
+      ((start + 240 - text.length) ? '...' : '');
+    var rv = $('<div class="context"></div>').text(excerpt);
+    $.each(hlwords, function() {
+      rv = rv.highlightText(this, 'highlighted');
+    });
+    return rv;
   }
-}
+};
 
 $(document).ready(function() {
   Search.init();
diff --git a/docs/_build/html/_static/tbx_levels_structure.png b/docs/_build/html/_static/tbx_levels_structure.png
deleted file mode 100644
index 16d10d2..0000000
Binary files a/docs/_build/html/_static/tbx_levels_structure.png and /dev/null differ
diff --git a/docs/_build/html/_static/underscore.js b/docs/_build/html/_static/underscore.js
index 5d89914..5b55f32 100644
--- a/docs/_build/html/_static/underscore.js
+++ b/docs/_build/html/_static/underscore.js
@@ -1,23 +1,31 @@
-// Underscore.js 0.5.5
-// (c) 2009 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the terms of the MIT license.
-// Portions of Underscore are inspired by or borrowed from Prototype.js,
+// Underscore.js 1.3.1
+// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
 // Oliver Steele's Functional, and John Resig's Micro-Templating.
 // For all details and documentation:
-// http://documentcloud.github.com/underscore/
-(function(){var j=this,n=j._,i=function(a){this._wrapped=a},m=typeof StopIteration!=="undefined"?StopIteration:"__break__",b=j._=function(a){return new i(a)};if(typeof exports!=="undefined")exports._=b;var k=Array.prototype.slice,o=Array.prototype.unshift,p=Object.prototype.toString,q=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;b.VERSION="0.5.5";b.each=function(a,c,d){try{if(a.forEach)a.forEach(c,d);else if(b.isArray(a)||b.isArguments(a))for(var e=0,f=a.length [...]
-a[e],e,a);else{var g=b.keys(a);f=g.length;for(e=0;e<f;e++)c.call(d,a[g[e]],g[e],a)}}catch(h){if(h!=m)throw h;}return a};b.map=function(a,c,d){if(a&&b.isFunction(a.map))return a.map(c,d);var e=[];b.each(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(a&&b.isFunction(a.reduce))return a.reduce(b.bind(d,e),c);b.each(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(a&&b.isFunction(a.reduceRight))return a.reduceRight(b.bin [...]
-var f=b.clone(b.toArray(a)).reverse();b.each(f,function(g,h){c=d.call(e,c,g,h,a)});return c};b.detect=function(a,c,d){var e;b.each(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.select=function(a,c,d){if(a&&b.isFunction(a.filter))return a.filter(c,d);var e=[];b.each(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];b.each(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.all=function(a,c,d){c=c||b.identity;if(a&&b [...]
-d);var e=true;b.each(a,function(f,g,h){(e=e&&c.call(d,f,g,h))||b.breakLoop()});return e};b.any=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.some))return a.some(c,d);var e=false;b.each(a,function(f,g,h){if(e=c.call(d,f,g,h))b.breakLoop()});return e};b.include=function(a,c){if(b.isArray(a))return b.indexOf(a,c)!=-1;var d=false;b.each(a,function(e){if(d=e===c)b.breakLoop()});return d};b.invoke=function(a,c){var d=b.rest(arguments,2);return b.map(a,function(e){return(c?e[c]:e).apply( [...]
-function(a,c){return b.map(a,function(d){return d[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g>=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g<e.computed&&(e={value:f,computed:g})});return e.value};b.sortBy=function(a,c,d){retur [...]
-function(e,f,g){return{value:e,criteria:c.call(d,e,f,g)}}).sort(function(e,f){e=e.criteria;f=f.criteria;return e<f?-1:e>f?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d||b.identity;for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?(e=g+1):(f=g)}return e};b.toArray=function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return k.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=function(a,c,d){return  [...]
-0,c):a[0]};b.rest=function(a,c,d){return k.call(a,b.isUndefined(c)||d?1:c)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.select(a,function(c){return!!c})};b.flatten=function(a){return b.reduce(a,[],function(c,d){if(b.isArray(d))return c.concat(b.flatten(d));c.push(d);return c})};b.without=function(a){var c=b.rest(arguments);return b.select(a,function(d){return!b.include(c,d)})};b.uniq=function(a,c){return b.reduce(a,[],function(d,e,f){if(0==f||(c===true?b.last( [...]
-e)))d.push(e);return d})};b.intersect=function(a){var c=b.rest(arguments);return b.select(b.uniq(a),function(d){return b.all(c,function(e){return b.indexOf(e,d)>=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e<c;e++)d[e]=b.pluck(a,String(e));return d};b.indexOf=function(a,c){if(a.indexOf)return a.indexOf(c);for(var d=0,e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,c){if(a.lastIndexOf)return a.lastIndexO [...]
-a.length;d--;)if(a[d]===c)return d;return-1};b.range=function(a,c,d){var e=b.toArray(arguments),f=e.length<=1;a=f?0:e[0];c=f?e[0]:e[1];d=e[2]||1;e=Math.ceil((c-a)/d);if(e<=0)return[];e=new Array(e);f=a;for(var g=0;1;f+=d){if((d>0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c||j,d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);b.each(c,function(d){a[d]=b.bind( [...]
-return a};b.delay=function(a,c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=function(a){if(b.isArray(a))return b.ran [...]
-var c=[];for(var d in a)q.call(a,d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.select(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a,c){for(var d in c)a[d]=c[d];return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c|| [...]
-if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a [...]
-0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=function(a){return!!(a&&a.concat&&a.unshift)};b.isArguments=function(a){return a&&b.isNumber(a.length)&&!b.isArray(a)&&!r.call(a,"length")};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return p.call(a)==="[object Number]"};b.isDate=function(a){return!!(a&&a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=func [...]
-a.test&&a.exec&&(a.ignoreCase||a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){j._=n;return this};b.identity=function(a){return a};b.breakLoop=function(){throw m;};var s=0;b.uniqueId=function(a){var c=s++;return a?a+c:c};b.template=function(a,c){a=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.re [...]
-" ").replace(/'(?=[^%]*%>)/g,"\t").split("'").join("\\'").split("\t").join("'").replace(/<%=(.+?)%>/g,"',$1,'").split("<%").join("');").split("%>").join("p.push('")+"');}return p.join('');");return c?a(c):a};b.forEach=b.each;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.filter=b.select;b.every=b.all;b.some=b.any;b.head=b.first;b.tail=b.rest;b.methods=b.functions;var l=function(a,c){return c?b(a).chain():a};b.each(b.functions(b),function(a){var c=b[a];i.prototype[a]=function(){var d=b [...]
-o.call(d,this._wrapped);return l(c.apply(b,d),this._chain)}});b.each(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){c.apply(this._wrapped,arguments);return l(this._wrapped,this._chain)}});b.each(["concat","join","slice"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){return l(c.apply(this._wrapped,arguments),this._chain)}});i.prototype.chain=function(){this._chain=true;return this};i.prototype.valu [...]
+// http://documentcloud.github.com/underscore
+(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object [...]
+c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h i [...]
+h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var [...]
+b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===n)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===n)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(x&&a.map===x)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.l [...]
+null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.f [...]
+function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g, [...]
+e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d) [...]
+function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&(e={value:a [...]
+return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){f==0?b[0]=a:(d=Math.floor(Math.random()*(f+1)),b[f]=b[d],b[d]=a)});return b};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,g){return{value:a,criteria:c.call(d,a,b,g)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedInd [...]
+c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:a.toArray?a.toArray():b.isArray(a)?i.call(a):b.isArguments(a)?i.call(a):b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length- [...]
+b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,e=[];b.reduce(d,function(d,g,h){if(0==h||(c===true?b.last(d)!=g:!b.include(d,g)))d[d.length]=g,e[e.length]=a[h];retur [...]
+return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=func [...]
+d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(p&&a.indexOf===p)return a.indexOf(c);for(d=0,e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(D&&a.lastIndexOf===D)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d; [...]
+var F=function(){};b.bind=function(a,c){var d,e;if(a.bind===s&&s)return s.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));F.prototype=a.prototype;var b=new F,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.mem [...]
+c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i=b.debounce(function(){h=g=false},c);return function(){d=this;e=arguments;var b;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);i()},c)) [...]
+a.apply(d,e);i();g=true}};b.debounce=function(a,b){var d;return function(){var e=this,f=arguments;clearTimeout(d);d=setTimeout(function(){d=null;a.apply(e,f)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)] [...]
+b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function( [...]
+1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){ret [...]
+b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a) [...]
+b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.mixin [...]
+function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return [...]
+u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=func [...]
+function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.ch [...]
+true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
diff --git a/docs/_build/html/_static/websupport.js b/docs/_build/html/_static/websupport.js
index e9bd1b8..19fcda5 100644
--- a/docs/_build/html/_static/websupport.js
+++ b/docs/_build/html/_static/websupport.js
@@ -4,7 +4,7 @@
  *
  * sphinx.websupport utilties for all documentation.
  *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
diff --git a/docs/_build/html/api/convert.html b/docs/_build/html/api/convert.html
index 7ec3b71..0dff9bb 100644
--- a/docs/_build/html/api/convert.html
+++ b/docs/_build/html/api/convert.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>convert — Translate Toolkit 1.9.0 documentation</title>
+    <title>convert — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
     <link rel="next" title="filters" href="filters.html" />
     <link rel="prev" title="API" href="index.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -142,10 +144,11 @@
   <li><a href="filters.html"
          title="next chapter">filters »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -237,7 +240,7 @@ contain accesskeys.</p>
 <div class="section" id="id1">
 <h2>convert<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
 <span class="target" id="module-translate.convert.convert"></span><p>Handles converting of files between formats (used by
-<a class="reference internal" href="index.html#module-translate.convert" title="translate.convert"><tt class="xref py py-mod docutils literal"><span class="pre">translate.convert</span></tt></a> tools).</p>
+<a class="reference internal" href="#module-translate.convert" title="translate.convert"><tt class="xref py py-mod docutils literal"><span class="pre">translate.convert</span></tt></a> tools).</p>
 <dl class="class">
 <dt id="translate.convert.convert.ArchiveConvertOptionParser">
 <em class="property">class </em><tt class="descclassname">translate.convert.convert.</tt><tt class="descname">ArchiveConvertOptionParser</tt><big>(</big><em>formats</em>, <em>usetemplates=False</em>, <em>usepots=False</em>, <em>description=None</em>, <em>archiveformats=None</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ArchiveConvertOptionParser" title="Permalink to this definition">¶</a></dt>
@@ -271,6 +274,13 @@ given as <tt class="docutils literal"><span class="pre">(extension,</span> <span
 </dd></dl>
 
 <dl class="method">
+<dt id="translate.convert.convert.ArchiveConvertOptionParser.add_threshold_option">
+<tt class="descname">add_threshold_option</tt><big>(</big><em>default=None</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ArchiveConvertOptionParser.add_threshold_option" title="Permalink to this definition">¶</a></dt>
+<dd><p>Adds an option to output only stores where translation percentage
+exceeds the threshold.</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="translate.convert.convert.ArchiveConvertOptionParser.check_values">
 <tt class="descname">check_values</tt><big>(</big><em>values : Values, args : [string]</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ArchiveConvertOptionParser.check_values" title="Permalink to this definition">¶</a></dt>
 <dd><p>-> (values : Values, args : [string])</p>
@@ -652,6 +662,12 @@ formats etc.</p>
 </dd></dl>
 
 <dl class="method">
+<dt id="translate.convert.convert.ArchiveConvertOptionParser.settimestampoption">
+<tt class="descname">settimestampoption</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.convert.convert.ArchiveConvertOptionParser.settimestampoption" title="Permalink to this definition">¶</a></dt>
+<dd><p>Sets <tt class="docutils literal"><span class="pre">-S</span></tt>/<tt class="docutils literal"><span class="pre">--timestamp</span></tt> option.</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="translate.convert.convert.ArchiveConvertOptionParser.splitext">
 <tt class="descname">splitext</tt><big>(</big><em>pathname</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ArchiveConvertOptionParser.splitext" title="Permalink to this definition">¶</a></dt>
 <dd><p>Splits <em>pathname</em> into name and ext, and removes the extsep.</p>
@@ -659,7 +675,7 @@ formats etc.</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -731,6 +747,13 @@ present, etc).</p>
 </dd></dl>
 
 <dl class="method">
+<dt id="translate.convert.convert.ConvertOptionParser.add_threshold_option">
+<tt class="descname">add_threshold_option</tt><big>(</big><em>default=None</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ConvertOptionParser.add_threshold_option" title="Permalink to this definition">¶</a></dt>
+<dd><p>Adds an option to output only stores where translation percentage
+exceeds the threshold.</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="translate.convert.convert.ConvertOptionParser.check_values">
 <tt class="descname">check_values</tt><big>(</big><em>values : Values, args : [string]</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ConvertOptionParser.check_values" title="Permalink to this definition">¶</a></dt>
 <dd><p>-> (values : Values, args : [string])</p>
@@ -975,12 +998,6 @@ name.  Does nothing if self.version is empty or undefined.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.convert.convert.ConvertOptionParser.processfile">
-<tt class="descname">processfile</tt><big>(</big><em>fileprocessor</em>, <em>options</em>, <em>fullinputpath</em>, <em>fulloutputpath</em>, <em>fulltemplatepath</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ConvertOptionParser.processfile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Process an individual file.</p>
-</dd></dl>
-
-<dl class="method">
 <dt id="translate.convert.convert.ConvertOptionParser.recurseinputfilelist">
 <tt class="descname">recurseinputfilelist</tt><big>(</big><em>options</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ConvertOptionParser.recurseinputfilelist" title="Permalink to this definition">¶</a></dt>
 <dd><p>Use a list of files, and find a common base directory for them.</p>
@@ -1069,6 +1086,12 @@ formats etc.</p>
 </dd></dl>
 
 <dl class="method">
+<dt id="translate.convert.convert.ConvertOptionParser.settimestampoption">
+<tt class="descname">settimestampoption</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.convert.convert.ConvertOptionParser.settimestampoption" title="Permalink to this definition">¶</a></dt>
+<dd><p>Sets <tt class="docutils literal"><span class="pre">-S</span></tt>/<tt class="docutils literal"><span class="pre">--timestamp</span></tt> option.</p>
+</dd></dl>
+
+<dl class="method">
 <dt id="translate.convert.convert.ConvertOptionParser.splitext">
 <tt class="descname">splitext</tt><big>(</big><em>pathname</em><big>)</big><a class="headerlink" href="#translate.convert.convert.ConvertOptionParser.splitext" title="Permalink to this definition">¶</a></dt>
 <dd><p>Splits <em>pathname</em> into name and ext, and removes the extsep.</p>
@@ -1076,7 +1099,7 @@ formats etc.</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -1156,6 +1179,13 @@ replacing.</p>
 <dd><p>Copies the template file to the output file.</p>
 </dd></dl>
 
+<dl class="function">
+<dt id="translate.convert.convert.should_output_store">
+<tt class="descclassname">translate.convert.convert.</tt><tt class="descname">should_output_store</tt><big>(</big><em>store</em>, <em>threshold</em><big>)</big><a class="headerlink" href="#translate.convert.convert.should_output_store" title="Permalink to this definition">¶</a></dt>
+<dd><p>Check if the percent of translated source words more than or equal to
+the given threshold.</p>
+</dd></dl>
+
 </div>
 <div class="section" id="module-translate.convert.csv2po">
 <span id="csv2po"></span><h2>csv2po<a class="headerlink" href="#module-translate.convert.csv2po" title="Permalink to this headline">¶</a></h2>
@@ -1514,29 +1544,29 @@ for examples and usage instructions.</p>
 <dl class="function">
 <dt id="translate.convert.php2po.convertphp">
 <tt class="descclassname">translate.convert.php2po.</tt><tt class="descname">convertphp</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>pot=False</em>, <em>duplicatestyle='msgctxt'</em><big>)</big><a class="headerlink" href="#translate.convert.php2po.convertphp" title="Permalink to this definition">¶</a></dt>
-<dd><p>reads in inputfile using php, converts using php2po, writes to outputfile</p>
+<dd><p>Read inputfile using php, convert using php2po, write to outputfile.</p>
 </dd></dl>
 
 <dl class="class">
 <dt id="translate.convert.php2po.php2po">
 <em class="property">class </em><tt class="descclassname">translate.convert.php2po.</tt><tt class="descname">php2po</tt><a class="headerlink" href="#translate.convert.php2po.php2po" title="Permalink to this definition">¶</a></dt>
-<dd><p>convert a .php file to a .po file for handling the translation...</p>
+<dd><p>Convert a .php file to a .po file for handling the translation.</p>
 <dl class="method">
 <dt id="translate.convert.php2po.php2po.convertstore">
 <tt class="descname">convertstore</tt><big>(</big><em>inputstore</em>, <em>duplicatestyle='msgctxt'</em><big>)</big><a class="headerlink" href="#translate.convert.php2po.php2po.convertstore" title="Permalink to this definition">¶</a></dt>
-<dd><p>converts a .php file to a .po file...</p>
+<dd><p>Convert a .php file to a .po file.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.convert.php2po.php2po.convertunit">
 <tt class="descname">convertunit</tt><big>(</big><em>inputunit</em>, <em>origin</em><big>)</big><a class="headerlink" href="#translate.convert.php2po.php2po.convertunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts a .php unit to a .po unit</p>
+<dd><p>Convert a .php unit to a .po unit.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.convert.php2po.php2po.mergestore">
 <tt class="descname">mergestore</tt><big>(</big><em>templatestore</em>, <em>inputstore</em>, <em>blankmsgstr=False</em>, <em>duplicatestyle='msgctxt'</em><big>)</big><a class="headerlink" href="#translate.convert.php2po.php2po.mergestore" title="Permalink to this definition">¶</a></dt>
-<dd><p>converts two .php files to a .po file...</p>
+<dd><p>Convert two .php files to a .po file.</p>
 </dd></dl>
 
 </dd></dl>
@@ -1565,13 +1595,13 @@ for examples and usage instructions.</p>
 
 <dl class="class">
 <dt id="translate.convert.po2dtd.po2dtd">
-<em class="property">class </em><tt class="descclassname">translate.convert.po2dtd.</tt><tt class="descname">po2dtd</tt><big>(</big><em>android=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2dtd.po2dtd" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><tt class="descclassname">translate.convert.po2dtd.</tt><tt class="descname">po2dtd</tt><big>(</big><em>android=False</em>, <em>remove_untranslated=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2dtd.po2dtd" title="Permalink to this definition">¶</a></dt>
 <dd><p>this is a convertor class that creates a new dtd file based on a po file without a template</p>
 </dd></dl>
 
 <dl class="class">
 <dt id="translate.convert.po2dtd.redtd">
-<em class="property">class </em><tt class="descclassname">translate.convert.po2dtd.</tt><tt class="descname">redtd</tt><big>(</big><em>dtdfile</em>, <em>android=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2dtd.redtd" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><tt class="descclassname">translate.convert.po2dtd.</tt><tt class="descname">redtd</tt><big>(</big><em>dtdfile</em>, <em>android=False</em>, <em>remove_untranslated=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2dtd.redtd" title="Permalink to this definition">¶</a></dt>
 <dd><p>this is a convertor class that creates a new dtd based on a template using translations in a po</p>
 </dd></dl>
 
@@ -1583,7 +1613,7 @@ for examples and usage instructions.</p>
 for examples and usage instructions.</p>
 <dl class="function">
 <dt id="translate.convert.po2html.converthtml">
-<tt class="descclassname">translate.convert.po2html.</tt><tt class="descname">converthtml</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>includefuzzy=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2html.converthtml" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.po2html.</tt><tt class="descname">converthtml</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>includefuzzy=False</em>, <em>outputthreshold=None</em><big>)</big><a class="headerlink" href="#translate.convert.po2html.converthtml" title="Permalink to this definition">¶</a></dt>
 <dd><p>reads in stdin using fromfileclass, converts using convertorclass,
 writes to stdout</p>
 </dd></dl>
@@ -1625,7 +1655,7 @@ for examples and usage instructions.</p>
 <p>Convert Gettext PO localization files to Mozilla .lang files.</p>
 <dl class="function">
 <dt id="translate.convert.po2mozlang.convertlang">
-<tt class="descclassname">translate.convert.po2mozlang.</tt><tt class="descname">convertlang</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templates</em>, <em>includefuzzy=False</em>, <em>mark_active=True</em><big>)</big><a class="headerlink" href="#translate.convert.po2mozlang.convertlang" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.po2mozlang.</tt><tt class="descname">convertlang</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templates</em>, <em>includefuzzy=False</em>, <em>mark_active=True</em>, <em>outputthreshold=None</em>, <em>remove_untranslated=None</em><big>)</big><a class="headerlink" href="#translate.convert.po2mozlang.convertlang" title="Permalink to this definition">¶</a></dt>
 <dd><p>reads in stdin using fromfileclass, converts using convertorclass,
 writes to stdout</p>
 </dd></dl>
@@ -1656,13 +1686,13 @@ for examples and usage instructions.</p>
 for examples and usage instructions.</p>
 <dl class="function">
 <dt id="translate.convert.po2prop.convertmozillaprop">
-<tt class="descclassname">translate.convert.po2prop.</tt><tt class="descname">convertmozillaprop</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>includefuzzy=False</em>, <em>remove_untranslated=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2prop.convertmozillaprop" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.po2prop.</tt><tt class="descname">convertmozillaprop</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>includefuzzy=False</em>, <em>remove_untranslated=False</em>, <em>outputthreshold=None</em><big>)</big><a class="headerlink" href="#translate.convert.po2prop.convertmozillaprop" title="Permalink to this definition">¶</a></dt>
 <dd><p>Mozilla specific convertor function</p>
 </dd></dl>
 
 <dl class="function">
 <dt id="translate.convert.po2prop.convertstrings">
-<tt class="descclassname">translate.convert.po2prop.</tt><tt class="descname">convertstrings</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>personality='strings'</em>, <em>includefuzzy=False</em>, <em>encoding=None</em>, <em>remove_untranslated=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2prop.convertstrings" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.po2prop.</tt><tt class="descname">convertstrings</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>personality='strings'</em>, <em>includefuzzy=False</em>, <em>encoding=None</em>, <em>outputthreshold=None</em>, <em>remove_untranslated=False</em><big>)</big><a class="headerlink" href="#translate.convert.po2prop.convertstrings" title="Permalink to this definition">¶</a></dt>
 <dd><p>.strings specific convertor function</p>
 </dd></dl>
 
@@ -1723,7 +1753,7 @@ for examples and usage instructions.</p>
 for examples and usage instructions.</p>
 <dl class="function">
 <dt id="translate.convert.po2tmx.convertpo">
-<tt class="descclassname">translate.convert.po2tmx.</tt><tt class="descname">convertpo</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>sourcelanguage='en'</em>, <em>targetlanguage=None</em><big>)</big><a class="headerlink" href="#translate.convert.po2tmx.convertpo" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.po2tmx.</tt><tt class="descname">convertpo</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>sourcelanguage='en'</em>, <em>targetlanguage=None</em>, <em>comment=None</em><big>)</big><a class="headerlink" href="#translate.convert.po2tmx.convertpo" title="Permalink to this definition">¶</a></dt>
 <dd><p>reads in stdin using fromfileclass, converts using convertorclass, writes to stdout</p>
 </dd></dl>
 
@@ -1747,7 +1777,7 @@ for examples and usage instructions.</p>
 for examples and usage instructions.</p>
 <dl class="function">
 <dt id="translate.convert.po2txt.converttxt">
-<tt class="descclassname">translate.convert.po2txt.</tt><tt class="descname">converttxt</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>wrap=None</em>, <em>includefuzzy=False</em>, <em>encoding='utf-8'</em><big>)</big><a class="headerlink" href="#translate.convert.po2txt.converttxt" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.po2txt.</tt><tt class="descname">converttxt</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>wrap=None</em>, <em>includefuzzy=False</em>, <em>encoding='utf-8'</em>, <em>outputthreshold=None</em><big>)</big><a class="headerlink" href="#translate.convert.po2txt.converttxt" title="Permalink to this definition">¶</a></dt>
 <dd><p>reads in stdin using fromfileclass, converts using convertorclass, writes to stdout</p>
 </dd></dl>
 
@@ -1779,7 +1809,7 @@ for examples and usage instructions.</p>
 <div class="section" id="module-translate.convert.po2web2py">
 <span id="po2web2py"></span><h2>po2web2py<a class="headerlink" href="#module-translate.convert.po2web2py" title="Permalink to this headline">¶</a></h2>
 <p>Convert GNU/gettext PO files to web2py translation dictionaries (.py).</p>
-<p>See: <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/py2web2po.html">http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/py2web2po.html</a>
+<p>See: <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/web2py2po.html">http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/web2py2po.html</a>
 for examples and usage instructions.</p>
 </div>
 <div class="section" id="module-translate.convert.po2wordfast">
@@ -1837,19 +1867,19 @@ old translations from template_store and pretranslating from TM.</p>
 <p>Converts properties files to additional Mozilla format files.</p>
 <dl class="function">
 <dt id="translate.convert.prop2mozfunny.po2inc">
-<tt class="descclassname">translate.convert.prop2mozfunny.</tt><tt class="descname">po2inc</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>encoding=None</em>, <em>includefuzzy=False</em><big>)</big><a class="headerlink" href="#translate.convert.prop2mozfunny.po2inc" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.prop2mozfunny.</tt><tt class="descname">po2inc</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>encoding=None</em>, <em>includefuzzy=False</em>, <em>remove_untranslated=False</em>, <em>outputthreshold=None</em><big>)</big><a class="headerlink" href="#translate.convert.prop2mozfunny.po2inc" title="Permalink to this definition">¶</a></dt>
 <dd><p>wraps po2prop but converts outputfile to properties first</p>
 </dd></dl>
 
 <dl class="function">
 <dt id="translate.convert.prop2mozfunny.po2ini">
-<tt class="descclassname">translate.convert.prop2mozfunny.</tt><tt class="descname">po2ini</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>encoding='UTF-8'</em>, <em>includefuzzy=False</em><big>)</big><a class="headerlink" href="#translate.convert.prop2mozfunny.po2ini" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.prop2mozfunny.</tt><tt class="descname">po2ini</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>encoding='UTF-8'</em>, <em>includefuzzy=False</em>, <em>remove_untranslated=False</em>, <em>outputthreshold=None</em><big>)</big><a class="headerlink" href="#translate.convert.prop2mozfunny.po2ini" title="Permalink to this definition">¶</a></dt>
 <dd><p>wraps po2prop but converts outputfile to properties first using UTF-8 encoding</p>
 </dd></dl>
 
 <dl class="function">
 <dt id="translate.convert.prop2mozfunny.po2it">
-<tt class="descclassname">translate.convert.prop2mozfunny.</tt><tt class="descname">po2it</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>encoding='cp1252'</em>, <em>includefuzzy=False</em><big>)</big><a class="headerlink" href="#translate.convert.prop2mozfunny.po2it" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.prop2mozfunny.</tt><tt class="descname">po2it</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templatefile</em>, <em>encoding='cp1252'</em>, <em>includefuzzy=False</em>, <em>remove_untranslated=False</em>, <em>outputthreshold=None</em><big>)</big><a class="headerlink" href="#translate.convert.prop2mozfunny.po2it" title="Permalink to this definition">¶</a></dt>
 <dd><p>wraps po2prop but converts outputfile to properties first</p>
 </dd></dl>
 
@@ -2087,7 +2117,7 @@ for examples and usage instructions.</p>
 for examples and usage instructions.</p>
 <dl class="function">
 <dt id="translate.convert.xliff2po.convertxliff">
-<tt class="descclassname">translate.convert.xliff2po.</tt><tt class="descname">convertxliff</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templates</em><big>)</big><a class="headerlink" href="#translate.convert.xliff2po.convertxliff" title="Permalink to this definition">¶</a></dt>
+<tt class="descclassname">translate.convert.xliff2po.</tt><tt class="descname">convertxliff</tt><big>(</big><em>inputfile</em>, <em>outputfile</em>, <em>templates</em>, <em>duplicatestyle='msgctxt'</em><big>)</big><a class="headerlink" href="#translate.convert.xliff2po.convertxliff" title="Permalink to this definition">¶</a></dt>
 <dd><p>reads in stdin using fromfileclass, converts using convertorclass,
 writes to stdout</p>
 </dd></dl>
@@ -2107,7 +2137,7 @@ writes to stdout</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/filters.html b/docs/_build/html/api/filters.html
index 27e73c1..4be9f1e 100644
--- a/docs/_build/html/api/filters.html
+++ b/docs/_build/html/api/filters.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>filters — Translate Toolkit 1.9.0 documentation</title>
+    <title>filters — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
     <link rel="next" title="lang" href="lang.html" />
     <link rel="prev" title="convert" href="convert.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -97,10 +99,11 @@
   <li><a href="lang.html"
          title="next chapter">lang »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -146,8 +149,8 @@ units.</p>
 <p>Derivatives of UnitChecker (like StandardUnitChecker) check translation units,
 and derivatives of TranslationChecker (like StandardChecker) check
 (source, target) translation pairs.</p>
-<p>When adding a new test here, please document and explain the behaviour on the
-<a class="reference external" href="http://translate.sourceforge.net/wiki/toolkit/pofilter_tests">wiki</a>.</p>
+<p>When adding a new test here, please document and explain their behaviour on the
+<a class="reference internal" href="../commands/pofilter_tests.html"><em>pofilter tests</em></a> page.</p>
 <dl class="class">
 <dt id="translate.filters.checks.CheckerConfig">
 <em class="property">class </em><tt class="descclassname">translate.filters.checks.</tt><tt class="descname">CheckerConfig</tt><big>(</big><em>targetlanguage=None</em>, <em>accelmarkers=None</em>, <em>varmatches=None</em>, <em>notranslatewords=None</em>, <em>musttranslatewords=None</em>, <em>validchars=None</em>, <em>punctuation=None</em>, <em>endpunctuation=None</em>, <em>ignoretags=None</em>, <em>canchangetags=None</em>, <em>criticaltests=None</em>, <em>credit_sources=None</em><big>)</ [...]
@@ -934,10 +937,12 @@ accelerators</li>
 <div class="section" id="module-translate.filters.pofilter">
 <span id="pofilter"></span><h2>pofilter<a class="headerlink" href="#module-translate.filters.pofilter" title="Permalink to this headline">¶</a></h2>
 <p>Perform quality checks on Gettext PO, XLIFF and TMX localization files.</p>
-<p>Snippet files whenever a test fails.  These can be examined, corrected and
-merged back into the originals using pomerge.</p>
-<p>See: <a class="reference external" href="http://translate.sourceforge.net/wiki/toolkit/pofilter">http://translate.sourceforge.net/wiki/toolkit/pofilter</a> for examples and
-usage instructions and <a class="reference external" href="http://translate.sourceforge.net/wiki/toolkit/pofilter_tests">http://translate.sourceforge.net/wiki/toolkit/pofilter_tests</a>
+<p>Snippet files are created whenever a test fails.  These can be examined,
+corrected and merged back into the originals using pomerge.</p>
+<p>See:
+<a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter.html">http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter.html</a>
+for examples and usage instructions and
+<a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter_tests.html">http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter_tests.html</a>
 for full descriptions of all tests.</p>
 <dl class="class">
 <dt id="translate.filters.pofilter.FilterOptionParser">
@@ -1278,7 +1283,7 @@ manpage</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -1340,7 +1345,7 @@ from a strings.</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>accelmarker</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Accelerator marker character</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>accelmarker</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Accelerator marker character</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">Function</td>
 </tr>
@@ -1360,8 +1365,8 @@ from a strings.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>startmarker</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Start of variable marker</li>
-<li><strong>endmarker</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – End of variable marker</li>
+<li><strong>startmarker</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Start of variable marker</li>
+<li><strong>endmarker</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – End of variable marker</li>
 <li><strong>varfilter</strong> (<em>Function</em>) – fn(variable, startmarker, endmarker)</li>
 </ul>
 </td>
@@ -1452,7 +1457,7 @@ removed.</td>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/index.html b/docs/_build/html/api/index.html
index e98782a..692ccdf 100644
--- a/docs/_build/html/api/index.html
+++ b/docs/_build/html/api/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>API — Translate Toolkit 1.9.0 documentation</title>
+    <title>API — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,16 +27,16 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="next" title="convert" href="convert.html" />
-    <link rel="prev" title="Translate Toolkit Developers Guide" href="../development/developers.html" /> 
+    <link rel="prev" title="License" href="../license.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -87,9 +89,7 @@
 <li><a class="reference internal" href="#module-translate.tools">tools</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#module-list">Module list</a><ul>
-</ul>
-</li>
+<li><a class="reference internal" href="#module-list">Module list</a></li>
 </ul>
 </li>
 </ul>
@@ -98,15 +98,16 @@
             
             
               
-  <li><a href="../development/developers.html"
-         title="previous chapter">« Translate Toolkit Developers Guide</a></li>
+  <li><a href="../license.html"
+         title="previous chapter">« License</a></li>
   <li><a href="convert.html"
          title="next chapter">convert »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -303,7 +304,6 @@ It provides network services for interacting with the toolkit</p>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.profiling">profiling</a></li>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.progressbar">progressbar</a></li>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.quote">quote</a></li>
-<li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.selector">selector</a></li>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.sparse">sparse</a></li>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.stdiotell">stdiotell</a></li>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.textwrap">textwrap</a></li>
@@ -317,14 +317,13 @@ It provides network services for interacting with the toolkit</p>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.wsgi">wsgi</a></li>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.wStringIO">wStringIO</a></li>
 <li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.xml_helpers">xml_helpers</a></li>
-<li class="toctree-l2"><a class="reference internal" href="misc.html#xmlwrapper">xmlwrapper</a></li>
-<li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.zipfileext">zipfileext</a></li>
+<li class="toctree-l2"><a class="reference internal" href="misc.html#module-translate.misc.xmlwrapper">xmlwrapper</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="search.html">search</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="search.html#module-translate.search.indexing">indexing</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="search.html#module-translate.search.indexing.CommonIndexer">CommonIndexer</a></li>
-<li class="toctree-l3"><a class="reference internal" href="search.html#pyluceneindexer1">PyLuceneIndexer1</a></li>
+<li class="toctree-l3"><a class="reference internal" href="search.html#module-translate.search.indexing.PyLuceneIndexer1">PyLuceneIndexer1</a></li>
 <li class="toctree-l3"><a class="reference internal" href="search.html#module-translate.search.indexing.PyLuceneIndexer">PyLuceneIndexer</a></li>
 <li class="toctree-l3"><a class="reference internal" href="search.html#module-translate.search.indexing.XapianIndexer">XapianIndexer</a></li>
 </ul>
@@ -370,7 +369,7 @@ It provides network services for interacting with the toolkit</p>
 <li class="toctree-l3"><a class="reference internal" href="storage.html#module-translate.storage.placeables.parse">parse</a></li>
 <li class="toctree-l3"><a class="reference internal" href="storage.html#module-translate.storage.placeables.strelem">strelem</a></li>
 <li class="toctree-l3"><a class="reference internal" href="storage.html#module-translate.storage.placeables.terminology">terminology</a></li>
-<li class="toctree-l3"><a class="reference internal" href="storage.html#module-translate.storage.placeables.xliff">xliff</a></li>
+<li class="toctree-l3"><a class="reference internal" href="storage.html#id4">xliff</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.php">php</a></li>
@@ -388,7 +387,7 @@ It provides network services for interacting with the toolkit</p>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.rc">rc</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.statistics">statistics</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.statsdb">statsdb</a></li>
-<li class="toctree-l2"><a class="reference internal" href="storage.html#subtitles">subtitles</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.subtitles">subtitles</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.symbian">symbian</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.tbx">tbx</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.tiki">tiki</a></li>
@@ -410,7 +409,7 @@ It provides network services for interacting with the toolkit</p>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.wordfast">wordfast</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.workflow">workflow</a></li>
-<li class="toctree-l2"><a class="reference internal" href="storage.html#id12">xliff</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage.html#id13">xliff</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.xml_extract">xml_extract</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="storage.html#module-translate.storage.xml_extract.extract">extract</a></li>
 <li class="toctree-l3"><a class="reference internal" href="storage.html#module-translate.storage.xml_extract.generate">generate</a></li>
@@ -420,7 +419,6 @@ It provides network services for interacting with the toolkit</p>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.xml_name">xml_name</a></li>
-<li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.xpi">xpi</a></li>
 <li class="toctree-l2"><a class="reference internal" href="storage.html#module-translate.storage.zip">zip</a></li>
 </ul>
 </li>
@@ -460,7 +458,7 @@ It provides network services for interacting with the toolkit</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/lang.html b/docs/_build/html/api/lang.html
index 411a374..5985a34 100644
--- a/docs/_build/html/api/lang.html
+++ b/docs/_build/html/api/lang.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>lang — Translate Toolkit 1.9.0 documentation</title>
+    <title>lang — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
     <link rel="next" title="misc" href="misc.html" />
     <link rel="prev" title="filters" href="filters.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -130,10 +132,11 @@
   <li><a href="misc.html"
          title="next chapter">misc »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -165,7 +168,7 @@
 <div class="section" id="module-translate.lang.af">
 <span id="af"></span><h2>af<a class="headerlink" href="#module-translate.lang.af" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Afrikaans language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Afrikaans_language">http://en.wikipedia.org/wiki/Afrikaans_language</a></p>
 </div>
@@ -209,7 +212,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.af.af.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.af.af.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -227,13 +230,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.af.af.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0ff52d050></em><a class="headerlink" href="#translate.lang.af.af.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f87660cdd60></em><a class="headerlink" href="#translate.lang.af.af.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.af.af.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.af.af.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -266,7 +269,7 @@ language.</p>
 <div class="section" id="module-translate.lang.am">
 <span id="am"></span><h2>am<a class="headerlink" href="#module-translate.lang.am" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Amharic language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Amharic_language">http://en.wikipedia.org/wiki/Amharic_language</a></p>
 </div>
@@ -310,7 +313,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.am.am.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.am.am.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -328,13 +331,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.am.am.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0ff503bc0></em><a class="headerlink" href="#translate.lang.am.am.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8767308b20></em><a class="headerlink" href="#translate.lang.am.am.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.am.am.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.am.am.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -355,7 +358,7 @@ language.</p>
 <div class="section" id="module-translate.lang.ar">
 <span id="ar"></span><h2>ar<a class="headerlink" href="#module-translate.lang.ar" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Arabic language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Arabic_language">http://en.wikipedia.org/wiki/Arabic_language</a></p>
 </div>
@@ -399,7 +402,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ar.ar.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ar.ar.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -410,13 +413,13 @@ English string of length length.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ar.ar.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.ar.ar.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.ar.ar.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ar.ar.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ar.ar.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -437,7 +440,7 @@ English string of length length.</p>
 <div class="section" id="module-translate.lang.bn">
 <span id="bn"></span><h2>bn<a class="headerlink" href="#module-translate.lang.bn" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Bengali language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Bengali_language">http://en.wikipedia.org/wiki/Bengali_language</a></p>
 </div>
@@ -481,7 +484,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.bn.bn.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.bn.bn.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -499,13 +502,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.bn.bn.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe613420></em><a class="headerlink" href="#translate.lang.bn.bn.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8766f9b6f0></em><a class="headerlink" href="#translate.lang.bn.bn.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.bn.bn.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.bn.bn.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -526,7 +529,7 @@ language.</p>
 <div class="section" id="module-translate.lang.code_or">
 <span id="code-or"></span><h2>code_or<a class="headerlink" href="#module-translate.lang.code_or" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Oriya language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Oriya_language">http://en.wikipedia.org/wiki/Oriya_language</a></p>
 </div>
@@ -570,7 +573,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.code_or.code_or.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.code_or.code_or.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -588,13 +591,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.code_or.code_or.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe613420></em><a class="headerlink" href="#translate.lang.code_or.code_or.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8766f9b6f0></em><a class="headerlink" href="#translate.lang.code_or.code_or.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.code_or.code_or.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.code_or.code_or.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -705,9 +708,10 @@ language).</p>
 <dd><p>The ISO 639 language code, possibly with a country specifier or other
 modifier.</p>
 <p>Examples:</p>
-<div class="highlight-python"><pre>km
+<div class="highlight-python"><div class="highlight"><pre>km
 pt_BR
-sr_YU at Latn</pre>
+sr_YU at Latn
+</pre></div>
 </div>
 </dd></dl>
 
@@ -777,12 +781,19 @@ Asian languages might want to override this.</p>
 </dd></dl>
 
 <dl class="attribute">
+<dt id="translate.lang.common.Common.mozilla_pluralequation">
+<tt class="descname">mozilla_pluralequation</tt><em class="property"> = '0'</em><a class="headerlink" href="#translate.lang.common.Common.mozilla_pluralequation" title="Permalink to this definition">¶</a></dt>
+<dd><p>This of languages that has different plural formula in Mozilla than the
+standard one in Gettext.</p>
+</dd></dl>
+
+<dl class="attribute">
 <dt id="translate.lang.common.Common.nplurals">
 <tt class="descname">nplurals</tt><em class="property"> = 0</em><a class="headerlink" href="#translate.lang.common.Common.nplurals" title="Permalink to this definition">¶</a></dt>
 <dd><p>The number of plural forms of this language.</p>
 <p>0 is not a valid value - it must be overridden.
 Any positive integer is valid (it should probably be between 1 and 6)</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference internal" href="#module-translate.lang.data" title="translate.lang.data"><tt class="xref py py-mod docutils literal"><span class="pre">translate.lang.data</span></tt></a></p>
 </div>
@@ -791,7 +802,7 @@ Any positive integer is valid (it should probably be between 1 and 6)</p>
 <dl class="classmethod">
 <dt id="translate.lang.common.Common.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.common.Common.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="attribute">
@@ -799,7 +810,7 @@ Any positive integer is valid (it should probably be between 1 and 6)</p>
 <tt class="descname">pluralequation</tt><em class="property"> = '0'</em><a class="headerlink" href="#translate.lang.common.Common.pluralequation" title="Permalink to this definition">¶</a></dt>
 <dd><p>The plural equation for selection of plural forms.</p>
 <p>This is used for PO files to fill into the header.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://www.gnu.org/software/gettext/manual/html_node/gettext_150.html#Plural-forms">Gettext manual</a>, <a class="reference internal" href="#module-translate.lang.data" title="translate.lang.data"><tt class="xref py py-mod docutils literal"><span class="pre">translate.lang.data</span></tt></a></p>
 </div>
@@ -855,13 +866,20 @@ for many languages. Most langauges won’t need to override this.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.common.Common.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.common.Common.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.common.Common.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.common.Common.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.common.Common.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.lang.common.Common.specialchars">
+<tt class="descname">specialchars</tt><em class="property"> = u''</em><a class="headerlink" href="#translate.lang.common.Common.specialchars" title="Permalink to this definition">¶</a></dt>
+<dd><p>Characters used by the language that might not be easy to input with
+common keyboard layouts</p>
 </dd></dl>
 
 <dl class="attribute">
@@ -957,7 +975,7 @@ language, or the system language if no language is specified.</p>
 
 <dl class="data">
 <dt id="translate.lang.data.languages">
-<tt class="descclassname">translate.lang.data.</tt><tt class="descname">languages</tt><em class="property"> = {'gu': (u'Gujarati', 2, '(n != 1)'), 'mfe': (u'Morisyen', 2, '(n > 1)'), 'sco': (u'Scots', 2, '(n != 1)'), 'ca@valencia': (u'Catalan; Valencian (Valencia)', 2, '(n != 1)'), 'gd': (u'Gaelic; Scottish Gaelic', 4, '(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3'), 'ga': (u'Irish', 5, 'n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4'), ' [...]
+<tt class="descclassname">translate.lang.data.</tt><tt class="descname">languages</tt><em class="property"> = {'son': (u'Songhai languages', 2, '(n != 1)'), 'gu': (u'Gujarati', 2, '(n != 1)'), 'ff': (u'Fulah', 2, '(n != 1)'), 'nqo': (u"N'Ko", 2, '(n > 1)'), 'nso': (u'Pedi; Sepedi; Northern Sotho', 2, '(n != 1)'), 'ca': (u'Catalan; Valencian', 2, '(n != 1)'), 'sco': (u'Scots', 2, '(n != 1)'), 'gun': (u'Gun', 2, '(n > 1)'), 'ca@valencia': (u'Catalan; Valencian (Valencia [...]
 <dd><p>Dictionary of language data.
 The language code is the dictionary key (which may contain country codes
 and modifiers).  The value is a tuple: (Full name in English from iso-codes,
@@ -999,7 +1017,7 @@ least passed through _fix_language_name().</p>
 <tt class="descclassname">translate.lang.data.</tt><tt class="descname">simplercode</tt><big>(</big><em>code</em><big>)</big><a class="headerlink" href="#translate.lang.data.simplercode" title="Permalink to this definition">¶</a></dt>
 <dd><p>This attempts to simplify the given language code by ignoring country
 codes, for example.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <ul class="last simple">
 <li><a class="reference external" href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a></li>
@@ -1012,7 +1030,7 @@ codes, for example.</p>
 
 <dl class="function">
 <dt id="translate.lang.data.simplify_to_common">
-<tt class="descclassname">translate.lang.data.</tt><tt class="descname">simplify_to_common</tt><big>(</big><em>language_code</em>, <em>languages={'gu': (u'Gujarati'</em>, <em>2</em>, <em>'(n != 1)')</em>, <em>'mfe': (u'Morisyen'</em>, <em>2</em>, <em>'(n > 1)')</em>, <em>'sco': (u'Scots'</em>, <em>2</em>, <em>'(n != 1)')</em>, <em>'ca@valencia': (u'Catalan; Valencian (Valencia)'</em>, <em>2</em>, <em>'(n != 1)')</em>, <em>'gd': (u'Gaelic; Scottish Gaelic'</em>, <em>4</em>, <em>'(n [...]
+<tt class="descclassname">translate.lang.data.</tt><tt class="descname">simplify_to_common</tt><big>(</big><em>language_code</em>, <em>languages={'son': (u'Songhai languages'</em>, <em>2</em>, <em>'(n != 1)')</em>, <em>'gu': (u'Gujarati'</em>, <em>2</em>, <em>'(n != 1)')</em>, <em>'ff': (u'Fulah'</em>, <em>2</em>, <em>'(n != 1)')</em>, <em>'nqo': (u"N'Ko"</em>, <em>2</em>, <em>'(n > 1)')</em>, <em>'nso': (u'Pedi; Sepedi; Northern Sotho'</em>, <em>2</em>, <em>'(n != 1)')</em> [...]
 <dd><p>Simplify language code to the most commonly used form for the
 language, stripping country information for languages that tend
 not to be localized differently for different countries</p>
@@ -1030,7 +1048,7 @@ or the system language if no language is specified.</p>
 <div class="section" id="module-translate.lang.de">
 <span id="de"></span><h2>de<a class="headerlink" href="#module-translate.lang.de" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the German language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/German_language">http://en.wikipedia.org/wiki/German_language</a></p>
 </div>
@@ -1074,7 +1092,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.de.de.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.de.de.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1092,13 +1110,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.de.de.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.de.de.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.de.de.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.de.de.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.de.de.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1119,7 +1137,7 @@ language.</p>
 <div class="section" id="module-translate.lang.el">
 <span id="el"></span><h2>el<a class="headerlink" href="#module-translate.lang.el" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Greek language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Greek_language">http://en.wikipedia.org/wiki/Greek_language</a></p>
 </div>
@@ -1163,7 +1181,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.el.el.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.el.el.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1181,13 +1199,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.el.el.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0ff0844b0></em><a class="headerlink" href="#translate.lang.el.el.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f876652e750></em><a class="headerlink" href="#translate.lang.el.el.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.el.el.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.el.el.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1253,7 +1271,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.es.es.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.es.es.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1270,13 +1288,13 @@ English string of length length.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.es.es.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.es.es.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.es.es.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.es.es.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.es.es.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1315,7 +1333,7 @@ English string of length length.</p>
 <div class="section" id="module-translate.lang.fa">
 <span id="fa"></span><h2>fa<a class="headerlink" href="#module-translate.lang.fa" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Persian language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Persian_language">http://en.wikipedia.org/wiki/Persian_language</a></p>
 </div>
@@ -1359,7 +1377,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.fa.fa.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.fa.fa.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1376,13 +1394,13 @@ English string of length length.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.fa.fa.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.fa.fa.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.fa.fa.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.fa.fa.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.fa.fa.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1402,11 +1420,11 @@ English string of length length.</p>
 </div>
 <div class="section" id="module-translate.lang.fi">
 <span id="fi"></span><h2>fi<a class="headerlink" href="#module-translate.lang.fi" title="Permalink to this headline">¶</a></h2>
-<p>This module represents the Finish language.</p>
+<p>This module represents the Finnish language.</p>
 <dl class="class">
 <dt id="translate.lang.fi.fi">
 <em class="property">class </em><tt class="descclassname">translate.lang.fi.</tt><tt class="descname">fi</tt><a class="headerlink" href="#translate.lang.fi.fi" title="Permalink to this definition">¶</a></dt>
-<dd><p>This class represents Finish.</p>
+<dd><p>This class represents Finnish.</p>
 <dl class="classmethod">
 <dt id="translate.lang.fi.fi.alter_length">
 <em class="property">classmethod </em><tt class="descname">alter_length</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.fi.fi.alter_length" title="Permalink to this definition">¶</a></dt>
@@ -1443,7 +1461,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.fi.fi.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.fi.fi.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1461,13 +1479,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.fi.fi.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.fi.fi.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.fi.fi.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.fi.fi.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.fi.fi.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1488,7 +1506,7 @@ language.</p>
 <div class="section" id="module-translate.lang.fr">
 <span id="fr"></span><h2>fr<a class="headerlink" href="#module-translate.lang.fr" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the French language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/French_language">http://en.wikipedia.org/wiki/French_language</a></p>
 </div>
@@ -1532,7 +1550,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.fr.fr.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.fr.fr.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1557,13 +1575,13 @@ English string of length length.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.fr.fr.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.fr.fr.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.fr.fr.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.fr.fr.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.fr.fr.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1584,7 +1602,7 @@ English string of length length.</p>
 <div class="section" id="module-translate.lang.gu">
 <span id="gu"></span><h2>gu<a class="headerlink" href="#module-translate.lang.gu" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Gujarati language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Gujarati_language">http://en.wikipedia.org/wiki/Gujarati_language</a></p>
 </div>
@@ -1628,7 +1646,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.gu.gu.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.gu.gu.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1646,13 +1664,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.gu.gu.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.gu.gu.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.gu.gu.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.gu.gu.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.gu.gu.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1673,7 +1691,7 @@ language.</p>
 <div class="section" id="module-translate.lang.he">
 <span id="he"></span><h2>he<a class="headerlink" href="#module-translate.lang.he" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Hebrew language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Hebrew_language">http://en.wikipedia.org/wiki/Hebrew_language</a></p>
 </div>
@@ -1717,7 +1735,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.he.he.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.he.he.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1735,13 +1753,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.he.he.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.he.he.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.he.he.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.he.he.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.he.he.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1762,7 +1780,7 @@ language.</p>
 <div class="section" id="module-translate.lang.hi">
 <span id="hi"></span><h2>hi<a class="headerlink" href="#module-translate.lang.hi" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Hindi language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Hindi_language">http://en.wikipedia.org/wiki/Hindi_language</a></p>
 </div>
@@ -1806,7 +1824,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.hi.hi.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.hi.hi.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1824,13 +1842,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.hi.hi.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.hi.hi.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.hi.hi.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.hi.hi.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.hi.hi.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1851,7 +1869,7 @@ language.</p>
 <div class="section" id="module-translate.lang.hy">
 <span id="hy"></span><h2>hy<a class="headerlink" href="#module-translate.lang.hy" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Armenian language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Armenian_language">http://en.wikipedia.org/wiki/Armenian_language</a></p>
 </div>
@@ -1895,7 +1913,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.hy.hy.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.hy.hy.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1913,13 +1931,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.hy.hy.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0ff532f10></em><a class="headerlink" href="#translate.lang.hy.hy.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8766fd3780></em><a class="headerlink" href="#translate.lang.hy.hy.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.hy.hy.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.hy.hy.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -1945,7 +1963,7 @@ models.</p>
 <div class="section" id="module-translate.lang.ja">
 <span id="ja"></span><h2>ja<a class="headerlink" href="#module-translate.lang.ja" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Japanese language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Japanese_language">http://en.wikipedia.org/wiki/Japanese_language</a></p>
 </div>
@@ -1989,7 +2007,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ja.ja.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ja.ja.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2007,13 +2025,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ja.ja.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fc887bf0></em><a class="headerlink" href="#translate.lang.ja.ja.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8766fa17f0></em><a class="headerlink" href="#translate.lang.ja.ja.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ja.ja.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ja.ja.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2034,7 +2052,7 @@ language.</p>
 <div class="section" id="module-translate.lang.km">
 <span id="km"></span><h2>km<a class="headerlink" href="#module-translate.lang.km" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Khmer language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Khmer_language">http://en.wikipedia.org/wiki/Khmer_language</a></p>
 </div>
@@ -2084,7 +2102,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.km.km.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.km.km.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2102,13 +2120,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.km.km.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe2d6270></em><a class="headerlink" href="#translate.lang.km.km.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8766188c70></em><a class="headerlink" href="#translate.lang.km.km.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.km.km.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.km.km.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2129,7 +2147,7 @@ language.</p>
 <div class="section" id="module-translate.lang.kn">
 <span id="kn"></span><h2>kn<a class="headerlink" href="#module-translate.lang.kn" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Kannada language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Kannada_language">http://en.wikipedia.org/wiki/Kannada_language</a></p>
 </div>
@@ -2173,7 +2191,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.kn.kn.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.kn.kn.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2191,13 +2209,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.kn.kn.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.kn.kn.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.kn.kn.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.kn.kn.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.kn.kn.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2218,7 +2236,7 @@ language.</p>
 <div class="section" id="module-translate.lang.ko">
 <span id="ko"></span><h2>ko<a class="headerlink" href="#module-translate.lang.ko" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Korean language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Korean_language">http://en.wikipedia.org/wiki/Korean_language</a></p>
 </div>
@@ -2262,7 +2280,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ko.ko.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ko.ko.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2280,13 +2298,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ko.ko.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.ko.ko.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.ko.ko.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ko.ko.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ko.ko.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2307,7 +2325,7 @@ language.</p>
 <div class="section" id="module-translate.lang.ml">
 <span id="ml"></span><h2>ml<a class="headerlink" href="#module-translate.lang.ml" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Malayalam language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Malayalam_language">http://en.wikipedia.org/wiki/Malayalam_language</a></p>
 </div>
@@ -2351,7 +2369,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ml.ml.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ml.ml.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2369,13 +2387,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ml.ml.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.ml.ml.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.ml.ml.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ml.ml.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ml.ml.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2396,7 +2414,7 @@ language.</p>
 <div class="section" id="module-translate.lang.mr">
 <span id="mr"></span><h2>mr<a class="headerlink" href="#module-translate.lang.mr" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Marathi language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Marathi_language">http://en.wikipedia.org/wiki/Marathi_language</a></p>
 </div>
@@ -2440,7 +2458,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.mr.mr.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.mr.mr.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2458,13 +2476,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.mr.mr.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.mr.mr.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.mr.mr.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.mr.mr.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.mr.mr.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2485,7 +2503,7 @@ language.</p>
 <div class="section" id="module-translate.lang.ne">
 <span id="ne"></span><h2>ne<a class="headerlink" href="#module-translate.lang.ne" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Nepali language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Nepali_language">http://en.wikipedia.org/wiki/Nepali_language</a></p>
 </div>
@@ -2529,7 +2547,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ne.ne.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ne.ne.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2547,13 +2565,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ne.ne.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4010a0></em><a class="headerlink" href="#translate.lang.ne.ne.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8766170640></em><a class="headerlink" href="#translate.lang.ne.ne.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ne.ne.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ne.ne.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2582,7 +2600,7 @@ language.</p>
 <div class="section" id="module-translate.lang.pa">
 <span id="pa"></span><h2>pa<a class="headerlink" href="#module-translate.lang.pa" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Punjabi language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Punjabi_language">http://en.wikipedia.org/wiki/Punjabi_language</a></p>
 </div>
@@ -2626,7 +2644,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.pa.pa.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.pa.pa.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2644,13 +2662,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.pa.pa.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0ffe43480></em><a class="headerlink" href="#translate.lang.pa.pa.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f87662c6450></em><a class="headerlink" href="#translate.lang.pa.pa.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.pa.pa.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.pa.pa.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2673,10 +2691,10 @@ language.</p>
 <p>Functions to manage Poedit’s language features.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">The ISO 639 maps are from Poedit’s</p>
+<p class="last">The ISO 639 maps are from Poedit’s
+<a class="reference external" href="https://github.com/vslavik/poedit/blob/v1.4.2/src/isocodes.cpp#L36-227">isocode.cpp</a>
+(v1.4.2) to ensure that we match currently released versions of Poedit.</p>
 </div>
-<p><a class="reference external" href="https://github.com/vslavik/poedit/blob/v1.4.2/src/isocodes.cpp#L36-227">isocode.cpp</a> (v1.4.2)
-to ensure that we match currently released versions of Poedit.</p>
 <dl class="data">
 <dt id="translate.lang.poedit.dialects">
 <tt class="descclassname">translate.lang.poedit.</tt><tt class="descname">dialects</tt><em class="property"> = {'Portuguese': {'BRAZIL': 'pt_BR', 'None': 'pt', 'PORTUGAL': 'pt'}, 'Chinese': {'TAIWAN': 'zh_TW', 'CHINA': 'zh_CN', 'None': 'zh_CN'}, 'English': {'UNITED KINGDOM': 'en_GB', 'None': 'en', 'SOUTH AFRICA': 'en_ZA'}}</em><a class="headerlink" href="#translate.lang.poedit.dialects" title="Permalink to this definition">¶</a></dt>
@@ -2733,7 +2751,7 @@ Mostly these are identical to ISO 639, but there are some differences.</p>
 <div class="section" id="module-translate.lang.si">
 <span id="si"></span><h2>si<a class="headerlink" href="#module-translate.lang.si" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Sinhala language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Sinhala_language">http://en.wikipedia.org/wiki/Sinhala_language</a></p>
 </div>
@@ -2777,7 +2795,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.si.si.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.si.si.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2795,13 +2813,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.si.si.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.si.si.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.si.si.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.si.si.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.si.si.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2862,7 +2880,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.st.st.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.st.st.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2880,13 +2898,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.st.st.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.st.st.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.st.st.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.st.st.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.st.st.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2907,7 +2925,7 @@ language.</p>
 <div class="section" id="module-translate.lang.sv">
 <span id="sv"></span><h2>sv<a class="headerlink" href="#module-translate.lang.sv" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the the Swedish language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Swedish_language">http://en.wikipedia.org/wiki/Swedish_language</a></p>
 </div>
@@ -2951,7 +2969,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.sv.sv.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.sv.sv.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2969,13 +2987,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.sv.sv.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.sv.sv.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.sv.sv.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.sv.sv.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.sv.sv.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -2996,7 +3014,7 @@ language.</p>
 <div class="section" id="module-translate.lang.ta">
 <span id="ta"></span><h2>ta<a class="headerlink" href="#module-translate.lang.ta" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Tamil language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Tamil_language">http://en.wikipedia.org/wiki/Tamil_language</a></p>
 </div>
@@ -3040,7 +3058,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ta.ta.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ta.ta.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3058,13 +3076,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ta.ta.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.ta.ta.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.ta.ta.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ta.ta.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ta.ta.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3103,7 +3121,7 @@ uniquely identify the language</p>
 <div class="section" id="module-translate.lang.te">
 <span id="te"></span><h2>te<a class="headerlink" href="#module-translate.lang.te" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Telugu language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Telugu_language">http://en.wikipedia.org/wiki/Telugu_language</a></p>
 </div>
@@ -3147,7 +3165,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.te.te.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.te.te.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3165,13 +3183,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.te.te.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.te.te.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.te.te.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.te.te.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.te.te.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3192,7 +3210,7 @@ language.</p>
 <div class="section" id="module-translate.lang.th">
 <span id="th"></span><h2>th<a class="headerlink" href="#module-translate.lang.th" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Thai language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Thai_language">http://en.wikipedia.org/wiki/Thai_language</a></p>
 </div>
@@ -3236,7 +3254,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.th.th.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.th.th.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3254,13 +3272,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.th.th.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.th.th.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.th.th.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.th.th.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.th.th.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3281,7 +3299,7 @@ language.</p>
 <div class="section" id="module-translate.lang.ug">
 <span id="ug"></span><h2>ug<a class="headerlink" href="#module-translate.lang.ug" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Uyghur language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Uyghur_language">http://en.wikipedia.org/wiki/Uyghur_language</a></p>
 </div>
@@ -3325,7 +3343,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ug.ug.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ug.ug.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3343,13 +3361,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ug.ug.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.ug.ug.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.ug.ug.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ug.ug.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ug.ug.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3370,7 +3388,7 @@ language.</p>
 <div class="section" id="module-translate.lang.ur">
 <span id="ur"></span><h2>ur<a class="headerlink" href="#module-translate.lang.ur" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Urdu language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Urdu_language">http://en.wikipedia.org/wiki/Urdu_language</a></p>
 </div>
@@ -3414,7 +3432,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.ur.ur.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.ur.ur.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3432,13 +3450,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.ur.ur.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.ur.ur.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.ur.ur.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.ur.ur.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.ur.ur.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3459,7 +3477,7 @@ language.</p>
 <div class="section" id="module-translate.lang.vi">
 <span id="vi"></span><h2>vi<a class="headerlink" href="#module-translate.lang.vi" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Vietnamese language.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Vietnamese_language">http://en.wikipedia.org/wiki/Vietnamese_language</a></p>
 </div>
@@ -3503,7 +3521,7 @@ English string of length length.</p>
 <dl class="classmethod">
 <dt id="translate.lang.vi.vi.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.vi.vi.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3528,13 +3546,13 @@ English string of length length.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.vi.vi.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fe4a7700></em><a class="headerlink" href="#translate.lang.vi.vi.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765ecd500></em><a class="headerlink" href="#translate.lang.vi.vi.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.vi.vi.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.vi.vi.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3555,7 +3573,7 @@ English string of length length.</p>
 <div class="section" id="module-translate.lang.zh">
 <span id="zh"></span><h2>zh<a class="headerlink" href="#module-translate.lang.zh" title="Permalink to this headline">¶</a></h2>
 <p>This module represents the Chinese language (Both tradisional and simplified).</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Chinese_language">http://en.wikipedia.org/wiki/Chinese_language</a></p>
 </div>
@@ -3592,7 +3610,7 @@ language).</p>
 <dl class="classmethod">
 <dt id="translate.lang.zh.zh.numstart">
 <em class="property">classmethod </em><tt class="descname">numstart</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.lang.zh.zh.numstart" title="Permalink to this definition">¶</a></dt>
-<dd><p>Determines whether the text starts with a mumeric value.</p>
+<dd><p>Determines whether the text starts with a numeric value.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3610,13 +3628,13 @@ language.</p>
 
 <dl class="attribute">
 <dt id="translate.lang.zh.zh.sentencere">
-<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0ff761b60></em><a class="headerlink" href="#translate.lang.zh.zh.sentencere" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">sentencere</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f876606f8e0></em><a class="headerlink" href="#translate.lang.zh.zh.sentencere" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.lang.zh.zh.sentences">
 <em class="property">classmethod </em><tt class="descname">sentences</tt><big>(</big><em>text</em>, <em>strip=True</em><big>)</big><a class="headerlink" href="#translate.lang.zh.zh.sentences" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of senteces in text.</p>
+<dd><p>Returns a list of sentences in text.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -3648,7 +3666,7 @@ language.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/misc.html b/docs/_build/html/api/misc.html
index 16aea98..f5800c0 100644
--- a/docs/_build/html/api/misc.html
+++ b/docs/_build/html/api/misc.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>misc — Translate Toolkit 1.9.0 documentation</title>
+    <title>misc — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
     <link rel="next" title="search" href="search.html" />
     <link rel="prev" title="lang" href="lang.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,7 +94,6 @@
 <li><a class="reference internal" href="#module-translate.misc.profiling">profiling</a></li>
 <li><a class="reference internal" href="#module-translate.misc.progressbar">progressbar</a></li>
 <li><a class="reference internal" href="#module-translate.misc.quote">quote</a></li>
-<li><a class="reference internal" href="#module-translate.misc.selector">selector</a></li>
 <li><a class="reference internal" href="#module-translate.misc.sparse">sparse</a></li>
 <li><a class="reference internal" href="#module-translate.misc.stdiotell">stdiotell</a></li>
 <li><a class="reference internal" href="#module-translate.misc.textwrap">textwrap</a></li>
@@ -106,8 +107,7 @@
 <li><a class="reference internal" href="#module-translate.misc.wsgi">wsgi</a></li>
 <li><a class="reference internal" href="#module-translate.misc.wStringIO">wStringIO</a></li>
 <li><a class="reference internal" href="#module-translate.misc.xml_helpers">xml_helpers</a></li>
-<li><a class="reference internal" href="#xmlwrapper">xmlwrapper</a></li>
-<li><a class="reference internal" href="#module-translate.misc.zipfileext">zipfileext</a></li>
+<li><a class="reference internal" href="#module-translate.misc.xmlwrapper">xmlwrapper</a></li>
 </ul>
 </li>
 </ul>
@@ -121,10 +121,11 @@
   <li><a href="search.html"
          title="next chapter">search »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -158,25 +159,28 @@ and uses this when converting to a string.</p>
 <tt class="descclassname">translate.misc.contextlib.</tt><tt class="descname">contextmanager</tt><big>(</big><em>func</em><big>)</big><a class="headerlink" href="#translate.misc.contextlib.contextmanager" title="Permalink to this definition">¶</a></dt>
 <dd><p>@contextmanager decorator.</p>
 <p>Typical usage:</p>
-<div class="highlight-python"><pre>@contextmanager
+<div class="highlight-python"><div class="highlight"><pre>@contextmanager
 def some_generator(<arguments>):
     <setup>
     try:
         yield <value>
     finally:
-        <cleanup></pre>
+        <cleanup>
+</pre></div>
 </div>
 <p>This makes this:</p>
-<div class="highlight-python"><pre>with some_generator(<arguments>) as <variable>:
-    <body></pre>
+<div class="highlight-python"><div class="highlight"><pre>with some_generator(<arguments>) as <variable>:
+    <body>
+</pre></div>
 </div>
 <p>equivalent to this:</p>
-<div class="highlight-python"><pre><setup>
+<div class="highlight-python"><div class="highlight"><pre><setup>
 try:
     <variable> = <value>
     <body>
 finally:
-    <cleanup></pre>
+    <cleanup>
+</pre></div>
 </div>
 </dd></dl>
 
@@ -185,14 +189,16 @@ finally:
 <tt class="descclassname">translate.misc.contextlib.</tt><tt class="descname">nested</tt><big>(</big><em>*args</em>, <em>**kwds</em><big>)</big><a class="headerlink" href="#translate.misc.contextlib.nested" title="Permalink to this definition">¶</a></dt>
 <dd><p>Support multiple context managers in a single with-statement.</p>
 <p>Code like this:</p>
-<div class="highlight-python"><pre>with nested(A, B, C) as (X, Y, Z):
-    <body></pre>
+<div class="highlight-python"><div class="highlight"><pre>with nested(A, B, C) as (X, Y, Z):
+    <body>
+</pre></div>
 </div>
 <p>is equivalent to this:</p>
-<div class="highlight-python"><pre>with A as X:
+<div class="highlight-python"><div class="highlight"><pre>with A as X:
     with B as Y:
         with C as Z:
-            <body></pre>
+            <body>
+</pre></div>
 </div>
 </dd></dl>
 
@@ -201,15 +207,17 @@ finally:
 <em class="property">class </em><tt class="descclassname">translate.misc.contextlib.</tt><tt class="descname">closing</tt><big>(</big><em>thing</em><big>)</big><a class="headerlink" href="#translate.misc.contextlib.closing" title="Permalink to this definition">¶</a></dt>
 <dd><p>Context to automatically close something at the end of a block.</p>
 <p>Code like this:</p>
-<div class="highlight-python"><pre>with closing(<module>.open(<arguments>)) as f:
-    <block></pre>
+<div class="highlight-python"><div class="highlight"><pre>with closing(<module>.open(<arguments>)) as f:
+    <block>
+</pre></div>
 </div>
 <p>is equivalent to this:</p>
-<div class="highlight-python"><pre>f = <module>.open(<arguments>)
+<div class="highlight-python"><div class="highlight"><pre>f = <module>.open(<arguments>)
 try:
     <block>
 finally:
-    f.close()</pre>
+    f.close()
+</pre></div>
 </div>
 </dd></dl>
 
@@ -481,8 +489,10 @@ e.g: The c<ins>at c</ins>ame. -> The <ins>cat </ins>c
 <dl class="method">
 <dt id="translate.misc.diff_match_patch.diff_match_patch.diff_compute">
 <tt class="descname">diff_compute</tt><big>(</big><em>text1</em>, <em>text2</em>, <em>checklines</em><big>)</big><a class="headerlink" href="#translate.misc.diff_match_patch.diff_match_patch.diff_compute" title="Permalink to this definition">¶</a></dt>
-<dd><p>Find the differences between two texts.  Assumes that the texts do not
-have any common prefix or suffix.</p>
+<dd><dl class="docutils">
+<dt>Find the differences between two texts.  Assumes that the texts do not</dt>
+<dd>have any common prefix or suffix.</dd>
+</dl>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -598,8 +608,10 @@ intentionally blank.</p>
 <dl class="method">
 <dt id="translate.misc.diff_match_patch.diff_match_patch.diff_main">
 <tt class="descname">diff_main</tt><big>(</big><em>text1</em>, <em>text2</em>, <em>checklines=True</em><big>)</big><a class="headerlink" href="#translate.misc.diff_match_patch.diff_match_patch.diff_main" title="Permalink to this definition">¶</a></dt>
-<dd><p>Find the differences between two texts.  Simplifies the problem by
-stripping any common prefix or suffix off the texts before diffing.</p>
+<dd><dl class="docutils">
+<dt>Find the differences between two texts.  Simplifies the problem by</dt>
+<dd>stripping any common prefix or suffix off the texts before diffing.</dd>
+</dl>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1455,7 +1467,7 @@ manpage</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -1556,8 +1568,7 @@ specified file.</p>
 <li><strong>filename</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/functions.html#str" title="(in Python v2.7)"><em>str</em></a>) – The filename to write the profile to. If not specified the
 decorated function’s name is used, followed by
 <tt class="docutils literal"><span class="pre">_func.profile</span></tt>.</li>
-<li><strong>mode</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/functions.html#str" title="(in Python v2.7)"><em>str</em></a>) – The mode in which to open <a href="#id1"><span class="problematic" id="id2">:param:`filename`</span></a>. Default is
-<tt class="docutils literal"><span class="pre">w+</span></tt>.</li>
+<li><strong>mode</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/functions.html#str" title="(in Python v2.7)"><em>str</em></a>) – The mode in which to open <tt class="docutils literal"><span class="pre">filename</span></tt>. Default is <tt class="docutils literal"><span class="pre">w+</span></tt>.</li>
 </ul>
 </td>
 </tr>
@@ -1693,225 +1704,6 @@ in Python and modify it to retain escaped control characters.</p>
 </dd></dl>
 
 </div>
-<div class="section" id="module-translate.misc.selector">
-<span id="selector"></span><h2>selector<a class="headerlink" href="#module-translate.misc.selector" title="Permalink to this headline">¶</a></h2>
-<p>selector - WSGI delegation based on URL path and method.</p>
-<p>(See the docstring of selector.Selector.)</p>
-<p>Copyright (C) 2006 Luke Arno - <a class="reference external" href="http://lukearno.com/">http://lukearno.com/</a></p>
-<p>This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.</p>
-<p>This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.</p>
-<p>You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to 
-the Free Software Foundation, Inc., 51 Franklin Street, 
-Fifth Floor, Boston, MA  02110-1301  USA</p>
-<p>Luke Arno can be found at <a class="reference external" href="http://lukearno.com/">http://lukearno.com/</a></p>
-<dl class="class">
-<dt id="translate.misc.selector.ByMethod">
-<em class="property">class </em><tt class="descclassname">translate.misc.selector.</tt><tt class="descname">ByMethod</tt><a class="headerlink" href="#translate.misc.selector.ByMethod" title="Permalink to this definition">¶</a></dt>
-<dd><p>Base class for dispatching to method named by <tt class="docutils literal"><span class="pre">REQUEST_METHOD</span></tt>.</p>
-</dd></dl>
-
-<dl class="class">
-<dt id="translate.misc.selector.EnvironDispatcher">
-<em class="property">class </em><tt class="descclassname">translate.misc.selector.</tt><tt class="descname">EnvironDispatcher</tt><big>(</big><em>rules</em><big>)</big><a class="headerlink" href="#translate.misc.selector.EnvironDispatcher" title="Permalink to this definition">¶</a></dt>
-<dd><p>Dispatch based on list of rules.</p>
-</dd></dl>
-
-<dl class="class">
-<dt id="translate.misc.selector.MiddlewareComposer">
-<em class="property">class </em><tt class="descclassname">translate.misc.selector.</tt><tt class="descname">MiddlewareComposer</tt><big>(</big><em>app</em>, <em>rules</em><big>)</big><a class="headerlink" href="#translate.misc.selector.MiddlewareComposer" title="Permalink to this definition">¶</a></dt>
-<dd><p>Compose middleware based on list of rules.</p>
-</dd></dl>
-
-<dl class="class">
-<dt id="translate.misc.selector.Naked">
-<em class="property">class </em><tt class="descclassname">translate.misc.selector.</tt><tt class="descname">Naked</tt><a class="headerlink" href="#translate.misc.selector.Naked" title="Permalink to this definition">¶</a></dt>
-<dd><p>Naked object style dispatch base class.</p>
-</dd></dl>
-
-<dl class="class">
-<dt id="translate.misc.selector.Selector">
-<em class="property">class </em><tt class="descclassname">translate.misc.selector.</tt><tt class="descname">Selector</tt><big>(</big><em>mappings=None</em>, <em>prefix=''</em>, <em>parser=None</em>, <em>wrap=None</em>, <em>mapfile=None</em>, <em>consume_path=True</em><big>)</big><a class="headerlink" href="#translate.misc.selector.Selector" title="Permalink to this definition">¶</a></dt>
-<dd><p>WSGI middleware for URL paths and HTTP method based delegation.</p>
-<p>See <a class="reference external" href="http://lukearno.com/projects/selector/">http://lukearno.com/projects/selector/</a></p>
-<p>Mappings are given are an iterable that returns tuples like this:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">(</span><span class="n">path_expression</span><span class="p">,</span> <span class="n">http_methods_dict</span><span class="p">,</span> <span class="n">optional_prefix</span><span class="p">)</span>
-</pre></div>
-</div>
-<dl class="method">
-<dt id="translate.misc.selector.Selector.add">
-<tt class="descname">add</tt><big>(</big><em>path</em>, <em>method_dict=None</em>, <em>prefix=None</em>, <em>**http_methods</em><big>)</big><a class="headerlink" href="#translate.misc.selector.Selector.add" title="Permalink to this definition">¶</a></dt>
-<dd><p>Add a mapping.</p>
-<p>HTTP methods can be specified in a dict or using kwargs,
-but kwargs will override if both are given.</p>
-<p>Prefix will override self.prefix for this mapping.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.selector.Selector.select">
-<tt class="descname">select</tt><big>(</big><em>path</em>, <em>method</em><big>)</big><a class="headerlink" href="#translate.misc.selector.Selector.select" title="Permalink to this definition">¶</a></dt>
-<dd><p>Figure out which app to delegate to or send 404 or 405.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.selector.Selector.slurp">
-<tt class="descname">slurp</tt><big>(</big><em>mappings</em>, <em>prefix=None</em>, <em>parser=None</em>, <em>wrap=None</em><big>)</big><a class="headerlink" href="#translate.misc.selector.Selector.slurp" title="Permalink to this definition">¶</a></dt>
-<dd><p>Slurp in a whole list (or iterable) of mappings.</p>
-<p>Prefix and parser args will override self.parser and self.args
-for the given mappings.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.selector.Selector.slurp_file">
-<tt class="descname">slurp_file</tt><big>(</big><em>the_file</em>, <em>prefix=None</em>, <em>parser=None</em>, <em>wrap=None</em><big>)</big><a class="headerlink" href="#translate.misc.selector.Selector.slurp_file" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read mappings from a simple text file.</p>
-<p>Format looks like this:</p>
-<div class="highlight-python"><pre>{{{
-
-# Comments if first non-whitespace char on line is '#'
-# Blank lines are ignored
-
-/foo/{id}[/]
-    GET somemodule:some_wsgi_app
-    POST pak.subpak.mod:other_wsgi_app
-
- at prefix /myapp
-/path[/]
-    GET module:app
-    POST package.module:get_app('foo')
-    PUT package.module:FooApp('hello', resolve('module.setting'))
-
- at parser :lambda x: x
- at prefix 
-^/spam/eggs[/]$
-    GET mod:regex_mapped_app
-
-}}}</pre>
-</div>
-<p><tt class="docutils literal"><span class="pre">@prefix</span></tt> and <tt class="docutils literal"><span class="pre">@parser</span></tt> directives take effect 
-until the end of the file or until changed.</p>
-</dd></dl>
-
-<dl class="staticmethod">
-<dt id="translate.misc.selector.Selector.status404">
-<em class="property">static </em><tt class="descname">status404</tt><big>(</big><em>environ</em>, <em>start_response</em><big>)</big><a class="headerlink" href="#translate.misc.selector.Selector.status404" title="Permalink to this definition">¶</a></dt>
-<dd><p>Respond with a 404.</p>
-</dd></dl>
-
-<dl class="staticmethod">
-<dt id="translate.misc.selector.Selector.status405">
-<em class="property">static </em><tt class="descname">status405</tt><big>(</big><em>environ</em>, <em>start_response</em><big>)</big><a class="headerlink" href="#translate.misc.selector.Selector.status405" title="Permalink to this definition">¶</a></dt>
-<dd><p>Respond with a 405 and appropriate Allow header.</p>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="translate.misc.selector.SimpleParser">
-<em class="property">class </em><tt class="descclassname">translate.misc.selector.</tt><tt class="descname">SimpleParser</tt><big>(</big><em>patterns=None</em><big>)</big><a class="headerlink" href="#translate.misc.selector.SimpleParser" title="Permalink to this definition">¶</a></dt>
-<dd><p>Callable to turn path expressions into regexes with named groups.</p>
-<p>For instance <tt class="docutils literal"><span class="pre">"/hello/{name}"</span></tt> becomes <tt class="docutils literal"><span class="pre">r"^\/hello\/(?P<name>[^\^.]+)$"</span></tt></p>
-<p>For <tt class="docutils literal"><span class="pre">/hello/{name:pattern}</span></tt>
-you get whatever is in <tt class="docutils literal"><span class="pre">self.patterns['pattern']</span></tt> instead of <tt class="docutils literal"><span class="pre">"[^\^.]+"</span></tt></p>
-<p>Optional portions of path expression can be expressed <tt class="docutils literal"><span class="pre">[like</span> <span class="pre">this]</span></tt></p>
-<p><tt class="docutils literal"><span class="pre">/hello/{name}[/]</span></tt> (can have trailing slash or not)</p>
-<p>Example:</p>
-<div class="highlight-python"><pre>/blog/archive/{year:digits}/{month:digits}[/[{article}[/]]]</pre>
-</div>
-<p>This would catch any of these:</p>
-<div class="highlight-python"><pre>/blog/archive/2005/09
-/blog/archive/2005/09/
-/blog/archive/2005/09/1
-/blog/archive/2005/09/1/</pre>
-</div>
-<p>(I am not suggesting that this example is a best practice.
-I would probably have a separate mapping for listing the month
-and retrieving an individual entry. It depends, though.)</p>
-<dl class="method">
-<dt id="translate.misc.selector.SimpleParser.lastly">
-<tt class="descname">lastly</tt><big>(</big><em>regex</em><big>)</big><a class="headerlink" href="#translate.misc.selector.SimpleParser.lastly" title="Permalink to this definition">¶</a></dt>
-<dd><p>Process the result of __call__ right before it returns.</p>
-<p>Adds the ^ and the $ to the beginning and the end, respectively.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.selector.SimpleParser.lookup">
-<tt class="descname">lookup</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#translate.misc.selector.SimpleParser.lookup" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return the replacement for the name found.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.selector.SimpleParser.openended">
-<tt class="descname">openended</tt><big>(</big><em>regex</em><big>)</big><a class="headerlink" href="#translate.misc.selector.SimpleParser.openended" title="Permalink to this definition">¶</a></dt>
-<dd><p>Process the result of <tt class="docutils literal"><span class="pre">__call__</span></tt> right before it returns.</p>
-<p>Adds the ^ to the beginning but no $ to the end.
-Called as a special alternative to lastly.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.selector.SimpleParser.outermost_optionals_split">
-<tt class="descname">outermost_optionals_split</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.misc.selector.SimpleParser.outermost_optionals_split" title="Permalink to this definition">¶</a></dt>
-<dd><p>Split out optional portions by outermost matching delims.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.selector.SimpleParser.parse">
-<tt class="descname">parse</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.misc.selector.SimpleParser.parse" title="Permalink to this definition">¶</a></dt>
-<dd><p>Turn a path expression into regex.</p>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="function">
-<dt id="translate.misc.selector.expose">
-<tt class="descclassname">translate.misc.selector.</tt><tt class="descname">expose</tt><big>(</big><em>obj</em><big>)</big><a class="headerlink" href="#translate.misc.selector.expose" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set obj._exposed = True and return obj.</p>
-</dd></dl>
-
-<dl class="function">
-<dt id="translate.misc.selector.method_not_allowed">
-<tt class="descclassname">translate.misc.selector.</tt><tt class="descname">method_not_allowed</tt><big>(</big><em>environ</em>, <em>start_response</em><big>)</big><a class="headerlink" href="#translate.misc.selector.method_not_allowed" title="Permalink to this definition">¶</a></dt>
-<dd><p>Respond with a 405 and appropriate Allow header.</p>
-</dd></dl>
-
-<dl class="function">
-<dt id="translate.misc.selector.not_found">
-<tt class="descclassname">translate.misc.selector.</tt><tt class="descname">not_found</tt><big>(</big><em>environ</em>, <em>start_response</em><big>)</big><a class="headerlink" href="#translate.misc.selector.not_found" title="Permalink to this definition">¶</a></dt>
-<dd><p>Respond with a 404.</p>
-</dd></dl>
-
-<dl class="function">
-<dt id="translate.misc.selector.opliant">
-<tt class="descclassname">translate.misc.selector.</tt><tt class="descname">opliant</tt><big>(</big><em>meth</em><big>)</big><a class="headerlink" href="#translate.misc.selector.opliant" title="Permalink to this definition">¶</a></dt>
-<dd><p>Decorate a bound wsgi callable taking args from
-<tt class="docutils literal"><span class="pre">wsgiorg.routing_args</span></tt></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="k">class</span> <span class="nc">App</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
-    <span class="nd">@opliant</span>
-    <span class="k">def</span> <span class="nf">__call__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">environ</span><span class="p">,</span> <span class="n">start_response</span><span class="p">,</span> <span class="n">arg1</span><span class="p">,</span> <span class="n">arg2</span><span class="p">,</span> <span class="n">foo</span><span class="o">=</span><span class="s">'bar'</span><span class="p">):</span>
-        <span class="o">...</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="function">
-<dt id="translate.misc.selector.pliant">
-<tt class="descclassname">translate.misc.selector.</tt><tt class="descname">pliant</tt><big>(</big><em>func</em><big>)</big><a class="headerlink" href="#translate.misc.selector.pliant" title="Permalink to this definition">¶</a></dt>
-<dd><p>Decorate an unbound wsgi callable taking args from
-<tt class="docutils literal"><span class="pre">wsgiorg.routing_args</span></tt></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="nd">@pliant</span>
-<span class="k">def</span> <span class="nf">app</span><span class="p">(</span><span class="n">environ</span><span class="p">,</span> <span class="n">start_response</span><span class="p">,</span> <span class="n">arg1</span><span class="p">,</span> <span class="n">arg2</span><span class="p">,</span> <span class="n">foo</span><span class="o">=</span><span class="s">'bar'</span><span class="p">):</span>
-    <span class="o">...</span>
-</pre></div>
-</div>
-</dd></dl>
-
-</div>
 <div class="section" id="module-translate.misc.sparse">
 <span id="sparse"></span><h2>sparse<a class="headerlink" href="#module-translate.misc.sparse" title="Permalink to this headline">¶</a></h2>
 <p>simple parser / string tokenizer
@@ -2021,7 +1813,7 @@ the text</p>
 <p>Text wrapping and filling.</p>
 <dl class="class">
 <dt id="translate.misc.textwrap.TextWrapper">
-<em class="property">class </em><tt class="descclassname">translate.misc.textwrap.</tt><tt class="descname">TextWrapper</tt><big>(</big><em>width=70</em>, <em>initial_indent=''</em>, <em>subsequent_indent=''</em>, <em>expand_tabs=True</em>, <em>drop_whitespace=True</em>, <em>replace_whitespace=True</em>, <em>fix_sentence_endings=False</em>, <em>break_long_words=True</em><big>)</big><a class="headerlink" href="#translate.misc.textwrap.TextWrapper" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><tt class="descclassname">translate.misc.textwrap.</tt><tt class="descname">TextWrapper</tt><big>(</big><em>width=70</em>, <em>break_long_words=True</em><big>)</big><a class="headerlink" href="#translate.misc.textwrap.TextWrapper" title="Permalink to this definition">¶</a></dt>
 <dd><p>Object for wrapping/filling text.  The public interface consists of
 the wrap() and fill() methods; the other methods are just there for
 subclasses to override in order to tweak the default behaviour.
@@ -2033,27 +1825,6 @@ you’ll probably have to override _wrap_chunks().</p>
 <dt>width (default: 70)</dt>
 <dd>the maximum width of wrapped lines (unless break_long_words
 is false)</dd>
-<dt>initial_indent (default: “”)</dt>
-<dd>string that will be prepended to the first line of wrapped
-output.  Counts towards the line’s width.</dd>
-<dt>subsequent_indent (default: “”)</dt>
-<dd>string that will be prepended to all lines save the first
-of wrapped output; also counts towards each line’s width.</dd>
-<dt>expand_tabs (default: true)</dt>
-<dd>Expand tabs in input text to spaces before further processing.
-Each tab will become 1 .. 8 spaces, depending on its position in
-its line.  If false, each tab is treated as a single character.</dd>
-<dt>drop_whitespace (default: true)</dt>
-<dd>Drop leading and trailing whitespace from lines.</dd>
-<dt>replace_whitespace (default: true)</dt>
-<dd>Replace all whitespace characters in the input text by spaces
-after tab expansion.  Note that if expand_tabs is false and
-replace_whitespace is true, every tab will be converted to a
-single space!</dd>
-<dt>fix_sentence_endings (default: false)</dt>
-<dd>Ensure that sentence-ending punctuation is always followed
-by two spaces.  Off by default because the algorithm is
-(unavoidably) imperfect.</dd>
 <dt>break_long_words (default: true)</dt>
 <dd>Break words longer than ‘width’.  If false, those words will not
 be broken, and some lines might be longer than ‘width’.</dd>
@@ -2069,13 +1840,8 @@ containing the entire wrapped paragraph.</p>
 </dd></dl>
 
 <dl class="attribute">
-<dt id="translate.misc.textwrap.TextWrapper.sentence_end_re">
-<tt class="descname">sentence_end_re</tt><em class="property"> = <_sre.SRE_Pattern object at 0x103287bb0></em><a class="headerlink" href="#translate.misc.textwrap.TextWrapper.sentence_end_re" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="attribute">
 <dt id="translate.misc.textwrap.TextWrapper.wordsep_re">
-<tt class="descname">wordsep_re</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0ff032a10></em><a class="headerlink" href="#translate.misc.textwrap.TextWrapper.wordsep_re" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">wordsep_re</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f876723db20></em><a class="headerlink" href="#translate.misc.textwrap.TextWrapper.wordsep_re" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
@@ -2258,119 +2024,56 @@ given xml_space parameter.</p>
 </dd></dl>
 
 </div>
-<div class="section" id="xmlwrapper">
-<h2>xmlwrapper<a class="headerlink" href="#xmlwrapper" title="Permalink to this headline">¶</a></h2>
-</div>
-<div class="section" id="module-translate.misc.zipfileext">
-<span id="zipfileext"></span><h2>zipfileext<a class="headerlink" href="#module-translate.misc.zipfileext" title="Permalink to this headline">¶</a></h2>
-<p>Extensions to zipfile standard module that will hopefully get
-included in future.</p>
+<div class="section" id="module-translate.misc.xmlwrapper">
+<span id="xmlwrapper"></span><h2>xmlwrapper<a class="headerlink" href="#module-translate.misc.xmlwrapper" title="Permalink to this headline">¶</a></h2>
+<p>simpler wrapper to the elementtree XML parser</p>
 <dl class="class">
-<dt id="translate.misc.zipfileext.ZipFileExt">
-<em class="property">class </em><tt class="descclassname">translate.misc.zipfileext.</tt><tt class="descname">ZipFileExt</tt><big>(</big><em>file</em>, <em>mode='r'</em>, <em>compression=0</em>, <em>allowZip64=False</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt" title="Permalink to this definition">¶</a></dt>
-<dd><p>a ZipFile that can handle replacing objects</p>
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.close">
-<tt class="descname">close</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.close" title="Permalink to this definition">¶</a></dt>
-<dd><p>Close the file, and for mode “w” and “a” write the ending
-records.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.delete">
-<tt class="descname">delete</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.delete" title="Permalink to this definition">¶</a></dt>
-<dd><p>Delete the file from the archive. If it appears multiple
-times only the first instance will be deleted.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.extract">
-<tt class="descname">extract</tt><big>(</big><em>member</em>, <em>path=None</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.extract" title="Permalink to this definition">¶</a></dt>
-<dd><p>Extract a member from the archive to the current working directory,
-using its full name. Its file information is extracted as accurately
-as possible. <a href="#id3"><span class="problematic" id="id4">`</span></a>member’ may be a filename or a ZipInfo object. You can
-specify a different directory using <a href="#id5"><span class="problematic" id="id6">`</span></a>path’.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.extractall">
-<tt class="descname">extractall</tt><big>(</big><em>path=None</em>, <em>members=None</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.extractall" title="Permalink to this definition">¶</a></dt>
-<dd><p>Extract all members from the archive to the current working
-directory. <a href="#id7"><span class="problematic" id="id8">`</span></a>path’ specifies a different directory to extract to.
-<a href="#id9"><span class="problematic" id="id10">`</span></a>members’ is optional and must be a subset of the list returned
-by namelist().</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.getinfo">
-<tt class="descname">getinfo</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.getinfo" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return the instance of ZipInfo given ‘name’.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.infolist">
-<tt class="descname">infolist</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.infolist" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a list of class ZipInfo instances for files in the
-archive.</p>
-</dd></dl>
-
+<dt id="translate.misc.xmlwrapper.XMLWrapper">
+<em class="property">class </em><tt class="descclassname">translate.misc.xmlwrapper.</tt><tt class="descname">XMLWrapper</tt><big>(</big><em>obj</em><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.XMLWrapper" title="Permalink to this definition">¶</a></dt>
+<dd><p>simple wrapper for xml objects</p>
 <dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.namelist">
-<tt class="descname">namelist</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.namelist" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a list of file names in the archive.</p>
+<dt id="translate.misc.xmlwrapper.XMLWrapper.getattr">
+<tt class="descname">getattr</tt><big>(</big><em>attrname</em><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.XMLWrapper.getattr" title="Permalink to this definition">¶</a></dt>
+<dd><p>gets an attribute of the tag</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.open">
-<tt class="descname">open</tt><big>(</big><em>name</em>, <em>mode='r'</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.open" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return file-like object for ‘name’.</p>
+<dt id="translate.misc.xmlwrapper.XMLWrapper.getchild">
+<tt class="descname">getchild</tt><big>(</big><em>searchtag</em>, <em>tagclass=None</em><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.XMLWrapper.getchild" title="Permalink to this definition">¶</a></dt>
+<dd><p>get a child with the given tag name</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.printdir">
-<tt class="descname">printdir</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.printdir" title="Permalink to this definition">¶</a></dt>
-<dd><p>Print a table of contents for the zip file.</p>
+<dt id="translate.misc.xmlwrapper.XMLWrapper.getchildren">
+<tt class="descname">getchildren</tt><big>(</big><em>searchtag</em>, <em>tagclass=None</em>, <em>excludetags=</em><span class="optional">[</span><span class="optional">]</span><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.XMLWrapper.getchildren" title="Permalink to this definition">¶</a></dt>
+<dd><p>get all children with the given tag name</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.read">
-<tt class="descname">read</tt><big>(</big><em>name</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.read" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return file bytes (as a string) for name.</p>
+<dt id="translate.misc.xmlwrapper.XMLWrapper.gettext">
+<tt class="descname">gettext</tt><big>(</big><em>searchtag</em><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.XMLWrapper.gettext" title="Permalink to this definition">¶</a></dt>
+<dd><p>get some contained text</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.setpassword">
-<tt class="descname">setpassword</tt><big>(</big><em>pwd</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.setpassword" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set default password for encrypted files.</p>
+<dt id="translate.misc.xmlwrapper.XMLWrapper.getvalues">
+<tt class="descname">getvalues</tt><big>(</big><em>searchtag</em><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.XMLWrapper.getvalues" title="Permalink to this definition">¶</a></dt>
+<dd><p>get some contained values...</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.testzip">
-<tt class="descname">testzip</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.testzip" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read all the files and check the CRC.</p>
+<dt id="translate.misc.xmlwrapper.XMLWrapper.write">
+<tt class="descname">write</tt><big>(</big><em>file</em>, <em>encoding='UTF-8'</em><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.XMLWrapper.write" title="Permalink to this definition">¶</a></dt>
+<dd><p>writes the object as XML to a file...</p>
 </dd></dl>
 
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.write">
-<tt class="descname">write</tt><big>(</big><em>filename</em>, <em>arcname=None</em>, <em>compress_type=None</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.write" title="Permalink to this definition">¶</a></dt>
-<dd><p>Put the bytes from filename into the archive under the name
-arcname.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.writeendrec">
-<tt class="descname">writeendrec</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.writeendrec" title="Permalink to this definition">¶</a></dt>
-<dd><p>Write the ending records (without neccessarily closing the file)</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.misc.zipfileext.ZipFileExt.writestr">
-<tt class="descname">writestr</tt><big>(</big><em>zinfo_or_arcname</em>, <em>bytes</em>, <em>compress_type=None</em><big>)</big><a class="headerlink" href="#translate.misc.zipfileext.ZipFileExt.writestr" title="Permalink to this definition">¶</a></dt>
-<dd><p>Write a file into the archive.  The contents is the string
-‘bytes’.  ‘zinfo_or_arcname’ is either a ZipInfo instance or
-the name of the file in the archive.</p>
 </dd></dl>
 
+<dl class="function">
+<dt id="translate.misc.xmlwrapper.makefixtagproc">
+<tt class="descclassname">translate.misc.xmlwrapper.</tt><tt class="descname">makefixtagproc</tt><big>(</big><em>namespacemap</em><big>)</big><a class="headerlink" href="#translate.misc.xmlwrapper.makefixtagproc" title="Permalink to this definition">¶</a></dt>
+<dd><p>Constructs an alternative fixtag procedure that will use appropriate
+names for namespaces.</p>
 </dd></dl>
 
 </div>
@@ -2388,7 +2091,7 @@ the name of the file in the archive.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/search.html b/docs/_build/html/api/search.html
index 76aa0b3..4252678 100644
--- a/docs/_build/html/api/search.html
+++ b/docs/_build/html/api/search.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>search — Translate Toolkit 1.9.0 documentation</title>
+    <title>search — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
     <link rel="next" title="services" href="services.html" />
     <link rel="prev" title="misc" href="misc.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -79,7 +81,7 @@
 <li><a class="reference internal" href="#">search</a><ul>
 <li><a class="reference internal" href="#module-translate.search.indexing">indexing</a><ul>
 <li><a class="reference internal" href="#module-translate.search.indexing.CommonIndexer">CommonIndexer</a></li>
-<li><a class="reference internal" href="#pyluceneindexer1">PyLuceneIndexer1</a></li>
+<li><a class="reference internal" href="#module-translate.search.indexing.PyLuceneIndexer1">PyLuceneIndexer1</a></li>
 <li><a class="reference internal" href="#module-translate.search.indexing.PyLuceneIndexer">PyLuceneIndexer</a></li>
 <li><a class="reference internal" href="#module-translate.search.indexing.XapianIndexer">XapianIndexer</a></li>
 </ul>
@@ -101,10 +103,11 @@
   <li><a href="services.html"
          title="next chapter">services »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -476,8 +479,178 @@ interfaces.</p>
 </dd></dl>
 
 </div>
-<div class="section" id="pyluceneindexer1">
-<h3>PyLuceneIndexer1<a class="headerlink" href="#pyluceneindexer1" title="Permalink to this headline">¶</a></h3>
+<div class="section" id="module-translate.search.indexing.PyLuceneIndexer1">
+<span id="pyluceneindexer1"></span><h3>PyLuceneIndexer1<a class="headerlink" href="#module-translate.search.indexing.PyLuceneIndexer1" title="Permalink to this headline">¶</a></h3>
+<p>interface for the pylucene (v1.x) indexing engine</p>
+<p>take a look at PyLuceneIndexer.py for PyLucene v2.x support</p>
+<dl class="class">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase">
+<em class="property">class </em><tt class="descclassname">translate.search.indexing.PyLuceneIndexer1.</tt><tt class="descname">PyLuceneDatabase</tt><big>(</big><em>basedir</em>, <em>analyzer=None</em>, <em>create_allowed=True</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase" title="Permalink to this definition">¶</a></dt>
+<dd><p>manage and use a pylucene indexing database</p>
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.begin_transaction">
+<tt class="descname">begin_transaction</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.begin_transaction" title="Permalink to this definition">¶</a></dt>
+<dd><p>PyLucene does not support transactions</p>
+<p>Thus this function just opens the database for write access.
+Call “cancel_transaction” or “commit_transaction” to close write
+access in order to remove the exclusive lock from the database
+directory.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.cancel_transaction">
+<tt class="descname">cancel_transaction</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.cancel_transaction" title="Permalink to this definition">¶</a></dt>
+<dd><p>PyLucene does not support transactions</p>
+<p>Thus this function just closes the database write access and removes
+the exclusive lock.</p>
+<p>See ‘start_transaction’ for details.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.commit_transaction">
+<tt class="descname">commit_transaction</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.commit_transaction" title="Permalink to this definition">¶</a></dt>
+<dd><p>PyLucene does not support transactions</p>
+<p>Thus this function just closes the database write access and removes
+the exclusive lock.</p>
+<p>See ‘start_transaction’ for details.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.delete_document_by_id">
+<tt class="descname">delete_document_by_id</tt><big>(</big><em>docid</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.delete_document_by_id" title="Permalink to this definition">¶</a></dt>
+<dd><p>delete a specified document</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>docid</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/functions.html#int" title="(in Python v2.7)"><em>int</em></a>) – the document ID to be deleted</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.flush">
+<tt class="descname">flush</tt><big>(</big><em>optimize=False</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.flush" title="Permalink to this definition">¶</a></dt>
+<dd><p>flush the content of the database - to force changes to be written
+to disk</p>
+<p>some databases also support index optimization</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>optimize</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/functions.html#bool" title="(in Python v2.7)"><em>bool</em></a>) – should the index be optimized if possible?</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.get_field_analyzers">
+<tt class="descname">get_field_analyzers</tt><big>(</big><em>fieldnames=None</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.get_field_analyzers" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return the analyzer that was mapped to a specific field.</p>
+<p>See <a class="reference internal" href="#translate.search.indexing.CommonIndexer.CommonDatabase.set_field_analyzers" title="translate.search.indexing.CommonIndexer.CommonDatabase.set_field_analyzers"><tt class="xref py py-meth docutils literal"><span class="pre">set_field_analyzers()</span></tt></a> for details.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>fieldnames</strong> (<em>str | list of str | None</em>) – the analyzer of this field (or all/multiple fields)
+is requested; leave empty (or <em>None</em>) to
+request all fields.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">The analyzer setting of the field - see
+<em>CommonDatabase.ANALYZER_???</em> or a dict of field names
+and analyzers</td>
+</tr>
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">int | dict</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.get_query_result">
+<tt class="descname">get_query_result</tt><big>(</big><em>query</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.get_query_result" title="Permalink to this definition">¶</a></dt>
+<dd><p>return an object containing the results of a query</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>query</strong> (<em>a query object of the real implementation</em>) – a pre-compiled query</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">an object that allows access to the results</td>
+</tr>
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">subclass of CommonEnquire</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.index_document">
+<tt class="descname">index_document</tt><big>(</big><em>data</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.index_document" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add the given data to the database.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>data</strong> (<em>dict | list of str</em>) – the data to be indexed.
+A dictionary will be treated as <tt class="docutils literal"><span class="pre">fieldname:value</span></tt>
+combinations.
+If the fieldname is None then the value will be
+interpreted as a plain term or as a list of plain terms.
+Lists of terms are indexed separately.
+Lists of strings are treated as plain terms.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.search">
+<tt class="descname">search</tt><big>(</big><em>query</em>, <em>fieldnames</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.search" title="Permalink to this definition">¶</a></dt>
+<dd><p>return a list of the contents of specified fields for all matches of
+a query</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
+<li><strong>query</strong> (<em>a query object of the real implementation</em>) – the query to be issued</li>
+<li><strong>fieldnames</strong> (<em>string | list of strings</em>) – the name(s) of a field of the document content</li>
+</ul>
+</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">a list of dicts containing the specified field(s)</p>
+</td>
+</tr>
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><p class="first last">list of dicts</p>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.set_field_analyzers">
+<tt class="descname">set_field_analyzers</tt><big>(</big><em>field_analyzers</em><big>)</big><a class="headerlink" href="#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.set_field_analyzers" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the analyzers for different fields of the database documents.</p>
+<p>All bitwise combinations of <em>CommonIndexer.ANALYZER_???</em> are possible.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>field_analyzers</strong> (<em>dict containing field names and analyzers</em>) – mapping of field names and analyzers</td>
+</tr>
+<tr class="field-even field"><th class="field-name" colspan="2">Raises TypeError:</th></tr>
+<tr class="field-even field"><td> </td><td class="field-body">invalid values in <em>field_analyzers</em></td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+</dd></dl>
+
 </div>
 <div class="section" id="module-translate.search.indexing.PyLuceneIndexer">
 <span id="pyluceneindexer"></span><h3>PyLuceneIndexer<a class="headerlink" href="#module-translate.search.indexing.PyLuceneIndexer" title="Permalink to this headline">¶</a></h3>
@@ -711,7 +884,8 @@ to retrieve the exact number of matches</p>
 <p>Xapian v1.0 or higher is supported.</p>
 <p>If you are interested in writing an interface for Xapian 0.x, then
 you should checkout the following:</p>
-<div class="highlight-python"><pre>svn export -r 7235 https://translate.svn.sourceforge.net/svnroot/translate/src/branches/translate-search-indexer-generic-merging/translate/search/indexer/</pre>
+<div class="highlight-python"><div class="highlight"><pre>svn export -r 7235 https://translate.svn.sourceforge.net/svnroot/translate/src/branches/translate-search-indexer-generic-merging/translate/search/indexer/
+</pre></div>
 </div>
 <p>It is not completely working, but it should give you a good start.</p>
 <dl class="class">
@@ -948,10 +1122,10 @@ to retrieve the exact number of matches</p>
 <div class="section" id="module-translate.search.lshtein">
 <span id="lshtein"></span><h2>lshtein<a class="headerlink" href="#module-translate.search.lshtein" title="Permalink to this headline">¶</a></h2>
 <p>A class to calculate a similarity based on the Levenshtein
-distance. See <a class="reference external" href="http://en.wikipedia.org/wiki/Levenshtein_distance">http://en.wikipedia.org/wiki/Levenshtein_distance</a>.</p>
-<p>If available, the python-Levenshtein package will be used which will provide
-better performance as it is implemented natively. See
-<a class="reference external" href="http://trific.ath.cx/python/levenshtein/">http://trific.ath.cx/python/levenshtein/</a></p>
+distance.</p>
+<p>See <a class="reference external" href="http://en.wikipedia.org/wiki/Levenshtein_distance">http://en.wikipedia.org/wiki/Levenshtein_distance</a>.</p>
+<p>If available, the <a class="reference external" href="https://pypi.python.org/pypi/python-Levenshtein">python-Levenshtein</a> will be used which will
+provide better performance as it is implemented natively.</p>
 <dl class="function">
 <dt id="translate.search.lshtein.distance">
 <tt class="descclassname">translate.search.lshtein.</tt><tt class="descname">distance</tt><big>(</big><em>a</em>, <em>b</em>, <em>stopvalue=0</em><big>)</big><a class="headerlink" href="#translate.search.lshtein.distance" title="Permalink to this definition">¶</a></dt>
@@ -1205,7 +1379,7 @@ is not specified, it is set to the default, not ignored</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/services.html b/docs/_build/html/api/services.html
index 8a7db5c..b3015fb 100644
--- a/docs/_build/html/api/services.html
+++ b/docs/_build/html/api/services.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>services — Translate Toolkit 1.9.0 documentation</title>
+    <title>services — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
     <link rel="next" title="storage" href="storage.html" />
     <link rel="prev" title="search" href="search.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="storage.html"
          title="next chapter">storage »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -140,7 +143,7 @@ with clients using JSON over HTTP.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/storage.html b/docs/_build/html/api/storage.html
index b9347c0..58bac43 100644
--- a/docs/_build/html/api/storage.html
+++ b/docs/_build/html/api/storage.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>storage — Translate Toolkit 1.9.0 documentation</title>
+    <title>storage — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
     <link rel="next" title="tools" href="tools.html" />
     <link rel="prev" title="services" href="services.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -107,7 +109,7 @@
 <li><a class="reference internal" href="#module-translate.storage.placeables.parse">parse</a></li>
 <li><a class="reference internal" href="#module-translate.storage.placeables.strelem">strelem</a></li>
 <li><a class="reference internal" href="#module-translate.storage.placeables.terminology">terminology</a></li>
-<li><a class="reference internal" href="#module-translate.storage.placeables.xliff">xliff</a></li>
+<li><a class="reference internal" href="#id4">xliff</a></li>
 </ul>
 </li>
 <li><a class="reference internal" href="#module-translate.storage.php">php</a></li>
@@ -125,7 +127,7 @@
 <li><a class="reference internal" href="#module-translate.storage.rc">rc</a></li>
 <li><a class="reference internal" href="#module-translate.storage.statistics">statistics</a></li>
 <li><a class="reference internal" href="#module-translate.storage.statsdb">statsdb</a></li>
-<li><a class="reference internal" href="#subtitles">subtitles</a></li>
+<li><a class="reference internal" href="#module-translate.storage.subtitles">subtitles</a></li>
 <li><a class="reference internal" href="#module-translate.storage.symbian">symbian</a></li>
 <li><a class="reference internal" href="#module-translate.storage.tbx">tbx</a></li>
 <li><a class="reference internal" href="#module-translate.storage.tiki">tiki</a></li>
@@ -147,7 +149,7 @@
 </li>
 <li><a class="reference internal" href="#module-translate.storage.wordfast">wordfast</a></li>
 <li><a class="reference internal" href="#module-translate.storage.workflow">workflow</a></li>
-<li><a class="reference internal" href="#id12">xliff</a></li>
+<li><a class="reference internal" href="#id13">xliff</a></li>
 <li><a class="reference internal" href="#module-translate.storage.xml_extract">xml_extract</a><ul>
 <li><a class="reference internal" href="#module-translate.storage.xml_extract.extract">extract</a></li>
 <li><a class="reference internal" href="#module-translate.storage.xml_extract.generate">generate</a></li>
@@ -157,7 +159,6 @@
 </ul>
 </li>
 <li><a class="reference internal" href="#module-translate.storage.xml_name">xml_name</a></li>
-<li><a class="reference internal" href="#module-translate.storage.xpi">xpi</a></li>
 <li><a class="reference internal" href="#module-translate.storage.zip">zip</a></li>
 </ul>
 </li>
@@ -172,10 +173,11 @@
   <li><a href="tools.html"
          title="next chapter">tools »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -237,7 +239,7 @@ UnitClass.</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -251,7 +253,7 @@ UnitClass.</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -273,7 +275,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -287,7 +289,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -307,19 +309,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -331,7 +333,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -373,7 +375,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.base.TranslationStore.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -398,25 +400,25 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="attribute">
@@ -429,7 +431,7 @@ for a unit</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationStore.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationStore.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -452,8 +454,7 @@ for a unit</p>
 <dt id="translate.storage.base.TranslationUnit">
 <em class="property">class </em><tt class="descclassname">translate.storage.base.</tt><tt class="descname">TranslationUnit</tt><big>(</big><em>source=None</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationUnit" title="Permalink to this definition">¶</a></dt>
 <dd><p>Base class for translation units.</p>
-<p>Our concept of a <em>translation unit</em> is influenced heavily by XLIFF:
-<a class="reference external" href="http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm">http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm</a></p>
+<p>Our concept of a <em>translation unit</em> is influenced heavily by <a class="reference external" href="http://docs.oasis-open.org/xliff/xliff-core/xliff-core.html">XLIFF</a>.</p>
 <p>As such most of the method- and variable names borrows from XLIFF
 terminology.</p>
 <p>A translation unit consists of the following:</p>
@@ -480,8 +481,8 @@ can run checks on translations and produce error messages.</li>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -523,8 +524,8 @@ implement <a class="reference internal" href="#translate.storage.base.Translatio
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -763,7 +764,7 @@ tree.</p>
 <dl class="attribute">
 <dt id="translate.storage.base.TranslationUnit.rich_source">
 <tt class="descname">rich_source</tt><a class="headerlink" href="#translate.storage.base.TranslationUnit.rich_source" title="Permalink to this definition">¶</a></dt>
-<dd><div class="admonition-see-also admonition seealso">
+<dd><div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference internal" href="#translate.storage.base.TranslationUnit.rich_to_multistring" title="translate.storage.base.TranslationUnit.rich_to_multistring"><tt class="xref py py-meth docutils literal"><span class="pre">rich_to_multistring()</span></tt></a>, <a class="reference internal" href="#translate.storage.base.TranslationUnit.multistring_to_rich" title="translate.storage.base.TranslationUnit.multistring_to_rich"><tt class="xref py py-meth docutils literal">< [...]
 </div>
@@ -772,7 +773,7 @@ tree.</p>
 <dl class="attribute">
 <dt id="translate.storage.base.TranslationUnit.rich_target">
 <tt class="descname">rich_target</tt><a class="headerlink" href="#translate.storage.base.TranslationUnit.rich_target" title="Permalink to this definition">¶</a></dt>
-<dd><div class="admonition-see-also admonition seealso">
+<dd><div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference internal" href="#translate.storage.base.TranslationUnit.rich_to_multistring" title="translate.storage.base.TranslationUnit.rich_to_multistring"><tt class="xref py py-meth docutils literal"><span class="pre">rich_to_multistring()</span></tt></a>, <a class="reference internal" href="#translate.storage.base.TranslationUnit.multistring_to_rich" title="translate.storage.base.TranslationUnit.multistring_to_rich"><tt class="xref py py-meth docutils literal">< [...]
 </div>
@@ -807,13 +808,13 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.base.TranslationUnit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationUnit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source string to the given value.</p>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.base.TranslationUnit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.base.TranslationUnit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -850,11 +851,17 @@ unit properties like source or context</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.benchmark.TranslateBenchmarker.parse_file">
-<tt class="descname">parse_file</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.benchmark.TranslateBenchmarker.parse_file" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.benchmark.TranslateBenchmarker.parse_files">
+<tt class="descname">parse_files</tt><big>(</big><em>file_dir=None</em><big>)</big><a class="headerlink" href="#translate.storage.benchmark.TranslateBenchmarker.parse_files" title="Permalink to this definition">¶</a></dt>
 <dd><p>parses all the files in the test directory into memory</p>
 </dd></dl>
 
+<dl class="method">
+<dt id="translate.storage.benchmark.TranslateBenchmarker.parse_placeables">
+<tt class="descname">parse_placeables</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.benchmark.TranslateBenchmarker.parse_placeables" title="Permalink to this definition">¶</a></dt>
+<dd><p>parses placeables</p>
+</dd></dl>
+
 </dd></dl>
 
 </div>
@@ -1019,7 +1026,7 @@ the source code unchanged, it seems.</p>
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1033,7 +1040,7 @@ the source code unchanged, it seems.</p>
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -1055,7 +1062,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1069,7 +1076,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1089,19 +1096,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -1113,7 +1120,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -1155,7 +1162,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.catkeys.CatkeysFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -1180,25 +1187,25 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.catkeys.CatkeysFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.catkeys.CatkeysFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1242,8 +1249,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -1285,8 +1292,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -1574,7 +1581,7 @@ package for the public API of the library.</p>
 <dl class="data">
 <dt id="translate.storage.cpo.lsep">
 <tt class="descclassname">translate.storage.cpo.</tt><tt class="descname">lsep</tt><em class="property"> = ' '</em><a class="headerlink" href="#translate.storage.cpo.lsep" title="Permalink to this definition">¶</a></dt>
-<dd><p>Seperator for #: entries</p>
+<dd><p>Separator for #: entries</p>
 </dd></dl>
 
 </div>
@@ -1596,7 +1603,7 @@ The default format contains three columns: location, source, target</p>
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1610,7 +1617,7 @@ The default format contains three columns: location, source, target</p>
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -1632,7 +1639,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1646,7 +1653,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1666,19 +1673,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -1690,7 +1697,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -1726,7 +1733,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.csvl10n.csvfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -1751,31 +1758,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.csvl10n.csvfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.csvl10n.csvfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1935,7 +1942,7 @@ ending in <tt class="xref py py-attr docutils literal"><span class="pre">labelsu
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1949,7 +1956,7 @@ ending in <tt class="xref py py-attr docutils literal"><span class="pre">labelsu
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -1971,7 +1978,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -1985,7 +1992,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2011,19 +2018,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -2035,7 +2042,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -2076,7 +2083,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.dtd.dtdfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -2101,31 +2108,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.dtd.dtdfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.dtd.dtdfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2157,8 +2164,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -2196,8 +2203,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -2549,14 +2556,14 @@ _ext is a pseudo extension, that is their is no real extension by that name.</p>
 
 <dl class="function">
 <dt id="translate.storage.factory.getclass">
-<tt class="descclassname">translate.storage.factory.</tt><tt class="descname">getclass</tt><big>(</big><em>storefile</em>, <em>ignore=None</em>, <em>classes=None</em>, <em>classes_str={'lang': ('mozilla_lang'</em>, <em>'LangStore')</em>, <em>'tbx': ('tbx'</em>, <em>'tbxfile')</em>, <em>'qph': ('qph'</em>, <em>'QphFile')</em>, <em>'xlf': ('xliff'</em>, <em>'xlifffile')</em>, <em>'mo': ('mo'</em>, <em>'mofile')</em>, <em>'_trados_txt_tm': ('trados'</em>, <em>'TradosTxtTmFile')</em>, <em>'t [...]
+<tt class="descclassname">translate.storage.factory.</tt><tt class="descname">getclass</tt><big>(</big><em>storefile</em>, <em>ignore=None</em>, <em>classes=None</em>, <em>classes_str={'lang': ('mozilla_lang'</em>, <em>'LangStore')</em>, <em>'tbx': ('tbx'</em>, <em>'tbxfile')</em>, <em>'qph': ('qph'</em>, <em>'QphFile')</em>, <em>'xlf': ('xliff'</em>, <em>'xlifffile')</em>, <em>'mo': ('mo'</em>, <em>'mofile')</em>, <em>'_trados_txt_tm': ('trados'</em>, <em>'TradosTxtTmFile')</em>, <em>'t [...]
 <dd><p>Factory that returns the applicable class for the type of file presented.
 Specify ignore to ignore some part at the back of the name (like .gz).</p>
 </dd></dl>
 
 <dl class="function">
 <dt id="translate.storage.factory.getobject">
-<tt class="descclassname">translate.storage.factory.</tt><tt class="descname">getobject</tt><big>(</big><em>storefile</em>, <em>ignore=None</em>, <em>classes=None</em>, <em>classes_str={'lang': ('mozilla_lang'</em>, <em>'LangStore')</em>, <em>'tbx': ('tbx'</em>, <em>'tbxfile')</em>, <em>'qph': ('qph'</em>, <em>'QphFile')</em>, <em>'xlf': ('xliff'</em>, <em>'xlifffile')</em>, <em>'mo': ('mo'</em>, <em>'mofile')</em>, <em>'_trados_txt_tm': ('trados'</em>, <em>'TradosTxtTmFile')</em>, <em>' [...]
+<tt class="descclassname">translate.storage.factory.</tt><tt class="descname">getobject</tt><big>(</big><em>storefile</em>, <em>ignore=None</em>, <em>classes=None</em>, <em>classes_str={'lang': ('mozilla_lang'</em>, <em>'LangStore')</em>, <em>'tbx': ('tbx'</em>, <em>'tbxfile')</em>, <em>'qph': ('qph'</em>, <em>'QphFile')</em>, <em>'xlf': ('xliff'</em>, <em>'xlifffile')</em>, <em>'mo': ('mo'</em>, <em>'mofile')</em>, <em>'_trados_txt_tm': ('trados'</em>, <em>'TradosTxtTmFile')</em>, <em>' [...]
 <dd><p>Factory that returns a usable object for the type of file presented.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -2594,7 +2601,7 @@ directly, but can be used once cpo has been established to work.</p>
 <dl class="data">
 <dt id="translate.storage.fpo.lsep">
 <tt class="descclassname">translate.storage.fpo.</tt><tt class="descname">lsep</tt><em class="property"> = ' '</em><a class="headerlink" href="#translate.storage.fpo.lsep" title="Permalink to this definition">¶</a></dt>
-<dd><p>Seperator for #: entries</p>
+<dd><p>Separator for #: entries</p>
 </dd></dl>
 
 <dl class="class">
@@ -2610,7 +2617,7 @@ directly, but can be used once cpo has been established to work.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2624,7 +2631,7 @@ directly, but can be used once cpo has been established to work.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -2652,7 +2659,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2666,7 +2673,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2709,7 +2716,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -2750,7 +2757,7 @@ if present.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -2828,7 +2835,7 @@ dictionary.</p>
 <dl class="classmethod">
 <dt id="translate.storage.fpo.pofile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -2859,7 +2866,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
@@ -2879,7 +2886,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -2900,7 +2907,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.fpo.pofile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.fpo.pofile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -2955,8 +2962,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -2988,8 +2995,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -3229,7 +3236,7 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.html.htmlunit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.html.htmlunit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -3319,7 +3326,7 @@ this format to understand those if needed.</dd>
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3333,7 +3340,7 @@ this format to understand those if needed.</dd>
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -3355,7 +3362,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3369,7 +3376,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3389,19 +3396,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -3413,7 +3420,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -3455,7 +3462,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.ical.icalfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -3480,31 +3487,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ical.icalfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3536,8 +3543,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -3569,8 +3576,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -3810,13 +3817,13 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.ical.icalunit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalunit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source string to the given value.</p>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ical.icalunit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.ical.icalunit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -3861,7 +3868,7 @@ b : a string</p>
 <dl class="method">
 <dt id="translate.storage.ini.inifile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3875,7 +3882,7 @@ b : a string</p>
 <dl class="method">
 <dt id="translate.storage.ini.inifile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -3897,7 +3904,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ini.inifile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3911,7 +3918,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ini.inifile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -3931,19 +3938,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ini.inifile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ini.inifile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ini.inifile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -3955,7 +3962,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.ini.inifile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -3997,7 +4004,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.ini.inifile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -4022,31 +4029,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.ini.inifile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ini.inifile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ini.inifile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ini.inifile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ini.inifile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ini.inifile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -4078,8 +4085,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -4111,8 +4118,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -4352,13 +4359,13 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.ini.iniunit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ini.iniunit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source string to the given value.</p>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ini.iniunit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.ini.iniunit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -4445,7 +4452,7 @@ enclosed in curly braces)</li>
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -4459,7 +4466,7 @@ enclosed in curly braces)</li>
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -4481,7 +4488,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -4495,7 +4502,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -4515,19 +4522,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -4539,7 +4546,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -4581,7 +4588,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.jsonl10n.JsonFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -4606,31 +4613,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.jsonl10n.JsonFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.jsonl10n.JsonFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -4662,8 +4669,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -4705,8 +4712,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -4966,7 +4973,7 @@ to ensure that other classes can implement more functionality
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -4980,7 +4987,7 @@ to ensure that other classes can implement more functionality
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -5000,19 +5007,19 @@ to ensure that other classes can implement more functionality
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -5031,7 +5038,7 @@ XML again.</p>
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -5063,7 +5070,8 @@ useful.</p>
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -5084,7 +5092,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.lisa.LISAfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -5109,31 +5117,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.lisa.LISAfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.lisa.LISAfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -5166,8 +5174,8 @@ languages possible.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -5209,8 +5217,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -5477,7 +5485,8 @@ to ensure that other classes can implement more functionality
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -5566,7 +5575,7 @@ in very small files.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -5580,7 +5589,7 @@ in very small files.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -5602,7 +5611,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -5616,7 +5625,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -5659,7 +5668,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -5700,7 +5709,7 @@ if present.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -5788,7 +5797,7 @@ dictionary.</p>
 <dl class="classmethod">
 <dt id="translate.storage.mo.mofile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -5813,7 +5822,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
@@ -5833,7 +5842,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -5854,7 +5863,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.mo.mofile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mofile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -5905,8 +5914,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -5948,8 +5957,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -6205,13 +6214,13 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.mo.mounit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mounit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source string to the given value.</p>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mo.mounit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.mo.mounit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6234,7 +6243,7 @@ unit properties like source or context</p>
 <p>A class to manage Mozilla .lang files.</p>
 <dl class="class">
 <dt id="translate.storage.mozilla_lang.LangStore">
-<em class="property">class </em><tt class="descclassname">translate.storage.mozilla_lang.</tt><tt class="descname">LangStore</tt><big>(</big><em>inputfile=None</em>, <em>flavour=None</em>, <em>encoding='utf-8'</em>, <em>mark_active=True</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><tt class="descclassname">translate.storage.mozilla_lang.</tt><tt class="descname">LangStore</tt><big>(</big><em>inputfile=None</em>, <em>flavour=None</em>, <em>encoding='utf-8'</em>, <em>mark_active=False</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore" title="Permalink to this definition">¶</a></dt>
 <dd><p>We extend TxtFile, since that has a lot of useful stuff for encoding</p>
 <dl class="attribute">
 <dt id="translate.storage.mozilla_lang.LangStore.UnitClass">
@@ -6251,7 +6260,7 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -6265,7 +6274,7 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -6287,7 +6296,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -6301,7 +6310,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -6327,19 +6336,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6351,7 +6360,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6387,7 +6396,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.mozilla_lang.LangStore.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6412,31 +6421,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangStore.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangStore.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -6468,8 +6477,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -6501,8 +6510,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -6742,13 +6751,13 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangUnit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangUnit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source string to the given value.</p>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.mozilla_lang.LangUnit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.mozilla_lang.LangUnit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6817,7 +6826,7 @@ file.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -6831,7 +6840,7 @@ file.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -6853,7 +6862,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -6867,7 +6876,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -6887,19 +6896,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6911,7 +6920,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6953,7 +6962,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.omegat.OmegaTFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -6978,31 +6987,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -7040,7 +7049,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -7054,7 +7063,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -7076,7 +7085,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -7090,7 +7099,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -7110,19 +7119,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -7134,7 +7143,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -7176,7 +7185,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.omegat.OmegaTFileTab.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -7201,31 +7210,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.omegat.OmegaTFileTab.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.omegat.OmegaTFileTab.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -7257,8 +7266,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -7549,8 +7558,7 @@ unit properties like source or context</p>
 <span id="oo"></span><h2>oo<a class="headerlink" href="#module-translate.storage.oo" title="Permalink to this headline">¶</a></h2>
 <p>Classes that hold units of .oo files (oounit) or entire files (oofile).</p>
 <p>These are specific .oo files for localisation exported by OpenOffice.org - SDF
-format (previously knows as GSI files). For an overview of the format, see
-<a class="reference external" href="http://l10n.openoffice.org/L10N_Framework/Intermediate_file_format.html">http://l10n.openoffice.org/L10N_Framework/Intermediate_file_format.html</a></p>
+format (previously knows as GSI files).</p>
 <p>The behaviour in terms of escaping is explained in detail in the programming
 comments.</p>
 <dl class="function">
@@ -7804,17 +7812,27 @@ fit into any other sub-category.</p>
 <dl class="method">
 <dt id="translate.storage.placeables.general.AltAttrPlaceable.apply_to_strings">
 <tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.apply_to_strings" title="Permalink to this definition">¶</a></dt>
-<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.
-:param f: Must take one (str or unicode) argument and return a
-string or unicode.</p>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>f</strong> – Must take one (str or unicode) argument and return a
+string or unicode.</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.placeables.general.AltAttrPlaceable.copy">
 <tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.copy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a copy of the sub-tree.
-This should be overridden in sub-classes with more data.</p>
-<p>NOTE: <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+<dd><p>Returns a copy of the sub-tree.  This should be overridden in
+sub-classes with more data.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last"><tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+</div>
 </dd></dl>
 
 <dl class="method">
@@ -7822,8 +7840,7 @@ This should be overridden in sub-classes with more data.</p>
 <tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.delete_range" title="Permalink to this definition">¶</a></dt>
 <dd><p>Delete the text in the range given by the string-indexes
 <tt class="docutils literal"><span class="pre">start_index</span></tt> and <tt class="docutils literal"><span class="pre">end_index</span></tt>.</p>
-<blockquote>
-<div>Partial nodes will only be removed if they are editable.</div></blockquote>
+<p>Partial nodes will only be removed if they are editable.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -7900,11 +7917,20 @@ tree’s leaves.</p>
 <dl class="method">
 <dt id="translate.storage.placeables.general.AltAttrPlaceable.get_index_data">
 <tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.get_index_data" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get info about the specified range in the tree.
-:returns: A dictionary with the following items:
-* <em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.
-* <em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter
-* <em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</p>
+<dd><p>Get info about the specified range in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A dictionary with the following items:<ul class="simple">
+<li><em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.</li>
+<li><em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter</li>
+<li><em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
@@ -7916,7 +7942,7 @@ tree’s leaves.</p>
 
 <dl class="method">
 <dt id="translate.storage.placeables.general.AltAttrPlaceable.insert">
-<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.insert" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em>, <em>preferred_parent=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.insert" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text at the specified offset of this string-tree’s
 string (Unicode) representation.</p>
 </dd></dl>
@@ -7979,7 +8005,7 @@ manner.</p>
 
 <dl class="attribute">
 <dt id="translate.storage.placeables.general.AltAttrPlaceable.regex">
-<tt class="descname">regex</tt><em class="property"> = <_sre.SRE_Pattern object at 0x102fde7b0></em><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.regex" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">regex</tt><em class="property"> = <_sre.SRE_Pattern object at 0x10f9f82b0></em><a class="headerlink" href="#translate.storage.placeables.general.AltAttrPlaceable.regex" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
@@ -8015,17 +8041,27 @@ or dynamically replaced by specific applications.</p>
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLEntityPlaceable.apply_to_strings">
 <tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.apply_to_strings" title="Permalink to this definition">¶</a></dt>
-<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.
-:param f: Must take one (str or unicode) argument and return a
-string or unicode.</p>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>f</strong> – Must take one (str or unicode) argument and return a
+string or unicode.</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLEntityPlaceable.copy">
 <tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.copy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a copy of the sub-tree.
-This should be overridden in sub-classes with more data.</p>
-<p>NOTE: <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+<dd><p>Returns a copy of the sub-tree.  This should be overridden in
+sub-classes with more data.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last"><tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+</div>
 </dd></dl>
 
 <dl class="method">
@@ -8033,8 +8069,7 @@ This should be overridden in sub-classes with more data.</p>
 <tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.delete_range" title="Permalink to this definition">¶</a></dt>
 <dd><p>Delete the text in the range given by the string-indexes
 <tt class="docutils literal"><span class="pre">start_index</span></tt> and <tt class="docutils literal"><span class="pre">end_index</span></tt>.</p>
-<blockquote>
-<div>Partial nodes will only be removed if they are editable.</div></blockquote>
+<p>Partial nodes will only be removed if they are editable.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -8111,11 +8146,20 @@ tree’s leaves.</p>
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLEntityPlaceable.get_index_data">
 <tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.get_index_data" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get info about the specified range in the tree.
-:returns: A dictionary with the following items:
-* <em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.
-* <em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter
-* <em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</p>
+<dd><p>Get info about the specified range in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A dictionary with the following items:<ul class="simple">
+<li><em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.</li>
+<li><em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter</li>
+<li><em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
@@ -8127,7 +8171,7 @@ tree’s leaves.</p>
 
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLEntityPlaceable.insert">
-<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.insert" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em>, <em>preferred_parent=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.insert" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text at the specified offset of this string-tree’s
 string (Unicode) representation.</p>
 </dd></dl>
@@ -8190,7 +8234,7 @@ manner.</p>
 
 <dl class="attribute">
 <dt id="translate.storage.placeables.general.XMLEntityPlaceable.regex">
-<tt class="descname">regex</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fcc3e3a0></em><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.regex" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">regex</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765bb7f60></em><a class="headerlink" href="#translate.storage.placeables.general.XMLEntityPlaceable.regex" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
@@ -8226,17 +8270,27 @@ or dynamically replaced by specific applications.</p>
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLTagPlaceable.apply_to_strings">
 <tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.apply_to_strings" title="Permalink to this definition">¶</a></dt>
-<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.
-:param f: Must take one (str or unicode) argument and return a
-string or unicode.</p>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>f</strong> – Must take one (str or unicode) argument and return a
+string or unicode.</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLTagPlaceable.copy">
 <tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.copy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a copy of the sub-tree.
-This should be overridden in sub-classes with more data.</p>
-<p>NOTE: <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+<dd><p>Returns a copy of the sub-tree.  This should be overridden in
+sub-classes with more data.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last"><tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+</div>
 </dd></dl>
 
 <dl class="method">
@@ -8244,8 +8298,7 @@ This should be overridden in sub-classes with more data.</p>
 <tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.delete_range" title="Permalink to this definition">¶</a></dt>
 <dd><p>Delete the text in the range given by the string-indexes
 <tt class="docutils literal"><span class="pre">start_index</span></tt> and <tt class="docutils literal"><span class="pre">end_index</span></tt>.</p>
-<blockquote>
-<div>Partial nodes will only be removed if they are editable.</div></blockquote>
+<p>Partial nodes will only be removed if they are editable.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -8322,11 +8375,20 @@ tree’s leaves.</p>
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLTagPlaceable.get_index_data">
 <tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.get_index_data" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get info about the specified range in the tree.
-:returns: A dictionary with the following items:
-* <em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.
-* <em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter
-* <em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</p>
+<dd><p>Get info about the specified range in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A dictionary with the following items:<ul class="simple">
+<li><em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.</li>
+<li><em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter</li>
+<li><em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
@@ -8338,7 +8400,7 @@ tree’s leaves.</p>
 
 <dl class="method">
 <dt id="translate.storage.placeables.general.XMLTagPlaceable.insert">
-<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.insert" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em>, <em>preferred_parent=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.insert" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text at the specified offset of this string-tree’s
 string (Unicode) representation.</p>
 </dd></dl>
@@ -8401,7 +8463,7 @@ manner.</p>
 
 <dl class="attribute">
 <dt id="translate.storage.placeables.general.XMLTagPlaceable.regex">
-<tt class="descname">regex</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7ff0fcc56000></em><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.regex" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">regex</tt><em class="property"> = <_sre.SRE_Pattern object at 0x7f8765bdcb40></em><a class="headerlink" href="#translate.storage.placeables.general.XMLTagPlaceable.regex" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
@@ -8437,69 +8499,42 @@ or dynamically replaced by specific applications.</p>
 <dt>This file contains abstract (semantic) interfaces for placeable</dt>
 <dd>implementations.</dd>
 </dl>
-</div>
-<div class="section" id="id3">
-<h3>lisa<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
-<span class="target" id="module-translate.storage.placeables.lisa"></span></div>
-<div class="section" id="module-translate.storage.placeables.parse">
-<span id="parse"></span><h3>parse<a class="headerlink" href="#module-translate.storage.placeables.parse" title="Permalink to this headline">¶</a></h3>
-<p>Contains the <tt class="docutils literal"><span class="pre">parse</span></tt> function that parses normal strings into StringElem-
-based “rich” string element trees.</p>
-<dl class="function">
-<dt id="translate.storage.placeables.parse.parse">
-<tt class="descclassname">translate.storage.placeables.parse.</tt><tt class="descname">parse</tt><big>(</big><em>tree</em>, <em>parse_funcs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.parse.parse" title="Permalink to this definition">¶</a></dt>
-<dd><p>Parse placeables from the given string or sub-tree by using the
-parsing functions provided.</p>
-<p>The output of this function is <strong>heavily</strong> dependent on the order of the
-parsing functions. This is because of the algorithm used.</p>
-<p>An over-simplification of the algorithm: the leaves in the <tt class="docutils literal"><span class="pre">StringElem</span></tt>
-tree are expanded to the output of the first parsing function in
-<tt class="docutils literal"><span class="pre">parse_funcs</span></tt>. The next level of recursion is then started on the new
-set of leaves with the used parsing function removed from
-<tt class="docutils literal"><span class="pre">parse_funcs</span></tt>.</p>
+<dl class="class">
+<dt id="translate.storage.placeables.interfaces.BasePlaceable">
+<em class="property">class </em><tt class="descclassname">translate.storage.placeables.interfaces.</tt><tt class="descname">BasePlaceable</tt><big>(</big><em>sub=None</em>, <em>id=None</em>, <em>rid=None</em>, <em>xid=None</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable" title="Permalink to this definition">¶</a></dt>
+<dd><p>Base class for all placeables.</p>
+<dl class="method">
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.apply_to_strings">
+<tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.apply_to_strings" title="Permalink to this definition">¶</a></dt>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>tree</strong> (<em>unicode|StringElem</em>) – The string or string element sub-tree to parse.</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>f</strong> – Must take one (str or unicode) argument and return a
+string or unicode.</td>
 </tr>
 </tbody>
 </table>
 </dd></dl>
 
-</div>
-<div class="section" id="module-translate.storage.placeables.strelem">
-<span id="strelem"></span><h3>strelem<a class="headerlink" href="#module-translate.storage.placeables.strelem" title="Permalink to this headline">¶</a></h3>
-<p>Contains the base <a class="reference internal" href="#translate.storage.placeables.strelem.StringElem" title="translate.storage.placeables.strelem.StringElem"><tt class="xref py py-class docutils literal"><span class="pre">StringElem</span></tt></a> class that represents a node in a
-parsed rich-string tree. It is the base class of all placeables.</p>
-<dl class="class">
-<dt id="translate.storage.placeables.strelem.StringElem">
-<em class="property">class </em><tt class="descclassname">translate.storage.placeables.strelem.</tt><tt class="descname">StringElem</tt><big>(</big><em>sub=None</em>, <em>id=None</em>, <em>rid=None</em>, <em>xid=None</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem" title="Permalink to this definition">¶</a></dt>
-<dd><p>This class represents a sub-tree of a string parsed into a rich structure.
-It is also the base class of all placeables.</p>
-<dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.apply_to_strings">
-<tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.apply_to_strings" title="Permalink to this definition">¶</a></dt>
-<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.
-:param f: Must take one (str or unicode) argument and return a
-string or unicode.</p>
-</dd></dl>
-
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.copy">
-<tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.copy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a copy of the sub-tree.
-This should be overridden in sub-classes with more data.</p>
-<p>NOTE: <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.copy">
+<tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.copy" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns a copy of the sub-tree.  This should be overridden in
+sub-classes with more data.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last"><tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+</div>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.delete_range">
-<tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.delete_range" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.delete_range">
+<tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.delete_range" title="Permalink to this definition">¶</a></dt>
 <dd><p>Delete the text in the range given by the string-indexes
 <tt class="docutils literal"><span class="pre">start_index</span></tt> and <tt class="docutils literal"><span class="pre">end_index</span></tt>.</p>
-<blockquote>
-<div>Partial nodes will only be removed if they are editable.</div></blockquote>
+<p>Partial nodes will only be removed if they are editable.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -8516,21 +8551,21 @@ effectively undoes the delete.</td>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.depth_first">
-<tt class="descname">depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.depth_first" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.depth_first">
+<tt class="descname">depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.depth_first" title="Permalink to this definition">¶</a></dt>
 <dd><p>Returns a list of the nodes in the tree in depth-first order.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.elem_at_offset">
-<tt class="descname">elem_at_offset</tt><big>(</big><em>offset</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.elem_at_offset" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.elem_at_offset">
+<tt class="descname">elem_at_offset</tt><big>(</big><em>offset</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.elem_at_offset" title="Permalink to this definition">¶</a></dt>
 <dd><p>Get the <tt class="docutils literal"><span class="pre">StringElem</span></tt> in the tree that contains the string rendered
 at the given offset.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.elem_offset">
-<tt class="descname">elem_offset</tt><big>(</big><em>elem</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.elem_offset" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.elem_offset">
+<tt class="descname">elem_offset</tt><big>(</big><em>elem</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.elem_offset" title="Permalink to this definition">¶</a></dt>
 <dd><p>Find the offset of <tt class="docutils literal"><span class="pre">elem</span></tt> in the current tree.</p>
 <p>This cannot be reliably used if <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is used and even
 less so if the rendering function renders the string differently
@@ -8548,84 +8583,73 @@ was not found.</td>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.encode">
-<tt class="descname">encode</tt><big>(</big><em>encoding='ascii'</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.encode" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.encode">
+<tt class="descname">encode</tt><big>(</big><em>encoding='ascii'</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.encode" title="Permalink to this definition">¶</a></dt>
 <dd><p>More <tt class="docutils literal"><span class="pre">unicode</span></tt> class emulation.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.find">
-<tt class="descname">find</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.find" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.find">
+<tt class="descname">find</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.find" title="Permalink to this definition">¶</a></dt>
 <dd><p>Find sub-string <tt class="docutils literal"><span class="pre">x</span></tt> in this string tree and return the position
 at which it starts.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.find_elems_with">
-<tt class="descname">find_elems_with</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.find_elems_with" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.find_elems_with">
+<tt class="descname">find_elems_with</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.find_elems_with" title="Permalink to this definition">¶</a></dt>
 <dd><p>Find all elements in the current sub-tree containing <tt class="docutils literal"><span class="pre">x</span></tt>.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.flatten">
-<tt class="descname">flatten</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.flatten" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.flatten">
+<tt class="descname">flatten</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.flatten" title="Permalink to this definition">¶</a></dt>
 <dd><p>Flatten the tree by returning a depth-first search over the
 tree’s leaves.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.get_index_data">
-<tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.get_index_data" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get info about the specified range in the tree.
-:returns: A dictionary with the following items:
-* <em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.
-* <em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter
-* <em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</p>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.get_index_data">
+<tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.get_index_data" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get info about the specified range in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A dictionary with the following items:<ul class="simple">
+<li><em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.</li>
+<li><em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter</li>
+<li><em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.get_parent_elem">
-<tt class="descname">get_parent_elem</tt><big>(</big><em>child</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.get_parent_elem" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.get_parent_elem">
+<tt class="descname">get_parent_elem</tt><big>(</big><em>child</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.get_parent_elem" title="Permalink to this definition">¶</a></dt>
 <dd><p>Searches the current sub-tree for and returns the parent of the
 <tt class="docutils literal"><span class="pre">child</span></tt> element.</p>
 </dd></dl>
 
-<dl class="attribute">
-<dt id="translate.storage.placeables.strelem.StringElem.has_content">
-<tt class="descname">has_content</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.has_content" title="Permalink to this definition">¶</a></dt>
-<dd><p>Whether this string can have sub-elements.</p>
-</dd></dl>
-
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.insert">
-<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.insert" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.insert">
+<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em>, <em>preferred_parent=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.insert" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text at the specified offset of this string-tree’s
 string (Unicode) representation.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.insert_between">
-<tt class="descname">insert_between</tt><big>(</big><em>left</em>, <em>right</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.insert_between" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.insert_between">
+<tt class="descname">insert_between</tt><big>(</big><em>left</em>, <em>right</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.insert_between" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text between the two parameter <tt class="docutils literal"><span class="pre">StringElem</span></tt>s.</p>
 </dd></dl>
 
-<dl class="attribute">
-<dt id="translate.storage.placeables.strelem.StringElem.iseditable">
-<tt class="descname">iseditable</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.iseditable" title="Permalink to this definition">¶</a></dt>
-<dd><p>Whether this string should be changable by the user. Not used at
-the moment.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="translate.storage.placeables.strelem.StringElem.isfragile">
-<tt class="descname">isfragile</tt><em class="property"> = False</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.isfragile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Whether this element should be deleted in its entirety when partially
-deleted. Only checked when <tt class="docutils literal"><span class="pre">iseditable</span> <span class="pre">=</span> <span class="pre">False</span></tt></p>
-</dd></dl>
-
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.isleaf">
-<tt class="descname">isleaf</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.isleaf" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.isleaf">
+<tt class="descname">isleaf</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.isleaf" title="Permalink to this definition">¶</a></dt>
 <dd><p>Whether or not this instance is a leaf node in the <tt class="docutils literal"><span class="pre">StringElem</span></tt> tree.</p>
 <p>A node is a leaf node if it is a <tt class="docutils literal"><span class="pre">StringElem</span></tt> (not a sub-class) and
 contains only sub-elements of type <tt class="docutils literal"><span class="pre">str</span></tt> or <tt class="docutils literal"><span class="pre">unicode</span></tt>.</p>
@@ -8639,88 +8663,43 @@ contains only sub-elements of type <tt class="docutils literal"><span class="pre
 </table>
 </dd></dl>
 
-<dl class="attribute">
-<dt id="translate.storage.placeables.strelem.StringElem.istranslatable">
-<tt class="descname">istranslatable</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.istranslatable" title="Permalink to this definition">¶</a></dt>
-<dd><p>Whether this string is translatable into other languages.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="translate.storage.placeables.strelem.StringElem.isvisible">
-<tt class="descname">isvisible</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.isvisible" title="Permalink to this definition">¶</a></dt>
-<dd><p>Whether this string should be visible to the user. Not used at
-the moment.</p>
-</dd></dl>
-
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.iter_depth_first">
-<tt class="descname">iter_depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.iter_depth_first" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.iter_depth_first">
+<tt class="descname">iter_depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.iter_depth_first" title="Permalink to this definition">¶</a></dt>
 <dd><p>Iterate through the nodes in the tree in dept-first order.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.map">
-<tt class="descname">map</tt><big>(</big><em>f</em>, <em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.map" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.map">
+<tt class="descname">map</tt><big>(</big><em>f</em>, <em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.map" title="Permalink to this definition">¶</a></dt>
 <dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all nodes for which <tt class="docutils literal"><span class="pre">filter</span></tt> returned <tt class="docutils literal"><span class="pre">True</span></tt>
 (optional).</p>
 </dd></dl>
 
-<dl class="classmethod">
-<dt id="translate.storage.placeables.strelem.StringElem.parse">
-<em class="property">classmethod </em><tt class="descname">parse</tt><big>(</big><em>pstr</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.parse" title="Permalink to this definition">¶</a></dt>
-<dd><p>Parse an instance of this class from the start of the given string.
-This method should be implemented by any sub-class that wants to
-parseable by <a class="reference internal" href="#module-translate.storage.placeables.parse" title="translate.storage.placeables.parse"><tt class="xref py py-mod docutils literal"><span class="pre">translate.storage.placeables.parse</span></tt></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pstr</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/functions.html#unicode" title="(in Python v2.7)"><em>unicode</em></a>) – The string to parse into an instance of this class.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">An instance of the current class, or <tt class="docutils literal"><span class="pre">None</span></tt> if the
-string not parseable by this class.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.print_tree">
-<tt class="descname">print_tree</tt><big>(</big><em>indent=0</em>, <em>verbose=False</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.print_tree" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.print_tree">
+<tt class="descname">print_tree</tt><big>(</big><em>indent=0</em>, <em>verbose=False</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.print_tree" title="Permalink to this definition">¶</a></dt>
 <dd><p>Print the tree from the current instance’s point in an indented
 manner.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.prune">
-<tt class="descname">prune</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.prune" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.prune">
+<tt class="descname">prune</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.prune" title="Permalink to this definition">¶</a></dt>
 <dd><p>Remove unnecessary nodes to make the tree optimal.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.remove_type">
-<tt class="descname">remove_type</tt><big>(</big><em>ptype</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.remove_type" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.remove_type">
+<tt class="descname">remove_type</tt><big>(</big><em>ptype</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.remove_type" title="Permalink to this definition">¶</a></dt>
 <dd><p>Replace nodes with type <tt class="docutils literal"><span class="pre">ptype</span></tt> with base <tt class="docutils literal"><span class="pre">StringElem</span></tt>s,
 containing the same sub-elements. This is only applicable to
 elements below the element tree root node.</p>
 </dd></dl>
 
-<dl class="attribute">
-<dt id="translate.storage.placeables.strelem.StringElem.renderer">
-<tt class="descname">renderer</tt><em class="property"> = None</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.renderer" title="Permalink to this definition">¶</a></dt>
-<dd><p>An optional function that returns the Unicode representation of
-the string.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="translate.storage.placeables.strelem.StringElem.sub">
-<tt class="descname">sub</tt><em class="property"> = []</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.sub" title="Permalink to this definition">¶</a></dt>
-<dd><p>The sub-elements that make up this this string.</p>
-</dd></dl>
-
 <dl class="method">
-<dt id="translate.storage.placeables.strelem.StringElem.translate">
-<tt class="descname">translate</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.translate" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.interfaces.BasePlaceable.translate">
+<tt class="descname">translate</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.interfaces.BasePlaceable.translate" title="Permalink to this definition">¶</a></dt>
 <dd><p>Transform the sub-tree according to some class-specific needs.
 This method should be either overridden in implementing sub-classes
 or dynamically replaced by specific applications.</p>
@@ -8737,37 +8716,77 @@ or dynamically replaced by specific applications.</p>
 </dd></dl>
 
 </div>
-<div class="section" id="module-translate.storage.placeables.terminology">
-<span id="terminology"></span><h3>terminology<a class="headerlink" href="#module-translate.storage.placeables.terminology" title="Permalink to this headline">¶</a></h3>
-<p>Contains the placeable that represents a terminology term.</p>
-<dl class="class">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable">
-<em class="property">class </em><tt class="descclassname">translate.storage.placeables.terminology.</tt><tt class="descname">TerminologyPlaceable</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable" title="Permalink to this definition">¶</a></dt>
-<dd><p>Terminology distinguished from the rest of a string by being
-a placeable.</p>
-<dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.apply_to_strings">
-<tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.apply_to_strings" title="Permalink to this definition">¶</a></dt>
-<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.
-:param f: Must take one (str or unicode) argument and return a
-string or unicode.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.copy">
-<tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.copy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a copy of the sub-tree.
-This should be overridden in sub-classes with more data.</p>
-<p>NOTE: <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.delete_range">
-<tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.delete_range" title="Permalink to this definition">¶</a></dt>
+<div class="section" id="id3">
+<h3>lisa<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<span class="target" id="module-translate.storage.placeables.lisa"></span></div>
+<div class="section" id="module-translate.storage.placeables.parse">
+<span id="parse"></span><h3>parse<a class="headerlink" href="#module-translate.storage.placeables.parse" title="Permalink to this headline">¶</a></h3>
+<p>Contains the <tt class="docutils literal"><span class="pre">parse</span></tt> function that parses normal strings into StringElem-
+based “rich” string element trees.</p>
+<dl class="function">
+<dt id="translate.storage.placeables.parse.parse">
+<tt class="descclassname">translate.storage.placeables.parse.</tt><tt class="descname">parse</tt><big>(</big><em>tree</em>, <em>parse_funcs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.parse.parse" title="Permalink to this definition">¶</a></dt>
+<dd><p>Parse placeables from the given string or sub-tree by using the
+parsing functions provided.</p>
+<p>The output of this function is <strong>heavily</strong> dependent on the order of the
+parsing functions. This is because of the algorithm used.</p>
+<p>An over-simplification of the algorithm: the leaves in the <tt class="docutils literal"><span class="pre">StringElem</span></tt>
+tree are expanded to the output of the first parsing function in
+<tt class="docutils literal"><span class="pre">parse_funcs</span></tt>. The next level of recursion is then started on the new
+set of leaves with the used parsing function removed from
+<tt class="docutils literal"><span class="pre">parse_funcs</span></tt>.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>tree</strong> (<em>unicode|StringElem</em>) – The string or string element sub-tree to parse.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+</div>
+<div class="section" id="module-translate.storage.placeables.strelem">
+<span id="strelem"></span><h3>strelem<a class="headerlink" href="#module-translate.storage.placeables.strelem" title="Permalink to this headline">¶</a></h3>
+<p>Contains the base <a class="reference internal" href="#translate.storage.placeables.strelem.StringElem" title="translate.storage.placeables.strelem.StringElem"><tt class="xref py py-class docutils literal"><span class="pre">StringElem</span></tt></a> class that represents a node in a
+parsed rich-string tree. It is the base class of all placeables.</p>
+<dl class="class">
+<dt id="translate.storage.placeables.strelem.StringElem">
+<em class="property">class </em><tt class="descclassname">translate.storage.placeables.strelem.</tt><tt class="descname">StringElem</tt><big>(</big><em>sub=None</em>, <em>id=None</em>, <em>rid=None</em>, <em>xid=None</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem" title="Permalink to this definition">¶</a></dt>
+<dd><p>This class represents a sub-tree of a string parsed into a rich structure.
+It is also the base class of all placeables.</p>
+<dl class="method">
+<dt id="translate.storage.placeables.strelem.StringElem.apply_to_strings">
+<tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.apply_to_strings" title="Permalink to this definition">¶</a></dt>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>f</strong> – Must take one (str or unicode) argument and return a
+string or unicode.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.strelem.StringElem.copy">
+<tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.copy" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns a copy of the sub-tree.  This should be overridden in
+sub-classes with more data.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last"><tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+</div>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.strelem.StringElem.delete_range">
+<tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.delete_range" title="Permalink to this definition">¶</a></dt>
 <dd><p>Delete the text in the range given by the string-indexes
 <tt class="docutils literal"><span class="pre">start_index</span></tt> and <tt class="docutils literal"><span class="pre">end_index</span></tt>.</p>
-<blockquote>
-<div>Partial nodes will only be removed if they are editable.</div></blockquote>
+<p>Partial nodes will only be removed if they are editable.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -8784,21 +8803,21 @@ effectively undoes the delete.</td>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.depth_first">
-<tt class="descname">depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.depth_first" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.depth_first">
+<tt class="descname">depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.depth_first" title="Permalink to this definition">¶</a></dt>
 <dd><p>Returns a list of the nodes in the tree in depth-first order.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.elem_at_offset">
-<tt class="descname">elem_at_offset</tt><big>(</big><em>offset</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.elem_at_offset" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.elem_at_offset">
+<tt class="descname">elem_at_offset</tt><big>(</big><em>offset</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.elem_at_offset" title="Permalink to this definition">¶</a></dt>
 <dd><p>Get the <tt class="docutils literal"><span class="pre">StringElem</span></tt> in the tree that contains the string rendered
 at the given offset.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.elem_offset">
-<tt class="descname">elem_offset</tt><big>(</big><em>elem</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.elem_offset" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.elem_offset">
+<tt class="descname">elem_offset</tt><big>(</big><em>elem</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.elem_offset" title="Permalink to this definition">¶</a></dt>
 <dd><p>Find the offset of <tt class="docutils literal"><span class="pre">elem</span></tt> in the current tree.</p>
 <p>This cannot be reliably used if <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is used and even
 less so if the rendering function renders the string differently
@@ -8816,64 +8835,93 @@ was not found.</td>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.encode">
-<tt class="descname">encode</tt><big>(</big><em>encoding='ascii'</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.encode" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.encode">
+<tt class="descname">encode</tt><big>(</big><em>encoding='ascii'</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.encode" title="Permalink to this definition">¶</a></dt>
 <dd><p>More <tt class="docutils literal"><span class="pre">unicode</span></tt> class emulation.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.find">
-<tt class="descname">find</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.find" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.find">
+<tt class="descname">find</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.find" title="Permalink to this definition">¶</a></dt>
 <dd><p>Find sub-string <tt class="docutils literal"><span class="pre">x</span></tt> in this string tree and return the position
 at which it starts.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.find_elems_with">
-<tt class="descname">find_elems_with</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.find_elems_with" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.find_elems_with">
+<tt class="descname">find_elems_with</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.find_elems_with" title="Permalink to this definition">¶</a></dt>
 <dd><p>Find all elements in the current sub-tree containing <tt class="docutils literal"><span class="pre">x</span></tt>.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.flatten">
-<tt class="descname">flatten</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.flatten" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.flatten">
+<tt class="descname">flatten</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.flatten" title="Permalink to this definition">¶</a></dt>
 <dd><p>Flatten the tree by returning a depth-first search over the
 tree’s leaves.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.get_index_data">
-<tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.get_index_data" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get info about the specified range in the tree.
-:returns: A dictionary with the following items:
-* <em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.
-* <em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter
-* <em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</p>
+<dt id="translate.storage.placeables.strelem.StringElem.get_index_data">
+<tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.get_index_data" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get info about the specified range in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A dictionary with the following items:<ul class="simple">
+<li><em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.</li>
+<li><em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter</li>
+<li><em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.get_parent_elem">
-<tt class="descname">get_parent_elem</tt><big>(</big><em>child</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.get_parent_elem" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.get_parent_elem">
+<tt class="descname">get_parent_elem</tt><big>(</big><em>child</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.get_parent_elem" title="Permalink to this definition">¶</a></dt>
 <dd><p>Searches the current sub-tree for and returns the parent of the
 <tt class="docutils literal"><span class="pre">child</span></tt> element.</p>
 </dd></dl>
 
+<dl class="attribute">
+<dt id="translate.storage.placeables.strelem.StringElem.has_content">
+<tt class="descname">has_content</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.has_content" title="Permalink to this definition">¶</a></dt>
+<dd><p>Whether this string can have sub-elements.</p>
+</dd></dl>
+
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.insert">
-<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.insert" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.insert">
+<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em>, <em>preferred_parent=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.insert" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text at the specified offset of this string-tree’s
 string (Unicode) representation.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.insert_between">
-<tt class="descname">insert_between</tt><big>(</big><em>left</em>, <em>right</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.insert_between" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.insert_between">
+<tt class="descname">insert_between</tt><big>(</big><em>left</em>, <em>right</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.insert_between" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text between the two parameter <tt class="docutils literal"><span class="pre">StringElem</span></tt>s.</p>
 </dd></dl>
 
+<dl class="attribute">
+<dt id="translate.storage.placeables.strelem.StringElem.iseditable">
+<tt class="descname">iseditable</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.iseditable" title="Permalink to this definition">¶</a></dt>
+<dd><p>Whether this string should be changable by the user. Not used at
+the moment.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.placeables.strelem.StringElem.isfragile">
+<tt class="descname">isfragile</tt><em class="property"> = False</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.isfragile" title="Permalink to this definition">¶</a></dt>
+<dd><p>Whether this element should be deleted in its entirety when partially
+deleted. Only checked when <tt class="docutils literal"><span class="pre">iseditable</span> <span class="pre">=</span> <span class="pre">False</span></tt></p>
+</dd></dl>
+
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.isleaf">
-<tt class="descname">isleaf</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.isleaf" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.isleaf">
+<tt class="descname">isleaf</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.isleaf" title="Permalink to this definition">¶</a></dt>
 <dd><p>Whether or not this instance is a leaf node in the <tt class="docutils literal"><span class="pre">StringElem</span></tt> tree.</p>
 <p>A node is a leaf node if it is a <tt class="docutils literal"><span class="pre">StringElem</span></tt> (not a sub-class) and
 contains only sub-elements of type <tt class="docutils literal"><span class="pre">str</span></tt> or <tt class="docutils literal"><span class="pre">unicode</span></tt>.</p>
@@ -8887,76 +8935,132 @@ contains only sub-elements of type <tt class="docutils literal"><span class="pre
 </table>
 </dd></dl>
 
+<dl class="attribute">
+<dt id="translate.storage.placeables.strelem.StringElem.istranslatable">
+<tt class="descname">istranslatable</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.istranslatable" title="Permalink to this definition">¶</a></dt>
+<dd><p>Whether this string is translatable into other languages.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.placeables.strelem.StringElem.isvisible">
+<tt class="descname">isvisible</tt><em class="property"> = True</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.isvisible" title="Permalink to this definition">¶</a></dt>
+<dd><p>Whether this string should be visible to the user. Not used at
+the moment.</p>
+</dd></dl>
+
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.iter_depth_first">
-<tt class="descname">iter_depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.iter_depth_first" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.iter_depth_first">
+<tt class="descname">iter_depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.iter_depth_first" title="Permalink to this definition">¶</a></dt>
 <dd><p>Iterate through the nodes in the tree in dept-first order.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.map">
-<tt class="descname">map</tt><big>(</big><em>f</em>, <em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.map" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.map">
+<tt class="descname">map</tt><big>(</big><em>f</em>, <em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.map" title="Permalink to this definition">¶</a></dt>
 <dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all nodes for which <tt class="docutils literal"><span class="pre">filter</span></tt> returned <tt class="docutils literal"><span class="pre">True</span></tt>
 (optional).</p>
 </dd></dl>
 
-<dl class="attribute">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.matchers">
-<tt class="descname">matchers</tt><em class="property"> = []</em><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.matchers" title="Permalink to this definition">¶</a></dt>
-<dd><p>A list of matcher objects to use to identify terminology.</p>
+<dl class="classmethod">
+<dt id="translate.storage.placeables.strelem.StringElem.parse">
+<em class="property">classmethod </em><tt class="descname">parse</tt><big>(</big><em>pstr</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.parse" title="Permalink to this definition">¶</a></dt>
+<dd><p>Parse an instance of this class from the start of the given string.
+This method should be implemented by any sub-class that wants to
+parseable by <a class="reference internal" href="#module-translate.storage.placeables.parse" title="translate.storage.placeables.parse"><tt class="xref py py-mod docutils literal"><span class="pre">translate.storage.placeables.parse</span></tt></a>.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pstr</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/functions.html#unicode" title="(in Python v2.7)"><em>unicode</em></a>) – The string to parse into an instance of this class.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">An instance of the current class, or <tt class="docutils literal"><span class="pre">None</span></tt> if the
+string not parseable by this class.</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.print_tree">
-<tt class="descname">print_tree</tt><big>(</big><em>indent=0</em>, <em>verbose=False</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.print_tree" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.print_tree">
+<tt class="descname">print_tree</tt><big>(</big><em>indent=0</em>, <em>verbose=False</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.print_tree" title="Permalink to this definition">¶</a></dt>
 <dd><p>Print the tree from the current instance’s point in an indented
 manner.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.prune">
-<tt class="descname">prune</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.prune" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.prune">
+<tt class="descname">prune</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.prune" title="Permalink to this definition">¶</a></dt>
 <dd><p>Remove unnecessary nodes to make the tree optimal.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.remove_type">
-<tt class="descname">remove_type</tt><big>(</big><em>ptype</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.remove_type" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.strelem.StringElem.remove_type">
+<tt class="descname">remove_type</tt><big>(</big><em>ptype</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.remove_type" title="Permalink to this definition">¶</a></dt>
 <dd><p>Replace nodes with type <tt class="docutils literal"><span class="pre">ptype</span></tt> with base <tt class="docutils literal"><span class="pre">StringElem</span></tt>s,
 containing the same sub-elements. This is only applicable to
 elements below the element tree root node.</p>
 </dd></dl>
 
 <dl class="attribute">
-<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.translations">
-<tt class="descname">translations</tt><em class="property"> = []</em><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.translations" title="Permalink to this definition">¶</a></dt>
-<dd><p>The available translations for this placeable.</p>
+<dt id="translate.storage.placeables.strelem.StringElem.renderer">
+<tt class="descname">renderer</tt><em class="property"> = None</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.renderer" title="Permalink to this definition">¶</a></dt>
+<dd><p>An optional function that returns the Unicode representation of
+the string.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.placeables.strelem.StringElem.sub">
+<tt class="descname">sub</tt><em class="property"> = []</em><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.sub" title="Permalink to this definition">¶</a></dt>
+<dd><p>The sub-elements that make up this this string.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.strelem.StringElem.translate">
+<tt class="descname">translate</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.strelem.StringElem.translate" title="Permalink to this definition">¶</a></dt>
+<dd><p>Transform the sub-tree according to some class-specific needs.
+This method should be either overridden in implementing sub-classes
+or dynamically replaced by specific applications.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The transformed Unicode string representing the sub-tree.</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 </dd></dl>
 
 </div>
-<div class="section" id="module-translate.storage.placeables.xliff">
-<span id="xliff"></span><h3>xliff<a class="headerlink" href="#module-translate.storage.placeables.xliff" title="Permalink to this headline">¶</a></h3>
-<p>Contains XLIFF-specific placeables.</p>
+<div class="section" id="module-translate.storage.placeables.terminology">
+<span id="terminology"></span><h3>terminology<a class="headerlink" href="#module-translate.storage.placeables.terminology" title="Permalink to this headline">¶</a></h3>
+<p>Contains the placeable that represents a terminology term.</p>
 <dl class="class">
-<dt id="translate.storage.placeables.xliff.UnknownXML">
-<em class="property">class </em><tt class="descclassname">translate.storage.placeables.xliff.</tt><tt class="descname">UnknownXML</tt><big>(</big><em>sub=None</em>, <em>id=None</em>, <em>rid=None</em>, <em>xid=None</em>, <em>xml_node=None</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML" title="Permalink to this definition">¶</a></dt>
-<dd><p>Placeable for unrecognized or umimplemented XML nodes. It’s main
-purpose is to preserve all associated XML data.</p>
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable">
+<em class="property">class </em><tt class="descclassname">translate.storage.placeables.terminology.</tt><tt class="descname">TerminologyPlaceable</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable" title="Permalink to this definition">¶</a></dt>
+<dd><p>Terminology distinguished from the rest of a string by being
+a placeable.</p>
 <dl class="method">
-<dt id="translate.storage.placeables.xliff.UnknownXML.apply_to_strings">
-<tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.apply_to_strings" title="Permalink to this definition">¶</a></dt>
-<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.
-:param f: Must take one (str or unicode) argument and return a
-string or unicode.</p>
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.apply_to_strings">
+<tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.apply_to_strings" title="Permalink to this definition">¶</a></dt>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>f</strong> – Must take one (str or unicode) argument and return a
+string or unicode.</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.xliff.UnknownXML.copy">
-<tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.copy" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a copy of the sub-tree.
-This should be overridden in sub-classes with more data.</p>
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.copy">
+<tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.copy" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns a copy of the sub-tree.  This should be overridden in
+sub-classes with more data.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p class="last"><tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
@@ -8964,12 +9068,11 @@ This should be overridden in sub-classes with more data.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.xliff.UnknownXML.delete_range">
-<tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.delete_range" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.delete_range">
+<tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.delete_range" title="Permalink to this definition">¶</a></dt>
 <dd><p>Delete the text in the range given by the string-indexes
 <tt class="docutils literal"><span class="pre">start_index</span></tt> and <tt class="docutils literal"><span class="pre">end_index</span></tt>.</p>
-<blockquote>
-<div>Partial nodes will only be removed if they are editable.</div></blockquote>
+<p>Partial nodes will only be removed if they are editable.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -8986,8 +9089,225 @@ effectively undoes the delete.</td>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.placeables.xliff.UnknownXML.depth_first">
-<tt class="descname">depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.depth_first" title="Permalink to this definition">¶</a></dt>
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.depth_first">
+<tt class="descname">depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.depth_first" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns a list of the nodes in the tree in depth-first order.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.elem_at_offset">
+<tt class="descname">elem_at_offset</tt><big>(</big><em>offset</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.elem_at_offset" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the <tt class="docutils literal"><span class="pre">StringElem</span></tt> in the tree that contains the string rendered
+at the given offset.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.elem_offset">
+<tt class="descname">elem_offset</tt><big>(</big><em>elem</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.elem_offset" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the offset of <tt class="docutils literal"><span class="pre">elem</span></tt> in the current tree.</p>
+<p>This cannot be reliably used if <tt class="docutils literal"><span class="pre">self.renderer</span></tt> is used and even
+less so if the rendering function renders the string differently
+upon different calls. In Virtaal the <tt class="docutils literal"><span class="pre">StringElemGUI.index()</span></tt> method
+is used as replacement for this one.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The string index where element <tt class="docutils literal"><span class="pre">e</span></tt> starts, or -1 if <tt class="docutils literal"><span class="pre">e</span></tt>
+was not found.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.encode">
+<tt class="descname">encode</tt><big>(</big><em>encoding='ascii'</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.encode" title="Permalink to this definition">¶</a></dt>
+<dd><p>More <tt class="docutils literal"><span class="pre">unicode</span></tt> class emulation.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.find">
+<tt class="descname">find</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.find" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find sub-string <tt class="docutils literal"><span class="pre">x</span></tt> in this string tree and return the position
+at which it starts.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.find_elems_with">
+<tt class="descname">find_elems_with</tt><big>(</big><em>x</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.find_elems_with" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find all elements in the current sub-tree containing <tt class="docutils literal"><span class="pre">x</span></tt>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.flatten">
+<tt class="descname">flatten</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.flatten" title="Permalink to this definition">¶</a></dt>
+<dd><p>Flatten the tree by returning a depth-first search over the
+tree’s leaves.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.get_index_data">
+<tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.get_index_data" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get info about the specified range in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A dictionary with the following items:<ul class="simple">
+<li><em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.</li>
+<li><em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter</li>
+<li><em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.get_parent_elem">
+<tt class="descname">get_parent_elem</tt><big>(</big><em>child</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.get_parent_elem" title="Permalink to this definition">¶</a></dt>
+<dd><p>Searches the current sub-tree for and returns the parent of the
+<tt class="docutils literal"><span class="pre">child</span></tt> element.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.insert">
+<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em>, <em>preferred_parent=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.insert" title="Permalink to this definition">¶</a></dt>
+<dd><p>Insert the given text at the specified offset of this string-tree’s
+string (Unicode) representation.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.insert_between">
+<tt class="descname">insert_between</tt><big>(</big><em>left</em>, <em>right</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.insert_between" title="Permalink to this definition">¶</a></dt>
+<dd><p>Insert the given text between the two parameter <tt class="docutils literal"><span class="pre">StringElem</span></tt>s.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.isleaf">
+<tt class="descname">isleaf</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.isleaf" title="Permalink to this definition">¶</a></dt>
+<dd><p>Whether or not this instance is a leaf node in the <tt class="docutils literal"><span class="pre">StringElem</span></tt> tree.</p>
+<p>A node is a leaf node if it is a <tt class="docutils literal"><span class="pre">StringElem</span></tt> (not a sub-class) and
+contains only sub-elements of type <tt class="docutils literal"><span class="pre">str</span></tt> or <tt class="docutils literal"><span class="pre">unicode</span></tt>.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">bool</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.iter_depth_first">
+<tt class="descname">iter_depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.iter_depth_first" title="Permalink to this definition">¶</a></dt>
+<dd><p>Iterate through the nodes in the tree in dept-first order.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.map">
+<tt class="descname">map</tt><big>(</big><em>f</em>, <em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.map" title="Permalink to this definition">¶</a></dt>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all nodes for which <tt class="docutils literal"><span class="pre">filter</span></tt> returned <tt class="docutils literal"><span class="pre">True</span></tt>
+(optional).</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.matchers">
+<tt class="descname">matchers</tt><em class="property"> = []</em><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.matchers" title="Permalink to this definition">¶</a></dt>
+<dd><p>A list of matcher objects to use to identify terminology.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.print_tree">
+<tt class="descname">print_tree</tt><big>(</big><em>indent=0</em>, <em>verbose=False</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.print_tree" title="Permalink to this definition">¶</a></dt>
+<dd><p>Print the tree from the current instance’s point in an indented
+manner.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.prune">
+<tt class="descname">prune</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.prune" title="Permalink to this definition">¶</a></dt>
+<dd><p>Remove unnecessary nodes to make the tree optimal.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.remove_type">
+<tt class="descname">remove_type</tt><big>(</big><em>ptype</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.remove_type" title="Permalink to this definition">¶</a></dt>
+<dd><p>Replace nodes with type <tt class="docutils literal"><span class="pre">ptype</span></tt> with base <tt class="docutils literal"><span class="pre">StringElem</span></tt>s,
+containing the same sub-elements. This is only applicable to
+elements below the element tree root node.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.placeables.terminology.TerminologyPlaceable.translations">
+<tt class="descname">translations</tt><em class="property"> = []</em><a class="headerlink" href="#translate.storage.placeables.terminology.TerminologyPlaceable.translations" title="Permalink to this definition">¶</a></dt>
+<dd><p>The available translations for this placeable.</p>
+</dd></dl>
+
+</dd></dl>
+
+</div>
+<div class="section" id="id4">
+<h3>xliff<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<span class="target" id="module-translate.storage.placeables.xliff"></span><p>Contains XLIFF-specific placeables.</p>
+<dl class="class">
+<dt id="translate.storage.placeables.xliff.UnknownXML">
+<em class="property">class </em><tt class="descclassname">translate.storage.placeables.xliff.</tt><tt class="descname">UnknownXML</tt><big>(</big><em>sub=None</em>, <em>id=None</em>, <em>rid=None</em>, <em>xid=None</em>, <em>xml_node=None</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML" title="Permalink to this definition">¶</a></dt>
+<dd><p>Placeable for unrecognized or umimplemented XML nodes. It’s main
+purpose is to preserve all associated XML data.</p>
+<dl class="method">
+<dt id="translate.storage.placeables.xliff.UnknownXML.apply_to_strings">
+<tt class="descname">apply_to_strings</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.apply_to_strings" title="Permalink to this definition">¶</a></dt>
+<dd><p>Apply <tt class="docutils literal"><span class="pre">f</span></tt> to all actual strings in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>f</strong> – Must take one (str or unicode) argument and return a
+string or unicode.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.xliff.UnknownXML.copy">
+<tt class="descname">copy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.copy" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns a copy of the sub-tree.  This should be overridden in
+sub-classes with more data.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last"><tt class="docutils literal"><span class="pre">self.renderer</span></tt> is <strong>not</strong> copied.</p>
+</div>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.xliff.UnknownXML.delete_range">
+<tt class="descname">delete_range</tt><big>(</big><em>start_index</em>, <em>end_index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.delete_range" title="Permalink to this definition">¶</a></dt>
+<dd><p>Delete the text in the range given by the string-indexes
+<tt class="docutils literal"><span class="pre">start_index</span></tt> and <tt class="docutils literal"><span class="pre">end_index</span></tt>.</p>
+<p>Partial nodes will only be removed if they are editable.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A <tt class="docutils literal"><span class="pre">StringElem</span></tt> representing the removed sub-string, the
+parent node from which it was deleted as well as the offset at
+which it was deleted from. <tt class="docutils literal"><span class="pre">None</span></tt> is returned for the parent
+value if the root was deleted. If the parent and offset values
+are not <tt class="docutils literal"><span class="pre">None</span></tt>, <tt class="docutils literal"><span class="pre">parent.insert(offset,</span> <span class="pre">deleted)</span></tt>
+effectively undoes the delete.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.placeables.xliff.UnknownXML.depth_first">
+<tt class="descname">depth_first</tt><big>(</big><em>filter=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.depth_first" title="Permalink to this definition">¶</a></dt>
 <dd><p>Returns a list of the nodes in the tree in depth-first order.</p>
 </dd></dl>
 
@@ -9046,11 +9366,20 @@ tree’s leaves.</p>
 <dl class="method">
 <dt id="translate.storage.placeables.xliff.UnknownXML.get_index_data">
 <tt class="descname">get_index_data</tt><big>(</big><em>index</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.get_index_data" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get info about the specified range in the tree.
-:returns: A dictionary with the following items:
-* <em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.
-* <em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter
-* <em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</p>
+<dd><p>Get info about the specified range in the tree.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A dictionary with the following items:<ul class="simple">
+<li><em>elem</em>: The element in which <tt class="docutils literal"><span class="pre">index</span></tt> resides.</li>
+<li><em>index</em>: Copy of the <tt class="docutils literal"><span class="pre">index</span></tt> parameter</li>
+<li><em>offset</em>: The offset of <tt class="docutils literal"><span class="pre">index</span></tt> into <tt class="docutils literal"><span class="pre">'elem'</span></tt>.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
@@ -9062,7 +9391,7 @@ tree’s leaves.</p>
 
 <dl class="method">
 <dt id="translate.storage.placeables.xliff.UnknownXML.insert">
-<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.insert" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">insert</tt><big>(</big><em>offset</em>, <em>text</em>, <em>preferred_parent=None</em><big>)</big><a class="headerlink" href="#translate.storage.placeables.xliff.UnknownXML.insert" title="Permalink to this definition">¶</a></dt>
 <dd><p>Insert the given text at the specified offset of this string-tree’s
 string (Unicode) representation.</p>
 </dd></dl>
@@ -9168,16 +9497,25 @@ or dynamically replaced by specific applications.</p>
 entire files <a class="reference internal" href="#translate.storage.php.phpfile" title="translate.storage.php.phpfile"><tt class="xref py py-class docutils literal"><span class="pre">phpfile</span></tt></a>. These files are used in translating many
 PHP based applications.</p>
 <p>Only PHP files written with these conventions are supported:</p>
-<div class="highlight-python"><pre>$lang['item'] = "vale";  # Array of values
-$some_entity = "value";  # Named variables
-define("ENTITY", "value");
+<div class="highlight-python"><div class="highlight"><pre>$lang['item'] = "vale";  # Array of values
+$some_entity = "value";  # Named variables
+define("ENTITY", "value");
 $lang = array(
-   'item1' => 'value1',
-   'item2' => 'value2',
-);</pre>
+   'item1' => 'value1'    ,   #Supports space before comma
+   'item2' => 'value2',
+);
+$lang = array(    # Nested arrays
+   'item1' => 'value1',
+   'item2' => array(
+      'key' => 'value'    ,   #Supports space before comma
+      'key2' => 'value2',
+   ),
+);
+</pre></div>
 </div>
-<p>Nested arrays are not supported:</p>
-<div class="highlight-python"><pre>$lang = array(array('key' => 'value'));</pre>
+<p>Nested arrays without key for nested array are not supported:</p>
+<div class="highlight-python"><div class="highlight"><pre>$lang = array(array('key' => 'value'));
+</pre></div>
 </div>
 <p>The working of PHP strings and specifically the escaping conventions which
 differ between single quote (‘) and double quote (”) characters are
@@ -9186,13 +9524,13 @@ implemented as outlined in the PHP documentation for the
 <dl class="function">
 <dt id="translate.storage.php.phpdecode">
 <tt class="descclassname">translate.storage.php.</tt><tt class="descname">phpdecode</tt><big>(</big><em>text</em>, <em>quotechar="'"</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpdecode" title="Permalink to this definition">¶</a></dt>
-<dd><p>convert PHP escaped string to a Python string</p>
+<dd><p>Convert PHP escaped string to a Python string.</p>
 </dd></dl>
 
 <dl class="function">
 <dt id="translate.storage.php.phpencode">
 <tt class="descclassname">translate.storage.php.</tt><tt class="descname">phpencode</tt><big>(</big><em>text</em>, <em>quotechar="'"</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpencode" title="Permalink to this definition">¶</a></dt>
-<dd><p>convert Python string to PHP escaping</p>
+<dd><p>Convert Python string to PHP escaping.</p>
 <p>The encoding is implemented for
 <a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single">‘single quote’</a>
 and <a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double">“double quote”</a>
@@ -9204,7 +9542,7 @@ would ever be needed for PHP localisation needs.</p>
 <dl class="class">
 <dt id="translate.storage.php.phpfile">
 <em class="property">class </em><tt class="descclassname">translate.storage.php.</tt><tt class="descname">phpfile</tt><big>(</big><em>inputfile=None</em>, <em>encoding='utf-8'</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile" title="Permalink to this definition">¶</a></dt>
-<dd><p>This class represents a PHP file, made up of phpunits</p>
+<dd><p>This class represents a PHP file, made up of phpunits.</p>
 <dl class="attribute">
 <dt id="translate.storage.php.phpfile.UnitClass">
 <tt class="descname">UnitClass</tt><a class="headerlink" href="#translate.storage.php.phpfile.UnitClass" title="Permalink to this definition">¶</a></dt>
@@ -9220,7 +9558,7 @@ would ever be needed for PHP localisation needs.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -9234,7 +9572,7 @@ would ever be needed for PHP localisation needs.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -9256,7 +9594,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -9270,7 +9608,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -9290,19 +9628,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.php.phpfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.php.phpfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -9314,7 +9652,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -9343,7 +9681,7 @@ useful.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.parse">
 <tt class="descname">parse</tt><big>(</big><em>phpsrc</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.parse" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read the source of a PHP file in and include them as units</p>
+<dd><p>Read the source of a PHP file in and include them as units.</p>
 </dd></dl>
 
 <dl class="classmethod">
@@ -9356,7 +9694,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.php.phpfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -9381,31 +9719,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.php.phpfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.php.phpfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.php.phpfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.php.phpfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -9427,8 +9765,7 @@ available.</p>
 <dl class="class">
 <dt id="translate.storage.php.phpunit">
 <em class="property">class </em><tt class="descclassname">translate.storage.php.</tt><tt class="descname">phpunit</tt><big>(</big><em>source=''</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>a unit of a PHP file i.e. a name and value, and any comments
-associated</p>
+<dd><p>A unit of a PHP file: a name, a value, and any comments associated.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpunit.adderror">
 <tt class="descname">adderror</tt><big>(</big><em>errorname</em>, <em>errortext</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpunit.adderror" title="Permalink to this definition">¶</a></dt>
@@ -9438,8 +9775,8 @@ associated</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -9492,7 +9829,7 @@ information as possible.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpunit.getoutput">
 <tt class="descname">getoutput</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.php.phpunit.getoutput" title="Permalink to this definition">¶</a></dt>
-<dd><p>convert the unit back into formatted lines for a php file</p>
+<dd><p>Convert the unit back into formatted lines for a php file.</p>
 </dd></dl>
 
 <dl class="method">
@@ -9535,7 +9872,7 @@ current state(_n) of the unit from its current state.</p>
 <dl class="method">
 <dt id="translate.storage.php.phpunit.isblank">
 <tt class="descname">isblank</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.php.phpunit.isblank" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns whether this is a blank element, containing only comments.</p>
+<dd><p>Return whether this is a blank element, containing only comments.</p>
 </dd></dl>
 
 <dl class="method">
@@ -9657,7 +9994,7 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.php.phpunit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.php.phpunit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source AND the target to be equal</p>
+<dd><p>Set the source AND the target to be equal.</p>
 </dd></dl>
 
 <dl class="method">
@@ -9983,7 +10320,7 @@ create the nodes required if asked). Returns success</p>
 <dl class="method">
 <dt id="translate.storage.poxliff.PoXliffFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.poxliff.PoXliffFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -9997,7 +10334,7 @@ create the nodes required if asked). Returns success</p>
 <dl class="method">
 <dt id="translate.storage.poxliff.PoXliffFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.poxliff.PoXliffFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -10072,7 +10409,7 @@ If the date attribute is not specified, None is returned.</p>
 <dl class="method">
 <dt id="translate.storage.poxliff.PoXliffFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.poxliff.PoXliffFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -10098,7 +10435,7 @@ if present.</p>
 <dl class="method">
 <dt id="translate.storage.poxliff.PoXliffFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.poxliff.PoXliffFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -10169,7 +10506,8 @@ useful.</p>
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -10229,7 +10567,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.poxliff.PoXliffFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.poxliff.PoXliffFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
@@ -10241,7 +10579,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.poxliff.PoXliffFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.poxliff.PoXliffFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -10263,7 +10601,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.poxliff.PoXliffFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.poxliff.PoXliffFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -10568,7 +10906,8 @@ to ensure that other classes can implement more functionality
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -10845,11 +11184,9 @@ dialects supported:</p>
 <dt>Java</dt>
 <dd><p class="first">Java .properties are supported completely except for the ability to drop
 pairs that are not translated.</p>
-<p>The following <a class="reference external" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Properties.html#load(java.io.InputStream)">.properties file description</a>
-and <a class="reference external" href="http://www.exampledepot.com/egs/java.util/Props.html">example</a> give
-some good references to the .properties specification.</p>
-<p>Properties file may also hold Java
-<a class="reference external" href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/MessageFormat.html">MessageFormat</a>
+<p>The following <a class="reference external" href="http://docs.oracle.com/javase/1.4.2/docs/api/java/util/Properties.html#load(java.io.InputStream)">.properties file description</a>
+gives a good references to the .properties specification.</p>
+<p>Properties file may also hold Java <a class="reference external" href="http://docs.oracle.com/javase/1.4.2/docs/api/java/text/MessageFormat.html">MessageFormat</a>
 messages.  No special handling is provided in this storage class for
 MessageFormat, but this may be implemented in future.</p>
 <p class="last">All delimiter types, comments, line continuations and spaces handling in
@@ -10861,8 +11198,8 @@ need u escaping.  Any U values will be converted to correct Unicode
 characters.</dd>
 <dt>Strings</dt>
 <dd>Mac OS X strings files are implemented using
-<a class="reference external" href="http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html">these</a>
-<a class="reference external" href="http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html">two</a>
+<a class="reference external" href="https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html">these</a>
+<a class="reference external" href="https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html">two</a>
 articles as references.</dd>
 <dt>Flex</dt>
 <dd>Adobe Flex files seem to be normal .properties files but in UTF-8 just like
@@ -10874,13 +11211,14 @@ provides the information used to implement the dialect.</dd>
 </dl>
 <p>A simple summary of what is permissible follows.</p>
 <p>Comments supported:</p>
-<div class="highlight-python"><pre># a comment
+<div class="highlight-python"><div class="highlight"><pre># a comment
 ! a comment
 // a comment (only at the beginning of a line)
-/* a comment (not across multiple lines) */</pre>
+/* a comment (not across multiple lines) */
+</pre></div>
 </div>
 <p>Name and Value pairs:</p>
-<div class="highlight-python"><pre># Delimiters
+<div class="highlight-python"><div class="highlight"><pre># Delimiters
 key = value
 key : value
 key value
@@ -10889,7 +11227,7 @@ key value
 \ key\ = \ value
 
 # Note that the b and c are escaped for reST rendering
-b = a string with escape sequences \t \n \r \\ \" \' \ (space) \u0123
+b = a string with escape sequences \t \n \r \\ \" \' \ (space) \u0123
 c = a string with a continuation line \
     continuation line
 
@@ -10900,7 +11238,8 @@ key
 =value
 
 # .strings specific
-"key" = "value";</pre>
+"key" = "value";
+</pre></div>
 </div>
 <dl class="class">
 <dt id="translate.storage.properties.Dialect">
@@ -10915,19 +11254,19 @@ key
 <dl class="classmethod">
 <dt id="translate.storage.properties.Dialect.find_delimiter">
 <em class="property">classmethod </em><tt class="descname">find_delimiter</tt><big>(</big><em>line</em><big>)</big><a class="headerlink" href="#translate.storage.properties.Dialect.find_delimiter" title="Permalink to this definition">¶</a></dt>
-<dd><p>Find the delimeter</p>
+<dd><p>Find the delimiter</p>
 </dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.storage.properties.Dialect.key_strip">
 <em class="property">classmethod </em><tt class="descname">key_strip</tt><big>(</big><em>key</em><big>)</big><a class="headerlink" href="#translate.storage.properties.Dialect.key_strip" title="Permalink to this definition">¶</a></dt>
-<dd><p>Strip uneeded characters from the key</p>
+<dd><p>Strip unneeded characters from the key</p>
 </dd></dl>
 
 <dl class="classmethod">
 <dt id="translate.storage.properties.Dialect.value_strip">
 <em class="property">classmethod </em><tt class="descname">value_strip</tt><big>(</big><em>value</em><big>)</big><a class="headerlink" href="#translate.storage.properties.Dialect.value_strip" title="Permalink to this definition">¶</a></dt>
-<dd><p>Strip uneeded characters from the value</p>
+<dd><p>Strip unneeded characters from the value</p>
 </dd></dl>
 
 </dd></dl>
@@ -10935,7 +11274,7 @@ key
 <dl class="function">
 <dt id="translate.storage.properties.find_delimeter">
 <tt class="descclassname">translate.storage.properties.</tt><tt class="descname">find_delimeter</tt><big>(</big><em>line</em><big>)</big><a class="headerlink" href="#translate.storage.properties.find_delimeter" title="Permalink to this definition">¶</a></dt>
-<dd><p>Spelling error that is kept around for in case someone relies on it.</p>
+<dd><p>Misspelled function that is kept around in case someone relies on it.</p>
 <p>Deprecated.</p>
 </dd></dl>
 
@@ -11034,7 +11373,7 @@ would result in a set of N/2 slashes not an escape)</p>
 <dl class="method">
 <dt id="translate.storage.properties.propfile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11048,7 +11387,7 @@ would result in a set of N/2 slashes not an escape)</p>
 <dl class="method">
 <dt id="translate.storage.properties.propfile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -11070,7 +11409,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.properties.propfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11084,7 +11423,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.properties.propfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11104,19 +11443,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.properties.propfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.properties.propfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.properties.propfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -11128,7 +11467,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.properties.propfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -11171,7 +11510,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.properties.propfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -11196,31 +11535,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.properties.propfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.properties.propfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.properties.propfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.properties.propfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.properties.propfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.properties.propfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11253,8 +11592,8 @@ comments associated.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -11483,14 +11822,16 @@ files (pofile).</p>
 <tt class="descclassname">translate.storage.pypo.</tt><tt class="descname">escapeforpo</tt><big>(</big><em>line</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.escapeforpo" title="Permalink to this definition">¶</a></dt>
 <dd><p>Escapes a line for po format. assumes no 
 occurs in the line.</p>
-<table class="docutils field-list" frame="void" rules="none">
+<blockquote>
+<div><table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>line</strong> – unescaped text</td>
+<tr class="field-odd field"><th class="field-name">param line:</th><td class="field-body">unescaped text</td>
 </tr>
 </tbody>
 </table>
+</div></blockquote>
 </dd></dl>
 
 <dl class="function">
@@ -11505,14 +11846,15 @@ occurs in the line.</p>
 </tr>
 </tbody>
 </table>
-<p class="deprecated">
-<span class="versionmodified">Deprecated since version 1.10.</span></p>
+<div class="deprecated">
+<p><span class="versionmodified">Deprecated since version 1.10.</span></p>
+</div>
 </dd></dl>
 
 <dl class="data">
 <dt id="translate.storage.pypo.lsep">
 <tt class="descclassname">translate.storage.pypo.</tt><tt class="descname">lsep</tt><em class="property"> = '\n#: '</em><a class="headerlink" href="#translate.storage.pypo.lsep" title="Permalink to this definition">¶</a></dt>
-<dd><p>Seperator for #: entries</p>
+<dd><p>Separator for #: entries</p>
 </dd></dl>
 
 <dl class="class">
@@ -11528,7 +11870,7 @@ occurs in the line.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11542,7 +11884,7 @@ occurs in the line.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -11576,7 +11918,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11590,7 +11932,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11633,7 +11975,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -11674,7 +12016,7 @@ if present.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -11752,7 +12094,7 @@ dictionary.</p>
 <dl class="classmethod">
 <dt id="translate.storage.pypo.pofile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -11784,7 +12126,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
@@ -11804,7 +12146,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -11825,7 +12167,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.pypo.pofile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.pofile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11871,12 +12213,6 @@ escaped lines</p>
 <p>Quotes on either side should already have been removed.</p>
 </dd></dl>
 
-<dl class="function">
-<dt id="translate.storage.pypo.wrapline">
-<tt class="descclassname">translate.storage.pypo.</tt><tt class="descname">wrapline</tt><big>(</big><em>line</em><big>)</big><a class="headerlink" href="#translate.storage.pypo.wrapline" title="Permalink to this definition">¶</a></dt>
-<dd><p>Wrap text for po files.</p>
-</dd></dl>
-
 </div>
 <div class="section" id="module-translate.storage.qm">
 <span id="qm"></span><h2>qm<a class="headerlink" href="#module-translate.storage.qm" title="Permalink to this headline">¶</a></h2>
@@ -11935,7 +12271,7 @@ more readable, especially the part that breaks the file into sections.</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11949,7 +12285,7 @@ more readable, especially the part that breaks the file into sections.</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -11971,7 +12307,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -11985,7 +12321,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -12005,19 +12341,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12029,7 +12365,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12071,7 +12407,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.qm.qmfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12096,25 +12432,25 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qm.qmfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -12146,8 +12482,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -12189,8 +12525,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -12448,13 +12784,13 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.qm.qmunit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmunit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source string to the given value.</p>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qm.qmunit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.qm.qmunit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12518,7 +12854,7 @@ provides the reference implementation for the Qt Linguist product.</p>
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -12532,7 +12868,7 @@ provides the reference implementation for the Qt Linguist product.</p>
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -12552,7 +12888,7 @@ provides the reference implementation for the Qt Linguist product.</p>
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12606,7 +12942,7 @@ XML again.</p>
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12638,7 +12974,8 @@ useful.</p>
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -12659,7 +12996,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.qph.QphFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12684,19 +13021,19 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -12716,7 +13053,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.qph.QphFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.qph.QphFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -12748,8 +13085,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -13033,7 +13370,8 @@ to ensure that other classes can implement more functionality
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -13128,7 +13466,7 @@ specified language, if it exists</p>
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -13142,7 +13480,7 @@ specified language, if it exists</p>
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -13164,7 +13502,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -13178,7 +13516,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -13198,19 +13536,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -13222,7 +13560,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -13264,7 +13602,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.rc.rcfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -13289,31 +13627,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.rc.rcfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.rc.rcfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -13345,8 +13683,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -13672,161 +14010,1534 @@ unit properties like source or context</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.reclassifyunit">
-<tt class="descname">reclassifyunit</tt><big>(</big><em>item</em><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.reclassifyunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Updates the classification of a unit in self.classification.</p>
+<dt id="translate.storage.statistics.Statistics.reclassifyunit">
+<tt class="descname">reclassifyunit</tt><big>(</big><em>item</em><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.reclassifyunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Updates the classification of a unit in self.classification.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>item</strong> – an integer that is an index in .getunits().</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.source_wordcount">
+<tt class="descname">source_wordcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.source_wordcount" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the number of words in the source text.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.translated_unitcount">
+<tt class="descname">translated_unitcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.translated_unitcount" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the number of translated units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.translated_units">
+<tt class="descname">translated_units</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.translated_units" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a list of translated units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.translated_wordcount">
+<tt class="descname">translated_wordcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.translated_wordcount" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the number of translated words in this object.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.untranslated_unitcount">
+<tt class="descname">untranslated_unitcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.untranslated_unitcount" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the number of untranslated units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.untranslated_units">
+<tt class="descname">untranslated_units</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.untranslated_units" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a list of untranslated units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.untranslated_wordcount">
+<tt class="descname">untranslated_wordcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.untranslated_wordcount" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the number of untranslated words in this object.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statistics.Statistics.wordcount">
+<tt class="descname">wordcount</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.wordcount" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the number of words in the given text.</p>
+</dd></dl>
+
+</dd></dl>
+
+</div>
+<div class="section" id="module-translate.storage.statsdb">
+<span id="statsdb"></span><h2>statsdb<a class="headerlink" href="#module-translate.storage.statsdb" title="Permalink to this headline">¶</a></h2>
+<p>Module to provide a cache of statistics in a database.</p>
+<dl class="class">
+<dt id="translate.storage.statsdb.StatsCache">
+<em class="property">class </em><tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">StatsCache</tt><a class="headerlink" href="#translate.storage.statsdb.StatsCache" title="Permalink to this definition">¶</a></dt>
+<dd><p>An object instantiated as a singleton for each statsfile that provides
+access to the database cache from a pool of StatsCache objects.</p>
+<dl class="attribute">
+<dt id="translate.storage.statsdb.StatsCache.con">
+<tt class="descname">con</tt><em class="property"> = None</em><a class="headerlink" href="#translate.storage.statsdb.StatsCache.con" title="Permalink to this definition">¶</a></dt>
+<dd><p>This cache’s connection</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.statsdb.StatsCache.cur">
+<tt class="descname">cur</tt><em class="property"> = None</em><a class="headerlink" href="#translate.storage.statsdb.StatsCache.cur" title="Permalink to this definition">¶</a></dt>
+<dd><p>The current cursor</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statsdb.StatsCache.filechecks">
+<tt class="descname">filechecks</tt><big>(</big><em>filename</em>, <em>checker</em>, <em>store=None</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filechecks" title="Permalink to this definition">¶</a></dt>
+<dd><p>Retrieves the error statistics for the given file if possible,
+otherwise delegates to cachestorechecks().</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statsdb.StatsCache.filestatestats">
+<tt class="descname">filestatestats</tt><big>(</big><em>filename</em>, <em>store=None</em>, <em>extended=False</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filestatestats" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a dictionary of unit stats mapping sets of unit
+indices with those states</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statsdb.StatsCache.filestats">
+<tt class="descname">filestats</tt><big>(</big><em>filename</em>, <em>checker</em>, <em>store=None</em>, <em>extended=False</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filestats" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a dictionary of property names mapping sets of unit
+indices with those properties.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statsdb.StatsCache.filetotals">
+<tt class="descname">filetotals</tt><big>(</big><em>filename</em>, <em>store=None</em>, <em>extended=False</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filetotals" title="Permalink to this definition">¶</a></dt>
+<dd><p>Retrieves the statistics for the given file if possible, otherwise
+delegates to cachestore().</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.statsdb.StatsCache.unitstats">
+<tt class="descname">unitstats</tt><big>(</big><em>filename</em>, <em>_lang=None</em>, <em>store=None</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.unitstats" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a dictionary of property names mapping to arrays which
+map unit indices to property values.</p>
+<p>Please note that this is different from filestats, since filestats
+supplies sets of unit indices with a given property, whereas this
+method supplies arrays which map unit indices to given values.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="function">
+<dt id="translate.storage.statsdb.emptyfiletotals">
+<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">emptyfiletotals</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statsdb.emptyfiletotals" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns a dictionary with all statistics initalised to 0.</p>
+</dd></dl>
+
+<dl class="function">
+<dt id="translate.storage.statsdb.statefordb">
+<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">statefordb</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.statefordb" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the numeric database state for the unit.</p>
+</dd></dl>
+
+<dl class="function">
+<dt id="translate.storage.statsdb.transaction">
+<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">transaction</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.transaction" title="Permalink to this definition">¶</a></dt>
+<dd><p>Modifies f to commit database changes if it executes without exceptions.
+Otherwise it rolls back the database.</p>
+<p>ALL publicly accessible methods in StatsCache MUST be decorated with this
+decorator.</p>
+</dd></dl>
+
+<dl class="function">
+<dt id="translate.storage.statsdb.wordsinunit">
+<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">wordsinunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.wordsinunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Counts the words in the unit’s source and target, taking plurals into
+account. The target words are only counted if the unit is translated.</p>
+</dd></dl>
+
+</div>
+<div class="section" id="module-translate.storage.subtitles">
+<span id="subtitles"></span><h2>subtitles<a class="headerlink" href="#module-translate.storage.subtitles" title="Permalink to this headline">¶</a></h2>
+<p>Class that manages subtitle files for translation.</p>
+<p>This class makes use of the subtitle functionality of <tt class="docutils literal"><span class="pre">gaupol</span></tt>.</p>
+<div class="admonition seealso">
+<p class="first admonition-title">See also</p>
+<p class="last">gaupol/agents/open.py::open_main</p>
+</div>
+<p>A patch to gaupol is required to open utf-8 files successfully.</p>
+<dl class="class">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile">
+<em class="property">class </em><tt class="descclassname">translate.storage.subtitles.</tt><tt class="descname">AdvSubStationAlphaFile</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile" title="Permalink to this definition">¶</a></dt>
+<dd><p>specialized class for SubRipFile’s only</p>
+<dl class="attribute">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.UnitClass">
+<tt class="descname">UnitClass</tt><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.UnitClass" title="Permalink to this definition">¶</a></dt>
+<dd><p>alias of <a class="reference internal" href="#translate.storage.subtitles.SubtitleUnit" title="translate.storage.subtitles.SubtitleUnit"><tt class="xref py py-class docutils literal"><span class="pre">SubtitleUnit</span></tt></a></p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.add_unit_to_index">
+<tt class="descname">add_unit_to_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.add_unit_to_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add a unit to source and location idexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.addsourceunit">
+<tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add and returns a new unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt></td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.addunit">
+<tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.addunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Append the given unit to the object’s list of units.</p>
+<p>This method should always be used rather than trying to modify the
+list manually.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>unit</strong> (<tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt>) – The unit that will be added.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.findid">
+<tt class="descname">findid</tt><big>(</big><em>id</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.findid" title="Permalink to this definition">¶</a></dt>
+<dd><p>find unit with matching id by checking id_index</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.findunit">
+<tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.findunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.findunits">
+<tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.findunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the units with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.getids">
+<tt class="descname">getids</tt><big>(</big><em>filename=None</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.getids" title="Permalink to this definition">¶</a></dt>
+<dd><p>return a list of unit ids</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.getprojectstyle">
+<tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.getsourcelanguage">
+<tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.gettargetlanguage">
+<tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.getunits">
+<tt class="descname">getunits</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.getunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a list of all units in this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.isempty">
+<tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.isempty" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.makeindex">
+<tt class="descname">makeindex</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.makeindex" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indexes the items in this store. At least .sourceindex should be
+useful.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.merge_on">
+<tt class="descname">merge_on</tt><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.merge_on" title="Permalink to this definition">¶</a></dt>
+<dd><p>The matching criterion to use when merging on.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The default matching criterion for all the subclasses.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">string</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.parsefile">
+<em class="property">classmethod </em><tt class="descname">parsefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.parsefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>parse the given file</p>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.parsestring">
+<em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.parsestring" title="Permalink to this definition">¶</a></dt>
+<dd><p>Convert the string representation back to an object.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.remove_unit_from_index">
+<tt class="descname">remove_unit_from_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.remove_unit_from_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Remove a unit from source and locaton indexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.require_index">
+<tt class="descname">require_index</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.require_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>make sure source index exists</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.save">
+<tt class="descname">save</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.save" title="Permalink to this definition">¶</a></dt>
+<dd><p>Save to the file that data was originally read from, if
+available.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.savefile">
+<tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.savefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>Write the string representation to the given file (or filename).</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.setprojectstyle">
+<tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.setsourcelanguage">
+<tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.settargetlanguage">
+<tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.translate">
+<tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.translate" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return the translated string for a given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">String or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.AdvSubStationAlphaFile.unit_iter">
+<tt class="descname">unit_iter</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.AdvSubStationAlphaFile.unit_iter" title="Permalink to this definition">¶</a></dt>
+<dd><p>Iterator over all the units in this store.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="translate.storage.subtitles.MicroDVDFile">
+<em class="property">class </em><tt class="descclassname">translate.storage.subtitles.</tt><tt class="descname">MicroDVDFile</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile" title="Permalink to this definition">¶</a></dt>
+<dd><p>specialized class for SubRipFile’s only</p>
+<dl class="attribute">
+<dt id="translate.storage.subtitles.MicroDVDFile.UnitClass">
+<tt class="descname">UnitClass</tt><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.UnitClass" title="Permalink to this definition">¶</a></dt>
+<dd><p>alias of <a class="reference internal" href="#translate.storage.subtitles.SubtitleUnit" title="translate.storage.subtitles.SubtitleUnit"><tt class="xref py py-class docutils literal"><span class="pre">SubtitleUnit</span></tt></a></p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.add_unit_to_index">
+<tt class="descname">add_unit_to_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.add_unit_to_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add a unit to source and location idexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.addsourceunit">
+<tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add and returns a new unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt></td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.addunit">
+<tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.addunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Append the given unit to the object’s list of units.</p>
+<p>This method should always be used rather than trying to modify the
+list manually.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>unit</strong> (<tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt>) – The unit that will be added.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.findid">
+<tt class="descname">findid</tt><big>(</big><em>id</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.findid" title="Permalink to this definition">¶</a></dt>
+<dd><p>find unit with matching id by checking id_index</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.findunit">
+<tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.findunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.findunits">
+<tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.findunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the units with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.getids">
+<tt class="descname">getids</tt><big>(</big><em>filename=None</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.getids" title="Permalink to this definition">¶</a></dt>
+<dd><p>return a list of unit ids</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.getprojectstyle">
+<tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.getsourcelanguage">
+<tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.gettargetlanguage">
+<tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.getunits">
+<tt class="descname">getunits</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.getunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a list of all units in this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.isempty">
+<tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.isempty" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.makeindex">
+<tt class="descname">makeindex</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.makeindex" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indexes the items in this store. At least .sourceindex should be
+useful.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.subtitles.MicroDVDFile.merge_on">
+<tt class="descname">merge_on</tt><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.merge_on" title="Permalink to this definition">¶</a></dt>
+<dd><p>The matching criterion to use when merging on.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The default matching criterion for all the subclasses.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">string</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.MicroDVDFile.parsefile">
+<em class="property">classmethod </em><tt class="descname">parsefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.parsefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>parse the given file</p>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.MicroDVDFile.parsestring">
+<em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.parsestring" title="Permalink to this definition">¶</a></dt>
+<dd><p>Convert the string representation back to an object.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.remove_unit_from_index">
+<tt class="descname">remove_unit_from_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.remove_unit_from_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Remove a unit from source and locaton indexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.require_index">
+<tt class="descname">require_index</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.require_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>make sure source index exists</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.save">
+<tt class="descname">save</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.save" title="Permalink to this definition">¶</a></dt>
+<dd><p>Save to the file that data was originally read from, if
+available.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.savefile">
+<tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.savefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>Write the string representation to the given file (or filename).</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.setprojectstyle">
+<tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.setsourcelanguage">
+<tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.settargetlanguage">
+<tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.translate">
+<tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.translate" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return the translated string for a given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">String or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.MicroDVDFile.unit_iter">
+<tt class="descname">unit_iter</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.MicroDVDFile.unit_iter" title="Permalink to this definition">¶</a></dt>
+<dd><p>Iterator over all the units in this store.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="translate.storage.subtitles.SubRipFile">
+<em class="property">class </em><tt class="descclassname">translate.storage.subtitles.</tt><tt class="descname">SubRipFile</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile" title="Permalink to this definition">¶</a></dt>
+<dd><p>specialized class for SubRipFile’s only</p>
+<dl class="attribute">
+<dt id="translate.storage.subtitles.SubRipFile.UnitClass">
+<tt class="descname">UnitClass</tt><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.UnitClass" title="Permalink to this definition">¶</a></dt>
+<dd><p>alias of <a class="reference internal" href="#translate.storage.subtitles.SubtitleUnit" title="translate.storage.subtitles.SubtitleUnit"><tt class="xref py py-class docutils literal"><span class="pre">SubtitleUnit</span></tt></a></p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.add_unit_to_index">
+<tt class="descname">add_unit_to_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.add_unit_to_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add a unit to source and location idexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.addsourceunit">
+<tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add and returns a new unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt></td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.addunit">
+<tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.addunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Append the given unit to the object’s list of units.</p>
+<p>This method should always be used rather than trying to modify the
+list manually.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>unit</strong> (<tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt>) – The unit that will be added.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.findid">
+<tt class="descname">findid</tt><big>(</big><em>id</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.findid" title="Permalink to this definition">¶</a></dt>
+<dd><p>find unit with matching id by checking id_index</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.findunit">
+<tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.findunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.findunits">
+<tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.findunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the units with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.getids">
+<tt class="descname">getids</tt><big>(</big><em>filename=None</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.getids" title="Permalink to this definition">¶</a></dt>
+<dd><p>return a list of unit ids</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.getprojectstyle">
+<tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.getsourcelanguage">
+<tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.gettargetlanguage">
+<tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.getunits">
+<tt class="descname">getunits</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.getunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a list of all units in this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.isempty">
+<tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.isempty" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.makeindex">
+<tt class="descname">makeindex</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.makeindex" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indexes the items in this store. At least .sourceindex should be
+useful.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.subtitles.SubRipFile.merge_on">
+<tt class="descname">merge_on</tt><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.merge_on" title="Permalink to this definition">¶</a></dt>
+<dd><p>The matching criterion to use when merging on.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The default matching criterion for all the subclasses.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">string</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubRipFile.parsefile">
+<em class="property">classmethod </em><tt class="descname">parsefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.parsefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>parse the given file</p>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubRipFile.parsestring">
+<em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.parsestring" title="Permalink to this definition">¶</a></dt>
+<dd><p>Convert the string representation back to an object.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.remove_unit_from_index">
+<tt class="descname">remove_unit_from_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.remove_unit_from_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Remove a unit from source and locaton indexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.require_index">
+<tt class="descname">require_index</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.require_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>make sure source index exists</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.save">
+<tt class="descname">save</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.save" title="Permalink to this definition">¶</a></dt>
+<dd><p>Save to the file that data was originally read from, if
+available.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.savefile">
+<tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.savefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>Write the string representation to the given file (or filename).</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.setprojectstyle">
+<tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.setsourcelanguage">
+<tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.settargetlanguage">
+<tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.translate">
+<tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.translate" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return the translated string for a given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">String or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubRipFile.unit_iter">
+<tt class="descname">unit_iter</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubRipFile.unit_iter" title="Permalink to this definition">¶</a></dt>
+<dd><p>Iterator over all the units in this store.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="translate.storage.subtitles.SubStationAlphaFile">
+<em class="property">class </em><tt class="descclassname">translate.storage.subtitles.</tt><tt class="descname">SubStationAlphaFile</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile" title="Permalink to this definition">¶</a></dt>
+<dd><p>specialized class for SubRipFile’s only</p>
+<dl class="attribute">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.UnitClass">
+<tt class="descname">UnitClass</tt><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.UnitClass" title="Permalink to this definition">¶</a></dt>
+<dd><p>alias of <a class="reference internal" href="#translate.storage.subtitles.SubtitleUnit" title="translate.storage.subtitles.SubtitleUnit"><tt class="xref py py-class docutils literal"><span class="pre">SubtitleUnit</span></tt></a></p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.add_unit_to_index">
+<tt class="descname">add_unit_to_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.add_unit_to_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add a unit to source and location idexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.addsourceunit">
+<tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add and returns a new unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt></td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.addunit">
+<tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.addunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Append the given unit to the object’s list of units.</p>
+<p>This method should always be used rather than trying to modify the
+list manually.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>unit</strong> (<tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt>) – The unit that will be added.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.findid">
+<tt class="descname">findid</tt><big>(</big><em>id</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.findid" title="Permalink to this definition">¶</a></dt>
+<dd><p>find unit with matching id by checking id_index</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.findunit">
+<tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.findunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.findunits">
+<tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.findunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the units with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.getids">
+<tt class="descname">getids</tt><big>(</big><em>filename=None</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.getids" title="Permalink to this definition">¶</a></dt>
+<dd><p>return a list of unit ids</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.getprojectstyle">
+<tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.getsourcelanguage">
+<tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.gettargetlanguage">
+<tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.getunits">
+<tt class="descname">getunits</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.getunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a list of all units in this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.isempty">
+<tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.isempty" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.makeindex">
+<tt class="descname">makeindex</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.makeindex" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indexes the items in this store. At least .sourceindex should be
+useful.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.merge_on">
+<tt class="descname">merge_on</tt><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.merge_on" title="Permalink to this definition">¶</a></dt>
+<dd><p>The matching criterion to use when merging on.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The default matching criterion for all the subclasses.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">string</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.parsefile">
+<em class="property">classmethod </em><tt class="descname">parsefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.parsefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>parse the given file</p>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.parsestring">
+<em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.parsestring" title="Permalink to this definition">¶</a></dt>
+<dd><p>Convert the string representation back to an object.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.remove_unit_from_index">
+<tt class="descname">remove_unit_from_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.remove_unit_from_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Remove a unit from source and locaton indexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.require_index">
+<tt class="descname">require_index</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.require_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>make sure source index exists</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.save">
+<tt class="descname">save</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.save" title="Permalink to this definition">¶</a></dt>
+<dd><p>Save to the file that data was originally read from, if
+available.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.savefile">
+<tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.savefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>Write the string representation to the given file (or filename).</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.setprojectstyle">
+<tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.setsourcelanguage">
+<tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.settargetlanguage">
+<tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.translate">
+<tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.translate" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return the translated string for a given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">String or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubStationAlphaFile.unit_iter">
+<tt class="descname">unit_iter</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubStationAlphaFile.unit_iter" title="Permalink to this definition">¶</a></dt>
+<dd><p>Iterator over all the units in this store.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="translate.storage.subtitles.SubtitleFile">
+<em class="property">class </em><tt class="descclassname">translate.storage.subtitles.</tt><tt class="descname">SubtitleFile</tt><big>(</big><em>inputfile=None</em>, <em>unitclass=<class 'translate.storage.subtitles.SubtitleUnit'></em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile" title="Permalink to this definition">¶</a></dt>
+<dd><p>A subtitle file</p>
+<dl class="attribute">
+<dt id="translate.storage.subtitles.SubtitleFile.UnitClass">
+<tt class="descname">UnitClass</tt><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.UnitClass" title="Permalink to this definition">¶</a></dt>
+<dd><p>alias of <a class="reference internal" href="#translate.storage.subtitles.SubtitleUnit" title="translate.storage.subtitles.SubtitleUnit"><tt class="xref py py-class docutils literal"><span class="pre">SubtitleUnit</span></tt></a></p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.add_unit_to_index">
+<tt class="descname">add_unit_to_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.add_unit_to_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add a unit to source and location idexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.addsourceunit">
+<tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add and returns a new unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt></td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.addunit">
+<tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.addunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Append the given unit to the object’s list of units.</p>
+<p>This method should always be used rather than trying to modify the
+list manually.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>unit</strong> (<tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt>) – The unit that will be added.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.findid">
+<tt class="descname">findid</tt><big>(</big><em>id</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.findid" title="Permalink to this definition">¶</a></dt>
+<dd><p>find unit with matching id by checking id_index</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.findunit">
+<tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.findunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the unit with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.findunits">
+<tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.findunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Find the units with the given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body"><tt class="xref py py-class docutils literal"><span class="pre">TranslationUnit</span></tt> or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.getids">
+<tt class="descname">getids</tt><big>(</big><em>filename=None</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.getids" title="Permalink to this definition">¶</a></dt>
+<dd><p>return a list of unit ids</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.getprojectstyle">
+<tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.getsourcelanguage">
+<tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.gettargetlanguage">
+<tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.getunits">
+<tt class="descname">getunits</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.getunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return a list of all units in this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.isempty">
+<tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.isempty" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.makeindex">
+<tt class="descname">makeindex</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.makeindex" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indexes the items in this store. At least .sourceindex should be
+useful.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="translate.storage.subtitles.SubtitleFile.merge_on">
+<tt class="descname">merge_on</tt><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.merge_on" title="Permalink to this definition">¶</a></dt>
+<dd><p>The matching criterion to use when merging on.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">The default matching criterion for all the subclasses.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">string</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubtitleFile.parsefile">
+<em class="property">classmethod </em><tt class="descname">parsefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.parsefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>parse the given file</p>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubtitleFile.parsestring">
+<em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.parsestring" title="Permalink to this definition">¶</a></dt>
+<dd><p>Convert the string representation back to an object.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.remove_unit_from_index">
+<tt class="descname">remove_unit_from_index</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.remove_unit_from_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>Remove a unit from source and locaton indexes</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.require_index">
+<tt class="descname">require_index</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.require_index" title="Permalink to this definition">¶</a></dt>
+<dd><p>make sure source index exists</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.save">
+<tt class="descname">save</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.save" title="Permalink to this definition">¶</a></dt>
+<dd><p>Save to the file that data was originally read from, if
+available.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.savefile">
+<tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.savefile" title="Permalink to this definition">¶</a></dt>
+<dd><p>Write the string representation to the given file (or filename).</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.setprojectstyle">
+<tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the project type for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.setsourcelanguage">
+<tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the source language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.settargetlanguage">
+<tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the target language for this store.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.translate">
+<tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.translate" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return the translated string for a given source string.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">String or None</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleFile.unit_iter">
+<tt class="descname">unit_iter</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleFile.unit_iter" title="Permalink to this definition">¶</a></dt>
+<dd><p>Iterator over all the units in this store.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="translate.storage.subtitles.SubtitleUnit">
+<em class="property">class </em><tt class="descclassname">translate.storage.subtitles.</tt><tt class="descname">SubtitleUnit</tt><big>(</big><em>source=None</em>, <em>encoding='utf_8'</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit" title="Permalink to this definition">¶</a></dt>
+<dd><p>A subtitle entry that is translatable</p>
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.adderror">
+<tt class="descname">adderror</tt><big>(</big><em>errorname</em>, <em>errortext</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.adderror" title="Permalink to this definition">¶</a></dt>
+<dd><p>Adds an error message to this unit.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.addlocation">
+<tt class="descname">addlocation</tt><big>(</big><em>location</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.addlocation" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add one location to the list of locations.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Shouldn’t be implemented if the format doesn’t support it.</p>
+</div>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.addlocations">
+<tt class="descname">addlocations</tt><big>(</big><em>location</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.addlocations" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add a location or a list of locations.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Most classes shouldn’t need to implement this, but should rather
+implement <tt class="xref py py-meth docutils literal"><span class="pre">TranslationUnit.addlocation()</span></tt>.</p>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">This method might be removed in future.</p>
+</div>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.addnote">
+<tt class="descname">addnote</tt><big>(</big><em>text</em>, <em>origin=None</em>, <em>position='append'</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.addnote" title="Permalink to this definition">¶</a></dt>
+<dd><p>Adds a note (comment).</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+Origin can be one of the following text strings:
+- ‘translator’
+- ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubtitleUnit.buildfromunit">
+<em class="property">classmethod </em><tt class="descname">buildfromunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.buildfromunit" title="Permalink to this definition">¶</a></dt>
+<dd><p>Build a native unit from a foreign unit, preserving as much
+information as possible.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.getcontext">
+<tt class="descname">getcontext</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.getcontext" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get the message context.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.geterrors">
+<tt class="descname">geterrors</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.geterrors" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get all error messages.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">Dictionary</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.gettargetlen">
+<tt class="descname">gettargetlen</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.gettargetlen" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns the length of the target string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>item</strong> – an integer that is an index in .getunits().</td>
+<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">Integer</td>
 </tr>
 </tbody>
 </table>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Plural forms might be combined.</p>
+</div>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.source_wordcount">
-<tt class="descname">source_wordcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.source_wordcount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of words in the source text.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.getunits">
+<tt class="descname">getunits</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.getunits" title="Permalink to this definition">¶</a></dt>
+<dd><p>This unit in a list.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.translated_unitcount">
-<tt class="descname">translated_unitcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.translated_unitcount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of translated units.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.hasplural">
+<tt class="descname">hasplural</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.hasplural" title="Permalink to this definition">¶</a></dt>
+<dd><p>Tells whether or not this specific unit has plural strings.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.translated_units">
-<tt class="descname">translated_units</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.translated_units" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a list of translated units.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.infer_state">
+<tt class="descname">infer_state</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.infer_state" title="Permalink to this definition">¶</a></dt>
+<dd><p>Empty method that should be overridden in sub-classes to infer the
+current state(_n) of the unit from its current state.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.translated_wordcount">
-<tt class="descname">translated_wordcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.translated_wordcount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of translated words in this object.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.isblank">
+<tt class="descname">isblank</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.isblank" title="Permalink to this definition">¶</a></dt>
+<dd><p>Used to see if this unit has no source or target string.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This is probably used more to find translatable units,
+and we might want to move in that direction rather and
+get rid of this.</p>
+</div>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.untranslated_unitcount">
-<tt class="descname">untranslated_unitcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.untranslated_unitcount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of untranslated units.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.isfuzzy">
+<tt class="descname">isfuzzy</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.isfuzzy" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indicates whether this unit is fuzzy.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.untranslated_units">
-<tt class="descname">untranslated_units</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.untranslated_units" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a list of untranslated units.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.isheader">
+<tt class="descname">isheader</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.isheader" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indicates whether this unit is a header.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.untranslated_wordcount">
-<tt class="descname">untranslated_wordcount</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.untranslated_wordcount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of untranslated words in this object.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.isobsolete">
+<tt class="descname">isobsolete</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.isobsolete" title="Permalink to this definition">¶</a></dt>
+<dd><p>indicate whether a unit is obsolete</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statistics.Statistics.wordcount">
-<tt class="descname">wordcount</tt><big>(</big><em>text</em><big>)</big><a class="headerlink" href="#translate.storage.statistics.Statistics.wordcount" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the number of words in the given text.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.isreview">
+<tt class="descname">isreview</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.isreview" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indicates whether this unit needs review.</p>
 </dd></dl>
 
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.istranslatable">
+<tt class="descname">istranslatable</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.istranslatable" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indicates whether this unit can be translated.</p>
+<p>This should be used to distinguish real units for translation from
+header, obsolete, binary or other blank units.</p>
 </dd></dl>
 
-</div>
-<div class="section" id="module-translate.storage.statsdb">
-<span id="statsdb"></span><h2>statsdb<a class="headerlink" href="#module-translate.storage.statsdb" title="Permalink to this headline">¶</a></h2>
-<p>Module to provide a cache of statistics in a database.</p>
-<dl class="class">
-<dt id="translate.storage.statsdb.StatsCache">
-<em class="property">class </em><tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">StatsCache</tt><a class="headerlink" href="#translate.storage.statsdb.StatsCache" title="Permalink to this definition">¶</a></dt>
-<dd><p>An object instantiated as a singleton for each statsfile that provides
-access to the database cache from a pool of StatsCache objects.</p>
-<dl class="attribute">
-<dt id="translate.storage.statsdb.StatsCache.con">
-<tt class="descname">con</tt><em class="property"> = None</em><a class="headerlink" href="#translate.storage.statsdb.StatsCache.con" title="Permalink to this definition">¶</a></dt>
-<dd><p>This cache’s connection</p>
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.istranslated">
+<tt class="descname">istranslated</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.istranslated" title="Permalink to this definition">¶</a></dt>
+<dd><p>Indicates whether this unit is translated.</p>
+<p>This should be used rather than deducing it from .target,
+to ensure that other classes can implement more functionality
+(as XLIFF does).</p>
 </dd></dl>
 
-<dl class="attribute">
-<dt id="translate.storage.statsdb.StatsCache.cur">
-<tt class="descname">cur</tt><em class="property"> = None</em><a class="headerlink" href="#translate.storage.statsdb.StatsCache.cur" title="Permalink to this definition">¶</a></dt>
-<dd><p>The current cursor</p>
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.makeobsolete">
+<tt class="descname">makeobsolete</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.makeobsolete" title="Permalink to this definition">¶</a></dt>
+<dd><p>Make a unit obsolete</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statsdb.StatsCache.filechecks">
-<tt class="descname">filechecks</tt><big>(</big><em>filename</em>, <em>checker</em>, <em>store=None</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filechecks" title="Permalink to this definition">¶</a></dt>
-<dd><p>Retrieves the error statistics for the given file if possible,
-otherwise delegates to cachestorechecks().</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.markfuzzy">
+<tt class="descname">markfuzzy</tt><big>(</big><em>value=True</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.markfuzzy" title="Permalink to this definition">¶</a></dt>
+<dd><p>Marks the unit as fuzzy or not.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statsdb.StatsCache.filestatestats">
-<tt class="descname">filestatestats</tt><big>(</big><em>filename</em>, <em>store=None</em>, <em>extended=False</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filestatestats" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a dictionary of unit stats mapping sets of unit
-indices with those states</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.markreviewneeded">
+<tt class="descname">markreviewneeded</tt><big>(</big><em>needsreview=True</em>, <em>explanation=None</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.markreviewneeded" title="Permalink to this definition">¶</a></dt>
+<dd><p>Marks the unit to indicate whether it needs review.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>needsreview</strong> – Defaults to True.</li>
+<li><strong>explanation</strong> – Adds an optional explanation as a note.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statsdb.StatsCache.filestats">
-<tt class="descname">filestats</tt><big>(</big><em>filename</em>, <em>checker</em>, <em>store=None</em>, <em>extended=False</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filestats" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a dictionary of property names mapping sets of unit
-indices with those properties.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.merge">
+<tt class="descname">merge</tt><big>(</big><em>otherunit</em>, <em>overwrite=False</em>, <em>comments=True</em>, <em>authoritative=False</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.merge" title="Permalink to this definition">¶</a></dt>
+<dd><p>Do basic format agnostic merging.</p>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statsdb.StatsCache.filetotals">
-<tt class="descname">filetotals</tt><big>(</big><em>filename</em>, <em>store=None</em>, <em>extended=False</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.filetotals" title="Permalink to this definition">¶</a></dt>
-<dd><p>Retrieves the statistics for the given file if possible, otherwise
-delegates to cachestore().</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.multistring_to_rich">
+<tt class="descname">multistring_to_rich</tt><big>(</big><em>mulstring</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.multistring_to_rich" title="Permalink to this definition">¶</a></dt>
+<dd><p>Convert a multistring to a list of “rich” string trees:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="gp">>>> </span><span class="n">target</span> <span class="o">=</span> <span class="n">multistring</span><span class="p">([</span><span class="s">u'foo'</span><span class="p">,</span> <span class="s">u'bar'</span><span class="p">,</span> <span class="s">u'baz'</span><span class="p">])</span>
+<span class="gp">>>> </span><span class="n">TranslationUnit</span><span class="o">.</span><span class="n">multistring_to_rich</span><span class="p">(</span><span class="n">target</span><span class="p">)</span>
+<span class="go">[<StringElem([<StringElem([u'foo'])>])>,</span>
+<span class="go"> <StringElem([<StringElem([u'bar'])>])>,</span>
+<span class="go"> <StringElem([<StringElem([u'baz'])>])>]</span>
+</pre></div>
+</div>
 </dd></dl>
 
 <dl class="method">
-<dt id="translate.storage.statsdb.StatsCache.unitstats">
-<tt class="descname">unitstats</tt><big>(</big><em>filename</em>, <em>_lang=None</em>, <em>store=None</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.StatsCache.unitstats" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a dictionary of property names mapping to arrays which
-map unit indices to property values.</p>
-<p>Please note that this is different from filestats, since filestats
-supplies sets of unit indices with a given property, whereas this
-method supplies arrays which map unit indices to given values.</p>
+<dt id="translate.storage.subtitles.SubtitleUnit.removenotes">
+<tt class="descname">removenotes</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.removenotes" title="Permalink to this definition">¶</a></dt>
+<dd><p>Remove all the translator’s notes.</p>
+</dd></dl>
+
+<dl class="classmethod">
+<dt id="translate.storage.subtitles.SubtitleUnit.rich_to_multistring">
+<em class="property">classmethod </em><tt class="descname">rich_to_multistring</tt><big>(</big><em>elem_list</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.rich_to_multistring" title="Permalink to this definition">¶</a></dt>
+<dd><p>Convert a “rich” string tree to a <tt class="docutils literal"><span class="pre">multistring</span></tt>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="gp">>>> </span><span class="kn">from</span> <span class="nn">translate.storage.placeables.interfaces</span> <span class="kn">import</span> <span class="n">X</span>
+<span class="gp">>>> </span><span class="n">rich</span> <span class="o">=</span> <span class="p">[</span><span class="n">StringElem</span><span class="p">([</span><span class="s">'foo'</span><span class="p">,</span> <span class="n">X</span><span class="p">(</span><span class="nb">id</span><span class="o">=</span><span class="s">'xxx'</span><span class="p">,</span> <span class="n">sub</span><span class="o">=</span><span class="p">[</span><span class="s">' &#39 [...]
+<span class="gp">>>> </span><span class="n">TranslationUnit</span><span class="o">.</span><span class="n">rich_to_multistring</span><span class="p">(</span><span class="n">rich</span><span class="p">)</span>
+<span class="go">multistring(u'foo bar')</span>
+</pre></div>
+</div>
 </dd></dl>
 
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.setcontext">
+<tt class="descname">setcontext</tt><big>(</big><em>context</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.setcontext" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the message context</p>
 </dd></dl>
 
-<dl class="function">
-<dt id="translate.storage.statsdb.emptyfiletotals">
-<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">emptyfiletotals</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.statsdb.emptyfiletotals" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a dictionary with all statistics initalised to 0.</p>
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.setid">
+<tt class="descname">setid</tt><big>(</big><em>value</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.setid" title="Permalink to this definition">¶</a></dt>
+<dd><p>Sets the unique identified for this unit.</p>
+<p>only implemented if format allows ids independant from other
+unit properties like source or context</p>
 </dd></dl>
 
-<dl class="function">
-<dt id="translate.storage.statsdb.statefordb">
-<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">statefordb</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.statefordb" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the numeric database state for the unit.</p>
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.setsource">
+<tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.setsource" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
-<dl class="function">
-<dt id="translate.storage.statsdb.transaction">
-<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">transaction</tt><big>(</big><em>f</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.transaction" title="Permalink to this definition">¶</a></dt>
-<dd><p>Modifies f to commit database changes if it executes without exceptions.
-Otherwise it rolls back the database.</p>
-<p>ALL publicly accessible methods in StatsCache MUST be decorated with this
-decorator.</p>
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.settarget">
+<tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.settarget" title="Permalink to this definition">¶</a></dt>
+<dd><p>Set the target string to the given value.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="translate.storage.subtitles.SubtitleUnit.unit_iter">
+<tt class="descname">unit_iter</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.subtitles.SubtitleUnit.unit_iter" title="Permalink to this definition">¶</a></dt>
+<dd><p>Iterator that only returns this unit.</p>
 </dd></dl>
 
-<dl class="function">
-<dt id="translate.storage.statsdb.wordsinunit">
-<tt class="descclassname">translate.storage.statsdb.</tt><tt class="descname">wordsinunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.statsdb.wordsinunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Counts the words in the unit’s source and target, taking plurals into
-account. The target words are only counted if the unit is translated.</p>
 </dd></dl>
 
-</div>
-<div class="section" id="subtitles">
-<h2>subtitles<a class="headerlink" href="#subtitles" title="Permalink to this headline">¶</a></h2>
 </div>
 <div class="section" id="module-translate.storage.symbian">
 <span id="symbian"></span><h2>symbian<a class="headerlink" href="#module-translate.storage.symbian" title="Permalink to this headline">¶</a></h2>
@@ -13871,7 +15582,7 @@ account. The target words are only counted if the unit is translated.</p>
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -13885,7 +15596,7 @@ account. The target words are only counted if the unit is translated.</p>
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -13905,19 +15616,19 @@ account. The target words are only counted if the unit is translated.</p>
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -13936,7 +15647,7 @@ XML again.</p>
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -13968,7 +15679,8 @@ useful.</p>
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -13989,7 +15701,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.tbx.tbxfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -14014,31 +15726,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tbx.tbxfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tbx.tbxfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -14071,8 +15783,8 @@ Provisional work is done to make several languages possible.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -14114,8 +15826,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -14363,7 +16075,8 @@ to ensure that other classes can implement more functionality
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -14428,24 +16141,25 @@ specified language, if it exists</p>
 <p>Class that manages TikiWiki files for translation.  Tiki files are <strike>ugly and
 inconsistent</strike> formatted as a single large PHP array with several special
 sections identified by comments.  Example current as of 2008-12-01:</p>
-<div class="highlight-python"><pre><?php
+<div class="highlight-python"><div class="highlight"><pre><?php
   // Many comments at the top
   $lang=Array(
   // ### Start of unused words
-  "aaa" => "zzz",
+  "aaa" => "zzz",
   // ### end of unused words
-  
+
   // ### start of untranslated words
-  // "bbb" => "yyy",
+  // "bbb" => "yyy",
   // ### end of untranslated words
-  
+
   // ### start of possibly untranslated words
-  "ccc" => "xxx",
+  "ccc" => "xxx",
   // ### end of possibly untranslated words
-  
-  "ddd" => "www",
-  "###end###"=>"###end###");
-?></pre>
+
+  "ddd" => "www",
+  "###end###"=>"###end###");
+?>
+</pre></div>
 </div>
 <p>In addition there are several auto-generated //-style comments scattered through the
 page and array, some of which matter when being parsed.</p>
@@ -14471,7 +16185,7 @@ As far as I know no detailed documentation exists for the tiki language.php file
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -14485,7 +16199,7 @@ As far as I know no detailed documentation exists for the tiki language.php file
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -14507,7 +16221,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -14521,7 +16235,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -14541,19 +16255,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -14565,7 +16279,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -14615,7 +16329,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.tiki.TikiStore.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -14640,31 +16354,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tiki.TikiStore.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiStore.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -14696,8 +16410,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -14744,8 +16458,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -14991,13 +16705,13 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.tiki.TikiUnit.setsource">
 <tt class="descname">setsource</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiUnit.setsource" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source string to the given value.</p>
+<dd><p>Set the source string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tiki.TikiUnit.settarget">
 <tt class="descname">settarget</tt><big>(</big><em>target</em><big>)</big><a class="headerlink" href="#translate.storage.tiki.TikiUnit.settarget" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target string to the given value.</p>
+<dd><p>Set the target string to the given value.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15040,7 +16754,7 @@ unit properties like source or context</p>
 
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.addtranslation">
-<tt class="descname">addtranslation</tt><big>(</big><em>source</em>, <em>srclang</em>, <em>translation</em>, <em>translang</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.addtranslation" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">addtranslation</tt><big>(</big><em>source</em>, <em>srclang</em>, <em>translation</em>, <em>translang</em>, <em>comment=None</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.addtranslation" title="Permalink to this definition">¶</a></dt>
 <dd><p>addtranslation method for testing old unit tests</p>
 </dd></dl>
 
@@ -15053,7 +16767,7 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15067,7 +16781,7 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15087,19 +16801,19 @@ unit properties like source or context</p>
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15118,7 +16832,7 @@ XML again.</p>
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15150,7 +16864,8 @@ useful.</p>
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -15171,7 +16886,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.tmx.tmxfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15196,25 +16911,25 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.tmx.tmxfile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.tmx.tmxfile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15500,7 +17215,8 @@ to ensure that other classes can implement more functionality
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -15583,8 +17299,8 @@ specified language, if it exists</p>
 <dl class="data">
 <dt id="translate.storage.trados.RTF_ESCAPES">
 <tt class="descclassname">translate.storage.trados.</tt><tt class="descname">RTF_ESCAPES</tt><em class="property"> = {u'\\lquote': u'\u2018', u'\\ldblquote': u'\u201c', u'\\_': u'\u2011', u'\\rquote': u'\u2019', u'\\bullet': u'\u2022', u'\\rdblquote': u'\u201d', u'\\endash': u'\u2013', u'\\emspace': u'\u2003', u'\\~': u'\xa0', u'\\emdash': u'\u2014', u'\\enspace': u'\u2002', u'\\-': u'\xad'}</em><a class="headerlink" href="#translate.storage.trados.RTF_ESCAPES" title="Permalink to this d [...]
-<dd><p>RTF control to Unicode map
-<<a class="reference external" href="http://msdn.microsoft.com/en-us/library/aa140283%28v=office.10%29.aspx#rtfspec_specialchar">http://msdn.microsoft.com/en-us/library/aa140283%28v=office.10%29.aspx#rtfspec_specialchar</a>></p>
+<dd><p>RTF control to Unicode map. See
+<a class="reference external" href="http://msdn.microsoft.com/en-us/library/aa140283(v=office.10).aspx">http://msdn.microsoft.com/en-us/library/aa140283(v=office.10).aspx</a></p>
 </dd></dl>
 
 <dl class="data">
@@ -15670,7 +17386,7 @@ specified language, if it exists</p>
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15684,7 +17400,7 @@ specified language, if it exists</p>
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -15706,7 +17422,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15720,7 +17436,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15740,19 +17456,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15764,7 +17480,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15800,7 +17516,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.trados.TradosTxtTmFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -15825,31 +17541,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.trados.TradosTxtTmFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.trados.TradosTxtTmFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15887,12 +17603,12 @@ available.</p>
 <p>This will eventually replace the older ts.py which only supports the older
 format. While converters haven’t been updated to use this module, we retain
 both.</p>
-<p><a class="reference external" href="http://doc.trolltech.com/4.3/linguist-ts-file-format.html">TS file format 4.3</a>,
-<a class="reference external" href="http://doc.trolltech.com/4.5/linguist-ts-file-format.html">4.5</a>,
-<a class="reference external" href="http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt">Example</a>,
-<a class="reference external" href="http://www.koders.com/cpp/fidE7B7E83C54B9036EB7FA0F27BC56BCCFC4B9DF34.aspx#L200">Plurals forms</a></p>
-<p><a class="reference external" href="http://doc.trolltech.com/4.3/qstring.html#arg">Specification of the valid variable entries</a>,
-<a class="reference external" href="http://doc.trolltech.com/4.3/qstring.html#arg-2">2</a></p>
+<p><a class="reference external" href="http://doc.qt.digia.com/4.3/linguist-ts-file-format.html">TS file format 4.3</a>,
+<a class="reference external" href="http://qt-project.org/doc/qt-4.8/linguist-ts-file-format.html">4.8</a>,
+<a class="reference external" href="http://qt-project.org/doc/qt-5.0/qtlinguist/linguist-ts-file-format.html">5.0</a>.
+<a class="reference external" href="http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt">Example</a>.</p>
+<p><a class="reference external" href="http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg">Specification of the valid variable entries</a>,
+<a class="reference external" href="http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg-2">2</a></p>
 <dl class="class">
 <dt id="translate.storage.ts2.tsfile">
 <em class="property">class </em><tt class="descclassname">translate.storage.ts2.</tt><tt class="descname">tsfile</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile" title="Permalink to this definition">¶</a></dt>
@@ -15938,7 +17654,7 @@ if allowed by createifmissing).</p>
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15952,7 +17668,7 @@ if allowed by createifmissing).</p>
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -15972,7 +17688,7 @@ if allowed by createifmissing).</p>
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -16027,7 +17743,7 @@ by the extraction tools.</p>
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -16059,7 +17775,8 @@ useful.</p>
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -16080,7 +17797,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.ts2.tsfile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -16105,19 +17822,19 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -16137,7 +17854,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.ts2.tsfile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.ts2.tsfile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -16169,8 +17886,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -16357,7 +18074,8 @@ to ensure that other classes can implement more functionality
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -16414,10 +18132,10 @@ unit properties like source or context</p>
 <p>Module for parsing Qt .ts files for translation.</p>
 <p>Currently this module supports the old format of .ts files. Some applictaions
 use the newer .ts format which are documented here:
-<a class="reference external" href="http://doc.trolltech.com/4.3/linguist-ts-file-format.html">TS file format 4.3</a>,
+<a class="reference external" href="http://doc.qt.digia.com/4.3/linguist-ts-file-format.html">TS file format 4.3</a>,
 <a class="reference external" href="http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt">Example</a></p>
-<p><a class="reference external" href="http://doc.trolltech.com/4.3/qstring.html#arg">Specification of the valid variable entries</a>,
-<a class="reference external" href="http://doc.trolltech.com/4.3/qstring.html#arg-2">2</a></p>
+<p><a class="reference external" href="http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg">Specification of the valid variable entries</a>,
+<a class="reference external" href="http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg-2">2</a></p>
 </div>
 <div class="section" id="module-translate.storage.txt">
 <span id="txt"></span><h2>txt<a class="headerlink" href="#module-translate.storage.txt" title="Permalink to this headline">¶</a></h2>
@@ -16451,7 +18169,7 @@ similar wiki type files.</p>
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -16465,7 +18183,7 @@ similar wiki type files.</p>
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -16487,7 +18205,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -16501,7 +18219,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -16527,19 +18245,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -16551,7 +18269,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -16593,7 +18311,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.txt.TxtFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -16618,31 +18336,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.txt.TxtFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.txt.TxtFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -16674,8 +18392,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -16707,8 +18425,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -17002,7 +18720,8 @@ and <a class="reference internal" href="#translate.storage.utx.UtxUnit" title="t
 implement that.</p>
 <dl class="docutils">
 <dt>Specification</dt>
-<dd>The format is implemented according to the <a class="reference external" href="http://www.aamt.info/english/utx/utx-simple-1.00-specification-e.pdf">v1.0 UTX</a></dd>
+<dd>The format is implemented according to UTX v1.0 (No longer available from
+their website. The current <a class="reference external" href="http://www.aamt.info/english/utx/#Download">UTX version</a> may be downloaded instead).</dd>
 <dt>Format Implementation</dt>
 <dd>The UTX format is a Tab Seperated Value (TSV) file in UTF-8.  The
 first two lines are headers with subsequent lines containing a
@@ -17036,7 +18755,7 @@ file.</p>
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -17050,7 +18769,7 @@ file.</p>
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -17072,7 +18791,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -17086,7 +18805,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -17106,7 +18825,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -17118,7 +18837,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -17160,7 +18879,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.utx.UtxFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -17185,19 +18904,19 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.utx.UtxFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.utx.UtxFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -17250,8 +18969,8 @@ omitted.</li>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -18091,7 +19810,7 @@ These are left as is and are not directly managed byour implemenation.</dd>
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.addsourceunit">
 <tt class="descname">addsourceunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.addsourceunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Adds and returns a new unit with the given source string.</p>
+<dd><p>Add and returns a new unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -18105,7 +19824,7 @@ These are left as is and are not directly managed byour implemenation.</dd>
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.addunit">
 <tt class="descname">addunit</tt><big>(</big><em>unit</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.addunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Appends the given unit to the object’s list of units.</p>
+<dd><p>Append the given unit to the object’s list of units.</p>
 <p>This method should always be used rather than trying to modify the
 list manually.</p>
 <table class="docutils field-list" frame="void" rules="none">
@@ -18127,7 +19846,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -18141,7 +19860,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -18161,19 +19880,19 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.getsourcelanguage">
 <tt class="descname">getsourcelanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.getsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the source language for this store</p>
+<dd><p>Get the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.gettargetlanguage">
 <tt class="descname">gettargetlanguage</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.gettargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the target language for this store</p>
+<dd><p>Get the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -18185,7 +19904,7 @@ list manually.</p>
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -18227,7 +19946,7 @@ to an object.</p>
 <dl class="classmethod">
 <dt id="translate.storage.wordfast.WordfastTMFile.parsestring">
 <em class="property">classmethod </em><tt class="descname">parsestring</tt><big>(</big><em>storestring</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.parsestring" title="Permalink to this definition">¶</a></dt>
-<dd><p>Converts the string representation back to an object.</p>
+<dd><p>Convert the string representation back to an object.</p>
 </dd></dl>
 
 <dl class="method">
@@ -18252,31 +19971,31 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.setsourcelanguage">
 <tt class="descname">setsourcelanguage</tt><big>(</big><em>sourcelanguage</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.setsourcelanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the source language for this store</p>
+<dd><p>Set the source language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.settargetlanguage">
 <tt class="descname">settargetlanguage</tt><big>(</big><em>targetlanguage</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.settargetlanguage" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the target language for this store</p>
+<dd><p>Set the target language for this store.</p>
 </dd></dl>
 
 <dl class="method">
 <dt id="translate.storage.wordfast.WordfastTMFile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.wordfast.WordfastTMFile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -18366,8 +20085,8 @@ available.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
-<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
+<li><strong>errorname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A single word to id the error.</li>
+<li><strong>errortext</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – The text describing the error.</li>
 </ul>
 </td>
 </tr>
@@ -18409,8 +20128,8 @@ implement <tt class="xref py py-meth docutils literal"><span class="pre">Transla
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
-<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
+<li><strong>text</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Usually just a sentence or two.</li>
+<li><strong>origin</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – Specifies who/where the comment comes from.
 Origin can be one of the following text strings:
 - ‘translator’
 - ‘developer’, ‘programmer’, ‘source code’ (synonyms)</li>
@@ -18713,8 +20432,8 @@ define similar states.</p>
 </dd></dl>
 
 </div>
-<div class="section" id="id12">
-<h2>xliff<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="id13">
+<h2>xliff<a class="headerlink" href="#id13" title="Permalink to this headline">¶</a></h2>
 <span class="target" id="module-translate.storage.xliff"></span><p>Module for handling XLIFF files for translation.</p>
 <p>The official recommendation is to use the extention .xlf for XLIFF files.</p>
 <dl class="class">
@@ -18769,7 +20488,7 @@ are needed for XLIFF compliance.</p>
 <dl class="method">
 <dt id="translate.storage.xliff.xlifffile.findunit">
 <tt class="descname">findunit</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.xliff.xlifffile.findunit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the unit with the given source string.</p>
+<dd><p>Find the unit with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -18783,7 +20502,7 @@ are needed for XLIFF compliance.</p>
 <dl class="method">
 <dt id="translate.storage.xliff.xlifffile.findunits">
 <tt class="descname">findunits</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.xliff.xlifffile.findunits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds the units with the given source string.</p>
+<dd><p>Find the units with the given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -18852,7 +20571,7 @@ If the date attribute is not specified, None is returned.</p>
 <dl class="method">
 <dt id="translate.storage.xliff.xlifffile.getprojectstyle">
 <tt class="descname">getprojectstyle</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xliff.xlifffile.getprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets the project type for this store</p>
+<dd><p>Get the project type for this store.</p>
 </dd></dl>
 
 <dl class="method">
@@ -18864,7 +20583,7 @@ If the date attribute is not specified, None is returned.</p>
 <dl class="method">
 <dt id="translate.storage.xliff.xlifffile.isempty">
 <tt class="descname">isempty</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xliff.xlifffile.isempty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns True if the object doesn’t contain any translation units.</p>
+<dd><p>Return True if the object doesn’t contain any translation units.</p>
 </dd></dl>
 
 <dl class="method">
@@ -18896,7 +20615,8 @@ useful.</p>
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -18949,7 +20669,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.xliff.xlifffile.savefile">
 <tt class="descname">savefile</tt><big>(</big><em>storefile</em><big>)</big><a class="headerlink" href="#translate.storage.xliff.xlifffile.savefile" title="Permalink to this definition">¶</a></dt>
-<dd><p>Writes the string representation to the given file (or filename).</p>
+<dd><p>Write the string representation to the given file (or filename).</p>
 </dd></dl>
 
 <dl class="method">
@@ -18961,7 +20681,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.xliff.xlifffile.setprojectstyle">
 <tt class="descname">setprojectstyle</tt><big>(</big><em>project_style</em><big>)</big><a class="headerlink" href="#translate.storage.xliff.xlifffile.setprojectstyle" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sets the project type for this store</p>
+<dd><p>Set the project type for this store.</p>
 </dd></dl>
 
 <dl class="attribute">
@@ -18989,7 +20709,7 @@ available.</p>
 <dl class="method">
 <dt id="translate.storage.xliff.xlifffile.translate">
 <tt class="descname">translate</tt><big>(</big><em>source</em><big>)</big><a class="headerlink" href="#translate.storage.xliff.xlifffile.translate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the translated string for a given source string.</p>
+<dd><p>Return the translated string for a given source string.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -19268,7 +20988,8 @@ by the <tt class="docutils literal"><span class="pre">rich_source</span></tt> an
 <dd><p>Returns name in Clark notation.</p>
 <p>For example <tt class="docutils literal"><span class="pre">namespaced("source")</span></tt> in an XLIFF document
 might return:</p>
-<div class="highlight-python"><pre>{urn:oasis:names:tc:xliff:document:1.1}source</pre>
+<div class="highlight-python"><div class="highlight"><pre>{urn:oasis:names:tc:xliff:document:1.1}source
+</pre></div>
 </div>
 <p>This is needed throughout lxml.</p>
 </dd></dl>
@@ -19351,7 +21072,7 @@ have children, which correspond to placeables.</p>
 <dl class="function">
 <dt id="translate.storage.xml_extract.generate.find_dom_root">
 <tt class="descclassname">translate.storage.xml_extract.generate.</tt><tt class="descname">find_dom_root</tt><big>(</big><em>parent_dom_node</em>, <em>dom_node</em><big>)</big><a class="headerlink" href="#translate.storage.xml_extract.generate.find_dom_root" title="Permalink to this definition">¶</a></dt>
-<dd><div class="admonition-see-also admonition seealso">
+<dd><div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference internal" href="#translate.storage.xml_extract.generate.find_placeable_dom_tree_roots" title="translate.storage.xml_extract.generate.find_placeable_dom_tree_roots"><tt class="xref py py-meth docutils literal"><span class="pre">find_placeable_dom_tree_roots()</span></tt></a></p>
 </div>
@@ -19367,11 +21088,12 @@ element. However, the span is contained in other tags (which we never process).
 When splicing the template DOM tree (that is, the DOM which comes from
 the XML document we’re using to generate a translated XML document), we’ll
 need to move DOM sub-trees around and we need the roots of these sub-trees:</p>
-<div class="highlight-python"><pre><p> This is text \/                <- Paragraph containing an inline placeable
-                 <blah>            <- Inline placeable's root (which we want to find)
+<div class="highlight-python"><div class="highlight"><pre><p> This is text \/                <- Paragraph containing an inline placeable
+                 <blah>            <- Inline placeable's root (which we want to find)
                  ...               <- Any number of intermediate DOM nodes
-                 <span> bold text  <- The inline placeable's Translatable
-                                      holds a reference to this DOM node</pre>
+                 <span> bold text  <- The inline placeable's Translatable
+                                      holds a reference to this DOM node
+</pre></div>
 </div>
 </dd></dl>
 
@@ -19379,7 +21101,8 @@ need to move DOM sub-trees around and we need the roots of these sub-trees:</p>
 <dt id="translate.storage.xml_extract.generate.replace_dom_text">
 <tt class="descclassname">translate.storage.xml_extract.generate.</tt><tt class="descname">replace_dom_text</tt><big>(</big><em>make_parse_state</em><big>)</big><a class="headerlink" href="#translate.storage.xml_extract.generate.replace_dom_text" title="Permalink to this definition">¶</a></dt>
 <dd><p>Return a function:</p>
-<div class="highlight-python"><pre>action: etree_Element x base.TranslationUnit -> None</pre>
+<div class="highlight-python"><div class="highlight"><pre>action: etree_Element x base.TranslationUnit -> None
+</pre></div>
 </div>
 <p>which takes a dom_node and a translation unit. The dom_node is rearranged
 according to rearrangement of placeables in unit.target (relative to their
@@ -19429,18 +21152,19 @@ to the tree.</p>
 and where a node contains a unit if a path from the root of the tree to the node
 containing the unit, is equal to the XPath of the unit.</p>
 <p>The tree looks something like this:</p>
-<div class="highlight-python"><pre>root
-   `- ('document-content', 1)
-      `- ('body', 2)
-         |- ('text', 1)
-         |  `- ('p', 1)
+<div class="highlight-python"><div class="highlight"><pre>root
+   `- ('document-content', 1)
+      `- ('body', 2)
+         |- ('text', 1)
+         |  `- ('p', 1)
          |     `- <reference to a unit>
-         |- ('text', 2)
-         |  `- ('p', 1)
+         |- ('text', 2)
+         |  `- ('p', 1)
          |     `- <reference to a unit>
-         `- ('text', 3)
-            `- ('p', 1)
-               `- <reference to a unit></pre>
+         `- ('text', 3)
+            `- ('p', 1)
+               `- <reference to a unit>
+</pre></div>
 </div>
 </dd></dl>
 
@@ -19509,166 +21233,6 @@ continuously.</p>
 </dd></dl>
 
 </div>
-<div class="section" id="module-translate.storage.xpi">
-<span id="xpi"></span><h2>xpi<a class="headerlink" href="#module-translate.storage.xpi" title="Permalink to this headline">¶</a></h2>
-<p>Module for accessing mozilla xpi packages.</p>
-<dl class="class">
-<dt id="translate.storage.xpi.CatchPotentialOutput">
-<em class="property">class </em><tt class="descclassname">translate.storage.xpi.</tt><tt class="descname">CatchPotentialOutput</tt><big>(</big><em>contents</em>, <em>onclose</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.CatchPotentialOutput" title="Permalink to this definition">¶</a></dt>
-<dd><p>catches output if there has been, before closing</p>
-<dl class="method">
-<dt id="translate.storage.xpi.CatchPotentialOutput.close">
-<tt class="descname">close</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.CatchPotentialOutput.close" title="Permalink to this definition">¶</a></dt>
-<dd><p>wrap the underlying close method, to pass the value to onclose before it goes</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.CatchPotentialOutput.flush">
-<tt class="descname">flush</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.CatchPotentialOutput.flush" title="Permalink to this definition">¶</a></dt>
-<dd><p>zip files call flush, not close, on file-like objects</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.CatchPotentialOutput.slam">
-<tt class="descname">slam</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.CatchPotentialOutput.slam" title="Permalink to this definition">¶</a></dt>
-<dd><p>use this method to force the closing of the stream if it isn’t closed yet</p>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="translate.storage.xpi.FixedStringIO">
-<em class="property">class </em><tt class="descclassname">translate.storage.xpi.</tt><tt class="descname">FixedStringIO</tt><big>(</big><em>buf=''</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.FixedStringIO" title="Permalink to this definition">¶</a></dt>
-<dd><p>This is a fix to the StringIO in Python 2.3.3
-submitted as patch 951915 on sourceforge</p>
-<dl class="method">
-<dt id="translate.storage.xpi.FixedStringIO.close">
-<tt class="descname">close</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.FixedStringIO.close" title="Permalink to this definition">¶</a></dt>
-<dd><p>Free the memory buffer.</p>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="translate.storage.xpi.ZipFileCatcher">
-<em class="property">class </em><tt class="descclassname">translate.storage.xpi.</tt><tt class="descname">ZipFileCatcher</tt><big>(</big><em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher" title="Permalink to this definition">¶</a></dt>
-<dd><p>a ZipFile that calls any methods its instructed to before closing (useful for catching stream output)</p>
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.addcatcher">
-<tt class="descname">addcatcher</tt><big>(</big><em>pendingsave</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.addcatcher" title="Permalink to this definition">¶</a></dt>
-<dd><p>remember to call the given method before closing</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.close">
-<tt class="descname">close</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.close" title="Permalink to this definition">¶</a></dt>
-<dd><p>close the stream, remembering to call any addcatcher methods first</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.delete">
-<tt class="descname">delete</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.delete" title="Permalink to this definition">¶</a></dt>
-<dd><p>Delete the file from the archive. If it appears multiple
-times only the first instance will be deleted.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.extract">
-<tt class="descname">extract</tt><big>(</big><em>member</em>, <em>path=None</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.extract" title="Permalink to this definition">¶</a></dt>
-<dd><p>Extract a member from the archive to the current working directory,
-using its full name. Its file information is extracted as accurately
-as possible. <a href="#id13"><span class="problematic" id="id14">`</span></a>member’ may be a filename or a ZipInfo object. You can
-specify a different directory using <a href="#id15"><span class="problematic" id="id16">`</span></a>path’.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.extractall">
-<tt class="descname">extractall</tt><big>(</big><em>path=None</em>, <em>members=None</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.extractall" title="Permalink to this definition">¶</a></dt>
-<dd><p>Extract all members from the archive to the current working
-directory. <a href="#id17"><span class="problematic" id="id18">`</span></a>path’ specifies a different directory to extract to.
-<a href="#id19"><span class="problematic" id="id20">`</span></a>members’ is optional and must be a subset of the list returned
-by namelist().</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.getinfo">
-<tt class="descname">getinfo</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.getinfo" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return the instance of ZipInfo given ‘name’.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.infolist">
-<tt class="descname">infolist</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.infolist" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a list of class ZipInfo instances for files in the
-archive.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.namelist">
-<tt class="descname">namelist</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.namelist" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return a list of file names in the archive.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.open">
-<tt class="descname">open</tt><big>(</big><em>name</em>, <em>mode='r'</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.open" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return file-like object for ‘name’.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.overwritestr">
-<tt class="descname">overwritestr</tt><big>(</big><em>zinfo_or_arcname</em>, <em>bytes</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.overwritestr" title="Permalink to this definition">¶</a></dt>
-<dd><p>writes the string into the archive, overwriting the file if it exists...</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.printdir">
-<tt class="descname">printdir</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.printdir" title="Permalink to this definition">¶</a></dt>
-<dd><p>Print a table of contents for the zip file.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.read">
-<tt class="descname">read</tt><big>(</big><em>name</em>, <em>pwd=None</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.read" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return file bytes (as a string) for name.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.setpassword">
-<tt class="descname">setpassword</tt><big>(</big><em>pwd</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.setpassword" title="Permalink to this definition">¶</a></dt>
-<dd><p>Set default password for encrypted files.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.testzip">
-<tt class="descname">testzip</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.testzip" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read all the files and check the CRC.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.write">
-<tt class="descname">write</tt><big>(</big><em>filename</em>, <em>arcname=None</em>, <em>compress_type=None</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.write" title="Permalink to this definition">¶</a></dt>
-<dd><p>Put the bytes from filename into the archive under the name
-arcname.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.writeendrec">
-<tt class="descname">writeendrec</tt><big>(</big><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.writeendrec" title="Permalink to this definition">¶</a></dt>
-<dd><p>Write the ending records (without neccessarily closing the file)</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="translate.storage.xpi.ZipFileCatcher.writestr">
-<tt class="descname">writestr</tt><big>(</big><em>zinfo_or_arcname</em>, <em>bytes</em>, <em>compress_type=None</em><big>)</big><a class="headerlink" href="#translate.storage.xpi.ZipFileCatcher.writestr" title="Permalink to this definition">¶</a></dt>
-<dd><p>Write a file into the archive.  The contents is the string
-‘bytes’.  ‘zinfo_or_arcname’ is either a ZipInfo instance or
-the name of the file in the archive.</p>
-</dd></dl>
-
-</dd></dl>
-
-</div>
 <div class="section" id="module-translate.storage.zip">
 <span id="zip"></span><h2>zip<a class="headerlink" href="#module-translate.storage.zip" title="Permalink to this headline">¶</a></h2>
 <p>This module provides functionality to work with zip files.</p>
@@ -19724,7 +21288,7 @@ this directory.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/api/tools.html b/docs/_build/html/api/tools.html
index 6f80a80..cfbed9f 100644
--- a/docs/_build/html/api/tools.html
+++ b/docs/_build/html/api/tools.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>tools — Translate Toolkit 1.9.0 documentation</title>
+    <title>tools — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +27,8 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="API" href="index.html" />
-    <link rel="next" title="Important Changes" href="../changelog.html" />
     <link rel="prev" title="storage" href="storage.html" /> 
   </head>
   <body>
@@ -38,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -103,13 +104,12 @@
               
   <li><a href="storage.html"
          title="previous chapter">« storage</a></li>
-  <li><a href="../changelog.html"
-         title="next chapter">Important Changes »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -557,7 +557,7 @@ manpage</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -989,7 +989,7 @@ manpage</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -1412,7 +1412,7 @@ manpage</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -1471,10 +1471,12 @@ source language.</p>
 this.</p>
 </div>
 <p>To translate Kurdish (ku) through French:</p>
-<div class="highlight-python"><pre>po2swap -i fr/ -t ku -o fr-ku</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2swap -i fr/ -t ku -o fr-ku
+</pre></div>
 </div>
 <p>To convert the fr-ku files back to en-ku:</p>
-<div class="highlight-python"><pre>po2swap --reverse -i fr/ -t fr-ku -o en-ku</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2swap --reverse -i fr/ -t fr-ku -o en-ku
+</pre></div>
 </div>
 <p>See: <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/poswap.html">http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/poswap.html</a>
 for examples and usage instructions.</p>
@@ -1831,7 +1833,7 @@ manpage</p>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>pathname</strong> (<a class="reference external" href="http://docs.python.org/2.7/library/string.html#module-string" title="(in Python v2.7)"><em>string</em></a>) – A file path</td>
 </tr>
 <tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">root, ext</td>
 </tr>
@@ -2043,7 +2045,7 @@ by line</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/changelog.html b/docs/_build/html/changelog.html
index 90a4a82..e1c75ba 100644
--- a/docs/_build/html/changelog.html
+++ b/docs/_build/html/changelog.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Important Changes — Translate Toolkit 1.9.0 documentation</title>
+    <title>Changelog — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,16 +27,16 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
-    <link rel="next" title="History of the Translate Toolkit" href="history.html" />
-    <link rel="prev" title="tools" href="api/tools.html" /> 
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" />
+    <link rel="next" title="Release Notes" href="releases/index.html" />
+    <link rel="prev" title="Making a Translate Toolkit Release" href="developers/releasing.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,27 +54,31 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="">Important Changes</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
 <li class="dropdown">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">Important Changes</a><ul>
+<li><a class="reference internal" href="#">Changelog</a><ul>
+<li><a class="reference internal" href="#changelog-1-11">1.11</a></li>
 <li><a class="reference internal" href="#changelog-1-10">1.10</a><ul>
 <li><a class="reference internal" href="#mozilla-dtd-files-change">Mozilla DTD files change</a></li>
 </ul>
@@ -152,7 +155,6 @@
 <li><a class="reference internal" href="#properties-files-no-longer-use-escaped-unicode">.properties files no longer use escaped Unicode</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#changelog-0-8">0.8</a></li>
 </ul>
 </li>
 </ul>
@@ -161,15 +163,16 @@
             
             
               
-  <li><a href="api/tools.html"
-         title="previous chapter">« tools</a></li>
-  <li><a href="history.html"
-         title="next chapter">History of the Translate Toolkit »</a></li>
+  <li><a href="developers/releasing.html"
+         title="previous chapter">« Making a Translate Toolkit Release</a></li>
+  <li><a href="releases/index.html"
+         title="next chapter">Release Notes »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -186,14 +189,24 @@
 
 <div class="container content">
    
-  <div class="section" id="important-changes">
-<span id="changelog"></span><span id="id1"></span><h1>Important Changes<a class="headerlink" href="#important-changes" title="Permalink to this headline">¶</a></h1>
+  <div class="section" id="changelog">
+<span id="id1"></span><h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">¶</a></h1>
 <p>The Translate Toolkit might have changed how it functions in certain cases.
 This page lists what has changed, how it might affect you and how to work
 around the change either to bring your files in line or to use the old
 behaviour if required.</p>
+<div class="section" id="changelog-1-11">
+<span id="id2"></span><h2>1.11<a class="headerlink" href="#changelog-1-11" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Dropped support for Python 2.5 since it is no longer supported by the Python
+Foundation. Also sticking to it was preventing us from using features that
+are not supported on Python 2.5 but they are on later versions.</li>
+<li>Properties will no longer drop entries where source and translation are
+identical.</li>
+</ul>
+</div>
 <div class="section" id="changelog-1-10">
-<span id="id2"></span><h2>1.10<a class="headerlink" href="#changelog-1-10" title="Permalink to this headline">¶</a></h2>
+<span id="id3"></span><h2>1.10<a class="headerlink" href="#changelog-1-10" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
 <li>The matching criterion when merging units can now be specified with the
 <tt class="docutils literal"><span class="pre">X-Merge-On</span></tt> header. Available values for this header are <cite>location</cite> and
@@ -204,7 +217,8 @@ explicit way to set the desired matching criterion.</li>
 <div class="section" id="mozilla-dtd-files-change">
 <span id="changelog-mozilla-dtd-files-change"></span><h3>Mozilla DTD files change<a class="headerlink" href="#mozilla-dtd-files-change" title="Permalink to this headline">¶</a></h3>
 <p>We now preserve spaces in DTD files i.e.:</p>
-<div class="highlight-python"><pre><!ENTITY          some.label          "definition"></pre>
+<div class="highlight-python"><div class="highlight"><pre><!ENTITY          some.label          "definition">
+</pre></div>
 </div>
 <p>Will preserve the spaces around the entity name <tt class="docutils literal"><span class="pre">some.lable</span></tt></p>
 <p>You probably want to run po2moz once to isolate the space changes from real
@@ -212,7 +226,7 @@ translations.</p>
 </div>
 </div>
 <div class="section" id="changelog-1-6-0">
-<span id="id3"></span><h2>1.6.0<a class="headerlink" href="#changelog-1-6-0" title="Permalink to this headline">¶</a></h2>
+<span id="id4"></span><h2>1.6.0<a class="headerlink" href="#changelog-1-6-0" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="po-files-now-always-have-headers">
 <span id="changelog-po-files-now-always-have-headers"></span><h3>PO files now always have headers<a class="headerlink" href="#po-files-now-always-have-headers" title="Permalink to this headline">¶</a></h3>
 <p>Generated PO files now always contain headers. This will mainly affect the
@@ -223,7 +237,7 @@ files are consistently handled with headers wherever possible.</p>
 </div>
 </div>
 <div class="section" id="changelog-1-4-1">
-<span id="id4"></span><h2>1.4.1<a class="headerlink" href="#changelog-1-4-1" title="Permalink to this headline">¶</a></h2>
+<span id="id5"></span><h2>1.4.1<a class="headerlink" href="#changelog-1-4-1" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="csv-column-header-names">
 <span id="changelog-csv-column-header-names"></span><h3>CSV column header names<a class="headerlink" href="#csv-column-header-names" title="Permalink to this headline">¶</a></h3>
 <p>The names given to CSV column headers have been changed. Early releases of
@@ -240,7 +254,7 @@ done the files will work as expected.</p>
 </div>
 </div>
 <div class="section" id="changelog-1-4-0">
-<span id="id5"></span><h2>1.4.0<a class="headerlink" href="#changelog-1-4-0" title="Permalink to this headline">¶</a></h2>
+<span id="id6"></span><h2>1.4.0<a class="headerlink" href="#changelog-1-4-0" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="java-and-mozilla-properties">
 <span id="changelog-java-and-mozilla-properties"></span><h3>Java and Mozilla .properties<a class="headerlink" href="#java-and-mozilla-properties" title="Permalink to this headline">¶</a></h3>
 <p>Unusual keys, separators and spacing should all be handled correctly now. Some
@@ -256,13 +270,13 @@ value.</p>
 </div>
 </div>
 <div class="section" id="changelog-1-3-0">
-<span id="id6"></span><h2>1.3.0<a class="headerlink" href="#changelog-1-3-0" title="Permalink to this headline">¶</a></h2>
+<span id="id7"></span><h2>1.3.0<a class="headerlink" href="#changelog-1-3-0" title="Permalink to this headline">¶</a></h2>
 <p>Several duplicate styles were removed as has been warned about long before.
 Please check the recommendations posted at the time that msgctxt was added on
 how to migrate.</p>
 </div>
 <div class="section" id="changelog-1-2">
-<span id="id7"></span><h2>1.2<a class="headerlink" href="#changelog-1-2" title="Permalink to this headline">¶</a></h2>
+<span id="id8"></span><h2>1.2<a class="headerlink" href="#changelog-1-2" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="new-formats">
 <span id="changelog-new-formats"></span><h3>New formats<a class="headerlink" href="#new-formats" title="Permalink to this headline">¶</a></h3>
 <p>The toolkit now supports:</p>
@@ -288,10 +302,9 @@ Windows installation.</p>
 <p>The <a class="reference internal" href="commands/pofilter.html"><em>pofilter</em></a> accelerator test is now able to make use of a
 list of valid accelerators.  This allows translators to control the behaviour
 of the test for their language and add or remove characters that can be used as
-accelerators.  Please define <tt class="xref doc docutils literal"><span class="pre">l10n/valid</span> <span class="pre">accelerators</span></tt> for your language
-and these will then be included in future releases of the toolkit.  By default
-the old process if followed so if you take no action then this check will
-continue to work as expected.</p>
+accelerators.  Please define the <a class="reference external" href="http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/valid_accelerators.html#valid-accelerators" title="(in Localization Guide v0.9.0)"><em class="xref std std-ref">valid accelerators</em></a> for your language and these will then be included
+in future releases of the toolkit.  By default the old process is followed so
+that if you take no action then this check will continue to work as expected.</p>
 </div>
 </div>
 <div class="section" id="branches">
@@ -309,7 +322,7 @@ supported as this is not valid Gettext output.</p>
 </div>
 </div>
 <div class="section" id="changelog-1-1-1">
-<span id="id8"></span><h2>1.1.1<a class="headerlink" href="#changelog-1-1-1" title="Permalink to this headline">¶</a></h2>
+<span id="id9"></span><h2>1.1.1<a class="headerlink" href="#changelog-1-1-1" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="premature-termination-of-dtd-entities">
 <span id="changelog-premature-termination-of-dtd-entities"></span><h3>Premature termination of DTD entities<a class="headerlink" href="#premature-termination-of-dtd-entities" title="Permalink to this headline">¶</a></h3>
 <p>Although this does not occur frequently a case emerged where some DTD entities
@@ -321,7 +334,7 @@ translation might be recovered from obsolete translations.</p>
 </div>
 </div>
 <div class="section" id="changelog-1-1">
-<span id="id9"></span><h2>1.1<a class="headerlink" href="#changelog-1-1" title="Permalink to this headline">¶</a></h2>
+<span id="id10"></span><h2>1.1<a class="headerlink" href="#changelog-1-1" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="oo2po-help-helpcontent2-escaping-fixed">
 <span id="changelog-oo2po-help-helpcontent2-escaping-fixed"></span><h3>oo2po Help (helpcontent2) escaping fixed<a class="headerlink" href="#oo2po-help-helpcontent2-escaping-fixed" title="Permalink to this headline">¶</a></h3>
 <p>OpenOffice.org Help (helpcontent2) has notoriously contained some unreadable
@@ -391,7 +404,7 @@ files.  We cannot however write .qm files at this time.</p>
 </div>
 </div>
 <div class="section" id="changelog-1-0-1">
-<span id="id10"></span><h2>1.0.1<a class="headerlink" href="#changelog-1-0-1" title="Permalink to this headline">¶</a></h2>
+<span id="id11"></span><h2>1.0.1<a class="headerlink" href="#changelog-1-0-1" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="pot2po-will-create-new-empty-po-files-if-needed">
 <span id="changelog-pot2po-will-create-new-empty-po-files-if-needed"></span><h3>pot2po will create new empty PO files if needed<a class="headerlink" href="#pot2po-will-create-new-empty-po-files-if-needed" title="Permalink to this headline">¶</a></h3>
 <p>From version 1.0.1, pot2po will create empty PO files corresponding to new POT
@@ -402,7 +415,7 @@ case you will see new files on projects that you thought were fully translated.<
 </div>
 </div>
 <div class="section" id="changelog-1-0">
-<span id="id11"></span><h2>1.0<a class="headerlink" href="#changelog-1-0" title="Permalink to this headline">¶</a></h2>
+<span id="id12"></span><h2>1.0<a class="headerlink" href="#changelog-1-0" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="improved-xliff-support">
 <span id="changelog-improved-xliff-support"></span><h3>Improved XLIFF support<a class="headerlink" href="#improved-xliff-support" title="Permalink to this headline">¶</a></h3>
 <p>Many toolkit tools that only worked with PO files before, can now also work
@@ -486,7 +499,8 @@ behaviour in any way.</p>
 <div class="section" id="merging-can-change-fuzzy-status">
 <span id="changelog-merging-can-change-fuzzy-status"></span><h3>Merging can change fuzzy status<a class="headerlink" href="#merging-can-change-fuzzy-status" title="Permalink to this headline">¶</a></h3>
 <p>pomerge now handles fuzzy states:</p>
-<div class="highlight-python"><pre>pomerge -t old -i merge -o new</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t old -i merge -o new
+</pre></div>
 </div>
 <p>Messages that are fuzzy in <em>merge</em> will now also be fuzzy in <em>new</em>.  Similarly
 if a fuzzy state is present in <em>old</em> but removed in <em>merge</em> then the message in
@@ -514,10 +528,12 @@ style.</p>
 <tt class="docutils literal"><span class="pre">java</span></tt>, thus if you are converting a single <tt class="docutils literal"><span class="pre">.properties</span></tt> file as part of a
 Mozilla conversion you will need to add <tt class="docutils literal"><span class="pre">--personality=mozilla</span></tt> to your
 conversion.  Thus:</p>
-<div class="highlight-python"><pre>po2prop -t moz.properties moz.properties.po my-moz.properties</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2prop -t moz.properties moz.properties.po my-moz.properties
+</pre></div>
 </div>
 <p>Would become:</p>
-<div class="highlight-python"><pre>po2prop --personality=mozilla -t moz.properties moz.properties.po my-moz.properties</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2prop --personality=mozilla -t moz.properties moz.properties.po my-moz.properties
+</pre></div>
 </div>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
@@ -535,7 +551,7 @@ working with uncompressed files. Hopefully more tools can support it in future.<
 </div>
 </div>
 <div class="section" id="changelog-0-11">
-<span id="id12"></span><h2>0.11<a class="headerlink" href="#changelog-0-11" title="Permalink to this headline">¶</a></h2>
+<span id="id13"></span><h2>0.11<a class="headerlink" href="#changelog-0-11" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="po2oo-defaults-to-not-check-for-errors">
 <span id="changelog-po2oo-defaults-to-not-check-for-errors"></span><h3>po2oo defaults to not check for errors<a class="headerlink" href="#po2oo-defaults-to-not-check-for-errors" title="Permalink to this headline">¶</a></h3>
 <p>In po2oo we made the default <tt class="docutils literal"><span class="pre">--filteraction=none</span></tt> i.e. do nothing and
@@ -558,7 +574,7 @@ human eyes anyway.</li>
 </div>
 </div>
 <div class="section" id="changelog-0-10">
-<span id="id13"></span><h2>0.10<a class="headerlink" href="#changelog-0-10" title="Permalink to this headline">¶</a></h2>
+<span id="id14"></span><h2>0.10<a class="headerlink" href="#changelog-0-10" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="po-to-xliff-conversion">
 <span id="changelog-po-to-xliff-conversion"></span><h3>PO to XLIFF conversion<a class="headerlink" href="#po-to-xliff-conversion" title="Permalink to this headline">¶</a></h3>
 <p>Conversion from PO to XLIFF is greatly improved in 0.10 and this was done
@@ -577,7 +593,8 @@ msgmerge and it can also replace <a class="reference internal" href="commands/po
 want to use pomigrate2 if there where file movements between versions as pot2po
 can still not do intelligent matching of PO and POT files, pomigrate2 has also
 been adapted so that it can use pot2po as it background merging tool.</p>
-<div class="highlight-python"><pre>pomigrate2 --use-compendium --pot2po <old> <pot> <new></pre>
+<div class="highlight-python"><div class="highlight"><pre>pomigrate2 --use-compendium --pot2po <old> <pot> <new>
+</pre></div>
 </div>
 <p>This will migrate file with a compendium built from PO files in <em><old></em> and
 will use pot2po as its conversion engine.</p>
@@ -606,7 +623,7 @@ translations to gt the formatting correct.</p>
 </div>
 </div>
 <div class="section" id="changelog-0-9">
-<span id="id14"></span><h2>0.9<a class="headerlink" href="#changelog-0-9" title="Permalink to this headline">¶</a></h2>
+<span id="id15"></span><h2>0.9<a class="headerlink" href="#changelog-0-9" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="escaping-dtd-files-are-no-longer-escaped">
 <span id="changelog-escaping-dtd-files-are-no-longer-escaped"></span><h3>Escaping – DTD files are no longer escaped<a class="headerlink" href="#escaping-dtd-files-are-no-longer-escaped" title="Permalink to this headline">¶</a></h3>
 <p>Previously each converter handled escaping, which made it a nightmare every
@@ -622,21 +639,25 @@ what po2moz will now expect. Probably resulting in bad output .dtd files.</p>
 one you would have done for any migration of your PO files.</p>
 <ol class="arabic">
 <li><p class="first">Create a new set of POT files</p>
-<div class="highlight-python"><pre>moz2po -P mozilla pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -P mozilla pot
+</pre></div>
 </div>
 </li>
 <li><p class="first">Migrate your old PO files</p>
-<div class="highlight-python"><pre>pomigrate2 old new pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomigrate2 old new pot
+</pre></div>
 </div>
 </li>
 <li><p class="first">Fix all the fuzzy translations by editing your PO files</p>
 </li>
 <li><p class="first">Use pofilter to check for escaping problems and fix them</p>
-<div class="highlight-python"><pre>pofilter -t escapes new new-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter -t escapes new new-check
+</pre></div>
 </div>
 </li>
 <li><p class="first">Edit file in new-check in your PO editor</p>
-<div class="highlight-python"><pre>pomerge -t new -i new-check -o new-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t new -i new-check -o new-check
+</pre></div>
 </div>
 </li>
 </ol>
@@ -686,9 +707,6 @@ status of this and we hope to add a feature to prop2po to restore the correct
 Java convention as an option.</p>
 </div>
 </div>
-<div class="section" id="changelog-0-8">
-<span id="id15"></span><h2>0.8<a class="headerlink" href="#changelog-0-8" title="Permalink to this headline">¶</a></h2>
-</div>
 </div>
 
 
@@ -703,7 +721,7 @@ Java convention as an option.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/csv2po.html b/docs/_build/html/commands/csv2po.html
index 1b0e8c5..d85767f 100644
--- a/docs/_build/html/commands/csv2po.html
+++ b/docs/_build/html/commands/csv2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>csv2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>csv2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="csv2tbx" href="csv2tbx.html" />
     <link rel="prev" title="pot2po" href="pot2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="csv2tbx.html"
          title="next chapter">csv2tbx »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -125,8 +128,9 @@ your PO translations.</p>
 note of the assumptions of the column layout explained below.</p>
 <div class="section" id="usage">
 <span id="csv2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>csv2po [options] <csv> <po>
-po2csv [options] <po> <csv></pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2po [options] <csv> <po>
+po2csv [options] <po> <csv>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -182,10 +186,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in pot, po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">--charset=<var>CHARSET</var></span></kbd></td>
 </tr>
@@ -237,10 +241,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in csv format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -287,14 +291,17 @@ into the PO file</td>
 <div class="section" id="examples">
 <span id="csv2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>These examples demonstrate the use of csv2po:</p>
-<div class="highlight-python"><pre>po2csv -P pot csv</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2csv -P pot csv
+</pre></div>
 </div>
 <p>We use the <tt class="docutils literal"><span class="pre">-P</span></tt> option to recognise POT files found in <em>pot</em> and convert
 them to CSV files placed in <em>csv</em>:</p>
-<div class="highlight-python"><pre>csv2po csv po</pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2po csv po
+</pre></div>
 </div>
 <p>Convert CSV files in <em>csv</em> to PO files placed in <em>po</em>:</p>
-<div class="highlight-python"><pre>csv2po --charset=windows-1250 -t pot csv po</pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2po --charset=windows-1250 -t pot csv po
+</pre></div>
 </div>
 <p>User working on Windows will often return files encoded in everything but
 Unicode.  In this case we convert CSV files found in <em>csv</em> from <em>windows-1250</em>
@@ -325,7 +332,7 @@ up by PO tools.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/csv2tbx.html b/docs/_build/html/commands/csv2tbx.html
index 013cc6c..3b284c9 100644
--- a/docs/_build/html/commands/csv2tbx.html
+++ b/docs/_build/html/commands/csv2tbx.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>csv2tbx — Translate Toolkit 1.9.0 documentation</title>
+    <title>csv2tbx — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="html2po" href="html2po.html" />
     <link rel="prev" title="csv2po" href="csv2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="html2po.html"
          title="next chapter">html2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -121,7 +124,8 @@
 format for terminology exchange.</p>
 <div class="section" id="usage">
 <span id="csv2tbx-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>csv2tbx [--charset=CHARSET] [--columnorder=COLUMNORDER] <csv> <tbx></pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2tbx [--charset=CHARSET] [--columnorder=COLUMNORDER] <csv> <tbx>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -173,10 +177,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in tbx format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">--charset=<var>CHARSET</var></span></kbd></td>
 </tr>
@@ -225,16 +229,19 @@ but could be generated by <a class="reference internal" href="csv2po.html"><em>p
 <div class="section" id="examples">
 <span id="csv2tbx-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>These examples demonstrate the use of csv2tbx:</p>
-<div class="highlight-python"><pre>csv2tbx terms.csv terms.tbx</pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2tbx terms.csv terms.tbx
+</pre></div>
 </div>
 <p>to simply convert <em>terms.csv</em> to <em>terms.tbx</em>.</p>
 <p>To convert a directory recursively to another directory with the same structure
 of files:</p>
-<div class="highlight-python"><pre>csv2tbx csv-dir tbx-target-dir</pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2tbx csv-dir tbx-target-dir
+</pre></div>
 </div>
 <p>This will convert CSV files in <em>csv-dir</em> to TBX files placed in
 <em>tbx-target-dir</em>.:</p>
-<div class="highlight-python"><pre>csv2tbx --charset=windows-1250 csv tbx</pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2tbx --charset=windows-1250 csv tbx
+</pre></div>
 </div>
 <p>Users working on Windows will often return files in encoding other the Unicode
 based encodings.  In this case we convert CSV files found in <em>csv</em> from
@@ -243,7 +250,8 @@ that UTF-8 is the only available destination encoding.</p>
 </div>
 <div class="section" id="two-column-csv">
 <span id="csv2tbx-two-column-csv"></span><h2>Two column CSV<a class="headerlink" href="#two-column-csv" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>csv2tbx --columnorder=source,target foo.csv foo.tbx</pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2tbx --columnorder=source,target foo.csv foo.tbx
+</pre></div>
 </div>
 </div>
 <div class="section" id="notes">
@@ -265,7 +273,7 @@ that UTF-8 is the only available destination encoding.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/general_usage.html b/docs/_build/html/commands/general_usage.html
index 665daff..dc0006e 100644
--- a/docs/_build/html/commands/general_usage.html
+++ b/docs/_build/html/commands/general_usage.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>General Usage — Translate Toolkit 1.9.0 documentation</title>
+    <title>General Usage — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="moz2po" href="moz2po.html" />
     <link rel="prev" title="Converters" href="index.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="moz2po.html"
          title="next chapter">moz2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -122,11 +125,13 @@
 <span id="general-usage-input-output"></span><h2>Input & Output<a class="headerlink" href="#input-output" title="Permalink to this headline">¶</a></h2>
 <p>The last two arguments of your command are the input and output
 files/directories:</p>
-<div class="highlight-python"><pre>moz2po <input> <output></pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po <input> <output>
+</pre></div>
 </div>
 <p>You can of course still us the <tt class="docutils literal"><span class="pre">-i</span></tt> and <tt class="docutils literal"><span class="pre">-o</span></tt> options which allows you
 to reorder commands</p>
-<div class="highlight-python"><pre>moz2po -o <output> -i <input></pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -o <output> -i <input>
+</pre></div>
 </div>
 </div>
 <div class="section" id="error-reporting">
@@ -141,14 +146,16 @@ option and send the traceback to the developers.</p>
 <span id="general-usage-templates"></span><h2>Templates<a class="headerlink" href="#templates" title="Permalink to this headline">¶</a></h2>
 <p>If you are working with any file format and you wish to preserve comments and
 layout then use your source file as a template.</p>
-<div class="highlight-python"><pre>po2dtd -t <source-file> <input> <output></pre>
+<div class="highlight-python"><div class="highlight"><pre>po2dtd -t <source-file> <input> <output>
+</pre></div>
 </div>
 <p>This will use the files in <tt class="docutils literal"><span class="pre"><source-file></span></tt> as a template, merge the PO files
 in <tt class="docutils literal"><span class="pre"><input></span></tt>, and create new DTD files in <tt class="docutils literal"><span class="pre"><output></span></tt></p>
 <p>If you ran this without the templates you would get valid DTD files but they
 would not preserve the layout or all the comments from the source DTD file</p>
 <p>The same concept of templates is also used when you merge files.</p>
-<div class="highlight-python"><pre>pomerge -t <old> <fixes> <new></pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t <old> <fixes> <new>
+</pre></div>
 </div>
 <p>This would take the <tt class="docutils literal"><span class="pre"><old></span></tt> files merge in the <tt class="docutils literal"><span class="pre"><fixes></span></tt> and output new PO
 files, preserving formatting, into <tt class="docutils literal"><span class="pre"><new></span></tt>.  You can use the same directory
@@ -184,7 +191,7 @@ for <tt class="docutils literal"><span class="pre"><old></span></tt> and <
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/html2po.html b/docs/_build/html/commands/html2po.html
index 99a5b19..1f1a988 100644
--- a/docs/_build/html/commands/html2po.html
+++ b/docs/_build/html/commands/html2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>html2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>html2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="ical2po" href="ical2po.html" />
     <link rel="prev" title="csv2tbx" href="csv2tbx.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="ical2po.html"
          title="next chapter">ical2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -118,8 +121,9 @@
 <p>Convert translatable items in HTML to the PO format.</p>
 <div class="section" id="usage">
 <span id="html2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>html2po [options] <html> <po>
-po2html [options] <po> <html></pre>
+<div class="highlight-python"><div class="highlight"><pre>html2po [options] <html> <po>
+po2html [options] <po> <html>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -171,10 +175,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -228,10 +232,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in htm, html formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-w<var>WRAP</var></span>, <span class="option">--wrap=<var>WRAP</var></span></kbd></td>
 </tr>
@@ -239,6 +243,10 @@ full, profile</em></a></td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--notidy</span></kbd></td>
 <td>don’t use tidy to clean up HTML, even if installed (new in version 1.2.1)</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -250,11 +258,13 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="examples">
 <span id="html2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>html2po -P site pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>html2po -P site pot
+</pre></div>
 </div>
 <p>This will find all HTML files (.htm, .html, .xhtml) in <em>site</em> convert them to
 POT files and place them in <em>pot</em>:</p>
-<div class="highlight-python"><pre>po2html -t site xh site-xh</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2html -t site xh site-xh
+</pre></div>
 </div>
 <p>All the PO translations in <em>xh</em> will be converted to html using html files in
 <em>site</em> as templates and outputting new translated HTML files in <em>site-xh</em></p>
@@ -286,7 +296,7 @@ XSLT to transform XHTML to Gettext PO</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/ical2po.html b/docs/_build/html/commands/ical2po.html
index 8a7bcc7..4f53898 100644
--- a/docs/_build/html/commands/ical2po.html
+++ b/docs/_build/html/commands/ical2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>ical2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>ical2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="ini2po" href="ini2po.html" />
     <link rel="prev" title="html2po" href="html2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="ini2po.html"
          title="next chapter">ini2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -115,13 +118,15 @@
    
   <div class="section" id="po2ical">
 <span id="ical2po"></span><span id="id1"></span><h1>ical2po<a class="headerlink" href="#po2ical" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.2.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.2.</span></p>
+</div>
 <p>Converts iCalendar (*.ics) files to Gettext PO format.</p>
 <div class="section" id="usage">
 <span id="ical2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>ical2po [options] <ical> <po>
-po2ical [options] -t <ical> <po> <ical></pre>
+<div class="highlight-python"><div class="highlight"><pre>ical2po [options] <ical> <po>
+po2ical [options] -t <ical> <po> <ical>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -177,10 +182,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -231,10 +236,14 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -249,17 +258,20 @@ full, profile</em></a></td></tr>
 <p>This example looks at roundtrip of iCalendar translations. While you can do
 recovery of translations, its unlikely that you will ever need to do that.</p>
 <p>First we need to create a set of POT files.</p>
-<div class="highlight-python"><pre>ical2po -P ical.ics ical.pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>ical2po -P ical.ics ical.pot
+</pre></div>
 </div>
 <p>The ical.ics file is converted to Gettext POT files called ical.pot.
 Directories of iCalendar files can also be processed.</p>
 <p>Begin translating the ical.pot file by first copying it to make a PO file.</p>
-<div class="highlight-python"><pre>cp ical.pot ical-af.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>cp ical.pot ical-af.po
+</pre></div>
 </div>
 <p>You are now in a position to translate the file ical-af.po in your favourite
 translation tool.</p>
 <p>Once translated you can convert back as follows:</p>
-<div class="highlight-python"><pre>po2ical -t ical.ics ical-af.po ical-af.ics</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2ical -t ical.ics ical-af.po ical-af.ics
+</pre></div>
 </div>
 <p>Your translations found in the Afrikaans PO file, <tt class="docutils literal"><span class="pre">ical-ad.po</span></tt>, will be
 converted to .ics using the file <tt class="docutils literal"><span class="pre">ical.ics</span></tt> as a template and creating your
@@ -275,9 +287,9 @@ you want to extract additional items.</p>
 <p>The converter does not make use of the LANGUAGE attribute which is permitted in
 the format.  The LANGUAGE attribute does not aid multilingualism in this
 context so is ignored.</p>
-<p>The converter could conceivably also process <a class="reference external" href="https://en.wikipedia.org/wiki/Vcard">vCard</a> files, but this has not been
-implemented for lack of a clear need.  Please raise a bug with an example if
-you have such a file that could benefit from localisation.</p>
+<p>The converter could conceivably also process <a class="reference external" href="http://en.wikipedia.org/wiki/Vcard">vCard</a> files, but
+this has not been implemented for lack of a clear need.  Please raise a bug
+with an example if you have such a file that could benefit from localisation.</p>
 </div>
 </div>
 
@@ -293,7 +305,7 @@ you have such a file that could benefit from localisation.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/index.html b/docs/_build/html/commands/index.html
index be84489..4c815f0 100644
--- a/docs/_build/html/commands/index.html
+++ b/docs/_build/html/commands/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Converters — Translate Toolkit 1.9.0 documentation</title>
+    <title>Converters — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="next" title="General Usage" href="general_usage.html" />
     <link rel="prev" title="Installation" href="../installation.html" /> 
   </head>
@@ -37,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -79,17 +81,11 @@
 </ul>
 </li>
 <li><a class="reference internal" href="#tools">Tools</a><ul>
-<li><a class="reference internal" href="#quality-assurance">Quality Assurance</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#other-tools">Other tools</a><ul>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#scripts">Scripts</a><ul>
+<li><a class="reference internal" href="#quality-assurance">Quality Assurance</a></li>
+<li><a class="reference internal" href="#other-tools">Other tools</a></li>
 </ul>
 </li>
+<li><a class="reference internal" href="#scripts">Scripts</a></li>
 </ul>
 </ul>
 </li>
@@ -101,10 +97,11 @@
   <li><a href="general_usage.html"
          title="next chapter">General Usage »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -251,7 +248,7 @@ files</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/ini2po.html b/docs/_build/html/commands/ini2po.html
index f73a9da..44d73f4 100644
--- a/docs/_build/html/commands/ini2po.html
+++ b/docs/_build/html/commands/ini2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>ini2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>ini2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="json2po" href="json2po.html" />
     <link rel="prev" title="ical2po" href="ical2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="json2po.html"
          title="next chapter">json2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -119,8 +122,9 @@
 <p>Converts .ini files to Gettext PO format.</p>
 <div class="section" id="usage">
 <span id="ini2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>ini2po [options] <ini> <po>
-po2ini [options] -t <ini> <po> <ini></pre>
+<div class="highlight-python"><div class="highlight"><pre>ini2po [options] <ini> <po>
+po2ini [options] -t <ini> <po> <ini>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -176,10 +180,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -230,10 +234,14 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -247,25 +255,28 @@ full, profile</em></a></td></tr>
 <span id="ini2po-formats-supported"></span><h2>Formats Supported<a class="headerlink" href="#formats-supported" title="Permalink to this headline">¶</a></h2>
 <p>INI files need to be organized into separate languages per file and in the
 following format:</p>
-<div class="highlight-python"><pre>[Section]
+<div class="highlight-python"><div class="highlight"><pre>[Section]
   ; a comment
-  a = a string</pre>
+  a = a string
+</pre></div>
 </div>
 <p>Comment marked with the hash symbol (#) are also allowed, and the colon (:) is
 also accepted as key-value delimiter:</p>
-<div class="highlight-python"><pre>[Section]
+<div class="highlight-python"><div class="highlight"><pre>[Section]
   # another comment
-  b : a string</pre>
+  b : a string
+</pre></div>
 </div>
 <p>This variants in comment marks and key-value delimiters can be mixed in one
 single INI file:</p>
-<div class="highlight-python"><pre>[Section]
+<div class="highlight-python"><div class="highlight"><pre>[Section]
 ; a comment
 a = a string
 # another comment
 b : a string
-c:'other example with apostrophes'
-d:"example with double quotes"</pre>
+c:'other example with apostrophes'
+d:"example with double quotes"
+</pre></div>
 </div>
 <p>The spacing between the key-value delimiter and the key, and the between the
 value and the key-value delimiter is not important since the converter
@@ -295,13 +306,15 @@ these quotation marks to the generated .po file, so they will appear like:</p>
 <p>This example looks at roundtrip of .ini translations as well as recovery of
 existing translations.</p>
 <p>First we need to create a set of POT files.</p>
-<div class="highlight-python"><pre>ini2po -P ini/ pot/</pre>
+<div class="highlight-python"><div class="highlight"><pre>ini2po -P ini/ pot/
+</pre></div>
 </div>
 <p>All .ini files found in the <tt class="docutils literal"><span class="pre">ini/</span></tt> directory are converted to Gettext POT
 files and placed in the <tt class="docutils literal"><span class="pre">pot/</span></tt> directory.</p>
 <p>If you are translating for the first time then you can skip the next step.  If
 you need to recover your existing translations then we do the following:</p>
-<div class="highlight-python"><pre>ini2po -t lang/ zu/ po-zu/</pre>
+<div class="highlight-python"><div class="highlight"><pre>ini2po -t lang/ zu/ po-zu/
+</pre></div>
 </div>
 <p>Using the English .ini files found in <tt class="docutils literal"><span class="pre">lang/</span></tt> and your existing Zulu
 translation in <tt class="docutils literal"><span class="pre">zu/</span></tt> we create a set of PO files in <tt class="docutils literal"><span class="pre">po-zu/</span></tt>.  These will
@@ -311,7 +324,8 @@ you will have to review all translations.</p>
 <p>You are now in a position to translate your recovered translations or your new
 POT files.</p>
 <p>Once translated you can convert back as follows:</p>
-<div class="highlight-python"><pre>po2ini -t lang/ po-zu/ zu/</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2ini -t lang/ po-zu/ zu/
+</pre></div>
 </div>
 <p>Your translations found in the Zulu PO directory, <tt class="docutils literal"><span class="pre">po-zu/</span></tt>, will be converted to .ini using the files in <tt class="docutils literal"><span class="pre">lang/</span></tt> as templates and placing your newly translated .ini files in <tt class="docutils literal"><span class="pre">zu/</span></tt>.</p>
 <p>To update your translations simply redo the POT creation step and make use of <a class="reference internal" href="pot2po.html"><em>pot2po</em></a> to bring your translation up-to-date.</p>
@@ -334,7 +348,7 @@ POT files.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/json2po.html b/docs/_build/html/commands/json2po.html
index a016ca6..4310000 100644
--- a/docs/_build/html/commands/json2po.html
+++ b/docs/_build/html/commands/json2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>json2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>json2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="web2py2po" href="web2py2po.html" />
     <link rel="prev" title="ini2po" href="ini2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="web2py2po.html"
          title="next chapter">web2py2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -117,8 +120,9 @@
 <p>Converts .json files to Gettext PO format.</p>
 <div class="section" id="usage">
 <span id="json2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>json2po [options] <json> <po>
-po2json [options] -t <json> <po> <json></pre>
+<div class="highlight-python"><div class="highlight"><pre>json2po [options] <json> <po>
+po2json [options] -t <json> <po> <json>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -161,7 +165,7 @@ traceback</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-i <var>INPUT</var></span>, <span class="option">--input=<var>INPUT</var></span></kbd></td>
 </tr>
-<tr><td> </td><td>read from INPUT in php format</td></tr>
+<tr><td> </td><td>read from INPUT in JSON format</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-x <var>EXCLUDE</var></span>, <span class="option">--exclude=<var>EXCLUDE</var></span></kbd></td>
 </tr>
@@ -173,11 +177,11 @@ traceback</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
-<tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td> </td><td>read from TEMPLATE in JSON format</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -227,15 +231,19 @@ traceback</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-o <var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
-<tr><td> </td><td>write to OUTPUT in php format</td></tr>
+<tr><td> </td><td>write to OUTPUT in JSON format</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
-<tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td> </td><td>read from TEMPLATE in JSON format</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -250,13 +258,15 @@ full, profile</em></a></td></tr>
 <p>This example looks at roundtrip of .json translations as well as recovery of
 existing translations.</p>
 <p>First we need to create a set of POT files.</p>
-<div class="highlight-python"><pre>json2po -P json/ pot/</pre>
+<div class="highlight-python"><div class="highlight"><pre>json2po -P json/ pot/
+</pre></div>
 </div>
 <p>All .json files found in the <tt class="docutils literal"><span class="pre">json/</span></tt> directory are converted to Gettext POT
 files and placed in the <tt class="docutils literal"><span class="pre">pot/</span></tt> directory.</p>
 <p>If you are translating for the first time then you can skip the next step.  If
 you need to recover your existing translations then we do the following:</p>
-<div class="highlight-python"><pre>json2po -t lang/ zu/ po-zu/</pre>
+<div class="highlight-python"><div class="highlight"><pre>json2po -t lang/ zu/ po-zu/
+</pre></div>
 </div>
 <p>Using the English .json files found in <tt class="docutils literal"><span class="pre">lang/</span></tt> and your existing Zulu
 translation in <tt class="docutils literal"><span class="pre">zu/</span></tt> we create a set of PO files in <tt class="docutils literal"><span class="pre">po-zu/</span></tt>.  These will
@@ -266,7 +276,8 @@ you will have to review all translations.</p>
 <p>You are now in a position to translate your recovered translations or your new
 POT files.</p>
 <p>Once translated you can convert back as follows:</p>
-<div class="highlight-python"><pre>po2json -t lang/ po-zu/ zu/</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2json -t lang/ po-zu/ zu/
+</pre></div>
 </div>
 <p>Your translations found in the Zulu PO directory, <tt class="docutils literal"><span class="pre">po-zu/</span></tt>, will be converted
 to .json using the files in <tt class="docutils literal"><span class="pre">lang/</span></tt> as templates and placing your newly
@@ -288,7 +299,7 @@ translated .json files in <tt class="docutils literal"><span class="pre">zu/</sp
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/junitmsgfmt.html b/docs/_build/html/commands/junitmsgfmt.html
index 57680e7..afbed21 100644
--- a/docs/_build/html/commands/junitmsgfmt.html
+++ b/docs/_build/html/commands/junitmsgfmt.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>junitmsgfmt — Translate Toolkit 1.9.0 documentation</title>
+    <title>junitmsgfmt — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="tmserver" href="tmserver.html" />
     <link rel="prev" title="porestructure" href="porestructure.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="tmserver.html"
          title="next chapter">tmserver »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -113,13 +116,15 @@
    
   <div class="section" id="junitmsgfmt">
 <span id="id1"></span><h1>junitmsgfmt<a class="headerlink" href="#junitmsgfmt" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.7.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.7.</span></p>
+</div>
 <p>Run msgfmt and provide JUnit type output for use in continuous integration
 systems like Hudson and Jenkins.</p>
 <div class="section" id="usage">
 <span id="junitmsgfmt-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>junitmsgfmt po/*.po > msgfmt_junit.xml</pre>
+<div class="highlight-python"><div class="highlight"><pre>junitmsgfmt po/*.po > msgfmt_junit.xml
+</pre></div>
 </div>
 </div>
 </div>
@@ -136,7 +141,7 @@ systems like Hudson and Jenkins.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/levenshtein_distance.html b/docs/_build/html/commands/levenshtein_distance.html
index 8e4ee1a..352719d 100644
--- a/docs/_build/html/commands/levenshtein_distance.html
+++ b/docs/_build/html/commands/levenshtein_distance.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Levenshtein distance — Translate Toolkit 1.9.0 documentation</title>
+    <title>Levenshtein distance — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="Mozilla L10n Scripts" href="mozilla_l10n_scripts.html" />
     <link rel="prev" title="pretranslate" href="pretranslate.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="mozilla_l10n_scripts.html"
          title="next chapter">Mozilla L10n Scripts »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -113,15 +116,16 @@
    
   <div class="section" id="levenshtein-distance">
 <span id="id1"></span><h1>Levenshtein distance<a class="headerlink" href="#levenshtein-distance" title="Permalink to this headline">¶</a></h1>
-<p>The <a class="reference external" href="https://en.wikipedia.org/wiki/Levenshtein_distance">levenshtein distance</a> is used for measuring
-the “distance” or similarity of two character strings. Other similarity
-algorithms can be supplied to the code that does the matching.</p>
-<p>This code is used in <a class="reference internal" href="pot2po.html"><em>pot2po</em></a>, <a class="reference internal" href="tmserver.html"><em>tmserver</em></a> and <a class="reference external" href="http://virtaal.org">Virtaal</a>. It is implemented in the toolkit, but can optionally
-use the fast C implementation provided by <a class="reference external" href="http://sourceforge.net/projects/translate/files/python-Levenshtein/">python-Levenshtein</a> if it
-is installed. It is strongly recommended that python-levenshtein be installed.</p>
-<p>To exercise the code the classfile “Levenshtein.py” can be executed directly
+<p>The <a class="reference external" href="http://en.wikipedia.org/wiki/Levenshtein_distance">levenshtein distance</a> is used for measuring the
+<em>“distance”</em> or similarity of two character strings. Other similarity algorithms
+can be supplied to the code that does the matching.</p>
+<p>This code is used in <a class="reference internal" href="pot2po.html"><em>pot2po</em></a>, <a class="reference internal" href="tmserver.html"><em>tmserver</em></a> and <a class="reference external" href="http://virtaal.org">Virtaal</a>. It is implemented in the toolkit, but can optionally use
+the fast C implementation provided by <a class="reference external" href="https://pypi.python.org/pypi/python-Levenshtein">python-Levenshtein</a> if it is installed. It is
+strongly recommended to have <strong>python-levenshtein</strong> installed.</p>
+<p>To exercise the code the classfile <em>“Levenshtein.py”</em> can be executed directly
 with:</p>
-<div class="highlight-python"><pre>python Levenshtein.py "The first string." "The second string"</pre>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>python Levenshtein.py <span class="s2">"The first string."</span> <span class="s2">"The second string"</span>
+</pre></div>
 </div>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
@@ -129,34 +133,34 @@ with:</p>
 </div>
 <p>The following things should be noted:</p>
 <ul class="simple">
-<li>Only the first MAX_LEN characters are considered. Long strings differing at
-the end will therefore seem to match better than they should. A penalty is
+<li>Only the first <tt class="docutils literal"><span class="pre">MAX_LEN</span></tt> characters are considered. Long strings differing
+at the end will therefore seem to match better than they should. A penalty is
 awarded if strings are shortened.</li>
 <li>The calculation can stop prematurely as soon as it realise that the supplied
 minimum required similarity can not be reached. Strings with widely different
 lengths give the opportunity for this shortcut. This is by definition of the
 Levenshtein distance: the distance will be at least as much as the difference
 in string length. Similarities lower than your supplied minimum (or the
-default) should therefore not be considered authoritive.</li>
+default) should therefore not be considered authoritative.</li>
 </ul>
 <div class="section" id="shortcommings">
 <span id="levenshtein-distance-shortcommings"></span><h2>Shortcommings<a class="headerlink" href="#shortcommings" title="Permalink to this headline">¶</a></h2>
 <p>The following shortcommings have been identified:</p>
 <ul class="simple">
-<li>Cases sensitivity: ‘E’ and ‘e’ are considered different characters and
-according differ as much as ‘z’ and ‘e’. This is not ideal, as case
+<li><strong>Cases sensitivity:</strong> <em>‘E’</em> and <em>‘e’</em> are considered different characters and
+according differ as much as <em>‘z’</em> and <em>‘e’</em>. This is not ideal, as case
 differences should be considered less of a difference.</li>
-<li>Diacritics: ‘ê’ and ‘e’ are considered different characters and according
-differ as much as ‘z’ and ‘e’. This is not ideal, as missing diacritics could
-be due to small input errors, or even input data that simply do not have the
-correct diacritics.</li>
-<li>Words that have similar characters, but are different, could increase the
-similarity beyond what is wanted. The sentences “It is though.” and “It is
-dough.” differ markedly semantically, but score similarity of almost 85%. A
-possible solution is to do an additional calculation based on words, instead
-of characters.</li>
-<li>Whitespace: Differences in tabs, newlines, and space usage should perhaps be
-considered as a special case.</li>
+<li><strong>Diacritics:</strong> <em>‘ê’</em> and <em>‘e’</em> are considered different characters and
+according differ as much as <em>‘z’</em> and <em>‘e’</em>. This is not ideal, as missing
+diacritics could be due to small input errors, or even input data that simply
+do not have the correct diacritics.</li>
+<li><strong>Similar but different words:</strong> Words that have similar characters, but are
+different, could increase the similarity beyond what is wanted. The sentences
+<em>“It is though.”</em> and <em>“It is dough.”</em> differ markedly semantically, but score
+similarity of almost 85%. A possible solution is to do an additional
+calculation based on words, instead of characters.</li>
+<li><strong>Whitespace:</strong> Differences in tabs, newlines, and space usage should perhaps
+be considered as a special case.</li>
 </ul>
 </div>
 </div>
@@ -173,7 +177,7 @@ considered as a special case.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/moz-l10n-builder.html b/docs/_build/html/commands/moz-l10n-builder.html
index 11ffded..1ef84a5 100644
--- a/docs/_build/html/commands/moz-l10n-builder.html
+++ b/docs/_build/html/commands/moz-l10n-builder.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>moz-l10n-builder — Translate Toolkit 1.9.0 documentation</title>
+    <title>moz-l10n-builder — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="phase" href="phase.html" />
     <link rel="prev" title="Mozilla L10n Scripts" href="mozilla_l10n_scripts.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="phase.html"
          title="next chapter">phase »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -120,16 +123,14 @@
 <p>Take a set of Mozilla (Firefox, Thunderbird, SeaMonkey, etc.) localisation and
 migrate them to the latest Mozilla source, building XPIs and repackaging hte
 Windows .exe file as needed.</p>
-<p>Please also check the page on <a class="reference external" href="http://developer.mozilla.org/en/docs/Creating_a_Language_Pack">creating a language pack</a> on the
+<p>Please also check the page on <a class="reference external" href="https://developer.mozilla.org/en/docs/Creating_a_Language_Pack">creating a language pack</a> on the
 Mozilla wiki, to stay abreast of the latest Mozilla way of doing things.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p>This page is only applicable to Mozilla products with its source
-hosted in CVS. This includes Firefox versions before 3.1 and Thunderbird</p>
-<blockquote class="last">
-<div><p>versions before 3.0.</p>
-<p>For information about working with the new source trees in Mercurial, see the <a class="reference internal" href="mozilla_l10n_scripts.html"><em>Mozilla L10n Scripts</em></a> page.</p>
-</div></blockquote>
+hosted in CVS. This includes Firefox versions before 3.1 and Thunderbird
+versions before 3.0.</p>
+<p class="last">For information about working with the new source trees in Mercurial, see the <a class="reference internal" href="mozilla_l10n_scripts.html"><em>Mozilla L10n Scripts</em></a> page.</p>
 </div>
 <div class="section" id="prerequisites">
 <span id="moz-l10n-builder-prerequisites"></span><h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
@@ -137,8 +138,8 @@ hosted in CVS. This includes Firefox versions before 3.1 and Thunderbird</p>
 <li>Translation update component and building XPIs<ul>
 <li><a class="reference internal" href="../installation.html"><em>Translate Toolkit</em></a></li>
 <li>Existing Mozilla translations in PO format</li>
-<li>A checkout of <a class="reference external" href="http://developer.mozilla.org/en/docs/Mozilla_Source_Code_Via_CVS">Mozilla sources</a>
-updated to the correct <a class="reference external" href="http://developer.mozilla.org/en/docs/CVS_Tags">BRANCH or RELEASE</a></li>
+<li>A checkout of <a class="reference external" href="https://developer.mozilla.org/en-US/docs/Developer_Guide/Source_Code/CVS">Mozilla sources</a>
+updated to the correct <a class="reference external" href="https://developer.mozilla.org/en/docs/CVS_Tags">BRANCH or RELEASE</a></li>
 </ul>
 </li>
 <li>Building Windows executables<ul>
@@ -148,7 +149,7 @@ updated to the correct <a class="reference external" href="http://developer.mozi
 <li><a class="reference external" href="http://nsis.sourceforge.net/Main_Page">Nullsoft installer</a> to package
 the installer.</li>
 <li><a class="reference external" href="http://www.7-zip.org/">7zip</a> for various compression</li>
-<li>Linux: <a class="reference external" href="http://winehq.com/">WINE</a> to run the Nullsoft installer</li>
+<li>Linux: <a class="reference external" href="http://www.winehq.org/">WINE</a> to run the Nullsoft installer</li>
 </ul>
 </li>
 <li>Directory structure under the directory you want to run moz-l10n-builder in:</li>
@@ -240,7 +241,7 @@ the Mozilla source code itself.  We hope over time that this might happen.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/moz2po.html b/docs/_build/html/commands/moz2po.html
index fd497f9..7e49191 100644
--- a/docs/_build/html/commands/moz2po.html
+++ b/docs/_build/html/commands/moz2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>moz2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>moz2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="oo2po" href="oo2po.html" />
     <link rel="prev" title="General Usage" href="general_usage.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -81,7 +83,7 @@
 <li><a class="reference internal" href="#examples">Examples</a><ul>
 <li><a class="reference internal" href="#creating-pot-files">Creating POT files</a></li>
 <li><a class="reference internal" href="#creating-po-files-from-existing-non-po-translations">Creating PO files from existing non-PO translations</a></li>
-<li><a class="reference internal" href="#creating-an-xpi-or-cvs-ready-translations">Creating an XPI or CVS ready translations</a></li>
+<li><a class="reference internal" href="#creating-mercurial-ready-translations">Creating Mercurial ready translations</a></li>
 </ul>
 </li>
 <li><a class="reference internal" href="#issues">Issues</a></li>
@@ -98,10 +100,11 @@
   <li><a href="oo2po.html"
          title="next chapter">oo2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -121,8 +124,8 @@
   <div class="section" id="po2moz">
 <span id="moz2po"></span><span id="id1"></span><h1>moz2po<a class="headerlink" href="#po2moz" title="Permalink to this headline">¶</a></h1>
 <p>moz2po converts Mozilla files to PO files.  It wraps converters that handle
-.properties, .dtd and some strange Mozilla files.  The tool can extract from an
-XPI file or work with files from Mozilla’s Mercurial repository.  The tools
+.properties, .dtd and some strange Mozilla files.  The tool can work with files
+from Mozilla’s Mercurial repository.  The tools
 thus provides a complete roundtrip for Mozilla localisation using PO files and
 PO editors.</p>
 <div class="admonition note">
@@ -132,16 +135,11 @@ options for moz2po and po2moz. For more about using the Translate Toolkit
 and PO files for translating Mozilla products, please see the page on
 <a class="reference internal" href="mozilla_l10n_scripts.html"><em>Mozilla L10n Scripts</em></a>.</p>
 </div>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">The conversion to and from XPI files is no longer actively
-supported.  The preffered method is to work directly with files in Mozilla’s
-Mercurial version control system.</p>
-</div>
 <div class="section" id="usage">
 <span id="moz2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>moz2po [options] <xpi|dir> <po>
-po2moz [options] <po> <xpi|dir></pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po [options] <dir> <po>
+po2moz [options] <po> <dir>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -150,13 +148,10 @@ po2moz [options] <po> <xpi|dir></pre>
 <col width="85%" />
 </colgroup>
 <tbody valign="top">
-<tr class="row-odd"><td><xpi></td>
-<td>is a Mozilla language pack</td>
-</tr>
-<tr class="row-even"><td><dir></td>
+<tr class="row-odd"><td><dir></td>
 <td>is a directory containing valid Mozilla files</td>
 </tr>
-<tr class="row-odd"><td><po></td>
+<tr class="row-even"><td><po></td>
 <td>is a directory of PO or POT files</td>
 </tr>
 </tbody>
@@ -200,10 +195,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in it, *, properties, dtd, inc formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -254,18 +249,22 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in dtd, *, inc, it, properties formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-l<var>LOCALE</var></span>, <span class="option">--locale=<var>LOCALE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>set output locale (required as this sets the directory names)</td></tr>
 <tr><td class="option-group" colspan="2">
-<kbd><span class="option">--clonexpi=<var>CLONEXPI</var></span></kbd></td>
+<kbd><span class="option">--removeuntranslated</span></kbd></td>
+</tr>
+<tr><td> </td><td>remove untranslated strings from output</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
 </tr>
-<tr><td> </td><td>clone xpi structure from the given xpi file</td></tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -279,22 +278,20 @@ full, profile</em></a></td></tr>
 <span id="moz2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="creating-pot-files">
 <span id="moz2po-creating-pot-files"></span><h3>Creating POT files<a class="headerlink" href="#creating-pot-files" title="Permalink to this headline">¶</a></h3>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
 <p class="last"><a class="reference internal" href="../guides/creating_mozilla_pot_files.html"><em>Creating Mozilla POT files</em></a>.</p>
 </div>
 <p>After extracting the en-US l10n files, you can run the following command:</p>
-<div class="highlight-python"><pre>moz2po -P l10n/en-US pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -P l10n/en-US pot
+</pre></div>
 </div>
 <p>This creates a set of POT (<tt class="docutils literal"><span class="pre">-P</span></tt>) files in the <tt class="docutils literal"><span class="pre">pot</span></tt> directory from the
-Mozilla files in <tt class="docutils literal"><span class="pre">l10n/en-US</span></tt>.</p>
-<div class="highlight-python"><pre>moz2po -P en-US.xpi pot</pre>
-</div>
-<p>Creating set of POT (<tt class="docutils literal"><span class="pre">-P</span></tt>) files from the American English XPI
-(<tt class="docutils literal"><span class="pre">en-US.xpi</span></tt>) and placing them in <tt class="docutils literal"><span class="pre">pot</span></tt> for use as PO Templates.</p>
+Mozilla files in <tt class="docutils literal"><span class="pre">l10n/en-US</span></tt> for use as PO Templates.</p>
 <p>If you want to create a set of POT files with another base language try the
 following:</p>
-<div class="highlight-python"><pre>moz2po -P fr-FR.xpi fr-pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -P l10n/fr-FR fr-pot
+</pre></div>
 </div>
 <p>This will create a set of POT files in <tt class="docutils literal"><span class="pre">fr-pot</span></tt> that have French as your
 source language.</p>
@@ -304,12 +301,14 @@ source language.</p>
 <p>If you have existing translations (Mozilla related or other Babelzilla files)
 and you wish to convert them to PO for future translation then the following
 generic instructions will work:</p>
-<div class="highlight-python"><pre>moz2po -t en-US af-ZA af-ZA_pofiles</pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -t en-US af-ZA af-ZA_pofiles
+</pre></div>
 </div>
 <p>This will combine the untranslated template en-US files from <tt class="docutils literal"><span class="pre">en-US</span></tt> combine
 them with your existing translations in <tt class="docutils literal"><span class="pre">af-ZA</span></tt> and output PO files to
 <tt class="docutils literal"><span class="pre">af-ZA_pofiles</span></tt>.</p>
-<div class="highlight-python"><pre>moz2po -t l10n/fr l10n/xh po/xh</pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -t l10n/fr l10n/xh po/xh
+</pre></div>
 </div>
 <p>For those who are not English fluent you can do the same with another
 languages.  In this case <tt class="docutils literal"><span class="pre">msgid</span></tt> will contain the French text from
@@ -318,14 +317,10 @@ languages is not English but French, Spanish or Portuguese.  Please make sure
 that the source languages i.e. the <tt class="docutils literal"><span class="pre">msgid</span></tt> language is fully translated as
 against en-US.</p>
 </div>
-<div class="section" id="creating-an-xpi-or-cvs-ready-translations">
-<span id="moz2po-creating-an-xpi-or-cvs-ready-translations"></span><h3>Creating an XPI or CVS ready translations<a class="headerlink" href="#creating-an-xpi-or-cvs-ready-translations" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>po2moz -lzu-ZA -t en-US.xpi zu zu-ZA.xpi</pre>
-</div>
-<p>Create a Zulu language (<tt class="docutils literal"><span class="pre">-lzu-ZA</span></tt>) XPI called <tt class="docutils literal"><span class="pre">zu-ZA.xpi</span></tt> from translations
-found in <tt class="docutils literal"><span class="pre">zu</span></tt> using <tt class="docutils literal"><span class="pre">en-US.xpi</span></tt> as a template.  We use a template to ensure
-that our DTD and .properties files appear exactly as those in en-US:</p>
-<div class="highlight-python"><pre>po2moz -t l10n/en-US po/xh l10n/xh</pre>
+<div class="section" id="creating-mercurial-ready-translations">
+<span id="moz2po-creating-mercurial-ready-translations"></span><h3>Creating Mercurial ready translations<a class="headerlink" href="#creating-mercurial-ready-translations" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>po2moz -t l10n/en-US po/xh l10n/xh
+</pre></div>
 </div>
 <p>Create Mozilla files using the templates files in <tt class="docutils literal"><span class="pre">l10n/en-US</span></tt> (see above for
 how to create them) with PO translations in <tt class="docutils literal"><span class="pre">po/xh</span></tt> and ouput them to
@@ -376,7 +371,7 @@ foo.dtd.po in order to <a class="reference internal" href=""><em>po2moz</em></a>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/mozilla_l10n_scripts.html b/docs/_build/html/commands/mozilla_l10n_scripts.html
index 97c7afd..2c8949c 100644
--- a/docs/_build/html/commands/mozilla_l10n_scripts.html
+++ b/docs/_build/html/commands/mozilla_l10n_scripts.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Mozilla L10n Scripts — Translate Toolkit 1.9.0 documentation</title>
+    <title>Mozilla L10n Scripts — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="moz-l10n-builder" href="moz-l10n-builder.html" />
     <link rel="prev" title="Levenshtein distance" href="levenshtein_distance.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -86,13 +88,13 @@
 </li>
 <li><a class="reference internal" href="#build-tb3-langs-sh">build_tb3_langs.sh</a></li>
 <li><a class="reference internal" href="#buildxpi-py">buildxpi.py</a><ul>
-<li><a class="reference internal" href="#id2">Description</a></li>
-<li><a class="reference internal" href="#id4">Usage</a></li>
+<li><a class="reference internal" href="#buildxpi-py-description">Description</a></li>
+<li><a class="reference internal" href="#buildxpi-py-usage">Usage</a></li>
 </ul>
 </li>
 <li><a class="reference internal" href="#get-moz-enus-py">get_moz_enUS.py</a><ul>
-<li><a class="reference internal" href="#id6">Description</a></li>
-<li><a class="reference internal" href="#id8">Usage</a></li>
+<li><a class="reference internal" href="#get-moz-enus-py-description">Description</a></li>
+<li><a class="reference internal" href="#get-moz-enus-py-usage">Usage</a></li>
 </ul>
 </li>
 <li><a class="reference internal" href="#moz-l10n-builder">moz-l10n-builder</a></li>
@@ -110,10 +112,11 @@
   <li><a href="moz-l10n-builder.html"
          title="next chapter">moz-l10n-builder »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -155,9 +158,9 @@ should be executable and in your <tt class="docutils literal"><span class="pre">
 </ul>
 </div>
 <div class="section" id="build-ff3-1-langs-sh">
-<span id="mozilla-l10n-scripts-build-ff3-1-langs-sh"></span><h2>build_ff3.1_langs.sh<a class="headerlink" href="#build-ff3-1-langs-sh" title="Permalink to this headline">¶</a></h2>
+<span id="id2"></span><h2>build_ff3.1_langs.sh<a class="headerlink" href="#build-ff3-1-langs-sh" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="description">
-<span id="mozilla-l10n-scripts-description"></span><h3>Description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h3>
+<span id="build-ff3-1-langs-sh-description"></span><h3>Description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h3>
 <p>This is a simple bash script that embodies most of the Mozilla l10n process and
 does the following:</p>
 <ol class="arabic simple">
@@ -165,7 +168,7 @@ does the following:</p>
 <li>Update language files from <a class="reference external" href="http://hg.mozilla.org/l10n-central">Mozilla’s L10n</a> Mercurial repository.</li>
 <li>Replace old l10n en-US files with a fresh copy from the updated source tree.</li>
 <li><a class="reference internal" href="../guides/creating_mozilla_pot_files.html"><em>Create new POT files</em></a> from the
-<a class="reference internal" href="#mozilla-l10n-scripts-get-moz-enus-py"><em>en-US</em></a> l10n files.</li>
+<a class="reference internal" href="#get-moz-enus-py"><em>en-US</em></a> l10n files.</li>
 <li>Create archives of the POT files.</li>
 <li>For each language:<ol class="arabic">
 <li>Update existing PO files if the checked out from a CVS, Subversion or
@@ -175,7 +178,7 @@ files.</li>
 <li><a class="reference internal" href="moz2po.html"><em>Create Mozilla l10n files</em></a> for the language based on the
 migrated PO files.</li>
 <li>Create archives of the PO files.</li>
-<li><a class="reference internal" href="#mozilla-l10n-scripts-buildxpi-py"><em>Build langpack</em></a> for the
+<li><a class="reference internal" href="#buildxpi-py"><em>Build langpack</em></a> for the
 language.</li>
 </ol>
 </li>
@@ -187,7 +190,7 @@ as possible was not the biggest requirement. This is evident in the script&#8217
 very narrow focus.</p>
 </div>
 <div class="section" id="usage">
-<span id="mozilla-l10n-scripts-usage"></span><h3>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h3>
+<span id="build-ff3-1-langs-sh-usage"></span><h3>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h3>
 <p>This script takes no command-line parameters and is only configurable via the
 variables at the top and, failing that, custom hacking of the script.</p>
 <p>The variables are used in the following ways:</p>
@@ -260,20 +263,20 @@ the only variable that need to be changed is <tt class="docutils literal"><span
 </div>
 </div>
 <div class="section" id="build-tb3-langs-sh">
-<span id="mozilla-l10n-scripts-build-tb3-langs-sh"></span><h2>build_tb3_langs.sh<a class="headerlink" href="#build-tb3-langs-sh" title="Permalink to this headline">¶</a></h2>
+<span id="id3"></span><h2>build_tb3_langs.sh<a class="headerlink" href="#build-tb3-langs-sh" title="Permalink to this headline">¶</a></h2>
 <p>This is the script that the <tt class="docutils literal"><span class="pre">build_ff3.1_langs.sh</span></tt> script above was actually
 adapted from. It is 90% similar with the obvious exception that it is aimed at
 building Thunderbird 3.0 packages in stead of Firefox 3.1. Also note that this
 script uses the comm-central repository in stead of mozilla-central.</p>
 </div>
 <div class="section" id="buildxpi-py">
-<span id="mozilla-l10n-scripts-buildxpi-py"></span><h2>buildxpi.py<a class="headerlink" href="#buildxpi-py" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="id2">
-<span id="id3"></span><h3>Description<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
-<p>Creats a XPI language pack from Mozilla sources and translated l10n files. This
+<span id="id4"></span><h2>buildxpi.py<a class="headerlink" href="#buildxpi-py" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="buildxpi-py-description">
+<span id="id5"></span><h3>Description<a class="headerlink" href="#buildxpi-py-description" title="Permalink to this headline">¶</a></h3>
+<p>Creates XPI language packs from Mozilla sources and translated l10n files. This
 script has only been tested with Firefox 3.1 beta sources.</p>
 <p>It is basically the scripted version of the process described on Mozilla’s
-<a class="reference external" href="https://developer.mozilla.org/en/creating_a_language_pack">“Creating a language pack”</a> page.</p>
+<a class="reference external" href="https://developer.mozilla.org/en-US/docs/Creating_a_Language_Pack">“Creating a language pack”</a> page.</p>
 <p>This script is used by <tt class="docutils literal"><span class="pre">build_ff3.1_langs.sh</span></tt> to build language packs in its
 final step.</p>
 <div class="admonition note">
@@ -283,12 +286,14 @@ existing <tt class="docutils literal"><span class="pre">.mozconfig</span></tt> i
 and copied back afterwards.</p>
 </div>
 </div>
-<div class="section" id="id4">
-<span id="id5"></span><h3>Usage<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>buildxpi.py [<options>] <lang></pre>
+<div class="section" id="buildxpi-py-usage">
+<span id="id6"></span><h3>Usage<a class="headerlink" href="#buildxpi-py-usage" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>buildxpi.py [<options>] <lang> [<lang2> ...]
+</pre></div>
 </div>
 <p>Example:</p>
-<div class="highlight-python"><pre>buildxpi.py -L /path/to/l10n -s /path/to/mozilla-central -o /path/to/xpi_output af</pre>
+<div class="highlight-python"><div class="highlight"><pre>buildxpi.py -L /path/to/l10n -s /path/to/mozilla-central -o /path/to/xpi_output af ar
+</pre></div>
 </div>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -327,15 +332,15 @@ current directory).</td></tr>
 </div>
 </div>
 <div class="section" id="get-moz-enus-py">
-<span id="mozilla-l10n-scripts-get-moz-enus-py"></span><h2>get_moz_enUS.py<a class="headerlink" href="#get-moz-enus-py" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="id6">
-<span id="id7"></span><h3>Description<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<span id="id7"></span><h2>get_moz_enUS.py<a class="headerlink" href="#get-moz-enus-py" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="get-moz-enus-py-description">
+<span id="id8"></span><h3>Description<a class="headerlink" href="#get-moz-enus-py-description" title="Permalink to this headline">¶</a></h3>
 <p>A simple script to collect the en-US l10n files from a Mozilla source tree
 (<tt class="docutils literal"><span class="pre">'comm-central</span></tt>‘ or <tt class="docutils literal"><span class="pre">'mozilla-central</span></tt>‘) by traversing the product’s
 <tt class="docutils literal"><span class="pre">l10n.ini</span></tt> file.</p>
 </div>
-<div class="section" id="id8">
-<span id="id9"></span><h3>Usage<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<div class="section" id="get-moz-enus-py-usage">
+<span id="id9"></span><h3>Usage<a class="headerlink" href="#get-moz-enus-py-usage" title="Permalink to this headline">¶</a></h3>
 <div class="highlight-python"><div class="highlight"><pre><span class="n">get_moz_enUS</span><span class="o">.</span><span class="n">py</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span>
 </pre></div>
 </div>
@@ -371,7 +376,7 @@ files to.</td></tr>
 </div>
 </div>
 <div class="section" id="moz-l10n-builder">
-<span id="mozilla-l10n-scripts-moz-l10n-builder"></span><h2>moz-l10n-builder<a class="headerlink" href="#moz-l10n-builder" title="Permalink to this headline">¶</a></h2>
+<span id="moz-l10n-builder-deprecated"></span><h2>moz-l10n-builder<a class="headerlink" href="#moz-l10n-builder" title="Permalink to this headline">¶</a></h2>
 <p>This is the pre-Mercurial build script originally written by Dwayne Bailey.
 This is the script that all the others on this page replaces for post-CVS
 Mozilla l10n.</p>
@@ -382,7 +387,7 @@ Mozilla l10n.</p>
 <p>For more information about this script see its <a class="reference internal" href="moz-l10n-builder.html"><em>dedicated page</em></a>.</p>
 </div>
 <div class="section" id="moz-l10n-builder-py">
-<span id="mozilla-l10n-scripts-moz-l10n-builder-py"></span><h2>moz_l10n_builder.py<a class="headerlink" href="#moz-l10n-builder-py" title="Permalink to this headline">¶</a></h2>
+<span id="id10"></span><h2>moz_l10n_builder.py<a class="headerlink" href="#moz-l10n-builder-py" title="Permalink to this headline">¶</a></h2>
 <p>This script was intended to be a simple and direct port of the
 <tt class="docutils literal"><span class="pre">moz-l10n-builder</span></tt> script from above. It has pro’s and cons in comparison to
 the original, but is very similar for the most part. So for more information
@@ -402,7 +407,7 @@ about this script, see the original script’s <a class="reference internal"
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/odf2xliff.html b/docs/_build/html/commands/odf2xliff.html
index 29b1d1e..1f27d72 100644
--- a/docs/_build/html/commands/odf2xliff.html
+++ b/docs/_build/html/commands/odf2xliff.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>odf2xliff and xliff2odf — Translate Toolkit 1.9.0 documentation</title>
+    <title>odf2xliff and xliff2odf — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="prop2po" href="prop2po.html" />
     <link rel="prev" title="oo2po" href="oo2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="prop2po.html"
          title="next chapter">prop2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -118,7 +121,7 @@
 <p>Convert OpenDocument (ODF) files to XLIFF localization files. Create translated
 ODF files by combining the original ODF files with XLIFF files containing
 translations of strings in the original document.</p>
-<p>XLIFF is the XML Localization Interchange File Format developed by <a class="reference external" href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff">OASIS</a> (The
+<p>XLIFF is the XML Localization Interchange File Format developed by <a class="reference external" href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff">OASIS</a> (The
 Organization for the Advancement of Structured Information Standards) to allow
 translation work to be standardised no matter what the source format and to
 allow the work to be freely moved from tool to tool.</p>
@@ -127,8 +130,9 @@ bit about <a class="reference internal" href="../guides/document_translation.htm
 most out of translating ODF with XLIFF.</p>
 <div class="section" id="usage">
 <span id="odf2xliff-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>odf2xliff [options] <original_odf> <xliff>
-xliff2odf [options] -t <original_odf> <xliff> <translated_odf></pre>
+<div class="highlight-python"><div class="highlight"><pre>odf2xliff [options] <original_odf> <xliff>
+xliff2odf [options] -t <original_odf> <xliff> <translated_odf>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -182,10 +186,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o <var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in XLIFF format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 </tbody>
 </table>
 <p>Options (xliff2odf):</p>
@@ -223,20 +227,22 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in ODF format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 </tbody>
 </table>
 </div>
 <div class="section" id="examples">
 <span id="odf2xliff-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>odf2xliff english.odt english_français.xlf</pre>
+<div class="highlight-python"><div class="highlight"><pre>odf2xliff english.odt english_français.xlf
+</pre></div>
 </div>
 <p>Create an XLIFF file from an ODT file (the source ODF file could also be any of
 the other ODF files, including ODS, ODG, etc.).</p>
-<div class="highlight-python"><pre>xliff2odf -t english.odt english_français.xlf français.odt</pre>
+<div class="highlight-python"><div class="highlight"><pre>xliff2odf -t english.odt english_français.xlf français.odt
+</pre></div>
 </div>
 <p>Using english.odt as the template document, and english_français.xlf as the
 file of translations, create a translated file français.odt.</p>
@@ -261,7 +267,7 @@ more information on conformance to standards, see the <a class="reference intern
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/oo2po.html b/docs/_build/html/commands/oo2po.html
index a0c621b..610bf77 100644
--- a/docs/_build/html/commands/oo2po.html
+++ b/docs/_build/html/commands/oo2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>oo2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>oo2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="odf2xliff and xliff2odf" href="odf2xliff.html" />
     <link rel="prev" title="moz2po" href="moz2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -98,10 +100,11 @@
   <li><a href="odf2xliff.html"
          title="next chapter">odf2xliff and xliff2odf »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -126,12 +129,14 @@ creates completely valid PO files.</p>
 <p>oo2xliff will convert the SDF files to XLIFF format.</p>
 <div class="section" id="usage">
 <span id="oo2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>oo2po [options] <sdf> <output>
-po2oo [options] [-t <en-US.sdf>] -l <targetlang> <input> <sdf|output></pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po [options] <sdf> <output>
+po2oo [options] [-t <en-US.sdf>] -l <targetlang> <input> <sdf|output>
+</pre></div>
 </div>
 <p>or for XLIFF files:</p>
-<div class="highlight-python"><pre>oo2xliff [options] -l <targetlang> <sdf> <output>
-xliff2oo [options] [-t <en-US.sdf>] -l <targetlang> <input> <sdf|output></pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2xliff [options] -l <targetlang> <sdf> <output>
+xliff2oo [options] [-t <en-US.sdf>] -l <targetlang> <input> <sdf|output>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -150,8 +155,8 @@ xliff2oo [options] [-t <en-US.sdf>] -l <targetlang> <input> &l
 <td>is a directory of translated PO/XLIFF files</td>
 </tr>
 <tr class="row-even"><td><targetlang></td>
-<td>is the <a class="reference external" href="https://en.wikipedia.org/wiki/ISO_639">ISO 639</a>
-language code used in the sdf file, e.g. af</td>
+<td>is the <a class="reference external" href="http://en.wikipedia.org/wiki/ISO_639">ISO 639</a> language code used in the
+sdf file, e.g. af</td>
 </tr>
 </tbody>
 </table>
@@ -190,10 +195,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po) (only available in oo2po</td></tr>
@@ -261,10 +266,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in oo format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-l<var>LANG</var></span>, <span class="option">--language=<var>LANG</var></span></kbd></td>
 </tr>
@@ -290,6 +295,10 @@ full, profile</em></a></td></tr>
 </tr>
 <tr><td> </td><td>action on pofilter failure: <a class="reference internal" href="option_filteraction.html"><em>none (default), warn,
 exclude-serious, exclude-all</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -309,11 +318,13 @@ onefile</em></a>)</td></tr>
 <p>These examples demonstrate most of the useful invocations of oo2po:</p>
 <div class="section" id="creating-pot-files">
 <span id="oo2po-creating-pot-files"></span><h3>Creating POT files<a class="headerlink" href="#creating-pot-files" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>oo2po -P en-US.sdf pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po -P en-US.sdf pot
+</pre></div>
 </div>
 <p>Extract messages from <em>en-US.sdf</em> and place them in a directory called <em>pot</em>.
 The <tt class="docutils literal"><span class="pre">-P</span></tt> option ensures that we create POT files instead of PO files.</p>
-<div class="highlight-python"><pre>oo2po -P --source-language=fr fr-FR.sdf french-pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po -P --source-language=fr fr-FR.sdf french-pot
+</pre></div>
 </div>
 <p>Instead of creating English POT files we are now creating POT files that
 contain French in the msgid.  This is useful for translators who are not
@@ -322,16 +333,18 @@ language.</p>
 </div>
 <div class="section" id="creating-po-files-from-existing-work">
 <span id="oo2po-creating-po-files-from-existing-work"></span><h3>Creating PO files from existing work<a class="headerlink" href="#creating-po-files-from-existing-work" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>oo2po --duplicates=merge -l zu zu-ZA.sdf zulu</pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po --duplicates=merge -l zu zu-ZA.sdf zulu
+</pre></div>
 </div>
 <p>Extract all existing Zulu (<em>zu</em>) messages from <em>zu-ZA.sdf</em> and place them in a
 directory called <em>zulu</em>.  If you find duplicate messages in a file then merge
 them into a single message (This is the default behaviour for traditional PO
 files).  You might want to use <a class="reference internal" href="pomigrate2.html"><em>pomigrate2</em></a> to ensure that your PO files
 match the latest POT files.:</p>
-<div class="highlight-python"><pre>cat GSI_af.sdf GSI_xh.sdf > GSI_af-xh.sdf oo2po --source-language=af -l xh</pre>
+<div class="highlight-python"><div class="highlight"><pre>cat GSI_af.sdf GSI_xh.sdf > GSI_af-xh.sdf
+oo2po --source-language=af -l xh GSI_af-xh.sdf af-xh-po
+</pre></div>
 </div>
-<p>GSI_af-xh.sdf af-xh-po</p>
 <p>Here we are creating PO files with your existing translations but a different
 source language.  Firstly we combine the two SDF files.  Then oo2po creates a
 set of PO files in <em>af-xh-po</em> using Afrikaans (<em>af</em>) as the source language and
@@ -339,11 +352,13 @@ Xhosa (<em>xh</em>) as the target language from the combined SDF file <em>GSI_af
 </div>
 <div class="section" id="creating-a-new-gsi-sdf-file">
 <span id="oo2po-creating-a-new-gsi-sdf-file"></span><h3>Creating a new GSI/SDF file<a class="headerlink" href="#creating-a-new-gsi-sdf-file" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>po2oo -l zu zulu zu_ZA.sdf</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2oo -l zu zulu zu_ZA.sdf
+</pre></div>
 </div>
 <p>Using PO files found in <em>zulu</em> create an SDF files called <em>zu_ZA.sdf</em> for
 language <em>zu</em>:</p>
-<div class="highlight-python"><pre>po2oo -l af -t en-US.sdf --nofuzzy --keeptimestamp --filteraction=exclude-serious afrikaans af_ZA.sdf</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2oo -l af -t en-US.sdf --nofuzzy --keeptimestamp --filteraction=exclude-serious afrikaans af_ZA.sdf
+</pre></div>
 </div>
 <p>Create an Afrikaans (<em>af</em>) SDF file called <em>af_ZA.sdf</em> using <em>en-US.sdf</em> as a
 template and preserving the timestamps within the SDF file while also
@@ -379,7 +394,7 @@ escaping.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_accelerator.html b/docs/_build/html/commands/option_accelerator.html
index 477da05..f73cc35 100644
--- a/docs/_build/html/commands/option_accelerator.html
+++ b/docs/_build/html/commands/option_accelerator.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–accelerator=ACCELERATOR — Translate Toolkit 1.9.0 documentation</title>
+    <title>–accelerator=ACCELERATOR — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="poconflicts" href="poconflicts.html" />
     <link rel="prev" title="–personality=TYPE" href="option_personality.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -88,10 +90,11 @@
   <li><a href="poconflicts.html"
          title="next chapter">poconflicts »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -126,10 +129,10 @@ Marker</th>
 <td><a class="reference external" href="http://kde.org">KDE Desktop</a> and <a class="reference external" href="http://mozilla.org">Mozilla</a> (when using <a class="reference internal" href="moz2po.html"><em>moz2po</em></a>)</td>
 </tr>
 <tr class="row-odd"><td>_</td>
-<td><a class="reference external" href="http://gnome.org">GNOME Desktop</a> and other <a class="reference external" href="http://gtk.org">GTK+</a> based applications</td>
+<td><a class="reference external" href="http://www.gnome.org">GNOME Desktop</a> and other <a class="reference external" href="http://www.gtk.org">GTK+</a> based applications</td>
 </tr>
 <tr class="row-even"><td>~</td>
-<td><a class="reference external" href="http://libreoffice.org">LibreOffice</a> and <a class="reference external" href="http://openoffice.org">Apache
+<td><a class="reference external" href="http://www.libreoffice.org">LibreOffice</a> and <a class="reference external" href="http://www.openoffice.org">Apache
 OpenOffice</a></td>
 </tr>
 </tbody>
@@ -148,7 +151,7 @@ OpenOffice</a></td>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_duplicates.html b/docs/_build/html/commands/option_duplicates.html
index ec91116..0a0731c 100644
--- a/docs/_build/html/commands/option_duplicates.html
+++ b/docs/_build/html/commands/option_duplicates.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–duplicates=DUPLICATESTYLE — Translate Toolkit 1.9.0 documentation</title>
+    <title>–duplicates=DUPLICATESTYLE — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="–progress=PROGRESS" href="option_progress.html" />
     <link rel="prev" title="–errorlevel=ERRORLEVEL" href="option_errorlevel.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="option_progress.html"
          title="next chapter">–progress=PROGRESS »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -159,15 +162,16 @@ used for configuration.</p>
 <p>This uses the msgctxt feature of Gettext that was introduced with Gettext 0.15.
 Some tools might not support it 100%. This option is the default in recent
 releases of the Translate Toolkit.</p>
-<div class="highlight-po"><pre>#: file1.dtd:instruction_manual
-msgctxt "instruction_manual"
-msgid "Manual"
-msgstr ""
+<div class="highlight-po"><div class="highlight"><pre>#: file1.dtd:instruction_manual
+msgctxt "instruction_manual"
+msgid "Manual"
+msgstr ""
 
 #: file1.dtd:manual_process
-msgctxt "manual_process"
-msgid "Manual"
-msgstr ""</pre>
+msgctxt "manual_process"
+msgid "Manual"
+msgstr ""
+</pre></div>
 </div>
 </div>
 </div>
@@ -184,7 +188,7 @@ msgstr ""</pre>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_errorlevel.html b/docs/_build/html/commands/option_errorlevel.html
index 9ac32ec..181a62c 100644
--- a/docs/_build/html/commands/option_errorlevel.html
+++ b/docs/_build/html/commands/option_errorlevel.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–errorlevel=ERRORLEVEL — Translate Toolkit 1.9.0 documentation</title>
+    <title>–errorlevel=ERRORLEVEL — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="–duplicates=DUPLICATESTYLE" href="option_duplicates.html" />
     <link rel="prev" title="xliff2po" href="xliff2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="option_duplicates.html"
          title="next chapter">–duplicates=DUPLICATESTYLE »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -127,33 +130,36 @@ developers with <tt class="docutils literal"><span class="pre">--errorlevel=trac
 <div class="section" id="message">
 <span id="option-errorlevel-message"></span><h2>message<a class="headerlink" href="#message" title="Permalink to this headline">¶</a></h2>
 <p>Display on the error message</p>
-<div class="highlight-python"><pre>An error occurred processing PO file</pre>
+<div class="highlight-python"><div class="highlight"><pre>An error occurred processing PO file
+</pre></div>
 </div>
 </div>
 <div class="section" id="exception">
 <span id="option-errorlevel-exception"></span><h2>exception<a class="headerlink" href="#exception" title="Permalink to this headline">¶</a></h2>
 <p>Give the error message and name and Python exception</p>
-<div class="highlight-python"><pre>ValueError: An error occurred processing PO file</pre>
+<div class="highlight-python"><div class="highlight"><pre>ValueError: An error occurred processing PO file
+</pre></div>
 </div>
 </div>
 <div class="section" id="traceback">
 <span id="option-errorlevel-traceback"></span><h2>traceback<a class="headerlink" href="#traceback" title="Permalink to this headline">¶</a></h2>
 <p>Provide a full traceback for debugging purposes</p>
-<div class="highlight-python"><pre>csv2po: warning: Error processing: nso/readlicense_oo/docs/readme.csv: Traceback (most recent call last):
+<div class="highlight-python"><div class="highlight"><pre>csv2po: warning: Error processing: nso/readlicense_oo/docs/readme.csv: Traceback (most recent call last):
 
-  File "/usr/lib/python2.4/site-packages/translate/misc/optrecurse.py", line 415, in recursiveprocess
+  File "/usr/lib/python2.4/site-packages/translate/misc/optrecurse.py", line 415, in recursiveprocess
     success = self.processfile(fileprocessor, options, fullinputpath, fulloutputpath, fulltemplatepath)
 
-  File "/usr/lib/python2.4/site-packages/translate/misc/optrecurse.py", line 468, in processfile
+  File "/usr/lib/python2.4/site-packages/translate/misc/optrecurse.py", line 468, in processfile
     if fileprocessor(inputfile, outputfile, templatefile, **passthroughoptions):
 
-  File "/usr/lib/python2.4/site-packages/translate/convert/csv2po.py", line 183, in convertcsv
+  File "/usr/lib/python2.4/site-packages/translate/convert/csv2po.py", line 183, in convertcsv
     outputpo = convertor.convertfile(inputcsv)
 
-  File "/usr/lib/python2.4/site-packages/translate/convert/csv2po.py", line 159, in convertfile
-    raise ValueError("An error occured processing PO file")
+  File "/usr/lib/python2.4/site-packages/translate/convert/csv2po.py", line 159, in convertfile
+    raise ValueError("An error occured processing PO file")
 
-ValueError: An error occurred processing PO file</pre>
+ValueError: An error occurred processing PO file
+</pre></div>
 </div>
 </div>
 </div>
@@ -170,7 +176,7 @@ ValueError: An error occurred processing PO file</pre>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_filteraction.html b/docs/_build/html/commands/option_filteraction.html
index 22cf599..95fc131 100644
--- a/docs/_build/html/commands/option_filteraction.html
+++ b/docs/_build/html/commands/option_filteraction.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–filteraction=ACTION — Translate Toolkit 1.9.0 documentation</title>
+    <title>–filteraction=ACTION — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="–multifile=MULTIFILESTYLE" href="option_multifile.html" />
     <link rel="prev" title="–progress=PROGRESS" href="option_progress.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="option_multifile.html"
          title="next chapter">–multifile=MULTIFILESTYLE »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -147,7 +150,7 @@ included.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_multifile.html b/docs/_build/html/commands/option_multifile.html
index 86ba437..e05cdc9 100644
--- a/docs/_build/html/commands/option_multifile.html
+++ b/docs/_build/html/commands/option_multifile.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–multifile=MULTIFILESTYLE — Translate Toolkit 1.9.0 documentation</title>
+    <title>–multifile=MULTIFILESTYLE — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +27,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
-    <link rel="next" title="–psyco=MODE" href="option_psyco.html" />
+    <link rel="next" title="–personality=TYPE" href="option_personality.html" />
     <link rel="prev" title="–filteraction=ACTION" href="option_filteraction.html" /> 
   </head>
   <body>
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -90,13 +92,14 @@
               
   <li><a href="option_filteraction.html"
          title="previous chapter">« –filteraction=ACTION</a></li>
-  <li><a href="option_psyco.html"
-         title="next chapter">–psyco=MODE »</a></li>
+  <li><a href="option_personality.html"
+         title="next chapter">–personality=TYPE »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -145,7 +148,7 @@ files.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_personality.html b/docs/_build/html/commands/option_personality.html
index e562409..c08e75a 100644
--- a/docs/_build/html/commands/option_personality.html
+++ b/docs/_build/html/commands/option_personality.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–personality=TYPE — Translate Toolkit 1.9.0 documentation</title>
+    <title>–personality=TYPE — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,17 +27,17 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="–accelerator=ACCELERATOR" href="option_accelerator.html" />
-    <link rel="prev" title="–psyco=MODE" href="option_psyco.html" /> 
+    <link rel="prev" title="–multifile=MULTIFILESTYLE" href="option_multifile.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -90,15 +92,16 @@
             
             
               
-  <li><a href="option_psyco.html"
-         title="previous chapter">« –psyco=MODE</a></li>
+  <li><a href="option_multifile.html"
+         title="previous chapter">« –multifile=MULTIFILESTYLE</a></li>
   <li><a href="option_accelerator.html"
          title="next chapter">–accelerator=ACCELERATOR »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -122,10 +125,12 @@
 <p>Create output strictly according to the specification for .properties files.
 This will use escaped Unicode for any non-ASCII characters.  Thus the following
 string found in a PO file:</p>
-<div class="highlight-python"><pre>ṽḁḽṻḝ</pre>
+<div class="highlight-python"><div class="highlight"><pre>ṽḁḽṻḝ
+</pre></div>
 </div>
 <p>Will appear as follows in the output .properties file:</p>
-<div class="highlight-python"><pre>\u1E7D\u1E01\u1E3D\u1E7B\u1E1D</pre>
+<div class="highlight-python"><div class="highlight"><pre>\u1E7D\u1E01\u1E3D\u1E7B\u1E1D
+</pre></div>
 </div>
 </div>
 <div class="section" id="mozilla">
@@ -169,7 +174,7 @@ files.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_progress.html b/docs/_build/html/commands/option_progress.html
index 1254678..c6b5e4c 100644
--- a/docs/_build/html/commands/option_progress.html
+++ b/docs/_build/html/commands/option_progress.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–progress=PROGRESS — Translate Toolkit 1.9.0 documentation</title>
+    <title>–progress=PROGRESS — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="–filteraction=ACTION" href="option_filteraction.html" />
     <link rel="prev" title="–duplicates=DUPLICATESTYLE" href="option_duplicates.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="option_filteraction.html"
          title="next chapter">–filteraction=ACTION »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -125,19 +128,21 @@ files using <a class="reference internal" href="oo2po.html"><em>oo2po</em></a>.<
 <span id="option-progress-none"></span><h2>none<a class="headerlink" href="#none" title="Permalink to this headline">¶</a></h2>
 <p>No visual feedback, this is useful if you want to use any of the scripts as
 part of another script and don’t want feedback to interfere with the operation.</p>
-<div class="highlight-bash"><pre>[dwayne at laptop OOo20]$ oo2po -P --progress=none en-US.sdf pot
-[dwayne at laptop OOo20]$</pre>
+<div class="highlight-bash"><div class="highlight"><pre>[dwayne at laptop OOo20]$ oo2po -P --progress=none en-US.sdf pot
+[dwayne at laptop OOo20]$
+</pre></div>
 </div>
 </div>
 <div class="section" id="dots">
 <span id="option-progress-dots"></span><h2>dots<a class="headerlink" href="#dots" title="Permalink to this headline">¶</a></h2>
 <p>Use visual dots to represent progress.  Each dot represent a file that has been
 processed.</p>
-<div class="highlight-bash"><pre>[dwayne at laptop OOo20]$ oo2po -P --progress=dots en-US.sdf pot
+<div class="highlight-bash"><div class="highlight"><pre>[dwayne at laptop OOo20]$ oo2po -P --progress=dots en-US.sdf pot
 .............................................................................................
 .............................................................................................
 .........................................
-[dwayne at laptop OOo20]$</pre>
+[dwayne at laptop OOo20]$
+</pre></div>
 </div>
 </div>
 <div class="section" id="bar-default">
@@ -208,7 +213,7 @@ filter/source/xsltdialog.oo
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/option_psyco.html b/docs/_build/html/commands/option_psyco.html
deleted file mode 100644
index 1a9b692..0000000
--- a/docs/_build/html/commands/option_psyco.html
+++ /dev/null
@@ -1,166 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>–psyco=MODE — Translate Toolkit 1.9.0 documentation</title>
-    
-    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
-    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
-    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
-    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '../',
-        VERSION:     '1.9.0',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="../_static/jquery.js"></script>
-    <script type="text/javascript" src="../_static/underscore.js"></script>
-    <script type="text/javascript" src="../_static/doctools.js"></script>
-    <script type="text/javascript" src="../_static/bootstrap.js"></script>
-    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
-    <link rel="up" title="Converters" href="index.html" />
-    <link rel="next" title="–personality=TYPE" href="option_personality.html" />
-    <link rel="prev" title="–multifile=MULTIFILESTYLE" href="option_multifile.html" /> 
-  </head>
-  <body>
-  <div id="navbar" class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container-fluid">
-        <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
-          <ul class="nav">
-            <li class="divider-vertical"></li>
-            
-              <li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc"><ul class="simple">
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="index.html">Converters</a></li>
-<li class="toctree-l1"><a class="reference internal" href="index.html#tools">Tools</a></li>
-<li class="toctree-l1"><a class="reference internal" href="index.html#scripts">Scripts</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
-</ul>
-</ul>
-</li>
-              
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
-  <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">–psyco=MODE</a><ul>
-<li><a class="reference internal" href="#none">none</a></li>
-<li><a class="reference internal" href="#full-default">full (default)</a></li>
-<li><a class="reference internal" href="#profile">profile</a></li>
-</ul>
-</li>
-</ul>
-</ul>
-</li>
-            
-            
-              
-  <li><a href="option_multifile.html"
-         title="previous chapter">« –multifile=MULTIFILESTYLE</a></li>
-  <li><a href="option_personality.html"
-         title="next chapter">–personality=TYPE »</a></li>
-            
-            
-              
-            
-          </ul>
-          
-            
-<form class="navbar-search pull-right" action="../search.html" method="get">
-  <input type="text" name="q" placeholder="Search" />
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-          
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-
-<div class="container content">
-   
-  <div class="section" id="psyco-mode">
-<span id="option-psyco"></span><h1>–psyco=MODE<a class="headerlink" href="#psyco-mode" title="Permalink to this headline">¶</a></h1>
-<p>Psyco is an optimiser for Python programs.  It takes the sections that are run
-often or that could benefit from being compiled and compiles them into machine
-language.  This machine code is executed instead of the Python code.</p>
-<p>If you didn’t understand any of that then simply understand that it makes you
-program run faster if it is installed.</p>
-<p>By default it is switched on, so you can safely ignore this option and benefit
-from psyco optimisations anyway.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">psyco only works on i386 architectures.</p>
-</div>
-<p>To install psyco, you can look for it in your distribution’s packages, or
-obtain it here: <a class="reference external" href="http://psyco.sourceforge.net/">http://psyco.sourceforge.net/</a></p>
-<div class="section" id="none">
-<span id="option-psyco-none"></span><h2>none<a class="headerlink" href="#none" title="Permalink to this headline">¶</a></h2>
-<p>Switch psyco optimisation off.</p>
-</div>
-<div class="section" id="full-default">
-<span id="option-psyco-full-default"></span><h2>full (default)<a class="headerlink" href="#full-default" title="Permalink to this headline">¶</a></h2>
-<p>This is the default option, even if no <tt class="docutils literal"><span class="pre">--psyco</span></tt> command line options is
-specified. It will try to optimise everything, so potentially it might consume
-more memory.</p>
-</div>
-<div class="section" id="profile">
-<span id="option-psyco-profile"></span><h2>profile<a class="headerlink" href="#profile" title="Permalink to this headline">¶</a></h2>
-<p>This tries to selectively compile certain program parts, and therefore should
-consume less memory.</p>
-</div>
-</div>
-
-
-</div>
-<hr>
-
-<footer class="footer">
-  <div class="container">
-    <p class="pull-right"><a href="#">Back to top ↑</a></p>
-    <ul class="unstyled muted">
-      <li><small>
-        © 2012, Translate.org.za.<br/>
-      </small></li>
-      <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
-      </small></li>
-    </ul>
-  </div>
-</footer>
-  </body>
-</html>
\ No newline at end of file
diff --git a/docs/_build/html/commands/option_rewrite.html b/docs/_build/html/commands/option_rewrite.html
index b25318c..e975deb 100644
--- a/docs/_build/html/commands/option_rewrite.html
+++ b/docs/_build/html/commands/option_rewrite.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>–rewrite=STYLE — Translate Toolkit 1.9.0 documentation</title>
+    <title>–rewrite=STYLE — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="posegment" href="posegment.html" />
     <link rel="prev" title="podebug" href="podebug.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -97,10 +99,11 @@
   <li><a href="posegment.html"
          title="next chapter">posegment »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -156,8 +159,9 @@ functionality of <a class="reference external" href="http://linux.die.net/man/1/
 </div>
 <div class="section" id="bracket">
 <span id="option-rewrite-bracket"></span><h2>bracket<a class="headerlink" href="#bracket" title="Permalink to this headline">¶</a></h2>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.4.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.4.</span></p>
+</div>
 <p>Places brackets around the translated text.</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="nv">msgid</span> <span class="s">"English"</span>
 <span class="nv">msgstr</span> <span class="s">"[English]"</span>
@@ -169,9 +173,11 @@ string in rendered and has not been cutoff by the application.</p>
 </div>
 <div class="section" id="chef">
 <span id="option-rewrite-chef"></span><h2>chef<a class="headerlink" href="#chef" title="Permalink to this headline">¶</a></h2>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.2.</span></p>
-<p>Rewrites the source text using mock Swedish as popularised by the <a class="reference external" href="https://en.wikipedia.org/wiki/Swedish_Chef">Swedish Chef</a>.</p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.2.</span></p>
+</div>
+<p>Rewrites the source text using mock Swedish as popularised by the <a class="reference external" href="http://en.wikipedia.org/wiki/Swedish_Chef">Swedish
+Chef</a>.</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="nv">msgid</span> <span class="s">"English"</span>
 <span class="nv">msgstr</span> <span class="s">"Ingleesh"</span>
 </pre></div>
@@ -182,8 +188,9 @@ ideal for identifying untranslatable strings.</p>
 </div>
 <div class="section" id="flipped">
 <span id="option-rewrite-flipped"></span><h2>flipped<a class="headerlink" href="#flipped" title="Permalink to this headline">¶</a></h2>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.4.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.4.</span></p>
+</div>
 <p>Change the text into a version that uses equivalent Latin characters that are
 upside down.</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="nv">msgid</span> <span class="s">"English"</span>
@@ -202,8 +209,9 @@ Arabic/Hebrew .mo files for them installed.</p>
 </div>
 <div class="section" id="unicode">
 <span id="option-rewrite-unicode"></span><h2>unicode<a class="headerlink" href="#unicode" title="Permalink to this headline">¶</a></h2>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.2.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.2.</span></p>
+</div>
 <p>Rewrites the source text with Unicode characters that looks like the Latin
 characters that they are replacing.</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="nv">msgid</span> <span class="s">"English"</span>
@@ -236,7 +244,7 @@ upgrade to version 1.4.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/phase.html b/docs/_build/html/commands/phase.html
index 32b8498..ac893e5 100644
--- a/docs/_build/html/commands/phase.html
+++ b/docs/_build/html/commands/phase.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>phase — Translate Toolkit 1.9.0 documentation</title>
+    <title>phase — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pocompendium" href="pocompendium.html" />
     <link rel="prev" title="moz-l10n-builder" href="moz-l10n-builder.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="pocompendium.html"
          title="next chapter">pocompendium »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -141,8 +144,9 @@ receiving work, checking it and committing to CVS.</p>
 </pre></div>
 </div>
 <p>Mostly the usage follows the format of:</p>
-<div class="highlight-python"><pre>phase <command> <language-dir> <phaselist> <phase-name>
-phase <command> <language-dir> <phase-name></pre>
+<div class="highlight-python"><div class="highlight"><pre>phase <command> <language-dir> <phaselist> <phase-name>
+phase <command> <language-dir> <phase-name>
+</pre></div>
 </div>
 <p>A full list of commands and options can be seen by running:</p>
 <div class="highlight-python"><div class="highlight"><pre><span class="n">phase</span> <span class="o">--</span><span class="n">help</span>
@@ -233,7 +237,7 @@ pretty inconsistent</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/php2po.html b/docs/_build/html/commands/php2po.html
index 207c4ab..561fc16 100644
--- a/docs/_build/html/commands/php2po.html
+++ b/docs/_build/html/commands/php2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>php2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>php2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="sub2po" href="sub2po.html" />
     <link rel="prev" title="prop2po" href="prop2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="sub2po.html"
          title="next chapter">sub2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -118,8 +121,9 @@
 <p>Converts PHP localisable string arrays to Gettext PO format.</p>
 <div class="section" id="usage">
 <span id="php2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>php2po [options] <php> <po>
-po2php [options] <po> <php></pre>
+<div class="highlight-python"><div class="highlight"><pre>php2po [options] <php> <po>
+po2php [options] <po> <php>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -175,10 +179,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -229,10 +233,14 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -244,51 +252,23 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="formats-supported">
 <span id="php2po-formats-supported"></span><h2>Formats Supported<a class="headerlink" href="#formats-supported" title="Permalink to this headline">¶</a></h2>
-<p>PHP files need to be organized into separate languages per file and in the
-following format:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$variable = 'string';</span>
-<span class="x">$another_variable = "another string";</span>
-</pre></div>
-</div>
-<p>If $variable is an array it can be declared with the square bracket syntax:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$lang['item'] = 'string';</span>
-<span class="x">$lang['another_item'] = "another string";</span>
-</pre></div>
-</div>
-<p>The converter also supports arrays in the form:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$variable = array(</span>
-<span class="x">   name => 'value',</span>
-<span class="x">   other => "other value",</span>
-<span class="x">)</span>
-</pre></div>
-</div>
-<p>Finally, the converter also supports the define syntax:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">define('item', 'string');</span>
-<span class="x">define("another_item", "another string");</span>
-</pre></div>
-</div>
-<p>Gettext notations are also not supported, use the Gettext tools for those
-files.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Nested arrays are not supported:</p>
-</div>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$lang = array(array('key' => 'value')); #NOT SUPPORTED</span>
-</pre></div>
-</div>
+<p>Check <a class="reference internal" href="../formats/php.html"><em>PHP format</em></a> document to see to which extent the PHP
+format is supported.</p>
 </div>
 <div class="section" id="examples">
 <span id="php2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>This example looks at roundtrip of PHP translations as well as recovery of
 existing translations.</p>
 <p>First we need to create a set of POT files.:</p>
-<div class="highlight-python"><pre>php2po -P lang/en pot/</pre>
+<div class="highlight-python"><div class="highlight"><pre>php2po -P lang/en pot/
+</pre></div>
 </div>
 <p>All .php files found in the <tt class="docutils literal"><span class="pre">lang/en</span></tt> directory are converted to Gettext POT
 files and placed in the <tt class="docutils literal"><span class="pre">pot</span></tt> directory.</p>
 <p>If you are translating for the first time then you can skip the next step. If
 you need to recover your existing translations then we do the following:</p>
-<div class="highlight-python"><pre>php2po -t lang/en lang/zu po-zu/</pre>
+<div class="highlight-python"><div class="highlight"><pre>php2po -t lang/en lang/zu po-zu/
+</pre></div>
 </div>
 <p>Using the English PHP files found in <tt class="docutils literal"><span class="pre">lang/en</span></tt> and your existing Zulu
 translation in <tt class="docutils literal"><span class="pre">lang/zu</span></tt> we create a set of PO files in <tt class="docutils literal"><span class="pre">po-zu</span></tt>.  These
@@ -298,7 +278,8 @@ not you will have to review all translations.</p>
 <p>You are now in a position to translate your recovered translations or your new
 POT files.</p>
 <p>Once translated you can convert back as follows:</p>
-<div class="highlight-python"><pre>po2php -t lang/en po-zu/ lang/zu</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2php -t lang/en po-zu/ lang/zu
+</pre></div>
 </div>
 <p>Your translations found in the Zulu PO directory, <tt class="docutils literal"><span class="pre">po-zu</span></tt>, will be converted
 to PHP using the files in <tt class="docutils literal"><span class="pre">lang/en</span></tt> as templates and placing your new
@@ -320,7 +301,7 @@ translations in <tt class="docutils literal"><span class="pre">lang/zu</span></t
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/po2tmx.html b/docs/_build/html/commands/po2tmx.html
index 78946d2..646edc2 100644
--- a/docs/_build/html/commands/po2tmx.html
+++ b/docs/_build/html/commands/po2tmx.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>po2tmx — Translate Toolkit 1.9.0 documentation</title>
+    <title>po2tmx — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pot2po" href="pot2po.html" />
     <link rel="prev" title="po2wordfast" href="po2wordfast.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -101,10 +103,11 @@
   <li><a href="pot2po.html"
          title="next chapter">pot2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -125,14 +128,23 @@
 <span id="id1"></span><h1>po2tmx<a class="headerlink" href="#po2tmx" title="Permalink to this headline">¶</a></h1>
 <p>Convert <a class="reference internal" href="../formats/po.html"><em>Gettext PO</em></a> files to a <a class="reference internal" href="../formats/tmx.html"><em>TMX</em></a>
 translation memory file.  TMX is the Translation Memory eXchange format
-developed by <a class="reference external" href="http://lisa.org/">LISA</a> (Localization Industry Standards
-Association).</p>
+developed by OSCAR.</p>
+<table class="docutils footnote" frame="void" id="id2" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[*]</td><td>OSCAR (Open Standards for Container/Content Allowing Re-use), a special
+interest group of the now defunct LISA (Localization Industry Standards
+Association). The Gala <a class="reference external" href="http://www.gala-global.org/lisa-oscar-standards">LISA OSCAR Standards</a> page has more details on
+the possble future for the standards.</td></tr>
+</tbody>
+</table>
 <p>If you are interested in po2tmx, you might also be interested in
 <a class="reference internal" href="posegment.html"><em>posegment</em></a> that can be used to perform some automated segmentation on
 sentence level.</p>
 <div class="section" id="usage">
 <span id="po2tmx-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>po2tmx [options] --language <target> <po> <tmx></pre>
+<div class="highlight-python"><div class="highlight"><pre>po2tmx [options] --language <target> <po> <tmx>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -184,10 +196,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in tmx format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-l<var>LANG</var></span>, <span class="option">--language=<var>LANG</var></span></kbd></td>
 </tr>
@@ -201,7 +209,8 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="examples">
 <span id="po2tmx-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>po2tmx -l xh browser.po browser.tmx</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2tmx -l xh browser.po browser.tmx
+</pre></div>
 </div>
 <p>Use the Xhosa (<em>xh</em>) translations in the PO file <em>browser.po</em> to create a TMX
 file called <em>browser.tmx</em></p>
@@ -250,7 +259,7 @@ msgcat to first create a large PO file with non-uniques removed.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/po2wordfast.html b/docs/_build/html/commands/po2wordfast.html
index c46b4ca..526bfe9 100644
--- a/docs/_build/html/commands/po2wordfast.html
+++ b/docs/_build/html/commands/po2wordfast.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>po2wordfast — Translate Toolkit 1.9.0 documentation</title>
+    <title>po2wordfast — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="po2tmx" href="po2tmx.html" />
     <link rel="prev" title="txt2po" href="txt2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="po2tmx.html"
          title="next chapter">po2tmx »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -115,11 +118,11 @@
   <div class="section" id="po2wordfast">
 <span id="id1"></span><h1>po2wordfast<a class="headerlink" href="#po2wordfast" title="Permalink to this headline">¶</a></h1>
 <p>Convert Gettext PO files to a <a class="reference internal" href="../formats/wordfast.html"><em>Wordfast Translation Memory</em></a> translation memory file.</p>
-<p><a class="reference external" href="https://en.wikipedia.org/wiki/Wordfast">Wordfast</a> is a popular Windows based
-computer-assisted translation tool.</p>
+<p><a class="reference external" href="http://en.wikipedia.org/wiki/Wordfast">Wordfast</a> is a popular Windows based computer-assisted translation tool.</p>
 <div class="section" id="usage">
 <span id="po2wordfast-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>po2wordfast [options] --language <target> <po> <wordfast></pre>
+<div class="highlight-python"><div class="highlight"><pre>po2wordfast [options] --language <target> <po> <wordfast>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -171,10 +174,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in tmx format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-l<var>LANG</var></span>, <span class="option">--language=<var>LANG</var></span></kbd></td>
 </tr>
@@ -188,7 +191,8 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="examples">
 <span id="po2wordfast-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>po2wordfast -l xh-ZA browser.po browser.txt</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2wordfast -l xh-ZA browser.po browser.txt
+</pre></div>
 </div>
 <p>Use the Xhosa (<em>xh-ZA</em>) translations in the PO file <em>browser.po</em> to create a
 Wordfast translation memory file called <em>browser.txt</em></p>
@@ -207,7 +211,7 @@ Wordfast translation memory file called <em>browser.txt</em></p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/poclean.html b/docs/_build/html/commands/poclean.html
index 96268ba..9d80ecc 100644
--- a/docs/_build/html/commands/poclean.html
+++ b/docs/_build/html/commands/poclean.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>poclean — Translate Toolkit 1.9.0 documentation</title>
+    <title>poclean — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pretranslate" href="pretranslate.html" />
     <link rel="prev" title="poswap" href="poswap.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="pretranslate.html"
          title="next chapter">pretranslate »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -118,7 +121,8 @@
 (Trados/Wordfast) by stripping out the tw4win indicators.</p>
 <div class="section" id="usage">
 <span id="poclean-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>poclean <input> <output></pre>
+<div class="highlight-python"><div class="highlight"><pre>poclean <input> <output>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -174,10 +178,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 </tbody>
 </table>
 </div>
@@ -186,13 +186,16 @@ full, profile</em></a></td></tr>
 <p>To create a text version of the unclean RTF file, you need UnRTF, available
 here: <a class="reference external" href="http://www.gnu.org/software/unrtf/unrtf.html">project site</a> or <a class="reference external" href="http://gnuwin32.sourceforge.net/packages/unrtf.htm">here
 (windows)</a>.</p>
-<div class="highlight-python"><pre>unrtf translation.rtf  --text > translation.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>unrtf translation.rtf  --text > translation.po
+</pre></div>
 </div>
 <p>You might need to convert the encoding of the file, with iconv, for example:</p>
-<div class="highlight-python"><pre>iconv -f latin1 -t utf-8 translation.po > new_translation.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>iconv -f latin1 -t utf-8 translation.po > new_translation.po
+</pre></div>
 </div>
 <p>Now you can clean the file with poclean</p>
-<div class="highlight-python"><pre>poclean new_translation.po clean_translation.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>poclean new_translation.po clean_translation.po
+</pre></div>
 </div>
 </div>
 </div>
@@ -209,7 +212,7 @@ here: <a class="reference external" href="http://www.gnu.org/software/unrtf/unrt
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pocommentclean.html b/docs/_build/html/commands/pocommentclean.html
index 2457a0a..00027b6 100644
--- a/docs/_build/html/commands/pocommentclean.html
+++ b/docs/_build/html/commands/pocommentclean.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pocommentclean — Translate Toolkit 1.9.0 documentation</title>
+    <title>pocommentclean — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pomigrate2" href="pomigrate2.html" />
     <link rel="prev" title="pocompendium" href="pocompendium.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="pomigrate2.html"
          title="next chapter">pomigrate2 »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -126,7 +129,8 @@ files.</p>
 </div>
 <div class="section" id="usage">
 <span id="pocommentclean-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pocommentclean [--backup] <po></pre>
+<div class="highlight-python"><div class="highlight"><pre>pocommentclean [--backup] <po>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -175,7 +179,7 @@ not standard Gettext PO format lines.  So it won’t delete developer commen
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pocompendium.html b/docs/_build/html/commands/pocompendium.html
index 5b06d5f..d70868f 100644
--- a/docs/_build/html/commands/pocompendium.html
+++ b/docs/_build/html/commands/pocompendium.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pocompendium — Translate Toolkit 1.9.0 documentation</title>
+    <title>pocompendium — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pocommentclean" href="pocommentclean.html" />
     <link rel="prev" title="phase" href="phase.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -96,10 +98,11 @@
   <li><a href="pocommentclean.html"
          title="next chapter">pocommentclean »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -134,7 +137,8 @@ only required for the invert command)</li>
 </div>
 <div class="section" id="usage">
 <span id="pocompendium-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pocompendium [options] output.po <-d po-directory(ies)|po-file(s)></pre>
+<div class="highlight-python"><div class="highlight"><pre>pocompendium [options] output.po <-d po-directory(ies)|po-file(s)>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -237,7 +241,7 @@ lowercase.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pocompile.html b/docs/_build/html/commands/pocompile.html
index 6d1d2fc..25478f2 100644
--- a/docs/_build/html/commands/pocompile.html
+++ b/docs/_build/html/commands/pocompile.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pocompile — Translate Toolkit 1.9.0 documentation</title>
+    <title>pocompile — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="poswap" href="poswap.html" />
     <link rel="prev" title="posegment" href="posegment.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="poswap.html"
          title="next chapter">poswap »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -119,7 +122,8 @@ installed on your computer and allow a Gettext enabled computer to provide the
 translations for the application.</p>
 <div class="section" id="usage">
 <span id="pocompile-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pocompile <po> <mo></pre>
+<div class="highlight-python"><div class="highlight"><pre>pocompile <po> <mo>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -172,10 +176,6 @@ traceback</em></a></td></tr>
 </tr>
 <tr><td> </td><td>write to OUTPUT in mo format</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
 <tr><td class="option-group">
@@ -186,12 +186,14 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="examples">
 <span id="pocompile-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pocompile --fuzzy file.po file.mo</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocompile --fuzzy file.po file.mo
+</pre></div>
 </div>
 <p>Creates a new MO file called <em>file.mo</em> based on the translation in the PO file
 <em>file.po</em>.  By using the <tt class="docutils literal"><span class="pre">--fuzzy</span></tt> option we use all translations
 including those marked fuzzy.</p>
-<div class="highlight-python"><pre>pocompile file.xlf file.mo</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocompile file.xlf file.mo
+</pre></div>
 </div>
 <p>Create an MO file from an XLIFF file called <em>file.xlf</em> (available from version
 1.1 of the toolkit).</p>
@@ -210,7 +212,7 @@ including those marked fuzzy.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/poconflicts.html b/docs/_build/html/commands/poconflicts.html
index 1aad054..d16e330 100644
--- a/docs/_build/html/commands/poconflicts.html
+++ b/docs/_build/html/commands/poconflicts.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>poconflicts — Translate Toolkit 1.9.0 documentation</title>
+    <title>poconflicts — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pofilter" href="pofilter.html" />
     <link rel="prev" title="–accelerator=ACCELERATOR" href="option_accelerator.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="pofilter.html"
          title="next chapter">pofilter »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -127,7 +130,8 @@ the correct directory structure using <a class="reference internal" href="porest
 merging using <a class="reference internal" href="pomerge.html"><em>pomerge</em></a>.</p>
 <div class="section" id="usage">
 <span id="poconflicts-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>poconflicts [options] <po> <conflicts></pre>
+<div class="highlight-python"><div class="highlight"><pre>poconflicts [options] <po> <conflicts>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -179,10 +183,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-I</span>, <span class="option">--ignore-case</span></kbd></td>
 </tr>
@@ -200,7 +200,8 @@ full, profile</em></a></td></tr>
 <div class="section" id="examples">
 <span id="poconflicts-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>Here are some examples that demonstrate the usefulness of poconflict</p>
-<div class="highlight-python"><pre>poconflicts --accelerator=~ -I xhosa conflicts</pre>
+<div class="highlight-python"><div class="highlight"><pre>poconflicts --accelerator=~ -I xhosa conflicts
+</pre></div>
 </div>
 <p>This extracts messages from the PO files in the <em>xhosa</em> directory and places a
 new PO file for each identified conflict in <em>conflicts</em>.  We are working with
@@ -210,7 +211,8 @@ ignoring the case of the message using <tt class="docutils literal"><span class=
 same as <em>file</em> or <em>FILE</em>)</p>
 <p>Another useful option is to look at the inverted conflicts.  This will detect
 target words that have been used to translate different source words.</p>
-<div class="highlight-python"><pre>poconflicts --accelerator=~ -I -v xhosa conflicts</pre>
+<div class="highlight-python"><div class="highlight"><pre>poconflicts --accelerator=~ -I -v xhosa conflicts
+</pre></div>
 </div>
 <p>Now in the <em>conflicts</em> directory we will find PO files based on the Xhosa word.
 We can now check where a Xhosa word has been used for different source or
@@ -221,10 +223,12 @@ proceed to merge the results back into the PO files. Unchanged entries can be
 removed.</p>
 <p>Now restructure the files to resemble the original directory structure using
 <a class="reference internal" href="porestructure.html"><em>porestructure</em></a>:</p>
-<div class="highlight-python"><pre>porestructure -i conflicts -o conflicts_tree</pre>
+<div class="highlight-python"><div class="highlight"><pre>porestructure -i conflicts -o conflicts_tree
+</pre></div>
 </div>
 <p>Now merge the changes back using pomerge:</p>
-<div class="highlight-python"><pre>pomerge -t xhosa -i conflicts_tree -o xhosa</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t xhosa -i conflicts_tree -o xhosa
+</pre></div>
 </div>
 <p>This takes the corrected files from <em>conflicts_tree</em> and merge them into the
 files in <em>xhosa</em> using the same files as templates.</p>
@@ -243,7 +247,7 @@ files in <em>xhosa</em> using the same files as templates.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pocount.html b/docs/_build/html/commands/pocount.html
index 388bc6c..67641ca 100644
--- a/docs/_build/html/commands/pocount.html
+++ b/docs/_build/html/commands/pocount.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pocount — Translate Toolkit 1.9.0 documentation</title>
+    <title>pocount — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="podebug" href="podebug.html" />
     <link rel="prev" title="Stopword file format" href="poterminology_stopword_file.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -104,10 +106,11 @@
   <li><a href="podebug.html"
          title="next chapter">podebug »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -136,7 +139,8 @@ toolkit develops.  Note that only multilingual formats based the storage
 almost all storage formats.</p>
 <div class="section" id="usage">
 <span id="pocount-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pocount [options] <directory|file(s)></pre>
+<div class="highlight-python"><div class="highlight"><pre>pocount [options] <directory|file(s)>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -173,10 +177,15 @@ almost all storage formats.</p>
 <tr><td class="option-group">
 <kbd><span class="option">--short</span></kbd></td>
 <td>same as –short-strings</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--short-strings</span></kbd></td>
+</tr>
+<tr><td> </td><td>statistics of strings in short format – one line per file</td></tr>
+<tr><td class="option-group">
+<kbd><span class="option">--short-words</span></kbd></td>
+<td>statistics of words in short format – one line per file</td></tr>
 </tbody>
 </table>
-<p>–short-strings statistics of strings in short format – one line per file
-–short-words   statistics of words in short format – one line per file</p>
 </div>
 <div class="section" id="examples">
 <span id="pocount-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
@@ -186,19 +195,22 @@ to count.</p>
 <div class="section" id="easy-counting">
 <span id="pocount-easy-counting"></span><h3>Easy counting<a class="headerlink" href="#easy-counting" title="Permalink to this headline">¶</a></h3>
 <p>To count how much work is to be done in you project:</p>
-<div class="highlight-python"><pre>pocount project/</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocount project/
+</pre></div>
 </div>
 <p>This will count all translatable files found in the directory <em>project</em>/ and
 output the results in <tt class="docutils literal"><span class="pre">--full</span></tt> format.</p>
 <p>You might want to be more specific and only count certain files:</p>
-<div class="highlight-python"><pre>pocount *.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocount *.po
+</pre></div>
 </div>
 <p>This will count all PO files in the current directory but will ignore any other
 files that ‘pocount’ can count.</p>
 <p>You can have full control of the files to count by using some of the abilities
 of the Unix commandline, these may work on Mac OS X but are unlikely to work on
 Windows.:</p>
-<div class="highlight-python"><pre>pocount $(find . -name "*.properties.po")</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocount $(find . -name "*.properties.po")
+</pre></div>
 </div>
 <p>This will first find all files that match <tt class="docutils literal"><span class="pre">*.properties.po</span></tt> and then count
 them.  That would make it easy to count the state of your Mozilla translations
@@ -208,7 +220,8 @@ of .properties files.</p>
 <span id="pocount-incomplete-work"></span><h3>Incomplete work<a class="headerlink" href="#incomplete-work" title="Permalink to this headline">¶</a></h3>
 <p>To count what still needs to be done, ignoring what is 100% complete you can
 use the <tt class="docutils literal"><span class="pre">--incomplete</span></tt> option.:</p>
-<div class="highlight-python"><pre>pocount --incomplete --short *.xlf</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocount --incomplete --short *.xlf
+</pre></div>
 </div>
 <p>We are now counting all XLIFF files by using the <tt class="docutils literal"><span class="pre">*.xlf</span></tt> expansion.  We are
 only counting files that are not 100% complete and we’re outputing string
@@ -223,12 +236,13 @@ counts using the <tt class="docutils literal"><span class="pre">--short</span></
 <p>This is the normal, or default, mode.  It produces the most comprehensive and
 easy to read data, although the amount of data may overwhelm the user. It
 produces the following output:</p>
-<div class="highlight-python"><pre>avmedia/source/viewer.po
+<div class="highlight-python"><div class="highlight"><pre>avmedia/source/viewer.po
 type              strings      words (source)    words (translation)
 translated:   73465 ( 99%)     538598 ( 99%)          513296
 fuzzy:           13 (  0%)        141 (  0%)             n/a
 untranslated:    53 (  0%)        602 (  0%)             n/a
-Total:        73531            539341                 513296</pre>
+Total:        73531            539341                 513296
+</pre></div>
 </div>
 <p>A grand total and file count is provided if the number of files is greater than
 one.</p>
@@ -237,8 +251,9 @@ one.</p>
 <span id="pocount-csv"></span><h3>–csv<a class="headerlink" href="#csv" title="Permalink to this headline">¶</a></h3>
 <p>This format is useful if you want to reuse the data in a spreadsheet.  In CSV
 mode the following output is shown:</p>
-<div class="highlight-python"><pre>Filename, Translated Messages, Translated Source Words, Translated Target Words, Fuzzy Messages, Fuzzy Source Words, Untranslated Messages, Untranslated Source Words, Review Messages, Review Source Words
-avmedia/source/viewer.po,  1, 3, 3, 0, 0, 4, 22, 1, 3</pre>
+<div class="highlight-python"><div class="highlight"><pre>Filename, Translated Messages, Translated Source Words, Translated Target Words, Fuzzy Messages, Fuzzy Source Words, Untranslated Messages, Untranslated Source Words, Review Messages, Review Source Words
+avmedia/source/viewer.po,  1, 3, 3, 0, 0, 4, 22, 1, 3
+</pre></div>
 </div>
 <p>Totals are not provided in CSV mode.</p>
 </div>
@@ -247,7 +262,8 @@ avmedia/source/viewer.po,  1, 3, 3, 0, 0, 4, 22, 1, 3</pre>
 <p>The focus is on easily accessible data in a compact form.  This will only count
 strings and uses a short syntax to make it easy for an experienced localiser to
 read.:</p>
-<div class="highlight-python"><pre>test-po/fuzzy.po strings: total: 1    | 0t    1f      0u      | 0%t   100%f   0%u</pre>
+<div class="highlight-python"><div class="highlight"><pre>test-po/fuzzy.po strings: total: 1    | 0t    1f      0u      | 0%t   100%f   0%u
+</pre></div>
 </div>
 <p>The filename is followed by a word indicating the type of count, here we are
 counting strings.  The total give the total string count.  While the letters t,
@@ -258,7 +274,8 @@ percentage representation of the same categories.</p>
 <div class="section" id="short-words">
 <span id="pocount-short-words"></span><h3>–short-words<a class="headerlink" href="#short-words" title="Permalink to this headline">¶</a></h3>
 <p>The output is very similar to <tt class="docutils literal"><span class="pre">--short-strings</span></tt> above:</p>
-<div class="highlight-python"><pre>test-po/fuzzy.po source words: total: 3       | 0t    3f      0u      | 0%t   100%f   0%u</pre>
+<div class="highlight-python"><div class="highlight"><pre>test-po/fuzzy.po source words: total: 3       | 0t    3f      0u      | 0%t   100%f   0%u
+</pre></div>
 </div>
 <p>But instead of counting string we are now counting words as indicated by the
 term ‘source words’</p>
@@ -289,7 +306,7 @@ processed.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/podebug.html b/docs/_build/html/commands/podebug.html
index 09b9621..696d54e 100644
--- a/docs/_build/html/commands/podebug.html
+++ b/docs/_build/html/commands/podebug.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>podebug — Translate Toolkit 1.9.0 documentation</title>
+    <title>podebug — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="–rewrite=STYLE" href="option_rewrite.html" />
     <link rel="prev" title="pocount" href="pocount.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -96,10 +98,11 @@
   <li><a href="option_rewrite.html"
          title="next chapter">–rewrite=STYLE »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -118,7 +121,7 @@
    
   <div class="section" id="podebug">
 <span id="id1"></span><h1>podebug<a class="headerlink" href="#podebug" title="Permalink to this headline">¶</a></h1>
-<p>Insert <a class="reference external" href="https://en.wikipedia.org/wiki/Pseudolocalization">pseudo translations</a> or debug markers into
+<p>Insert <a class="reference external" href="http://en.wikipedia.org/wiki/Pseudolocalization">pseudo translations</a> or debug markers into
 target text in XLIFF, Gettex PO and other localization files.</p>
 <p>The pseudo translation or debug markers make it easy to reference and locate
 strings when your translated application is running.</p>
@@ -136,7 +139,8 @@ correctly.</li>
 </ul>
 <div class="section" id="usage">
 <span id="podebug-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>podebug [options] <in> <out></pre>
+<div class="highlight-python"><div class="highlight"><pre>podebug [options] <in> <out>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -191,10 +195,6 @@ traceback</em></a></td></tr>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
 <tr><td class="option-group" colspan="2">
@@ -322,7 +322,7 @@ value.  Its is then easy to search for that value and find your problem string.<
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pofilter.html b/docs/_build/html/commands/pofilter.html
index 2b3f565..043ae0f 100644
--- a/docs/_build/html/commands/pofilter.html
+++ b/docs/_build/html/commands/pofilter.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pofilter — Translate Toolkit 1.9.0 documentation</title>
+    <title>pofilter — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="Descriptions of all pofilter tests" href="pofilter_tests.html" />
     <link rel="prev" title="poconflicts" href="poconflicts.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="pofilter_tests.html"
          title="next chapter">Descriptions of all pofilter tests »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -124,7 +127,8 @@ any of the checks are output and marked so that you can correct them.</p>
 corrections into your existing translated PO files using <a class="reference internal" href="pomerge.html"><em>pomerge</em></a>.</p>
 <div class="section" id="usage">
 <span id="pofilter-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pofilter [options] <in> <out></pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter [options] <in> <out>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -177,10 +181,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot, xlf, tmx formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-l</span>, <span class="option">--listfilters</span></kbd></td>
 </tr>
@@ -254,16 +254,19 @@ full, profile</em></a></td></tr>
 <div class="section" id="example">
 <span id="pofilter-example"></span><h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
 <p>Here are some examples to demonstrate how to use pofilter:</p>
-<div class="highlight-python"><pre>pofilter --openoffice af af-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter --openoffice af af-check
+</pre></div>
 </div>
 <p>Use the default settings (accelerator and variables) for OpenOffice.org.  Check
 all PO files in <em>af</em> and output any messages that fail the check in <em>af-check</em>
 (create the directory if it does not already exist).</p>
-<div class="highlight-python"><pre>pofilter -t isfuzzy -t untranslated zu zu-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter -t isfuzzy -t untranslated zu zu-check
+</pre></div>
 </div>
 <p>Only run the <em>isfuzzy</em> and <em>untranslated</em> checks, this will extract all
 messages that are either fuzzy or untranslated.</p>
-<div class="highlight-python"><pre>pofilter --excludefilter=simplecaps --nofuzzy nso nso-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter --excludefilter=simplecaps --nofuzzy nso nso-check
+</pre></div>
 </div>
 <p>Run all filters except <em>simplecaps</em>.  You might want to do this if your
 language does not make use of capitalisation or if the test is creating too
@@ -271,7 +274,8 @@ many false positives.  Also only run the checks against messages that are not
 marked fuzzy.  This is useful if you have already marked problem strings as
 fuzzy or you know that the fuzzy strings are bad, with this option you don’t
 have to see the obviously wrong messages.</p>
-<div class="highlight-python"><pre>pofilter --language=fr dir dir-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter --language=fr dir dir-check
+</pre></div>
 </div>
 <p>Tell pofilter that you are checking French translations so that it can take the
 conventions of the language into account (for things like punctuation, spacing,
@@ -306,7 +310,7 @@ cases or minor changes for better fault description.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pofilter_tests.html b/docs/_build/html/commands/pofilter_tests.html
index fa328d3..2751551 100644
--- a/docs/_build/html/commands/pofilter_tests.html
+++ b/docs/_build/html/commands/pofilter_tests.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Descriptions of all pofilter tests — Translate Toolkit 1.9.0 documentation</title>
+    <title>Descriptions of all pofilter tests — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pogrep" href="pogrep.html" />
     <link rel="prev" title="pofilter" href="pofilter.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -142,10 +144,11 @@
   <li><a href="pogrep.html"
          title="next chapter">pogrep »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -165,7 +168,7 @@
   <div class="section" id="descriptions-of-all-pofilter-tests">
 <span id="pofilter-tests"></span><span id="id1"></span><h1>Descriptions of all pofilter tests<a class="headerlink" href="#descriptions-of-all-pofilter-tests" title="Permalink to this headline">¶</a></h1>
 <p>The following are descriptions of the tests available in <a class="reference internal" href="pofilter.html"><em>pofilter</em></a>,
-<a class="reference external" href="http://pootle.readthedocs.org/en/latest/features/checks.html#checks" title="(in Pootle v2.5.0)"><em class="xref std std-ref">Pootle</em></a> and <em class="xref std std-ref">Virtaal</em> with some
+<a class="reference external" href="http://docs.translatehouse.org/projects/pootle/en/latest/features/checks.html#checks" title="(in Pootle v2.5.1)"><em class="xref std std-ref">Pootle</em></a> and <a class="reference external" href="http://docs.translatehouse.org/projects/virtaal/en/latest/checks.html#checks" title="(in Virtaal v0.7.1)"><em class="xref std std-ref">Virtaal</em></a> with some
 details about what type of errors they are useful to test for and the
 limitations of each test.</p>
 <p>Keep in mind that the software might point to errors which are not necessarily
@@ -192,7 +195,7 @@ the specifics of your language.</p>
 you determine which to run first.</p>
 <ul class="simple">
 <li>Critical – can break a program<ul>
-<li><a class="reference internal" href="#pofilter-tests-accelerators"><em>accelerators</em></a>, <a class="reference internal" href="#pofilter-tests-escapes"><em>escapes</em></a>,
+<li><a class="reference internal" href="#pofilter-tests-escapes"><em>escapes</em></a>,
 <a class="reference internal" href="#pofilter-tests-newlines"><em>newlines</em></a>, <a class="reference internal" href="#pofilter-tests-nplurals"><em>nplurals</em></a>,
 <a class="reference internal" href="#pofilter-tests-printf"><em>printf</em></a>, <a class="reference internal" href="#pofilter-tests-tabs"><em>tabs</em></a>,
 <a class="reference internal" href="#pofilter-tests-variables"><em>variables</em></a>, <a class="reference internal" href="#pofilter-tests-xmltags"><em>xmltags</em></a>,
@@ -200,7 +203,8 @@ you determine which to run first.</p>
 </ul>
 </li>
 <li>Functional – may confuse the user<ul>
-<li><a class="reference internal" href="#pofilter-tests-acronyms"><em>acronyms</em></a>, <a class="reference internal" href="#pofilter-tests-blank"><em>blank</em></a>,
+<li><a class="reference internal" href="#pofilter-tests-accelerators"><em>accelerators</em></a>,
+<a class="reference internal" href="#pofilter-tests-acronyms"><em>acronyms</em></a>, <a class="reference internal" href="#pofilter-tests-blank"><em>blank</em></a>,
 <a class="reference internal" href="#pofilter-tests-emails"><em>emails</em></a>, <a class="reference internal" href="#pofilter-tests-filepaths"><em>filepaths</em></a>,
 <a class="reference internal" href="#pofilter-tests-functions"><em>functions</em></a>, <a class="reference internal" href="#pofilter-tests-gconf"><em>gconf</em></a>,
 <a class="reference internal" href="#pofilter-tests-kdecomments"><em>kdecomments</em></a>, <a class="reference internal" href="#pofilter-tests-long"><em>long</em></a>,
@@ -234,8 +238,8 @@ you determine which to run first.</p>
 <span id="id4"></span><h2>Test Description<a class="headerlink" href="#test-description" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="accelerators">
 <span id="pofilter-tests-accelerators"></span><h3>accelerators<a class="headerlink" href="#accelerators" title="Permalink to this headline">¶</a></h3>
-<p>Checks whether <tt class="xref doc docutils literal"><span class="pre">guide/translation/accelerators</span></tt> are consistent between the
-two strings.</p>
+<p>Checks whether <a class="reference external" href="http://docs.translatehouse.org/projects/localization-guide/en/latest/guide/translation/accelerators.html#accelerators" title="(in Localization Guide v0.9.0)"><em class="xref std std-ref">accelerators</em></a> are consistent between
+the two strings.</p>
 <p>Make sure you use the <tt class="docutils literal"><span class="pre">--mozilla</span></tt>, <tt class="docutils literal"><span class="pre">--kde</span></tt>, etc options so that
 pofilter knows which type of accelerator it is looking for.  The test will pick
 up accelerators that are missing and ones that shouldn’t be there.</p>
@@ -259,13 +263,13 @@ appear to most tools as if it is translated.</p>
 <div class="section" id="brackets">
 <span id="pofilter-tests-brackets"></span><h3>brackets<a class="headerlink" href="#brackets" title="Permalink to this headline">¶</a></h3>
 <p>Checks that the number of brackets in both strings match.</p>
-<p>If ([{ or }]) appear in the original this will check that the same number
-appear in the translation.</p>
+<p>If <tt class="docutils literal"><span class="pre">([{</span></tt> or <tt class="docutils literal"><span class="pre">}])</span></tt> appear in the original this will check that the same
+number appear in the translation.</p>
 </div>
 <div class="section" id="compendiumconflicts">
 <span id="pofilter-tests-compendiumconflicts"></span><h3>compendiumconflicts<a class="headerlink" href="#compendiumconflicts" title="Permalink to this headline">¶</a></h3>
-<p>Checks for Gettext compendium conflicts (#-#-#-#-#).</p>
-<p>When you use msgcat to create a PO compendium it will insert #-#-#-#-# into
+<p>Checks for Gettext compendium conflicts (<tt class="docutils literal"><span class="pre">#-#-#-#-#</span></tt>).</p>
+<p>When you use msgcat to create a PO compendium it will insert <tt class="docutils literal"><span class="pre">#-#-#-#-#</span></tt> into
 entries that are not consistent.  If the compendium is used later in a message
 merge then these conflicts will appear in your translations.  This test quickly
 extracts those for correction.</p>
@@ -295,9 +299,10 @@ other types of errors in these units.</p>
 <div class="section" id="doublequoting">
 <span id="pofilter-tests-doublequoting"></span><h3>doublequoting<a class="headerlink" href="#doublequoting" title="Permalink to this headline">¶</a></h3>
 <p>Checks whether doublequoting is consistent between the two strings.</p>
-<p>Checks on double quotes ” to ensure that you have the same number in both the
-original and the translated string. This tests takes into account that several
-languages use different quoting characters, and will test for them instead.</p>
+<p>Checks on double quotes <tt class="docutils literal"><span class="pre">"</span></tt> to ensure that you have the same number in both
+the original and the translated string. This tests takes into account that
+several languages use different quoting characters, and will test for them
+instead.</p>
 </div>
 <div class="section" id="doublespacing">
 <span id="pofilter-tests-doublespacing"></span><h3>doublespacing<a class="headerlink" href="#doublespacing" title="Permalink to this headline">¶</a></h3>
@@ -482,9 +487,9 @@ etc. Generally they will look like this: <tt class="docutils literal"><span clas
 test can also manage variables-reordering using the <tt class="docutils literal"><span class="pre">%1$s</span></tt> syntax.  The
 variables’ type and details following data are tested to ensure that they are
 strictly identical, but they may be reordered.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
-<p class="last"><a class="reference external" href="https://en.wikipedia.org/wiki/Printf_format_string">printf Format String</a></p>
+<p class="last"><a class="reference external" href="http://en.wikipedia.org/wiki/Printf_format_string">printf Format String</a></p>
 </div>
 </div>
 <div class="section" id="puncspacing">
@@ -535,22 +540,22 @@ Title Case, or change them all to normal sentence case.</p>
 <p>Checks for English style plural(s) for you to review.</p>
 <p>This test will extract any message that contains words with a final “(s)” in
 the source text.  You can then inspect the message, to check that the correct
-<a class="reference external" href="http://qooxdoo.org/l10n/pluralforms">plural form</a> has been used for your
-language.  In some languages, plurals are made by adding text at the beginning
-of words, making the English style messy.  In this case, they often revert to
-the plural form.  This test allows an editor to check that the plurals used are
-correct.  Be aware that this test may create a number of false positives.</p>
+plural form has been used for your language.  In some languages, plurals are
+made by adding text at the beginning of words, making the English style messy.
+In this case, they often revert to the plural form.  This test allows an editor
+to check that the plurals used are correct.  Be aware that this test may create
+a number of false positives.</p>
 <p>For languages with no plural forms (only one noun form) this test will simply
 test that nothing like “(s)” was used in the translation.</p>
 </div>
 <div class="section" id="singlequoting">
 <span id="pofilter-tests-singlequoting"></span><h3>singlequoting<a class="headerlink" href="#singlequoting" title="Permalink to this headline">¶</a></h3>
 <p>Checks whether singlequoting is consistent between the two strings.</p>
-<p>The same as doublequoting but checks for the ‘ character.  Because this is used
-in contractions like it’s and in possessive forms like user’s, this test can
-output spurious errors if your language doesn’t use such forms.  If a quote
-appears at the end of a sentence in the translation, i.e. ‘[full-stop], this
-might not be detected properly by the check.</p>
+<p>The same as doublequoting but checks for the <tt class="docutils literal"><span class="pre">'</span></tt> character.  Because this is
+used in contractions like it’s and in possessive forms like user’s, this test
+can output spurious errors if your language doesn’t use such forms.  If a quote
+appears at the end of a sentence in the translation, i.e. <tt class="docutils literal"><span class="pre">'.</span></tt>, this might
+not be detected properly by the check.</p>
 </div>
 <div class="section" id="spellcheck">
 <span id="pofilter-tests-spellcheck"></span><h3>spellcheck<a class="headerlink" href="#spellcheck" title="Permalink to this headline">¶</a></h3>
@@ -560,10 +565,11 @@ checks for misspelled words in the original (usually English) text, and adds
 those to an exclusion list. The advantage of this exclusion is that many words
 that are specific to the application will not raise errors e.g. program names,
 brand names, function names.</p>
-<p>The checker works with <a class="reference external" href="http://pyenchant.sourceforge.net/">PyEnchant</a>. You
+<p>The checker works with <a class="reference external" href="http://pythonhosted.org/pyenchant/">PyEnchant</a>. You
 need to have PyEnchant installed as well as a dictionary for your language (for
-example, one of the <a class="reference external" href="http://wiki.services.openoffice.org/wiki/Dictionaries">Hunspell</a> or <a class="reference external" href="http://ftp.gnu.org/gnu/aspell/dict/">aspell</a> dictionaries).  This test will only
-work if you have specified the <tt class="docutils literal"><span class="pre">--language</span></tt> option.</p>
+example, one of the <a class="reference external" href="https://wiki.openoffice.org/wiki/Dictionaries">Hunspell</a>
+or <a class="reference external" href="http://ftp.gnu.org/gnu/aspell/dict/">aspell</a> dictionaries).  This test
+will only work if you have specified the <tt class="docutils literal"><span class="pre">--language</span></tt> option.</p>
 <p>The pofilter error that is created, lists the misspelled word, plus
 suggestions returned from the spell checker.  That makes it easy for you to
 identify the word and select a replacement.</p>
@@ -640,7 +646,7 @@ files.</p>
 </div>
 <div class="section" id="xmltags">
 <span id="pofilter-tests-xmltags"></span><h3>xmltags<a class="headerlink" href="#xmltags" title="Permalink to this headline">¶</a></h3>
-<p>Checks that <tt class="xref doc docutils literal"><span class="pre">XML/HTML</span></tt> tags have not been
+<p>Checks that <a class="reference external" href="http://translate.sourceforge.net/wiki/guide/translation/html">XML/HTML</a> tags have not been
 translated.</p>
 <p>This check finds the number of tags in the source string and checks that the
 same number are in the translation.  If the counts don’t match then either the
@@ -667,7 +673,7 @@ description”> or similar translatable attributes in OpenOffice.org help
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pogrep.html b/docs/_build/html/commands/pogrep.html
index 3bf143b..4040c16 100644
--- a/docs/_build/html/commands/pogrep.html
+++ b/docs/_build/html/commands/pogrep.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pogrep — Translate Toolkit 1.9.0 documentation</title>
+    <title>pogrep — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pomerge" href="pomerge.html" />
     <link rel="prev" title="Descriptions of all pofilter tests" href="pofilter_tests.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -97,10 +99,11 @@
   <li><a href="pomerge.html"
          title="next chapter">pomerge »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -124,7 +127,8 @@ set of PO files that can be examined, edited and corrected.  These corrections
 can then be merged using <a class="reference internal" href="pomerge.html"><em>pomerge</em></a>.</p>
 <div class="section" id="usage">
 <span id="pogrep-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pogrep [options] <in> <out></pre>
+<div class="highlight-python"><div class="highlight"><pre>pogrep [options] <in> <out>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -175,10 +179,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot, xlf formats (XLIFF since version 1.0)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">--search=<var>SEARCHPARTS</var></span></kbd></td>
 </tr>
@@ -198,12 +198,17 @@ full, profile</em></a></td></tr>
 <kbd><span class="option">--accelerator=<var>ACCELERATORS</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>ignores the given <a class="reference internal" href="option_accelerator.html"><em>accelerator characters</em></a> when matching</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-k</span>, <span class="option">--keep-translations</span></kbd></td>
+</tr>
+<tr><td> </td><td>always extract units with translations</td></tr>
 </tbody>
 </table>
 </div>
 <div class="section" id="example">
 <span id="pogrep-example"></span><h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pogrep --accelerator="_" --search msgid -I -e "software|hardware" only-zu only-zu-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pogrep --accelerator="_" --search msgid -I -e "software|hardware" only-zu only-zu-check
+</pre></div>
 </div>
 <p>Search for the words “software” or “hardware” in the msgid field.  Ignore case
 (<tt class="docutils literal"><span class="pre">-I</span></tt>) and treat the underscore (_) character as an accelerator key.
@@ -211,12 +216,14 @@ Search through all PO files in the directory “only-zu” and place any
 PO files in the directory “only-zu-check”.  This would be useful to run if you
 know that the word for software and hardware has been changed during the course
 of translation and you want to check and correct all these instances.</p>
-<div class="highlight-python"><pre>pogrep --search=msgid -e '^\w+(\s+\w+){0,3}$' -i templates -o short-words</pre>
+<div class="highlight-python"><div class="highlight"><pre>pogrep --search=msgid -e '^\w+(\s+\w+){0,3}$' -i templates -o short-words
+</pre></div>
 </div>
 <p>Find all messages in the <em>templates</em> directory that have between 1 and 4 words
 and place them in <em>short-words</em>.  Use this if you want to see quick results by
 translating messages that are most likely menu entries or dialogue labels.</p>
-<div class="highlight-python"><pre>pogrep --search=msgstr -I -e "Ifayile" zu zu-check</pre>
+<div class="highlight-python"><div class="highlight"><pre>pogrep --search=msgstr -I -e "Ifayile" zu zu-check
+</pre></div>
 </div>
 <p>Search all translations for the occurrence of <em>Ifayile</em>.  You would use this to
 check if words have been used correctly.  Useful if you find problematic use of
@@ -254,7 +261,7 @@ localisation of GNOME:
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pomerge.html b/docs/_build/html/commands/pomerge.html
index ce90f72..aee95aa 100644
--- a/docs/_build/html/commands/pomerge.html
+++ b/docs/_build/html/commands/pomerge.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pomerge — Translate Toolkit 1.9.0 documentation</title>
+    <title>pomerge — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="porestructure" href="porestructure.html" />
     <link rel="prev" title="pogrep" href="pogrep.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="porestructure.html"
          title="next chapter">porestructure »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -127,7 +130,8 @@ control system so that you can monitor what changes were made.</p>
 making it easier to see the changes using your version control system.</p>
 <div class="section" id="usage">
 <span id="pomerge-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pomerge [options] [-t <template>] -i <input> -o <output></pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge [options] [-t <template>] -i <input> -o <output>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -189,10 +193,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in po, pot, xlf, tmx formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">--mergeblanks=<var>MERGEBLANKS</var></span></kbd></td>
 </tr>
@@ -211,14 +211,16 @@ full, profile</em></a></td></tr>
 <div class="section" id="examples">
 <span id="pomerge-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>These examples show pomerge in action.</p>
-<div class="highlight-python"><pre>pomerge -t af -i af-check -o af</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t af -i af-check -o af
+</pre></div>
 </div>
 <p>Take corrections from <em>af-check</em> merge them with the templates in <em>af</em> and
 output into <em>af</em>.  Thus merge af-check and override entries found in <em>af</em>.  Do
 this only if you are using a version control system so that you can check
 what changes pomerge made or if you have complete and utter confidence in this
 tool.</p>
-<div class="highlight-python"><pre>pomerge --mergeblanks=yes -t af -i af-check -o af-new</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge --mergeblanks=yes -t af -i af-check -o af-new
+</pre></div>
 </div>
 <p>Merge the corrections from <em>af-check</em> with templates in <em>af</em> and output to
 <em>af-new</em>.  If an entry is blank in <em>af-check</em> then make it blank in the output
@@ -251,7 +253,7 @@ the files of the input still present.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pomigrate2.html b/docs/_build/html/commands/pomigrate2.html
index d4e16a5..0b59957 100644
--- a/docs/_build/html/commands/pomigrate2.html
+++ b/docs/_build/html/commands/pomigrate2.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pomigrate2 — Translate Toolkit 1.9.0 documentation</title>
+    <title>pomigrate2 — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="popuretext" href="popuretext.html" />
     <link rel="prev" title="pocommentclean" href="pocommentclean.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="popuretext.html"
          title="next chapter">popuretext »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -130,7 +133,8 @@ but divergent products e.g.  Mozilla to Firefox.</p>
 </div>
 <div class="section" id="usage">
 <span id="pomigrate2-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pomigrate [options] <from> <to> <new templates></pre>
+<div class="highlight-python"><div class="highlight"><pre>pomigrate [options] <from> <to> <new templates>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -212,7 +216,7 @@ by using <tt class="docutils literal"><span class="pre">--use-compendium</span><
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/popuretext.html b/docs/_build/html/commands/popuretext.html
index f18d0f6..682c689 100644
--- a/docs/_build/html/commands/popuretext.html
+++ b/docs/_build/html/commands/popuretext.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>popuretext — Translate Toolkit 1.9.0 documentation</title>
+    <title>popuretext — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="poreencode" href="poreencode.html" />
     <link rel="prev" title="pomigrate2" href="pomigrate2.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="poreencode.html"
          title="next chapter">poreencode »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -131,7 +134,8 @@ source text.</p>
 </div>
 <div class="section" id="usage">
 <span id="popuretext-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>popuretext <-P pot-dir|po-dir> <file.txt> [accelerator]</pre>
+<div class="highlight-python"><div class="highlight"><pre>popuretext <-P pot-dir|po-dir> <file.txt> [accelerator]
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -157,11 +161,13 @@ source text.</p>
 </div>
 <div class="section" id="examples">
 <span id="popuretext-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>popuretext -P pot pot.txt '&'</pre>
+<div class="highlight-python"><div class="highlight"><pre>popuretext -P pot pot.txt '&'
+</pre></div>
 </div>
 <p>Extract all the source text from the <em>pot</em> directory and place it in the
 <em>pot.txt</em> file removing all occurrences of the <tt class="docutils literal"><span class="pre">&</span></tt> accelerator.</p>
-<div class="highlight-python"><pre>popuretext af af.txt</pre>
+<div class="highlight-python"><div class="highlight"><pre>popuretext af af.txt
+</pre></div>
 </div>
 <p>Extract all target text from the Afrikaans files in the <em>af</em> directory, placing
 the extracted text in <em>af.txt</em>.  In this case we are not filtering any
@@ -181,7 +187,7 @@ accelerator characters.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/poreencode.html b/docs/_build/html/commands/poreencode.html
index e0f7417..ff130db 100644
--- a/docs/_build/html/commands/poreencode.html
+++ b/docs/_build/html/commands/poreencode.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>poreencode — Translate Toolkit 1.9.0 documentation</title>
+    <title>poreencode — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="posplit" href="posplit.html" />
     <link rel="prev" title="popuretext" href="popuretext.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="posplit.html"
          title="next chapter">posplit »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -123,7 +126,8 @@
 </div>
 <div class="section" id="usage">
 <span id="poreencode-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>poreencode <encoding> <PO directory></pre>
+<div class="highlight-python"><div class="highlight"><pre>poreencode <encoding> <PO directory>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -170,7 +174,7 @@ placed in the place Gettext expects them).</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/porestructure.html b/docs/_build/html/commands/porestructure.html
index 7ac42b6..be40ace 100644
--- a/docs/_build/html/commands/porestructure.html
+++ b/docs/_build/html/commands/porestructure.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>porestructure — Translate Toolkit 1.9.0 documentation</title>
+    <title>porestructure — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="junitmsgfmt" href="junitmsgfmt.html" />
     <link rel="prev" title="pomerge" href="pomerge.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="junitmsgfmt.html"
          title="next chapter">junitmsgfmt »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -125,7 +128,8 @@ and the new PO files are output to a single directory. The original structure
 information is left in “(pofilter)” comments for each PO element.</p>
 <div class="section" id="usage">
 <span id="porestructure-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>porestructure [options] <conflicts> <po></pre>
+<div class="highlight-python"><div class="highlight"><pre>porestructure [options] <conflicts> <po>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -178,10 +182,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 </tbody>
 </table>
 </div>
@@ -204,7 +204,7 @@ complete process using poconflict, porestructure, and pomerge.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/posegment.html b/docs/_build/html/commands/posegment.html
index 610647d..f57c387 100644
--- a/docs/_build/html/commands/posegment.html
+++ b/docs/_build/html/commands/posegment.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>posegment — Translate Toolkit 1.9.0 documentation</title>
+    <title>posegment — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pocompile" href="pocompile.html" />
     <link rel="prev" title="–rewrite=STYLE" href="option_rewrite.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="pocompile.html"
          title="next chapter">pocompile »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -127,7 +130,8 @@ For the purpose of increasing your TM (as described below), it is already very
 useful. Give it a try and help us to improve it even more for your language.</p>
 <div class="section" id="usage">
 <span id="posegment-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>posegment [options] <input> <segmented></pre>
+<div class="highlight-python"><div class="highlight"><pre>posegment [options] <input> <segmented>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -180,10 +184,6 @@ traceback</em></a></td></tr>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
 <tr><td class="option-group" colspan="2">
@@ -208,13 +208,15 @@ correspond</td></tr>
 <span id="posegment-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>You want to reuse all of your Pidgin translations in another Instant
 Messenger:</p>
-<div class="highlight-python"><pre>posegment pidgin-af.po pidgin-af-segmented.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>posegment pidgin-af.po pidgin-af-segmented.po
+</pre></div>
 </div>
 <p>Now all of our Pidgin translation are available, segmented at a sentence level,
 to be used as a Translation Memory for our other translation work.</p>
 <p>You can do the same at a project level.  Here we want to segment all of our
 OpenOffice.org translation work, a few hundred files:</p>
-<div class="highlight-python"><pre>posegment af/ af-segmented/</pre>
+<div class="highlight-python"><div class="highlight"><pre>posegment af/ af-segmented/
+</pre></div>
 </div>
 <p>We start with all our files in <tt class="docutils literal"><span class="pre">af</span></tt> which are now duplicated in
 <tt class="docutils literal"><span class="pre">af-segmented</span></tt> except files are now fully segmented.</p>
@@ -247,7 +249,7 @@ joined together to recreate a file.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/posplit.html b/docs/_build/html/commands/posplit.html
index 212de44..aa03c46 100644
--- a/docs/_build/html/commands/posplit.html
+++ b/docs/_build/html/commands/posplit.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>posplit — Translate Toolkit 1.9.0 documentation</title>
+    <title>posplit — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="Use Cases" href="../guides/index.html" />
     <link rel="prev" title="poreencode" href="poreencode.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="../guides/index.html"
          title="next chapter">Use Cases »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -126,7 +129,8 @@ generated output files can be combined again with msgcat.</p>
 </div>
 <div class="section" id="usage">
 <span id="posplit-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>posplit ./file.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>posplit ./file.po
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -162,7 +166,7 @@ generated output files can be combined again with msgcat.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/poswap.html b/docs/_build/html/commands/poswap.html
index ec58eca..d431e91 100644
--- a/docs/_build/html/commands/poswap.html
+++ b/docs/_build/html/commands/poswap.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>poswap — Translate Toolkit 1.9.0 documentation</title>
+    <title>poswap — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="poclean" href="poclean.html" />
     <link rel="prev" title="pocompile" href="pocompile.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="poclean.html"
          title="next chapter">poclean »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -125,7 +128,8 @@ requirement for this tool is a French translation.</p>
 of source text into a format usable by human localisers.</p>
 <div class="section" id="usage">
 <span id="poswap-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>poswap [options] <newsource> [-t current] <new></pre>
+<div class="highlight-python"><div class="highlight"><pre>poswap [options] <newsource> [-t current] <new>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -187,10 +191,6 @@ traceback</em></a></td></tr>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in po, pot formats</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">--reverse</span></kbd></td>
 <td>Do the inverse operation (converting back to a normal English based file). See the examples.</td></tr>
 </tbody>
@@ -201,20 +201,24 @@ full, profile</em></a></td></tr>
 <p>Ensure that the two po files / directories correspond 100% to the same pot file
 before using this.</p>
 <p>To start a fresh Afrikaans (af) translation from Dutch (nl):</p>
-<div class="highlight-python"><pre>poswap nl.po nl-af.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>poswap nl.po nl-af.po
+</pre></div>
 </div>
 <p>This initialises a new, empty file nl-af.po with Dutch as the source language.</p>
 <p>To change the nl-af.po file back to the expected English based af.po:</p>
-<div class="highlight-python"><pre>poswap --reverse nl.po -t nl-af.po af.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>poswap --reverse nl.po -t nl-af.po af.po
+</pre></div>
 </div>
 <p>To translate Kurdish (ku) through French (fr):</p>
-<div class="highlight-python"><pre>poswap -i fr/ -t ku/ -o fr-ku/</pre>
+<div class="highlight-python"><div class="highlight"><pre>poswap -i fr/ -t ku/ -o fr-ku/
+</pre></div>
 </div>
 <p>This will take the existing (English based) Kurdish translation in ku/ and
 produce files in fr-ku with French as the source language and Kurdish as the
 target language.</p>
 <p>To convert the fr-ku files back to en-ku:</p>
-<div class="highlight-python"><pre>poswap --reverse -i fr/ -t fr-ku/ -o en-ku/</pre>
+<div class="highlight-python"><div class="highlight"><pre>poswap --reverse -i fr/ -t fr-ku/ -o en-ku/
+</pre></div>
 </div>
 <p>This recreates the English based Kurdish translation from the French based
 files previously created in fr-ku/.</p>
@@ -242,7 +246,7 @@ over the lifetime of a changing French translation.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pot2po.html b/docs/_build/html/commands/pot2po.html
index 5c5618f..b328e69 100644
--- a/docs/_build/html/commands/pot2po.html
+++ b/docs/_build/html/commands/pot2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pot2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>pot2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="csv2po" href="csv2po.html" />
     <link rel="prev" title="po2tmx" href="po2tmx.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="csv2po.html"
          title="next chapter">csv2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -123,7 +126,8 @@ used for fuzzy matching. This corresponds to a large extent with the program
 “msgmerge” from the gettext package.</p>
 <div class="section" id="usage">
 <span id="pot2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pot2po [options] <pot> <po></pre>
+<div class="highlight-python"><div class="highlight"><pre>pot2po [options] <pot> <po>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -179,10 +183,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in po, pot formats (old translations)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -202,7 +206,8 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="examples">
 <span id="pot2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pot2po -t zu-1.0.1 pot-2.0.2 zu-2.0.2</pre>
+<div class="highlight-python"><div class="highlight"><pre>pot2po -t zu-1.0.1 pot-2.0.2 zu-2.0.2
+</pre></div>
 </div>
 <p>Here we are initialising the PO files in <em>zu-2.0.2</em> based on the POT files in
 <em>pot-2.0.2</em>.  We are using the old translations in <em>zu-1.0.1</em> as templates so
@@ -211,7 +216,8 @@ that we can reuse our existing translations in the new files.</p>
 <a class="reference internal" href="pomigrate2.html"><em>pomigrate2</em></a> which can now use pot2po as its merging backend.  pomigrate2
 will do its best to migrate your files to the correct locations before merging.
 It will also make make use of a compendium if requested.:</p>
-<div class="highlight-python"><pre>pot2po --tm=compendium.po --similarity=60 -t xh-old pot xh-new</pre>
+<div class="highlight-python"><div class="highlight"><pre>pot2po --tm=compendium.po --similarity=60 -t xh-old pot xh-new
+</pre></div>
 </div>
 <p>With this update we are using <em>compendium.po</em> as a translations memory (you can
 make use of other files such as TMX, etc).  We will accept any match that
@@ -234,11 +240,9 @@ algorithm to detect the best matches</li>
 <div class="section" id="performance">
 <span id="pot2po-performance"></span><h2>Performance<a class="headerlink" href="#performance" title="Permalink to this headline">¶</a></h2>
 <p>Fuzzy matches are usually of good quality. Installation of the
-<a class="reference external" href="https://sourceforge.net/project/showfiles.php?group_id=91920&package_id=260161">python-Levenshtein</a>
-package will speed up fuzzy matching. Without this a Python based matcher is
-used which is considerably slower.</p>
-<p>Install psyco for additional speedup (it is used by most toolkit tools if it is
-installed.)</p>
+<a class="reference external" href="https://pypi.python.org/pypi/python-Levenshtein">python-Levenshtein</a> package
+will speed up fuzzy matching. Without this a Python based matcher is used which
+is considerably slower.</p>
 </div>
 <div class="section" id="bugs">
 <span id="pot2po-bugs"></span><h2>Bugs<a class="headerlink" href="#bugs" title="Permalink to this headline">¶</a></h2>
@@ -260,7 +264,7 @@ installed.)</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/poterminology.html b/docs/_build/html/commands/poterminology.html
index e63272e..fc09b75 100644
--- a/docs/_build/html/commands/poterminology.html
+++ b/docs/_build/html/commands/poterminology.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>poterminology — Translate Toolkit 1.9.0 documentation</title>
+    <title>poterminology — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="Stopword file format" href="poterminology_stopword_file.html" />
     <link rel="prev" title="tmserver" href="tmserver.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -104,10 +106,11 @@
   <li><a href="poterminology_stopword_file.html"
          title="next chapter">Stopword file format »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -139,7 +142,8 @@ results will be, but poterminology can be used with just a single input file.</p
 <p>Read more about <a class="reference external" href="http://en.wikipedia.org/wiki/Terminology_extraction">terminology extraction</a></p>
 <div class="section" id="usage">
 <span id="poterminology-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>poterminology [options] <input> <terminology></pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology [options] <input> <terminology>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -195,10 +199,6 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-u <var>UPDATEFILE</var></span>, <span class="option">--update=<var>UPDATEFILE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>update terminology in UPDATEFILE</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-S <var>STOPFILE</var></span>, <span class="option">--stopword-list=<var>STOPFILE</var></span></kbd></td>
 </tr>
@@ -256,18 +256,20 @@ full, profile</em></a></td></tr>
 <span id="poterminology-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>You want to generate a terminology file for Pootle that will be used to provide
 suggestions for translating Pootle itself:</p>
-<div class="highlight-python"><pre>poterminology Pootle/po/pootle/templates/*.pot .</pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology Pootle/po/pootle/templates/*.pot .
+</pre></div>
 </div>
 <p>This results in a <tt class="docutils literal"><span class="pre">./pootle-terminology.pot</span></tt> output file with 23 terms (from
 “file” to “does not exist”) – without any translations.</p>
 <p>The default output file can be added to a Pootle project to provide
-<a class="reference external" href="http://pootle.readthedocs.org/en/latest/features/terminology.html#terminology" title="(in Pootle v2.5.0)"><em class="xref std std-ref">terminology matching</em></a> suggestions for that project;
+<a class="reference external" href="http://docs.translatehouse.org/projects/pootle/en/latest/features/terminology.html#terminology" title="(in Pootle v2.5.1)"><em class="xref std std-ref">terminology matching</em></a> suggestions for that project;
 alternately a special Terminology project can be used and it will provide
 terminology suggestions for all projects that do not have a
 pootle-terminology.po file.</p>
 <p>Generating a terminology file containing automatically extracted translations
 is possible as well, by using PO files with translations for the input files:</p>
-<div class="highlight-python"><pre>poterminology Pootle/po/pootle/fi/*.po --output fi/pootle-terminology.po --sort dictionary</pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology Pootle/po/pootle/fi/*.po --output fi/pootle-terminology.po --sort dictionary
+</pre></div>
 </div>
 <p>Using PO files with Finnish translations, you get an output file that contains
 the same 23 terms, with translations of eight terms – one (“login”) is fuzzy
@@ -279,8 +281,9 @@ Gnome UI terminology PO file as a source for translations; in order to extract
 only the terms common to jToolkit and Pootle this command includes the POT
 output from the first step above (which is redundant) and require terms to
 appear in three different input sources:</p>
-<div class="highlight-python"><pre>poterminology Pootle/po/pootle/templates/*.pot pootle-terminology.pot \
-  Pootle/po/terminology/rw/gnome/rw.po --inputs-needed=3 -o terminology/rw.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology Pootle/po/pootle/templates/*.pot pootle-terminology.pot \
+  Pootle/po/terminology/rw/gnome/rw.po --inputs-needed=3 -o terminology/rw.po
+</pre></div>
 </div>
 <p>Of the 23 terms, 16 have Kinyarwanda translations extracted from the Gnome UI
 terminology.</p>
@@ -289,9 +292,10 @@ terminology available, 18 translations (2 fuzzy) are generated by the following
 command, which initializes the terminology file from the POT output from the
 first step, and then uses <tt class="docutils literal"><span class="pre">--update</span></tt> to specify that the pootle-es.po file
 is to be used both for input and output:</p>
-<div class="highlight-python"><pre>cp pootle-terminology.pot glossary-es.po
+<div class="highlight-python"><div class="highlight"><pre>cp pootle-terminology.pot glossary-es.po
 poterminology --inputs=3 --update glossary-es.po \
-  Pootle/po/pootle/es/*.po Pootle/po/terminology/es/gnome/es.po</pre>
+  Pootle/po/pootle/es/*.po Pootle/po/terminology/es/gnome/es.po
+</pre></div>
 </div>
 <div class="section" id="reduced-terminology-glossaries">
 <span id="poterminology-reduced-terminology-glossaries"></span><h3>Reduced terminology glossaries<a class="headerlink" href="#reduced-terminology-glossaries" title="Permalink to this headline">¶</a></h3>
@@ -304,11 +308,12 @@ the phrase size from the default value of 3 can be helpful.</p>
 phrase size can take quite some time and may not even complete on a
 small-memory system, but with <tt class="docutils literal"><span class="pre">--term-words=1</span></tt> the initial number of terms
 is reduced by half, and the thresholding process can complete:</p>
-<div class="highlight-python"><pre>poterminology --progress=none -t 1 translate
+<div class="highlight-python"><div class="highlight"><pre>poterminology --progress=none -t 1 translate
 
 1297 terms from 64039 units in 216 files
 254 terms after thresholding
-254 terms after subphrase reduction</pre>
+254 terms after subphrase reduction
+</pre></div>
 </div>
 <p>The first line of output indicates the number of input files and translation
 units (messages), with the number of unique terms present after removing C and
@@ -399,12 +404,14 @@ operation of these files.</p>
 <p>If you want to completely replace the stopword list (for example, if your
 source language is French rather than English) you could do it with a command
 like this:</p>
-<div class="highlight-python"><pre>poterminology --stopword-list=stoplist-fr logiciel/ -o glossaire.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology --stopword-list=stoplist-fr logiciel/ -o glossaire.po
+</pre></div>
 </div>
 <p>If you merely want to modify the standard stopword list with your own additions
 and overrides, you must explicitly specify the default list first:</p>
-<div class="highlight-python"><pre>poterminology -S /usr/lib/python2.5/site-packages/translate/share/stoplist-en \
-  -S my-stoplist po/ -o terminology.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology -S /usr/lib/python2.5/site-packages/translate/share/stoplist-en \
+  -S my-stoplist po/ -o terminology.po
+</pre></div>
 </div>
 <p>You can use poterminology <tt class="docutils literal"><span class="pre">--help</span></tt> to see the default stopword list
 pathname, which may differ from the one shown above.</p>
@@ -465,7 +472,8 @@ languages that have variant translations.</p>
 <div class="section" id="on-single-files">
 <span id="poterminology-on-single-files"></span><h2>On single files<a class="headerlink" href="#on-single-files" title="Permalink to this headline">¶</a></h2>
 <p>If poterminology yields 0 terms from single files, try the following:</p>
-<div class="highlight-python"><pre>poterminology --locs-needed=0 --inputs-needed=0 --substr-needed=5 -i yourfile.po -o yourfile_term.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology --locs-needed=0 --inputs-needed=0 --substr-needed=5 -i yourfile.po -o yourfile_term.po
+</pre></div>
 </div>
 <p>...where “substr-needed” is the number of times a term should occur to be
 considered.</p>
@@ -484,7 +492,7 @@ considered.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/poterminology_stopword_file.html b/docs/_build/html/commands/poterminology_stopword_file.html
index 84a916c..76f6719 100644
--- a/docs/_build/html/commands/poterminology_stopword_file.html
+++ b/docs/_build/html/commands/poterminology_stopword_file.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Stopword file format — Translate Toolkit 1.9.0 documentation</title>
+    <title>Stopword file format — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="pocount" href="pocount.html" />
     <link rel="prev" title="poterminology" href="poterminology.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -97,10 +99,11 @@
   <li><a href="pocount.html"
          title="next chapter">pocount »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -119,13 +122,15 @@
    
   <div class="section" id="stopword-file-format">
 <span id="poterminology-stopword-file"></span><h1>Stopword file format<a class="headerlink" href="#stopword-file-format" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.2.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.2.</span></p>
+</div>
 <p>The default stopword file for <a class="reference internal" href="poterminology.html"><em>poterminology</em></a> describes the syntax of
 these files and provides a good default for most applications using English
 source text.  You can find the location of the default stopword file by looking
 at the output of poterminology <tt class="docutils literal"><span class="pre">--help</span></tt>, or using the following command:</p>
-<div class="highlight-python"><pre>poterminology --manpage | sed -n '/STOPFILE/s/.*(\(.*\)).*/\1/p'</pre>
+<div class="highlight-python"><div class="highlight"><pre>poterminology --manpage | sed -n '/STOPFILE/s/.*(\(.*\)).*/\1/p'
+</pre></div>
 </div>
 <div class="section" id="overview">
 <span id="poterminology-stopword-file-overview"></span><h2>Overview<a class="headerlink" href="#overview" title="Permalink to this headline">¶</a></h2>
@@ -211,8 +216,9 @@ important in stopword files.</p>
 </div>
 <div class="section" id="default-file-example">
 <span id="poterminology-stopword-file-default-file-example"></span><h2>Default file example<a class="headerlink" href="#default-file-example" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre># apply title-case folding to words before comparing with this stoplist
-!F</pre>
+<div class="highlight-python"><div class="highlight"><pre># apply title-case folding to words before comparing with this stoplist
+!F
+</pre></div>
 </div>
 <p>The fold-titlecase setting is the default, even if it were not explicitly
 specified.  This allows capitalized words at the start of a sentence (e.g.
@@ -227,62 +233,68 @@ TEXT you may find the ignore-case setting to be preferable.</p>
 <p>The regular expression /..? below would normally match the word ‘no’ and both
 ignore it as a term and exclude any phrases containing it.  The above will
 allow it to appear as a term and in phrases.</p>
-<div class="highlight-python"><pre># ignore all one or two-character words (unless =word appears below)
+<div class="highlight-python"><div class="highlight"><pre># ignore all one or two-character words (unless =word appears below)
 /..?
 # ignore words with parenthesis, typically function() calls and the like
 /.*\(.*
 # ignore numbers, both cardinal (e.g. 1,234.0) and ordinal (e.g. 1st, 22nd)
-/[0-9,.]+(st|nd|rd|th)?</pre>
+/[0-9,.]+(st|nd|rd|th)?
+</pre></div>
 </div>
 <p>These regular expressions ignore a lot of uninteresting terms that are
 typically code or other things that shouldn’t be translated anyhow.  There are
 many exceptions to the one or two-character word pattern in the default
 stoplist file, not only with = like ‘=in’ but also ‘+no’ and ‘:on’ and ‘<ok’
 and ‘>of’.</p>
-<div class="highlight-python"><pre># allow these words by themselves and don't count against length for phrases
+<div class="highlight-python"><div class="highlight"><pre># allow these words by themselves and don't count against length for phrases
 :off
-:on</pre>
+:on
+</pre></div>
 </div>
 <p>These prepositions are common as button text and thus useful to have as terms;
 they also form an important part of phrases so are disregarded for term word
 count to allow for slightly longer phrases including them.</p>
-<div class="highlight-python"><pre># allow these words by themselves, but ignore any phrases containing them
+<div class="highlight-python"><div class="highlight"><pre># allow these words by themselves, but ignore any phrases containing them
 <first
 <hello
-<last</pre>
+<last
+</pre></div>
 </div>
 <p>These are words that are worth including in a terminology, as they are common
 in applications, but which aren’t generally part of idiomatic phrases.</p>
-<div class="highlight-python"><pre># ignore these words by themselves, but allow phrases containing them
+<div class="highlight-python"><div class="highlight"><pre># ignore these words by themselves, but allow phrases containing them
 =able
 =about
 =actually
 =ad
 =as
-=at</pre>
+=at
+</pre></div>
 </div>
 <p>This is the largest category of stoplist words, and these are all just rather
 common words.  The purpose of a terminology list is to provide specific
 translation suggestions for the harder words or phrases, not provide a general
 dictionary, so these words are not of interest by themselves, but may well be
 part of an interesting phrase.</p>
-<div class="highlight-python"><pre># ignore these words by themselves, but allow phrases containing them,   and
-# don't count against length for phrases
+<div class="highlight-python"><div class="highlight"><pre># ignore these words by themselves, but allow phrases containing them,   and
+# don't count against length for phrases
 #
 # (possible additions to this list for multi-lingual text: >di >el >le)
 #
 >a
 >an
->and</pre>
+>and
+</pre></div>
 </div>
 <p>These very common words aren’t of interest by themselves, but often form an
 important part of phrases so are disregarded for term word count to allow for
 slightly longer phrases including them.</p>
-<div class="highlight-python"><pre># ignore these words and any phrases containing them
- at ain't
+<div class="highlight-python"><div class="highlight"><pre># ignore these words and any phrases containing them
+ at ain't
 @aint
 @al
- at are</pre>
+ at are
+</pre></div>
 </div>
 <p>These are “junk” words that are not only uninteresting by themselves, they
 generally do not contribute anything to the phrases containing them.</p>
@@ -301,7 +313,7 @@ generally do not contribute anything to the phrases containing them.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/pretranslate.html b/docs/_build/html/commands/pretranslate.html
index f746563..e37c63b 100644
--- a/docs/_build/html/commands/pretranslate.html
+++ b/docs/_build/html/commands/pretranslate.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>pretranslate — Translate Toolkit 1.9.0 documentation</title>
+    <title>pretranslate — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="Levenshtein distance" href="levenshtein_distance.html" />
     <link rel="prev" title="poclean" href="poclean.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="levenshtein_distance.html"
          title="next chapter">Levenshtein distance »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -123,7 +126,8 @@ the gettext package.</p>
 <p>pretranslate works on PO and XLIFF files.</p>
 <div class="section" id="usage">
 <span id="pretranslate-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pretranslate [options] <input> <output></pre>
+<div class="highlight-python"><div class="highlight"><pre>pretranslate [options] <input> <output>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -181,10 +185,6 @@ traceback</em></a></td></tr>
 </tr>
 <tr><td> </td><td>read old translations from TEMPLATE</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">--tm=<var>TM</var></span></kbd></td>
 <td>The file to use as translation memory when fuzzy matching</td></tr>
 <tr><td class="option-group" colspan="2">
@@ -200,7 +200,8 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="examples">
 <span id="pretranslate-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>pretranslate -t zu-1.0.1 -tm zu_tm.po zu-2.0.2 zu-2.0.2-translated</pre>
+<div class="highlight-python"><div class="highlight"><pre>pretranslate -t zu-1.0.1 -tm zu_tm.po zu-2.0.2 zu-2.0.2-translated
+</pre></div>
 </div>
 <p>Here we are pretranslating the PO or XLIFF files in <em>zu-2.0.2</em> using the old
 translations in <em>zu-1.0.1</em> and fuzzy matches from the zu_tm.po compendium. the
@@ -223,11 +224,9 @@ messages and then through any global translation memory</li>
 <div class="section" id="performance">
 <span id="pretranslate-performance"></span><h2>Performance<a class="headerlink" href="#performance" title="Permalink to this headline">¶</a></h2>
 <p>Fuzzy matches are usually of good quality. Installation of the
-<a class="reference external" href="https://sourceforge.net/project/showfiles.php?group_id=91920&package_id=260161">python-Levenshtein</a>
+<a class="reference external" href="https://pypi.python.org/pypi/python-Levenshtein">python-Levenshtein</a>
 package will speed up fuzzy matching. Without this a Python based matcher is
 used which is considerably slower.</p>
-<p>Install psyco for additional speedup (it is used by most toolkit tools if it is
-installed.)</p>
 </div>
 </div>
 
@@ -243,7 +242,7 @@ installed.)</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/prop2po.html b/docs/_build/html/commands/prop2po.html
index daf7cd3..580ef9e 100644
--- a/docs/_build/html/commands/prop2po.html
+++ b/docs/_build/html/commands/prop2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>prop2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>prop2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="php2po" href="php2po.html" />
     <link rel="prev" title="odf2xliff and xliff2odf" href="odf2xliff.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -98,10 +100,11 @@
   <li><a href="php2po.html"
          title="next chapter">php2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -132,8 +135,9 @@ the Latin1 encoding that is needed by Java.</p>
 </ul>
 <div class="section" id="usage">
 <span id="prop2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>prop2po [options] <property> <po>
-po2prop [options] -t <template> <po> <property></pre>
+<div class="highlight-python"><div class="highlight"><pre>prop2po [options] <property> <po>
+po2prop [options] -t <template> <po> <property>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -195,10 +199,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in properties format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -259,10 +263,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in properties format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">--personality=<var>TYPE</var></span></kbd></td>
 </tr>
@@ -273,6 +277,14 @@ java-utf8, skype, gaia, strings</em></a>
 <kbd><span class="option">--encoding=<var>ENCODING</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>override the encoding set by the personality (since 1.8.0)</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--removeuntranslated</span></kbd></td>
+</tr>
+<tr><td> </td><td>remove key value from output if it is untranslated</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -287,18 +299,21 @@ java-utf8, skype, gaia, strings</em></a>
 <p>These examples demonstrate most of the useful invocations of prop2po:</p>
 <div class="section" id="creating-pot-files">
 <span id="prop2po-creating-pot-files"></span><h3>Creating POT files<a class="headerlink" href="#creating-pot-files" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>prop2po -P properties pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>prop2po -P properties pot
+</pre></div>
 </div>
 <p>Extract messages from <em>properties</em> directory and place them in a directory
 called <em>pot</em>.  The <tt class="docutils literal"><span class="pre">-P</span></tt> option ensures that we create POT files instead of
 PO files.:</p>
-<div class="highlight-python"><pre>prop2po -P file.properties file.pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>prop2po -P file.properties file.pot
+</pre></div>
 </div>
 <p>Extract messages from <em>file.properties</em> and place them in <em>file.pot</em>.</p>
 </div>
 <div class="section" id="creating-po-files-from-existing-work">
 <span id="prop2po-creating-po-files-from-existing-work"></span><h3>Creating PO files from existing work<a class="headerlink" href="#creating-po-files-from-existing-work" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>prop2po --duplicates=msgctxt -t reference zu zu-po</pre>
+<div class="highlight-python"><div class="highlight"><pre>prop2po --duplicates=msgctxt -t reference zu zu-po
+</pre></div>
 </div>
 <p>Extract all existing Zulu messages from <em>zu</em> directory and place the resultant
 PO files in a directory called <em>zu-po</em>.  If you find duplicate messages in a
@@ -309,7 +324,8 @@ English text for the msgid.  Once you have your PO files you might want to use
 </div>
 <div class="section" id="creating-properties-files-from-your-translations">
 <span id="prop2po-creating-properties-files-from-your-translations"></span><h3>Creating .properties files from your translations<a class="headerlink" href="#creating-properties-files-from-your-translations" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>po2prop -t reference zu-po zu</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2prop -t reference zu-po zu
+</pre></div>
 </div>
 <p>Using our translations found in <em>zu-po</em> and the templates found in <em>reference</em>
 we create a new set of property files in <em>zu</em>.  These new property files will
@@ -318,13 +334,16 @@ the translation.  Any fuzzy entry in our PO files will be ignored and any
 untranslated item will be placed in <em>zu</em> in English.  The .properties file
 created will be based on the Java specification and will thus use escaped
 Unicode.  Where:</p>
-<div class="highlight-python"><pre>ṽḁḽṻḝ</pre>
+<div class="highlight-python"><div class="highlight"><pre>ṽḁḽṻḝ
+</pre></div>
 </div>
 <p>Will appear in the files as:</p>
-<div class="highlight-python"><pre>\u1E7D\u1E01\u1E3D\u1E7B\u1E1D</pre>
+<div class="highlight-python"><div class="highlight"><pre>\u1E7D\u1E01\u1E3D\u1E7B\u1E1D
+</pre></div>
 </div>
 <p>To get output as used by Mozilla localisation do the following:</p>
-<div class="highlight-python"><pre>po2prop --personality=mozilla -t reference zu-po zu</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2prop --personality=mozilla -t reference zu-po zu
+</pre></div>
 </div>
 <p>This will do exactly the same as above except that the output will now appear
 as real Unicode characters in UTF-8 encoding.</p>
@@ -332,25 +351,28 @@ as real Unicode characters in UTF-8 encoding.</p>
 </div>
 <div class="section" id="doing-away-with-native2ascii">
 <span id="prop2po-doing-away-with-native2ascii"></span><h2>Doing away with native2ascii<a class="headerlink" href="#doing-away-with-native2ascii" title="Permalink to this headline">¶</a></h2>
-<p>The <a class="reference external" href="http://docs.oracle.com/javase/1.4.2/docs/tooldocs/windows/native2ascii.html">native2ascii</a>
+<p>The <a class="reference external" href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/native2ascii.html">native2ascii</a>
 command is the traditional tool of property file localisers.  With prop2po
 there is no need to use this command or to ever work directly with the escaped
 Unicode.</p>
 <p>If you are working mostly with Gettext PO files then this is a double benefit
 as you can now use your favourite PO editor to translate Java applications.
 Your process would now look like this:</p>
-<div class="highlight-python"><pre>prop2po some.properties some.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>prop2po some.properties some.po
+</pre></div>
 </div>
 <p>Firstly create a PO file that you can translate.  Now translate it in your
 favourite PO editor.:</p>
-<div class="highlight-python"><pre>po2prop -t some.properties some.po some-other.properties</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2prop -t some.properties some.po some-other.properties
+</pre></div>
 </div>
 <p>Using the original properties file as a template we preserve all layout and
 comments, combined with your PO translation we create a new translate
 properties file.  During this whole process we have not needed to understand or
 process any escaping prop2po and po2prop handle that all automatically.</p>
 <p>If you have existing translations you can recover them as follows:</p>
-<div class="highlight-python"><pre>prop2po -t some.properties translations.properties translations.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>prop2po -t some.properties translations.properties translations.po
+</pre></div>
 </div>
 <p>This takes the default English properties file and combines it with your
 translate properties file and created a PO file.  You now continue translating
@@ -370,7 +392,7 @@ using your PO file.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/rc2po.html b/docs/_build/html/commands/rc2po.html
index b33efa9..f9dba4b 100644
--- a/docs/_build/html/commands/rc2po.html
+++ b/docs/_build/html/commands/rc2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>rc2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>rc2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="symb2po" href="symb2po.html" />
     <link rel="prev" title="web2py2po" href="web2py2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="symb2po.html"
          title="next chapter">symb2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -119,8 +122,9 @@
 <p>Converts Windows Resource .rc files to Gettext PO format.</p>
 <div class="section" id="usage">
 <span id="rc2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>rc2po [options] <rc> <po>
-po2rc [options] -t <rc> <po> <rc></pre>
+<div class="highlight-python"><div class="highlight"><pre>rc2po [options] <rc> <po>
+po2rc [options] -t <rc> <po> <rc>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -177,10 +181,6 @@ traceback</em></a></td></tr>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in rc format</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
 <tr><td class="option-group" colspan="2">
@@ -234,10 +234,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in rc format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">--charset=<var>CHARSET</var></span></kbd></td>
 </tr>
@@ -250,6 +250,10 @@ full, profile</em></a></td></tr>
 <kbd><span class="option">--sublang=<var>SUBLANG</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>SUBLANG entry (default: SUBLANG_DEFAULT)</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -272,13 +276,15 @@ these should mimic other non-WINE .rc files.</p>
 <p>This example looks at roundtrip of Windows Resource translations as well as
 recovery of existing translations.</p>
 <p>First we need to create a set of POT files.</p>
-<div class="highlight-python"><pre>rc2po -P lang/ pot/</pre>
+<div class="highlight-python"><div class="highlight"><pre>rc2po -P lang/ pot/
+</pre></div>
 </div>
 <p>All .rc files found in the <tt class="docutils literal"><span class="pre">lang/</span></tt> directory are converted to Gettext POT
 files and placed in the <tt class="docutils literal"><span class="pre">pot/</span></tt> directory.</p>
 <p>If you are translating for the first time then you can skip the next step.  If
 you need to recovery your existing translations then we do the following:</p>
-<div class="highlight-python"><pre>rc2po -t lang zu po-zu/</pre>
+<div class="highlight-python"><div class="highlight"><pre>rc2po -t lang zu po-zu/
+</pre></div>
 </div>
 <p>Using the English .rc files found in <tt class="docutils literal"><span class="pre">lang</span></tt> and your existing Zulu
 translation in <tt class="docutils literal"><span class="pre">zu</span></tt> we create a set of PO files in <tt class="docutils literal"><span class="pre">po-zu</span></tt>.  These will now
@@ -290,7 +296,8 @@ assume both are in the same encoding supplied.</p>
 <p>You are now in a position to translate your recovered translations or your new
 POT files.</p>
 <p>Once translated you can convert back as follows:</p>
-<div class="highlight-python"><pre>po2rc -t lang/ po-zu/ zu/</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2rc -t lang/ po-zu/ zu/
+</pre></div>
 </div>
 <p>Your translations found in the Zulu PO directory, <tt class="docutils literal"><span class="pre">po-zu</span></tt>, will be converted
 to .rc using the files in <tt class="docutils literal"><span class="pre">lang/</span></tt> as templates and placing your new
@@ -318,7 +325,7 @@ both en.rc and xx.rc need to be in the same encoding.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/sub2po.html b/docs/_build/html/commands/sub2po.html
index 5cee07f..d5a3c8c 100644
--- a/docs/_build/html/commands/sub2po.html
+++ b/docs/_build/html/commands/sub2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>sub2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>sub2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="txt2po" href="txt2po.html" />
     <link rel="prev" title="php2po" href="php2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -96,10 +98,11 @@
   <li><a href="txt2po.html"
          title="next chapter">txt2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -124,8 +127,9 @@ only new items need to be translated, unchanged items remain unchanged for the
 translation.</p>
 <div class="section" id="usage">
 <span id="sub2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>sub2po [options] <foo.srt> <foo.po>
-po2sub [options] [-t <foo.srt>] <XX.po> <foo-XX.srt></pre>
+<div class="highlight-python"><div class="highlight"><pre>sub2po [options] <foo.srt> <foo.po>
+po2sub [options] [-t <foo.srt>] <XX.po> <foo-XX.srt>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -183,10 +187,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -237,10 +241,14 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in txt format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -252,13 +260,15 @@ full, profile</em></a></td></tr>
 <div class="section" id="examples">
 <span id="sub2po-examples"></span><h3>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h3>
 <p>To create the POT files is simple:</p>
-<div class="highlight-python"><pre>sub2po -P SUBTITLE_FILE subtitles.pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>sub2po -P SUBTITLE_FILE subtitles.pot
+</pre></div>
 </div>
 <p>A translator would copy the POT file to their own PO file and then create
 translations of the entries. If you wish to create a PO file and not a POT file
 then leave off the <tt class="docutils literal"><span class="pre">-P</span></tt> option.</p>
 <p>To convert back:</p>
-<div class="highlight-python"><pre>po2sub -t SUBTITLE_FILE   subtitles-XX.po  subtitles-XX.srt</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2sub -t SUBTITLE_FILE   subtitles-XX.po  subtitles-XX.srt
+</pre></div>
 </div>
 </div>
 <div class="section" id="translating">
@@ -287,7 +297,7 @@ easily. Note that most of the handling of the srt files come from gaupol.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/symb2po.html b/docs/_build/html/commands/symb2po.html
index f9e454c..e8c8bc4 100644
--- a/docs/_build/html/commands/symb2po.html
+++ b/docs/_build/html/commands/symb2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>symb2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>symb2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="tiki2po" href="tiki2po.html" />
     <link rel="prev" title="rc2po" href="rc2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -99,10 +101,11 @@
   <li><a href="tiki2po.html"
          title="next chapter">tiki2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -121,15 +124,17 @@
    
   <div class="section" id="po2symb">
 <span id="symb2po"></span><span id="id1"></span><h1>symb2po<a class="headerlink" href="#po2symb" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.3.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.3.</span></p>
+</div>
 <p>Converts Symbian-style translation files to PO files and vice versa. The
 Symbian translation files currently have a strong Buddycloud flavour, but the
 tools will be made more general as the need arises.</p>
 <div class="section" id="usage">
 <span id="symb2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>symb2po [options] [-t <target_lang_symb>] <source_lang_symb> <po>
-po2symb [options] -t <target_lang_symb> <po> <target_lang_symb></pre>
+<div class="highlight-python"><div class="highlight"><pre>symb2po [options] [-t <target_lang_symb>] <source_lang_symb> <po>
+po2symb [options] -t <target_lang_symb> <po> <target_lang_symb>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -190,10 +195,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in the Symbian translation format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -244,10 +249,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t <var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in the Symbian translation format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 </tbody>
 </table>
 </div>
@@ -262,7 +267,8 @@ translation files). This file then serves as the source document from which all
 translations will be derived.</p>
 <p>To create a POT file called <tt class="docutils literal"><span class="pre">my_project.pot</span></tt> from the source Symbian
 translation file <tt class="docutils literal"><span class="pre">my_project.r01</span></tt>, the following is executed:</p>
-<div class="highlight-python"><pre>symb2po my_project.r01 my_project.pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>symb2po my_project.r01 my_project.pot
+</pre></div>
 </div>
 <p>In order to re-use existing translations in the Symbian translation format,
 symb2po can merge that translation into the source Symbian translation to
@@ -271,7 +277,8 @@ specified with the <tt class="docutils literal"><span class="pre">-t</span></tt>
 <p>To create a file called <tt class="docutils literal"><span class="pre">my_project-en-fr.po</span></tt> (this is not the recommended PO
 naming convention) from the source Symbian translation file <tt class="docutils literal"><span class="pre">my_project.r01</span></tt>
 and its French translation <tt class="docutils literal"><span class="pre">my_project.r02</span></tt>, execute:</p>
-<div class="highlight-python"><pre>symb2po -t my_project.r02 my_project.r01 my_project-en-fr.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>symb2po -t my_project.r02 my_project.r01 my_project-en-fr.po
+</pre></div>
 </div>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
@@ -289,14 +296,16 @@ Symbian translation file. The template Symbian translation file supplies the
 translation file <tt class="docutils literal"><span class="pre">my_project.r01</span></tt> as a template and the PO file
 <tt class="docutils literal"><span class="pre">my_project-en-fr.po</span></tt> (this is not the recommended PO naming convention) as
 the source document, execute:</p>
-<div class="highlight-python"><pre>po2symb -t my_project.r01 my_project-en-fr.po my_project.r02</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2symb -t my_project.r01 my_project-en-fr.po my_project.r02
+</pre></div>
 </div>
 </div>
 </div>
 <div class="section" id="notes">
 <span id="symb2po-notes"></span><h2>Notes<a class="headerlink" href="#notes" title="Permalink to this headline">¶</a></h2>
 <p>The tools won’t touch anything appearing between lines marked as:</p>
-<div class="highlight-python"><pre>// DO NOT TRANSLATE</pre>
+<div class="highlight-python"><div class="highlight"><pre>// DO NOT TRANSLATE
+</pre></div>
 </div>
 <p>The string <tt class="docutils literal"><span class="pre">r_string_languagegroup_name</span></tt> is used to set the <tt class="docutils literal"><span class="pre">Language-Team</span></tt>
 PO header field.</p>
@@ -309,7 +318,8 @@ PO header field.</p>
 <p>The tools do nothing with the <tt class="docutils literal"><span class="pre">Name</span></tt> and <tt class="docutils literal"><span class="pre">Description</span></tt> Symbian header
 fields. This means that <tt class="docutils literal"><span class="pre">po2symb</span></tt> will just copy the values in the supplied
 template. So you might see something such as:</p>
-<div class="highlight-python"><pre>Description : Localisation File : English</pre>
+<div class="highlight-python"><div class="highlight"><pre>Description : Localisation File : English
+</pre></div>
 </div>
 <p>in a generated French translation file.</p>
 </div>
@@ -331,7 +341,7 @@ template. So you might see something such as:</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/tiki2po.html b/docs/_build/html/commands/tiki2po.html
index 4a8b6a4..d533e9a 100644
--- a/docs/_build/html/commands/tiki2po.html
+++ b/docs/_build/html/commands/tiki2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>tiki2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>tiki2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="ts2po" href="ts2po.html" />
     <link rel="prev" title="symb2po" href="symb2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="ts2po.html"
          title="next chapter">ts2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -119,8 +122,9 @@
 format.</p>
 <div class="section" id="usage">
 <span id="tiki2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>tiki2po [options] <tiki> <po>
-po2tiki [options] <po> <tiki></pre>
+<div class="highlight-python"><div class="highlight"><pre>tiki2po [options] <tiki> <po>
+po2tiki [options] <po> <tiki>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -172,9 +176,16 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o <var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--include-unused</span></kbd></td>
+</tr>
+<tr><td> </td><td>When converting, include strings in the “unused” section?</td></tr>
 </tbody>
 </table>
-<p>–include-unused When converting, include strings in the “unused” section?</p>
 <p>Options (po2tiki):</p>
 <table class="docutils option-list" frame="void" rules="none">
 <col class="option" />
@@ -210,16 +221,22 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o <var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in php format</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 </tbody>
 </table>
 </div>
 <div class="section" id="examples">
 <span id="tiki2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
 <p>These examples demonstrate the use of tiki2po:</p>
-<div class="highlight-python"><pre>tiki2po language.php language.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>tiki2po language.php language.po
+</pre></div>
 </div>
 <p>Convert the tiki language.php file to .po:</p>
-<div class="highlight-python"><pre>po2tiki language.po language.php</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2tiki language.po language.php
+</pre></div>
 </div>
 <p>Convert a .po file to a tiki language.php file</p>
 </div>
@@ -243,7 +260,7 @@ traceback</em></a></td></tr>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/tmserver.html b/docs/_build/html/commands/tmserver.html
index 882cb3b..d5515d0 100644
--- a/docs/_build/html/commands/tmserver.html
+++ b/docs/_build/html/commands/tmserver.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>tmserver — Translate Toolkit 1.9.0 documentation</title>
+    <title>tmserver — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="poterminology" href="poterminology.html" />
     <link rel="prev" title="junitmsgfmt" href="junitmsgfmt.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="poterminology.html"
          title="next chapter">poterminology »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -116,10 +119,16 @@
 <span id="id1"></span><h1>tmserver<a class="headerlink" href="#tmserver" title="Permalink to this headline">¶</a></h1>
 <p>tmserver is a Translation Memory service that can be queried via HTTP using a
 simple REST like URL/http and data is exchanged between server and client
-encoded in JSON</p>
+encoded in JSON.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are searching for an enterprise Translation Memory server then
+rather use <a class="reference external" href="http://amagama.translatehouse.org/">amaGama</a>.</p>
+</div>
 <div class="section" id="usage">
 <span id="tmserver-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>tmserver.py --bind=HOSTNAME --port=PORT [--tmdb=TMDBFILE] [--import-translation-file=TMFILE [--import-source-lang=SOURCE_LANG] [--import-target-lang=TARGET_LANG]]</pre>
+<div class="highlight-python"><div class="highlight"><pre>tmserver.py --bind=HOSTNAME --port=PORT [--tmdb=TMDBFILE] [--import-translation-file=TMFILE [--import-source-lang=SOURCE_LANG] [--import-target-lang=TARGET_LANG]]
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -194,10 +203,12 @@ is specified).</td>
 <p>easiest way to run the server for testing is to pass it a large translation
 file (maybe generated by <a class="reference internal" href="pocompendium.html"><em>pocompendium</em></a>) to create a tmdb database on the
 fly.</p>
-<div class="highlight-python"><pre>tmserver -b localhost -p 8080 -f compendium.po -s en_US -t ar</pre>
+<div class="highlight-python"><div class="highlight"><pre>tmserver -b localhost -p 8080 -f compendium.po -s en_US -t ar
+</pre></div>
 </div>
 <p>The server can be queried using a webbrowser. the url would be:</p>
-<div class="highlight-python"><pre>http://HOST:PORT/tmserver/SOURCE_LANG/TARGET_LANG/unit/STRING</pre>
+<div class="highlight-python"><div class="highlight"><pre>http://HOST:PORT/tmserver/SOURCE_LANG/TARGET_LANG/unit/STRING
+</pre></div>
 </div>
 <p>So to see suggestions for “open file” try the url
 <a class="reference external" href="http://localhost:8080/tmserver/en_US/ar/unit/open+file">http://localhost:8080/tmserver/en_US/ar/unit/open+file</a></p>
@@ -216,7 +227,7 @@ fly.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/ts2po.html b/docs/_build/html/commands/ts2po.html
index 63beeef..cd0399e 100644
--- a/docs/_build/html/commands/ts2po.html
+++ b/docs/_build/html/commands/ts2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>ts2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>ts2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="xliff2po" href="xliff2po.html" />
     <link rel="prev" title="tiki2po" href="tiki2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="xliff2po.html"
          title="next chapter">xliff2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -123,19 +126,20 @@ might wish to standardise on one localization tool.  ts2po allows you to
 standardise on the PO format and PO related tools.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last"><a class="reference external" href="http://virtaal.org">Virtaal</a> and <a class="reference external" href="http://pootle.tramslatehouse.org">Pootle</a> can edit .ts files directly without the
+<p class="last"><a class="reference external" href="http://virtaal.org">Virtaal</a> and <a class="reference external" href="http://pootle.translatehouse.org">Pootle</a> can edit .ts files directly without the
 need for any conversion.</p>
 </div>
 <div class="admonition warning">
 <p class="first admonition-title">Warning</p>
 <p class="last">po2ts uses our older .ts support.  Thus many of the newer features
 in .ts are not supported.  To support those features rather edit directly in
-<a class="reference external" href="http://virtaal.org">Virtaal</a> or <a class="reference external" href="http://pootle.tramslatehouse.org">Pootle</a>.</p>
+<a class="reference external" href="http://virtaal.org">Virtaal</a> or <a class="reference external" href="http://pootle.translatehouse.org">Pootle</a>.</p>
 </div>
 <div class="section" id="usage">
 <span id="ts2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>ts2po [options] <ts> <po>
-po2ts [options] <po> <ts></pre>
+<div class="highlight-python"><div class="highlight"><pre>ts2po [options] <ts> <po>
+po2ts [options] <po> <ts>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -187,10 +191,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -241,20 +245,22 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in ts format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 </tbody>
 </table>
 </div>
 <div class="section" id="examples">
 <span id="ts2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>ts2po -P psi.ts psi.pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>ts2po -P psi.ts psi.pot
+</pre></div>
 </div>
 <p>This will create a POT file called <em>psi.pot</em> from the Qt .ts file called
 <em>psi.ts</em>.</p>
-<div class="highlight-python"><pre>po2ts af.po psi_af.ts</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2ts af.po psi_af.ts
+</pre></div>
 </div>
 <p>Now take your translated PO files <em>af.po</em> and convert it into a translated Qt
 .ts file, <em>psi_af.ts</em>.</p>
@@ -285,7 +291,7 @@ much better.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/txt2po.html b/docs/_build/html/commands/txt2po.html
index effe6a1..3c3bfed 100644
--- a/docs/_build/html/commands/txt2po.html
+++ b/docs/_build/html/commands/txt2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>txt2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>txt2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="po2wordfast" href="po2wordfast.html" />
     <link rel="prev" title="sub2po" href="sub2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -103,10 +105,11 @@
   <li><a href="po2wordfast.html"
          title="next chapter">po2wordfast »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -130,8 +133,9 @@ files.  In PO only items that change are marked fuzzy and only new items need
 to be translated, unchanged items remain unchanged for the translation.</p>
 <div class="section" id="usage">
 <span id="txt2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>txt2po [options] <foo.txt> <foo.po>
-po2txt [options] [-t <foo.txt>] <XX.po> <foo-XX.txt></pre>
+<div class="highlight-python"><div class="highlight"><pre>txt2po [options] <foo.txt> <foo.po>
+po2txt [options] [-t <foo.txt>] <XX.po> <foo-XX.txt>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -189,10 +193,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -251,14 +255,18 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in txt format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-w<var>WRAP</var></span>, <span class="option">--wrap=<var>WRAP</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>set number of columns to wrap text at</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -289,7 +297,8 @@ could for example place them in alphabetic order for their translation.</p>
 <div class="section" id="creating-the-pot-files">
 <span id="txt2po-creating-the-pot-files"></span><h3>Creating the POT files<a class="headerlink" href="#creating-the-pot-files" title="Permalink to this headline">¶</a></h3>
 <p>This is simple:</p>
-<div class="highlight-python"><pre>txt2po -P TEXT_FILE text_file.pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>txt2po -P TEXT_FILE text_file.pot
+</pre></div>
 </div>
 <p>A translator would copy the POT file to their own PO file and then create
 translations of the entries.  If you wish to create a PO file and not a POT
@@ -303,10 +312,11 @@ to remove those if you do not want the license translated for legal reasons.</p>
 <p>Translate as normal.  However translators should be aware that writers of the
 text file may have used spaces, dashes, equals, underscores and other aids to
 indicate things such as:</p>
-<div class="highlight-python"><pre>* Headings and sub-headings
+<div class="highlight-python"><div class="highlight"><pre>* Headings and sub-headings
 * Code examples, command lines examples
 * Various lists
-* etc</pre>
+* etc
+</pre></div>
 </div>
 <p>They will need to adapt these to work in their language being aware of how they
 will appear once they are merged with the original text document.</p>
@@ -315,7 +325,8 @@ will appear once they are merged with the original text document.</p>
 <span id="txt2po-creating-a-translated-text-file"></span><h3>Creating a translated text file<a class="headerlink" href="#creating-a-translated-text-file" title="Permalink to this headline">¶</a></h3>
 <p>With the translations complete you can create a translated text file like
 this:</p>
-<div class="highlight-python"><pre>po2txt -w 75 -t TEXT_FILE translated.po TEXT_FILE.translated</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2txt -w 75 -t TEXT_FILE translated.po TEXT_FILE.translated
+</pre></div>
 </div>
 <p>This uses the original text file as a template and creates a new translated
 text file using the translations found in the PO file.</p>
@@ -330,10 +341,11 @@ number of characters, otherwise the text will appear as one long line.</p>
 <p>To retrieve the raw syntax for your dokuwiki page add ‘?do=export_raw’ to you
 URL.  The following would retrieve the <a class="reference external" href="https://www.dokuwiki.org/dokuwiki">DokuWiki home page</a> in raw dokuwiki format
 <a class="reference external" href="https://www.dokuwiki.org/dokuwiki?do=export_raw">https://www.dokuwiki.org/dokuwiki?do=export_raw</a></p>
-<div class="highlight-python"><pre>wget https://www.dokuwiki.org/dokuwiki?do=export_raw -O txt2po.txt
+<div class="highlight-python"><div class="highlight"><pre>wget https://www.dokuwiki.org/dokuwiki?do=export_raw -O txt2po.txt
 txt2po --flavour=dokuwiki -P txt2po.txt txt2po.pot
 # edit txt2po.pot
-po2txt -t txt2po.txt fr.po fr.txt</pre>
+po2txt -t txt2po.txt fr.po fr.txt
+</pre></div>
 </div>
 <p>First we retrieve the file in raw dokuwiki format, then we create a POT file
 for editing.  We created a French translation and using po2txt plus the
@@ -364,7 +376,7 @@ retrieval method.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/web2py2po.html b/docs/_build/html/commands/web2py2po.html
index e899911..866f70e 100644
--- a/docs/_build/html/commands/web2py2po.html
+++ b/docs/_build/html/commands/web2py2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>web2py2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>web2py2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="rc2po" href="rc2po.html" />
     <link rel="prev" title="json2po" href="json2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="rc2po.html"
          title="next chapter">rc2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -115,9 +118,9 @@
   <div class="section" id="web2py2po">
 <span id="po2web2py"></span><span id="py2web2po"></span><h1>web2py2po<a class="headerlink" href="#web2py2po" title="Permalink to this headline">¶</a></h1>
 <p>Converts web2py translation files to PO files and vice versa.</p>
-<p><a class="reference external" href="http://mdp.cti.depaul.edu">Web2py</a>, formerly known as Gluon) is an
-open-source, Python-based web application framework by Massimo Di Pierro
-(inspired by Django and Rails).</p>
+<p><a class="reference external" href="http://web2py.com/">Web2py</a>, formerly known as Gluon) is an open-source,
+Python-based web application framework by Massimo Di Pierro (inspired by Django
+and Rails).</p>
 <p>Web2py uses an internal localization engine based on Python dictionaries, which
 is applied with the T() lookup function. Web2py provides a built-in translation
 interface for the T()-engine, which is excellent for rapid application
@@ -128,8 +131,9 @@ for translation, thus need to transform the web2py dictionaries into PO files
 and vice versa. And exactly that is what the web2py2po converters are good for.</p>
 <div class="section" id="usage">
 <span id="py2web2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>web2py2po [options] <web2py> <po>
-po2web2py [options] <po> <web2py></pre>
+<div class="highlight-python"><div class="highlight"><pre>web2py2po [options] <web2py> <po>
+po2web2py [options] <po> <web2py>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -181,10 +185,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o <var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">--duplicates=<var>DUPLICATESTYLE</var></span></kbd></td>
 </tr>
@@ -228,10 +232,14 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o <var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in php format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--threshold=<var>PERCENT</var></span></kbd></td>
+</tr>
+<tr><td> </td><td>only convert files where the translation completion is above PERCENT</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--fuzzy</span></kbd></td>
 <td>use translations marked fuzzy</td></tr>
@@ -267,7 +275,7 @@ inserted as blank msgstr’s into the PO result (web2py2po)</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/commands/xliff2po.html b/docs/_build/html/commands/xliff2po.html
index 6ace316..e4f45ae 100644
--- a/docs/_build/html/commands/xliff2po.html
+++ b/docs/_build/html/commands/xliff2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>xliff2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>xliff2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Converters" href="index.html" />
     <link rel="next" title="–errorlevel=ERRORLEVEL" href="option_errorlevel.html" />
     <link rel="prev" title="ts2po" href="ts2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="option_errorlevel.html"
          title="next chapter">–errorlevel=ERRORLEVEL »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -116,14 +119,15 @@
   <div class="section" id="po2xliff">
 <span id="xliff2po"></span><span id="id1"></span><h1>xliff2po<a class="headerlink" href="#po2xliff" title="Permalink to this headline">¶</a></h1>
 <p>Converts XLIFF localization files to Gettext PO files.  XLIFF is the XML
-Localization Interchange File Format developed by <a class="reference external" href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff">OASIS</a>
+Localization Interchange File Format developed by <a class="reference external" href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff">OASIS</a>
 (Organization for the Advancement of Structured Information Standards) to allow
 translation work to be standardised no matter what the source format and to
 allow the work to be freely moved from tool to tool.</p>
 <div class="section" id="usage">
 <span id="xliff2po-usage"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>po2xliff [options] <po> <xliff>
-xliff2po [options] <xliff> <po></pre>
+<div class="highlight-python"><div class="highlight"><pre>po2xliff [options] <po> <xliff>
+xliff2po [options] <xliff> <po>
+</pre></div>
 </div>
 <p>Where:</p>
 <table border="1" class="docutils">
@@ -175,10 +179,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-o<var>OUTPUT</var></span>, <span class="option">--output=<var>OUTPUT</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>write to OUTPUT in po, pot formats</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -229,10 +233,10 @@ traceback</em></a></td></tr>
 <kbd><span class="option">-t<var>TEMPLATE</var></span>, <span class="option">--template=<var>TEMPLATE</var></span></kbd></td>
 </tr>
 <tr><td> </td><td>read from TEMPLATE in xliff format</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--psyco=<var>MODE</var></span></kbd></td>
-<td>use psyco to speed up the operation, modes: <a class="reference internal" href="option_psyco.html"><em>none,
-full, profile</em></a></td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-S</span>, <span class="option">--timestamp</span></kbd></td>
+</tr>
+<tr><td> </td><td>skip conversion if the output file has newer timestamp</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--pot</span></kbd></td>
 <td>output PO Templates (.pot) rather than PO files (.po)</td></tr>
@@ -241,11 +245,13 @@ full, profile</em></a></td></tr>
 </div>
 <div class="section" id="examples">
 <span id="xliff2po-examples"></span><h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>xliff2po -P xliff pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>xliff2po -P xliff pot
+</pre></div>
 </div>
 <p>Create POT files from the XLIFF files found in directory <em>xliff</em> and output
 them to the directory <em>pot</em></p>
-<div class="highlight-python"><pre>po2xliff xh xh-xlf</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2xliff xh xh-xlf
+</pre></div>
 </div>
 <p>Convert the Xhosa PO files in <em>xh</em> to XLIFF and place them in <em>xh-xlf</em></p>
 </div>
@@ -268,7 +274,7 @@ them to the directory <em>pot</em></p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/development/building.html b/docs/_build/html/developers/building.html
similarity index 82%
rename from docs/_build/html/development/building.html
rename to docs/_build/html/developers/building.html
index dd7a363..7fd9b3d 100644
--- a/docs/_build/html/development/building.html
+++ b/docs/_build/html/developers/building.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Building — Translate Toolkit 1.9.0 documentation</title>
+    <title>Building — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,16 +27,16 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
-    <link rel="next" title="Contributing" href="contributing.html" />
-    <link rel="prev" title="Translate Styleguide" href="../styleguide.html" /> 
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="next" title="Testing" href="testing.html" />
+    <link rel="prev" title="Translate Styleguide" href="styleguide.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="testing.html">Testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="contributing.html">Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,15 +95,16 @@
             
             
               
-  <li><a href="../styleguide.html"
+  <li><a href="styleguide.html"
          title="previous chapter">« Translate Styleguide</a></li>
-  <li><a href="contributing.html"
-         title="next chapter">Contributing »</a></li>
+  <li><a href="testing.html"
+         title="next chapter">Testing »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -135,22 +138,25 @@
 <div class="section" id="building-python-packages-with-c-extensions-under-windows">
 <span id="building-building-python-packages-with-c-extensions-under-windows"></span><h4>Building Python packages with C extensions under Windows<a class="headerlink" href="#building-python-packages-with-c-extensions-under-windows" title="Permalink to this headline">¶</a></h4>
 <p>In order to build modules which have C extensions, you will need either the
-Visual Studio C++ compiler or <a class="reference external" href="http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=240780">MinGW</a>.</p>
+Visual Studio C++ compiler or <a class="reference external" href="http://sourceforge.net/projects/mingw/files/MSYS/Extension/">MinGW</a>.</p>
 <p>Make sure that your Visual Studio C++ or MinGW program path is part of your
 system’s program path, since the Python build system requires this.</p>
 <p>To build and install a package with MinGW, you need to execute:</p>
-<div class="highlight-python"><pre>python setup.py build -c mingw32 install</pre>
+<div class="highlight-python"><div class="highlight"><pre>python setup.py build -c mingw32 install
+</pre></div>
 </div>
 <p>from the command line.</p>
 <p>To build a Windows installer when using MinGW, execute:</p>
-<div class="highlight-python"><pre>python setup.py build -c mingw32 bdist_wininst</pre>
+<div class="highlight-python"><div class="highlight"><pre>python setup.py build -c mingw32 bdist_wininst
+</pre></div>
 </div>
 </div>
 </div>
 <div class="section" id="building-building">
 <span id="id2"></span><h3>Building<a class="headerlink" href="#building-building" title="Permalink to this headline">¶</a></h3>
 <p>Simply execute:</p>
-<div class="highlight-python"><pre>python setup.py innosetup</pre>
+<div class="highlight-python"><div class="highlight"><pre>python setup.py innosetup
+</pre></div>
 </div>
 <p>The generated file can be found under <tt class="docutils literal"><span class="pre">translate-toolkit-<version>\Output</span></tt>
 (where <tt class="docutils literal"><span class="pre"><version></span></tt> is the software version).</p>
@@ -170,7 +176,7 @@ system’s program path, since the Python build system requires this.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/development/contributing.html b/docs/_build/html/developers/contributing.html
similarity index 85%
rename from docs/_build/html/development/contributing.html
rename to docs/_build/html/developers/contributing.html
index d5af382..5c6d8bb 100644
--- a/docs/_build/html/development/contributing.html
+++ b/docs/_build/html/developers/contributing.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Contributing — Translate Toolkit 1.9.0 documentation</title>
+    <title>Contributing — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,16 +27,16 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="next" title="Translate Toolkit Developers Guide" href="developers.html" />
-    <link rel="prev" title="Building" href="building.html" /> 
+    <link rel="prev" title="Testing" href="testing.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="testing.html">Testing</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">Contributing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -88,15 +90,16 @@
             
             
               
-  <li><a href="building.html"
-         title="previous chapter">« Building</a></li>
+  <li><a href="testing.html"
+         title="previous chapter">« Testing</a></li>
   <li><a href="developers.html"
          title="next chapter">Translate Toolkit Developers Guide »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -137,10 +140,11 @@ still work correctly.  If you are a frequent user you might want to start using
 the release candidate on your current work and report any errors before we
 release them.</p>
 <p>Compile and install the software to see if we have any platform issues:</p>
-<div class="highlight-python"><pre>./setup.py install</pre>
+<div class="highlight-python"><div class="highlight"><pre>./setup.py install
+</pre></div>
 </div>
 <p>Check for any files that are missing, tools that were not installed, etc.</p>
-<p><em class="xref std std-ref">Run unit tests</em> to see if
+<p><a class="reference external" href="http://translate.sourceforge.net/wiki/developers/testing_guidelines#running_tests">Run unit tests</a> to see if
 there are any issues.  Please report any failures.</p>
 <p>Finally, simply work with the software.  Checking all your current usage
 patterns and report problems.</p>
@@ -148,7 +152,7 @@ patterns and report problems.</p>
 <div class="section" id="debugging">
 <span id="contributing-debugging"></span><h2>Debugging<a class="headerlink" href="#debugging" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
-<li>Make sure your familiar with the <tt class="xref doc docutils literal"><span class="pre">bug</span> <span class="pre">reporting</span> <span class="pre">guidelines</span></tt>.</li>
+<li>Make sure your familiar with the <a class="reference external" href="http://translate.sourceforge.net/wiki/developers/reporting_bugs">bug reporting guidelines</a>.</li>
 <li>Create a login for yourself at <a class="reference external" href="http://bugs.locamotion.org">http://bugs.locamotion.org</a></li>
 <li>Then choose a bug</li>
 </ul>
@@ -182,8 +186,8 @@ and do the following:</p>
 <li>Add a <a class="reference internal" href="../formats/index.html"><em>format</em></a> type and converters</li>
 <li>Add more features to help our formats <a class="reference internal" href="../formats/conformance.html"><em>conform to the standards</em></a></li>
 </ul>
-<p>You will definitely need to be on the <a class="reference external" href="http://lists.sourceforge.net/lists/listinfo/translate-devel">Development</a> and probably on
-the <a class="reference external" href="http://lists.sourceforge.net/lists/listinfo/translate-cvs">Subversion checkin</a> lists.</p>
+<p>You will definitely need to be on the <a class="reference external" href="https://lists.sourceforge.net/lists/listinfo/translate-devel">Development</a> and probably
+on the <a class="reference external" href="https://lists.sourceforge.net/lists/listinfo/translate-cvs">Subversion checkin</a> lists.</p>
 <p>Now is the time to familiarise yourself with the <a class="reference internal" href="developers.html"><em>developers guide</em></a>.</p>
 </div>
 <div class="section" id="documenting">
@@ -218,7 +222,7 @@ changed its approach</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/development/developers.html b/docs/_build/html/developers/developers.html
similarity index 82%
rename from docs/_build/html/development/developers.html
rename to docs/_build/html/developers/developers.html
index eccc73f..347d79c 100644
--- a/docs/_build/html/development/developers.html
+++ b/docs/_build/html/developers/developers.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Translate Toolkit Developers Guide — Translate Toolkit 1.9.0 documentation</title>
+    <title>Translate Toolkit Developers Guide — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,8 +27,8 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
-    <link rel="next" title="API" href="../api/index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="next" title="Making a Translate Toolkit Release" href="releasing.html" />
     <link rel="prev" title="Contributing" href="contributing.html" /> 
   </head>
   <body>
@@ -37,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="testing.html">Testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="contributing.html">Contributing</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -83,6 +85,10 @@
 <li><a class="reference internal" href="#communication">Communication</a></li>
 </ul>
 </li>
+<li><a class="reference internal" href="#working-with-bugzilla">Working with Bugzilla</a><ul>
+<li><a class="reference internal" href="#automated-bugzilla-update-from-commits">Automated Bugzilla update from commits</a></li>
+</ul>
+</li>
 <li><a class="reference internal" href="#source-code-map">Source code map</a></li>
 <li><a class="reference internal" href="#setup">Setup</a></li>
 <li><a class="reference internal" href="#general-overview-of-the-programs">General overview of the programs</a><ul>
@@ -106,13 +112,14 @@
               
   <li><a href="contributing.html"
          title="previous chapter">« Contributing</a></li>
-  <li><a href="../api/index.html"
-         title="next chapter">API »</a></li>
+  <li><a href="releasing.html"
+         title="next chapter">Making a Translate Toolkit Release »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -155,7 +162,8 @@ so that we have a more or less stable API for converters.</p>
 <span id="developers-git-access"></span><h3>Git access<a class="headerlink" href="#git-access" title="Permalink to this headline">¶</a></h3>
 <p>Translate Toolkit uses Git as a Version Control System. You can directly clone
 the translate repository or fork it at GitHub.</p>
-<div class="highlight-python"><pre>git clone https://github.com/translate/translate.git</pre>
+<div class="highlight-python"><div class="highlight"><pre>git clone https://github.com/translate/translate.git
+</pre></div>
 </div>
 </div>
 <div class="section" id="bugzilla">
@@ -167,9 +175,42 @@ the translate repository or fork it at GitHub.</p>
 <div class="section" id="communication">
 <span id="developers-communication"></span><h3>Communication<a class="headerlink" href="#communication" title="Permalink to this headline">¶</a></h3>
 <ul class="simple">
-<li>IRC channel – <a class="reference external" href="irc://irc.freenode.net/#pootle">irc://irc.freenode.net/#pootle</a> Developers mailing list –</li>
-<li><a class="reference external" href="https://lists.sourceforge.net/lists/listinfo/translate-devel">https://lists.sourceforge.net/lists/listinfo/translate-devel</a> Commits to</li>
-<li>version control – <a class="reference external" href="https://lists.sourceforge.net/lists/listinfo/translate-cvs">https://lists.sourceforge.net/lists/listinfo/translate-cvs</a></li>
+<li><a class="reference external" href="irc://irc.freenode.net/#pootle">IRC channel</a></li>
+<li><a class="reference external" href="https://lists.sourceforge.net/lists/listinfo/translate-devel">Developers mailing list</a></li>
+<li><a class="reference external" href="https://lists.sourceforge.net/lists/listinfo/translate-cvs">Commits to version control</a></li>
+</ul>
+</div>
+</div>
+<div class="section" id="working-with-bugzilla">
+<span id="developers-working-with-bugzilla"></span><h2>Working with Bugzilla<a class="headerlink" href="#working-with-bugzilla" title="Permalink to this headline">¶</a></h2>
+<p>When you close bugs ensure that you give a description and git hash for the
+fix.  This ensures that the reporter or code reviewer can see your work and has
+an easy method of finding your fix.  This is made easier by GitHub’s Bugzilla
+integration.</p>
+<div class="section" id="automated-bugzilla-update-from-commits">
+<h3>Automated Bugzilla update from commits<a class="headerlink" href="#automated-bugzilla-update-from-commits" title="Permalink to this headline">¶</a></h3>
+<p>Github will post comments on Bugzilla bugs when the commit messages make
+references to the bug by its bug number.</p>
+<ul>
+<li><p class="first">Bugs are recognised by the following format (which are case-insensitive):</p>
+<div class="highlight-python"><div class="highlight"><pre>Bug 123
+</pre></div>
+</div>
+</li>
+<li><p class="first">Multiple bugs can be specified by separating them with a comma, ampersand,
+plus or “and”:</p>
+<div class="highlight-python"><div class="highlight"><pre>Bug 123, 124 and 125
+</pre></div>
+</div>
+</li>
+<li><p class="first">Commits to all branches will be processed.</p>
+</li>
+<li><p class="first">If there is a “fix”, “close”, or “address” before the bug then that bug is
+closed.</p>
+<div class="highlight-python"><div class="highlight"><pre>Fix bug 123
+</pre></div>
+</div>
+</li>
 </ul>
 </div>
 </div>
@@ -194,12 +235,11 @@ etc.</li>
 <div class="section" id="setup">
 <span id="developers-setup"></span><h2>Setup<a class="headerlink" href="#setup" title="Permalink to this headline">¶</a></h2>
 <p>The toolkit is installed by running:</p>
-<div class="highlight-python"><pre>./setup.py install</pre>
+<div class="highlight-python"><div class="highlight"><pre>./setup.py install
+</pre></div>
 </div>
 <p>As root</p>
 <p>The various setup options are yours to explore</p>
-<p>To run / test things without installing, see the <tt class="xref doc docutils literal"><span class="pre">instructions</span> <span class="pre">for</span> <span class="pre">Pootle</span></tt>. Those instructions sets your environment for both Pootle
-and the toolkit</p>
 </div>
 <div class="section" id="general-overview-of-the-programs">
 <span id="developers-general-overview-of-the-programs"></span><h2>General overview of the programs<a class="headerlink" href="#general-overview-of-the-programs" title="Permalink to this headline">¶</a></h2>
@@ -291,17 +331,15 @@ implemented in its own file.  Up until toolkit version 0.8, there was no
 formally defined API (the tools have been evolving and only recently
 stabilised), but they generally followed this structure.  These classes are
 defined:</p>
-<ul>
-<li><p class="first">XXelement – handles the low level individual elements of the file format.
-e.g. PO message, CSV records, DTD elements</p>
-</li>
-<li><p class="first">XXfile – handles the document or file level of the format.  Eg a PO file, a
-CSV file a DTD file
-* fromlines – read in a file and initialise the various elements
-* tolines – convert the elements stored in XXelements and portions in XXfile</p>
-<blockquote>
-<div><p>to a raw file in that format</p>
-</div></blockquote>
+<ul class="simple">
+<li>XXelement – handles the low level individual elements of the file format.
+e.g. PO message, CSV records, DTD elements</li>
+<li>XXfile – handles the document or file level of the format.  Eg a PO file, a
+CSV file a DTD file<ul>
+<li>fromlines – read in a file and initialise the various elements</li>
+<li>tolines – convert the elements stored in XXelements and portions in XXfile
+to a raw file in that format</li>
+</ul>
 </li>
 </ul>
 <p>In the XML based formats e.g.  TMX, XLIFF and HTML there is usually just an
@@ -347,7 +385,7 @@ classes as far as possible.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/developers/releasing.html b/docs/_build/html/developers/releasing.html
new file mode 100644
index 0000000..8626c95
--- /dev/null
+++ b/docs/_build/html/developers/releasing.html
@@ -0,0 +1,429 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Making a Translate Toolkit Release — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="next" title="Changelog" href="../changelog.html" />
+    <link rel="prev" title="Translate Toolkit Developers Guide" href="developers.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Making a Translate Toolkit Release</a><ul>
+<li><a class="reference internal" href="#summary">Summary</a><ul>
+<li><a class="reference internal" href="#other-possible-steps">Other possible steps</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#detailed-instructions">Detailed instructions</a><ul>
+<li><a class="reference internal" href="#get-a-clean-checkout">Get a clean checkout</a></li>
+<li><a class="reference internal" href="#create-release-notes">Create release notes</a></li>
+<li><a class="reference internal" href="#up-version-numbers">Up version numbers</a></li>
+<li><a class="reference internal" href="#build-the-package">Build the package</a></li>
+<li><a class="reference internal" href="#test-install-and-other-tests">Test install and other tests</a></li>
+<li><a class="reference internal" href="#tag-the-release">Tag the release</a></li>
+<li><a class="reference internal" href="#publish-on-pypi">Publish on PyPI</a></li>
+<li><a class="reference internal" href="#copy-files-to-sourceforge">Copy files to sourceforge</a></li>
+<li><a class="reference internal" href="#release-documentation">Release documentation</a></li>
+<li><a class="reference internal" href="#update-translate-website">Update translate website</a></li>
+<li><a class="reference internal" href="#unstage-on-sourceforge">Unstage on sourceforge</a></li>
+<li><a class="reference internal" href="#announce-to-the-world">Announce to the world</a></li>
+<li><a class="reference internal" href="#cleanup">Cleanup</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="developers.html"
+         title="previous chapter">« Translate Toolkit Developers Guide</a></li>
+  <li><a href="../changelog.html"
+         title="next chapter">Changelog »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="making-a-translate-toolkit-release">
+<h1>Making a Translate Toolkit Release<a class="headerlink" href="#making-a-translate-toolkit-release" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="summary">
+<h2>Summary<a class="headerlink" href="#summary" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Git clone <a class="reference external" href="mailto:git%40github.com">git<span>@</span>github<span>.</span>com</a>:translate/translate.git translate-release</li>
+<li>Create release notes</li>
+<li>Up version number</li>
+<li>make build</li>
+<li>Test install and other tests</li>
+<li>Tag the release</li>
+<li>Publish on PyPI</li>
+<li>Upload to Sourceforge</li>
+<li>Release documentation</li>
+<li>Update translate website</li>
+<li>Unstage sourceforge</li>
+<li>Announce to the world</li>
+<li>Cleanup</li>
+</ol>
+<div class="section" id="other-possible-steps">
+<h3>Other possible steps<a class="headerlink" href="#other-possible-steps" title="Permalink to this headline">¶</a></h3>
+<p>We need to check and document these if needed:</p>
+<ul class="simple">
+<li>Build docs: we need to check if e need to build the docs for the release</li>
+<li>Change URLs to point to the correct docs: do we want to change URLs to point
+to the $version docs rather then ‘latest’</li>
+<li>Building on Windows, building for other Linux distros. We have produced</li>
+<li>Communicating to upstream packagers</li>
+</ul>
+</div>
+</div>
+<div class="section" id="detailed-instructions">
+<h2>Detailed instructions<a class="headerlink" href="#detailed-instructions" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="get-a-clean-checkout">
+<h3>Get a clean checkout<a class="headerlink" href="#get-a-clean-checkout" title="Permalink to this headline">¶</a></h3>
+<p>We work from a clean checkout to esnure that everything you are adding to the
+build is what is in VC and doesn’t contain any of your uncommitted changes.  It
+also ensure that someone else could relicate your process.</p>
+<div class="highlight-python"><div class="highlight"><pre>git clone git at github.com:translate/translate.git translate-release
+</pre></div>
+</div>
+</div>
+<div class="section" id="create-release-notes">
+<h3>Create release notes<a class="headerlink" href="#create-release-notes" title="Permalink to this headline">¶</a></h3>
+<p>The release notes will be used in these places:</p>
+<ul class="simple">
+<li>Toolkit website - <a class="reference external" href="http://toolkit.translatehouse.org/download.html">download page</a> (used in gh-pages)</li>
+<li>Sourceforge download - README.rst (used to give user info)</li>
+<li>Email announcements - text version</li>
+</ul>
+<p>We create our release notes in reStructured Text, since we use that elsewhere
+and since it can be rendered well in some of our key sites.</p>
+<p>First we need to create a log of changes in the Translate Toolkit, which is
+done generically like this:</p>
+<div class="highlight-python"><div class="highlight"><pre>git log $version-1..HEAD > docs/release/$version.rst
+</pre></div>
+</div>
+<p>Or a more specific example:</p>
+<div class="highlight-python"><div class="highlight"><pre>git log 1.10.0..HEAD > docs/releases/1.10.0.rst
+</pre></div>
+</div>
+<p>Edit this file.  You can use the commits as a guide to build up the release
+notes.  You should remove all log messages before the release.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Since the release notes will be used in places that allow linking we
+use links within the notes.  These should link back to products websites
+(<a class="reference external" href="http://virtaal.org">Virtaal</a>, <a class="reference external" href="http://pootle.translatehouse.org">Pootle</a>, etc), references to <a class="reference external" href="http://translatehouse.org">Translate</a> and possibly bug numbers, etc.</p>
+</div>
+<p>Read for grammar and spelling errors.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>When writing the notes please remember:</p>
+<ol class="last arabic simple">
+<li>The voice is active. ‘Translate has released a new version of the
+toolkit’, not ‘A new version of the toolkit was release by Translate’.</li>
+<li>The connection to the users is human not distant.</li>
+<li>We speak in familiar terms e.g. “I know you’ve been waiting for this
+release” instead of formal.</li>
+</ol>
+</div>
+<p>We create a list of contributors using this command:</p>
+<div class="highlight-python"><div class="highlight"><pre>git log 1.10.0..HEAD --format='%aN, ' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn | cut -d\  -f2-
+</pre></div>
+</div>
+</div>
+<div class="section" id="up-version-numbers">
+<h3>Up version numbers<a class="headerlink" href="#up-version-numbers" title="Permalink to this headline">¶</a></h3>
+<p>Update the version number in:</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">translate/__version__.py</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">docs/conf.py`</span></tt></li>
+</ul>
+<p>In <tt class="docutils literal"><span class="pre">__version__.py</span></tt>, bump the build number if anybody used the toolkit with
+the previous number, and there have been any changes to code touching stats or
+quality checks.  An increased build number will force a toolkit user, like
+Pootle, to regenerate the stats and checks.</p>
+<p>For <tt class="docutils literal"><span class="pre">conf.py</span></tt> change <tt class="docutils literal"><span class="pre">version</span></tt> and <tt class="docutils literal"><span class="pre">release</span></tt></p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">FIXME - We might want to consolidate the version and release info so
+that we can update it in one place.</p>
+</div>
+<p>The version string should follow the pattern:</p>
+<div class="highlight-python"><div class="highlight"><pre>$MAJOR-$MINOR-$MICRO[-$EXTRA]
+</pre></div>
+</div>
+<p>E.g.</p>
+<div class="highlight-python"><div class="highlight"><pre>1.10.0
+0.9.1-rc1
+</pre></div>
+</div>
+<p><tt class="docutils literal"><span class="pre">$EXTRA</span></tt> is optional but all the three others are required.  The first
+release of a <tt class="docutils literal"><span class="pre">$MINOR</span></tt> version will always have a <tt class="docutils literal"><span class="pre">$MICRO</span></tt> of <tt class="docutils literal"><span class="pre">.0</span></tt>. So
+<tt class="docutils literal"><span class="pre">1.10.0</span></tt> and never just <tt class="docutils literal"><span class="pre">1.10</span></tt>.</p>
+</div>
+<div class="section" id="build-the-package">
+<h3>Build the package<a class="headerlink" href="#build-the-package" title="Permalink to this headline">¶</a></h3>
+<p>Building is the first step to testing that things work.  From your clean
+checkout run:</p>
+<div class="highlight-python"><div class="highlight"><pre>make build
+</pre></div>
+</div>
+<p>This will create a tarball in <tt class="docutils literal"><span class="pre">dist/</span></tt> which you can use for further testing.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">We use a clean checkout just to make sure that no inadvertant changes
+make it into the release.</p>
+</div>
+</div>
+<div class="section" id="test-install-and-other-tests">
+<h3>Test install and other tests<a class="headerlink" href="#test-install-and-other-tests" title="Permalink to this headline">¶</a></h3>
+<p>The easiest way to test is in a virtualenv.  You can install the new toolkit
+using:</p>
+<div class="highlight-python"><div class="highlight"><pre>pip install path/to/dist/translate-toolkit-$version.tar.bz2
+</pre></div>
+</div>
+<p>This will allow you test installation of the software.</p>
+<p>You can then proceed with other tests such as checking</p>
+<ol class="arabic simple">
+<li>Documentation is available</li>
+<li>Converters and scripts are installed and run correctly</li>
+<li>Meta information about the package is correct. See pypy section of reviewing
+meta data.</li>
+</ol>
+</div>
+<div class="section" id="tag-the-release">
+<h3>Tag the release<a class="headerlink" href="#tag-the-release" title="Permalink to this headline">¶</a></h3>
+<p>You should only tag once you are happy with your release as there are some
+things that we can’t undo.</p>
+<div class="highlight-python"><div class="highlight"><pre>git tag -a 1.10.0 -m "Tag version 1.10.0"
+git push --tags
+</pre></div>
+</div>
+</div>
+<div class="section" id="publish-on-pypi">
+<h3>Publish on PyPI<a class="headerlink" href="#publish-on-pypi" title="Permalink to this headline">¶</a></h3>
+<p>Publish the package on the <a class="reference external" href="https://pypi.python.org/pypi">Python Package Index</a> (PyPI)</p>
+<ul class="simple">
+<li><a class="reference external" href="http://wiki.python.org/moin/CheeseShopTutorial#Submitting_Packages_to_the_Package_Index">Submitting Packages to the Package Index</a></li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>You need a username and password on <a class="reference external" href="https://pypi.python.org">https://pypi.python.org</a> and have
+rights to the project before you can proceed with this step.</p>
+<p class="last">These can be stored in <tt class="docutils literal"><span class="pre">$HOME/.pypirc</span></tt> and will contain your username and
+password. A first run of <tt class="docutils literal"><span class="pre">./setup.py</span> <span class="pre">register</span></tt> will create such a file.
+It will also actually publish the meta-data so only do it when you are
+actually ready.</p>
+</div>
+<p>Review the meta data. This is stored in <tt class="docutils literal"><span class="pre">setup.py</span></tt>, use <tt class="docutils literal"><span class="pre">./setup.py</span> <span class="pre">--help</span></tt>
+to se some options to display meta-data. The actual descriptions are taken from
+<tt class="docutils literal"><span class="pre">translate/__init__.py</span></tt>.</p>
+<p>To test before publishing run:</p>
+<div class="highlight-python"><div class="highlight"><pre>make test-publish-pypi
+</pre></div>
+</div>
+<p>Then to actually publish:</p>
+<div class="highlight-python"><div class="highlight"><pre>make publish-pypi
+</pre></div>
+</div>
+</div>
+<div class="section" id="copy-files-to-sourceforge">
+<h3>Copy files to sourceforge<a class="headerlink" href="#copy-files-to-sourceforge" title="Permalink to this headline">¶</a></h3>
+<p>Publishing files to the Translate Sourceforge project.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You need to have release permissions on sourceforge to perform this
+step.</p>
+</div>
+<ul class="simple">
+<li><a class="reference external" href="http://sourceforge.net/projects/translate/files/Translate%20Toolkit/">http://sourceforge.net/projects/translate/files/Translate%20Toolkit/</a></li>
+</ul>
+<p>You will need:</p>
+<ul class="simple">
+<li>Tarball of the release</li>
+<li>Release notes in reStructured Text</li>
+</ul>
+<ol class="arabic simple">
+<li>Create a new folder in the <a class="reference external" href="https://sourceforge.net/projects/translate/files/Translate%20Toolkit/">Translate Toolkit</a>
+release folder using the ‘Add Folder’ button.  The folder must have the same
+name as the release version e.g.  <tt class="docutils literal"><span class="pre">1.10.0-rc1</span></tt>.  Mark this as being for
+staging for the moment.</li>
+<li><tt class="docutils literal"><span class="pre">make</span> <span class="pre">publish-sourceforge</span></tt> will give you the command to upload your
+tarball and <tt class="docutils literal"><span class="pre">README.rst</span></tt>.<ol class="arabic">
+<li>Upload tarball for release.</li>
+<li>Upload release notes as <tt class="docutils literal"><span class="pre">README.rst</span></tt>.</li>
+<li>Click on the info icon for <tt class="docutils literal"><span class="pre">README.rst</span></tt> and tick “Exclude Stats” to
+exlude the README from stats counting.</li>
+</ol>
+</li>
+<li>Check that the README.rst for the parent <tt class="docutils literal"><span class="pre">Translate</span> <span class="pre">Toolkit</span></tt> folder is
+still appropriate, this is the text from <tt class="docutils literal"><span class="pre">translate/__info__.py</span></tt>.</li>
+<li>Check all links for <tt class="docutils literal"><span class="pre">README.rst</span></tt> files, new release and parent.</li>
+</ol>
+</div>
+<div class="section" id="release-documentation">
+<h3>Release documentation<a class="headerlink" href="#release-documentation" title="Permalink to this headline">¶</a></h3>
+<p>We need a tagged release before we can do this.  The docs are published on Read
+The Docs.</p>
+<ul class="simple">
+<li><a class="reference external" href="https://readthedocs.org/dashboard/translate-toolkit/versions/">https://readthedocs.org/dashboard/translate-toolkit/versions/</a></li>
+</ul>
+<p>Use the admin pages to flag a version that should be published</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">FIXME we might need to do this before publishing so that we can
+update doc references to point to the tagged version as apposed to the
+latest version.</p>
+</div>
+</div>
+<div class="section" id="update-translate-website">
+<h3>Update translate website<a class="headerlink" href="#update-translate-website" title="Permalink to this headline">¶</a></h3>
+<p>We use github pages for the website. First we need to checkout the pages:</p>
+<div class="highlight-python"><div class="highlight"><pre>git checkout gh-pages
+</pre></div>
+</div>
+<ol class="arabic simple">
+<li>In <tt class="docutils literal"><span class="pre">_posts/</span></tt> add a new release posting.  This is in Markdown format (for
+now), so we need to change the release notes .rst to .md, which mostly means
+changing URL links from <tt class="docutils literal"><span class="pre">`xxx</span> <span class="pre"><link>`_</span></tt> to <tt class="docutils literal"><span class="pre">[xxx](link)</span></tt>.</li>
+<li>Change $version as needed. See <tt class="docutils literal"><span class="pre">download.html</span></tt>, <tt class="docutils literal"><span class="pre">_config.yml</span></tt> and
+<tt class="docutils literal"><span class="pre">egrep</span> <span class="pre">-r</span> <span class="pre">$old_release</span> <span class="pre">*</span></tt></li>
+<li><strong class="command">git commit</strong> and <strong class="command">git push</strong> - changes are quite quick so
+easy to review.</li>
+</ol>
+</div>
+<div class="section" id="unstage-on-sourceforge">
+<h3>Unstage on sourceforge<a class="headerlink" href="#unstage-on-sourceforge" title="Permalink to this headline">¶</a></h3>
+<p>If you have created a staged release folder, then unstage it now.</p>
+</div>
+<div class="section" id="announce-to-the-world">
+<h3>Announce to the world<a class="headerlink" href="#announce-to-the-world" title="Permalink to this headline">¶</a></h3>
+<p>Let people know that there is a new version:</p>
+<ol class="arabic simple">
+<li>Announce on mailing lists:
+Send the announcement to the translate-announce mailing lists on
+<a class="reference external" href="mailto:translate-announce%40lists.sourceforge.net">translate-announce<span>@</span>lists<span>.</span>sourceforge<span>.</span>net</a></li>
+<li>Adjust the #pootle channel notice. Use <tt class="docutils literal"><span class="pre">/topic</span></tt> to change the topic.</li>
+<li>Email important users</li>
+<li>Tweet about it</li>
+</ol>
+</div>
+<div class="section" id="cleanup">
+<h3>Cleanup<a class="headerlink" href="#cleanup" title="Permalink to this headline">¶</a></h3>
+<p>Some possible cleanup tasks:</p>
+<ul class="simple">
+<li>Remove any RC builds from the sourceforge download pages (maybe?).</li>
+<li>Commit any release notes and such (or maybe do that before tagging).</li>
+<li>Remove your translate-release checkout.</li>
+<li>Update and fix these release notes.</li>
+</ul>
+</div>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/developers/styleguide.html b/docs/_build/html/developers/styleguide.html
new file mode 100644
index 0000000..863fe29
--- /dev/null
+++ b/docs/_build/html/developers/styleguide.html
@@ -0,0 +1,729 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Translate Styleguide — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="next" title="Building" href="building.html" />
+    <link rel="prev" title="Quoting and Escaping" href="../formats/quoting_and_escaping.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Translate Styleguide</a><ul>
+<li><a class="reference internal" href="#general">General</a><ul>
+<li><a class="reference internal" href="#indentation">Indentation</a></li>
+<li><a class="reference internal" href="#maximum-line-length">Maximum line length</a></li>
+<li><a class="reference internal" href="#continuing-long-statements">Continuing long statements</a></li>
+<li><a class="reference internal" href="#blank-lines">Blank lines</a></li>
+<li><a class="reference internal" href="#imports">Imports</a></li>
+<li><a class="reference internal" href="#properties">Properties</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#expressions-and-statements">Expressions and Statements</a><ul>
+<li><a class="reference internal" href="#general-whitespace-rules">General whitespace rules</a></li>
+<li><a class="reference internal" href="#slice-notation">Slice notation</a></li>
+<li><a class="reference internal" href="#comparisons">Comparisons</a></li>
+<li><a class="reference internal" href="#negated-containment-checks">Negated containment checks</a></li>
+<li><a class="reference internal" href="#instance-checks">Instance checks</a></li>
+<li><a class="reference internal" href="#if-statements">If statements</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#naming-conventions">Naming Conventions</a><ul>
+<li><a class="reference internal" href="#function-and-method-arguments">Function and method arguments</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#documentation">Documentation</a><ul>
+<li><a class="reference internal" href="#special-roles">Special roles</a></li>
+<li><a class="reference internal" href="#code-and-command-line-highlighting">Code and command line highlighting</a></li>
+<li><a class="reference internal" href="#user-documentation">User documentation</a></li>
+<li><a class="reference internal" href="#docstrings">Docstrings</a></li>
+<li><a class="reference internal" href="#comments">Comments</a></li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="../formats/quoting_and_escaping.html"
+         title="previous chapter">« Quoting and Escaping</a></li>
+  <li><a href="building.html"
+         title="next chapter">Building »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="translate-styleguide">
+<span id="styleguide"></span><h1>Translate Styleguide<a class="headerlink" href="#translate-styleguide" title="Permalink to this headline">¶</a></h1>
+<p>The Translate styleguide is the styleguide for all Translate projects,
+including Translate Toolkit, Pootle, Virtaal and others.  Patches are required
+to follow these guidelines.</p>
+<p>This Styleguide follows <span class="target" id="index-0"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0008"><strong>PEP 8</strong></a> with some clarifications. It is based almost
+verbatim on the <a class="reference external" href="http://flask.pocoo.org/docs/styleguide/">Flask Styleguide</a>.</p>
+<div class="section" id="general">
+<span id="styleguide-general"></span><h2>General<a class="headerlink" href="#general" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="indentation">
+<h3>Indentation<a class="headerlink" href="#indentation" title="Permalink to this headline">¶</a></h3>
+<p>4 real spaces, no tabs. Exceptions: modules that have been copied into the
+source that don’t follow this guideline.</p>
+</div>
+<div class="section" id="maximum-line-length">
+<h3>Maximum line length<a class="headerlink" href="#maximum-line-length" title="Permalink to this headline">¶</a></h3>
+<p>79 characters with a soft limit for 84 if absolutely necessary. Try to avoid
+too nested code by cleverly placing <cite>break</cite>, <cite>continue</cite> and <cite>return</cite>
+statements.</p>
+</div>
+<div class="section" id="continuing-long-statements">
+<h3>Continuing long statements<a class="headerlink" href="#continuing-long-statements" title="Permalink to this headline">¶</a></h3>
+<p>To continue a statement you can use backslashes (preceeded by a space) in which
+case you should align the next line with the last dot or equal sign, or indent
+four spaces:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">MyModel</span><span class="o">.</span><span class="n">query</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">scalar</span> <span class="o">></span> <span class="mi">120</span><span class="p">)</span> \
+             <span class="o">.</span><span class="n">order_by</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">desc</span><span class="p">())</span> \
+             <span class="o">.</span><span class="n">limit</span><span class="p">(</span><span class="mi">10</span><span class="p">)</span>
+
+<span class="n">my_long_assignment</span> <span class="o">=</span> <span class="n">MyModel</span><span class="o">.</span><span class="n">query</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">scalar</span> <span class="o">></span> <span class="mi">120</span><span class="p">)</span> \
+                     <span class="o">.</span><span class="n">order_by</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">desc</span><span class="p">())</span> \
+                     <span class="o">.</span><span class="n">limit</span><span class="p">(</span><span class="mi">10</span><span class="p">)</span>
+
+<span class="n">this_is_a_very_long</span><span class="p">(</span><span class="n">function_call</span><span class="p">,</span> <span class="s">'with many parameters'</span><span class="p">)</span> \
+    <span class="o">.</span><span class="n">that_returns_an_object_with_an_attribute</span>
+</pre></div>
+</div>
+<p>If you break in a statement with parentheses or braces, align to the braces:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">this_is_a_very_long</span><span class="p">(</span><span class="n">function_call</span><span class="p">,</span> <span class="s">'with many parameters'</span><span class="p">,</span>
+                    <span class="mi">23</span><span class="p">,</span> <span class="mi">42</span><span class="p">,</span> <span class="s">'and even more'</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>If you need to break long strings, on function calls or when assigning to
+variables, try to use implicit string continuation:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">this_holds_a_very_long_string</span><span class="p">(</span><span class="s">"Very long string with a lot of characters "</span>
+                              <span class="s">"and words on it, so many that it is "</span>
+                              <span class="s">"necessary to break it in several lines to "</span>
+                              <span class="s">"improve readability."</span><span class="p">)</span>
+<span class="n">long_string_var</span> <span class="o">=</span> <span class="p">(</span><span class="s">"Very long string with a lot of characters and words on "</span>
+                   <span class="s">"it, so many that it is necessary to break it in "</span>
+                   <span class="s">"several lines to improve readability."</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>For lists or tuples with many items, break immediately after the opening brace:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">items</span> <span class="o">=</span> <span class="p">[</span>
+    <span class="s">'this is the first'</span><span class="p">,</span> <span class="s">'set of items'</span><span class="p">,</span> <span class="s">'with more items'</span><span class="p">,</span>
+    <span class="s">'to come in this line'</span><span class="p">,</span> <span class="s">'like this'</span>
+<span class="p">]</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="blank-lines">
+<h3>Blank lines<a class="headerlink" href="#blank-lines" title="Permalink to this headline">¶</a></h3>
+<p>Top level functions and classes are separated by two lines, everything else
+by one. Do not use too many blank lines to separate logical segments in code.
+Example:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">hello</span><span class="p">(</span><span class="n">name</span><span class="p">):</span>
+    <span class="k">print</span> <span class="s">'Hello </span><span class="si">%s</span><span class="s">!'</span> <span class="o">%</span> <span class="n">name</span>
+
+
+<span class="k">def</span> <span class="nf">goodbye</span><span class="p">(</span><span class="n">name</span><span class="p">):</span>
+    <span class="k">print</span> <span class="s">'See you </span><span class="si">%s</span><span class="s">.'</span> <span class="o">%</span> <span class="n">name</span>
+
+
+<span class="k">class</span> <span class="nc">MyClass</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
+    <span class="sd">"""This is a simple docstring"""</span>
+
+    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="p">):</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">name</span> <span class="o">=</span> <span class="n">name</span>
+
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">annoying_name</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">+</span> <span class="s">'!!!!111'</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="imports">
+<span id="styleguide-imports"></span><h3>Imports<a class="headerlink" href="#imports" title="Permalink to this headline">¶</a></h3>
+<p>Like in <span class="target" id="index-1"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0008"><strong>PEP 8</strong></a>, but:</p>
+<ul class="simple">
+<li>Imports should be grouped in the following order:<ol class="arabic">
+<li>__future__ library imports</li>
+<li>Python standard library imports</li>
+<li>Third party libraries imports</li>
+<li>Translate Toolkit imports</li>
+<li>Current package imports, using explicit relative imports (See <a class="reference external" href="http://www.python.org/dev/peps/pep-0328/#guido-s-decision">PEP 328</a>)</li>
+</ol>
+</li>
+<li>A blank line must be present between each group of imports (like in PEP8).</li>
+<li>Imports on each group must be arranged alphabetically by module name:<ul>
+<li>Shortest module names must be before longer ones:
+<tt class="docutils literal"><span class="pre">from</span> <span class="pre">django.db</span> <span class="pre">import</span> <span class="pre">...</span></tt> before <tt class="docutils literal"><span class="pre">from</span> <span class="pre">django.db.models</span> <span class="pre">import</span> <span class="pre">...</span></tt>.</li>
+</ul>
+</li>
+<li><tt class="docutils literal"><span class="pre">import</span> <span class="pre">...</span></tt> calls must precede <tt class="docutils literal"><span class="pre">from</span> <span class="pre">...</span> <span class="pre">import</span></tt> ones on each group:<ul>
+<li>On each of these subgroups the entries should be alphabetically arranged.</li>
+<li>No blank lines between subgroups.</li>
+</ul>
+</li>
+<li>On <tt class="docutils literal"><span class="pre">from</span> <span class="pre">...</span> <span class="pre">import</span></tt><ul>
+<li>Use a <tt class="docutils literal"><span class="pre">CONSTANT</span></tt>, <tt class="docutils literal"><span class="pre">Class</span></tt>, <tt class="docutils literal"><span class="pre">function</span></tt> order, where the constants,
+classes and functions are in alphabetical order inside of its respective
+groups.</li>
+<li>If the import line exceeds the 80 chars, then split it using parentheses to
+continue the import on the next line (aligning the imported items with the
+opening parenthesis).</li>
+</ul>
+</li>
+</ul>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">absolute_import</span>
+
+<span class="kn">import</span> <span class="nn">re</span>
+<span class="kn">import</span> <span class="nn">sys.path</span> <span class="kn">as</span> <span class="nn">sys_path</span>
+<span class="kn">import</span> <span class="nn">time</span>
+<span class="kn">from</span> <span class="nn">datetime</span> <span class="kn">import</span> <span class="n">timedelta</span>
+<span class="kn">from</span> <span class="nn">os</span> <span class="kn">import</span> <span class="n">path</span>
+
+<span class="kn">from</span> <span class="nn">lxml.html</span> <span class="kn">import</span> <span class="n">fromstring</span>
+
+<span class="kn">from</span> <span class="nn">translate.filters</span> <span class="kn">import</span> <span class="n">checks</span>
+<span class="kn">from</span> <span class="nn">translate.storage</span> <span class="kn">import</span> <span class="n">versioncontrol</span>
+<span class="kn">from</span> <span class="nn">translate.storage.aresource</span> <span class="kn">import</span> <span class="p">(</span><span class="n">EOF</span><span class="p">,</span> <span class="n">WHITESPACE</span><span class="p">,</span> <span class="n">AndroidFile</span><span class="p">,</span>
+                                         <span class="n">AndroidUnit</span><span class="p">,</span> <span class="n">android_decode</span><span class="p">,</span>
+                                         <span class="n">android_encode</span><span class="p">)</span>
+
+<span class="kn">from</span> <span class="nn">.</span> <span class="kn">import</span> <span class="n">php2po</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="properties">
+<h3>Properties<a class="headerlink" href="#properties" title="Permalink to this headline">¶</a></h3>
+<ul>
+<li><p class="first">Never use <tt class="docutils literal"><span class="pre">lambda</span></tt> functions:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># Good.</span>
+<span class="nd">@property</span>
+<span class="k">def</span> <span class="nf">stores</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">child</span><span class="o">.</span><span class="n">stores</span>
+
+
+<span class="c"># Bad.</span>
+<span class="n">stores</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">child</span><span class="o">.</span><span class="n">stores</span><span class="p">)</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Try to use <tt class="docutils literal"><span class="pre">@property</span></tt> instead of <tt class="docutils literal"><span class="pre">get_*</span></tt> or <tt class="docutils literal"><span class="pre">is_*</span></tt> methods that don’t
+require passing any parameter:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># Good.</span>
+<span class="nd">@property</span>
+<span class="k">def</span> <span class="nf">terminology</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="o">...</span>
+
+<span class="nd">@property</span>
+<span class="k">def</span> <span class="nf">is_monolingual</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="o">...</span>
+
+
+<span class="c"># Also good.</span>
+<span class="k">def</span> <span class="nf">get_stores_for_language</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">language</span><span class="p">):</span>
+  <span class="o">...</span>
+
+
+<span class="c"># Bad.</span>
+<span class="k">def</span> <span class="nf">get_terminology</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="o">...</span>
+
+<span class="k">def</span> <span class="nf">is_monolingual</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="o">...</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Always use <tt class="docutils literal"><span class="pre">@property</span></tt> instead of <tt class="docutils literal"><span class="pre">property(...)</span></tt>, even for properties
+that also have a setter or a deleter:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># Good.</span>
+<span class="nd">@property</span>
+<span class="k">def</span> <span class="nf">units</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="o">...</span>
+
+
+<span class="c"># Also good.</span>
+<span class="nd">@property</span>
+<span class="k">def</span> <span class="nf">x</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="sd">"""I'm the 'x' property."""</span>
+  <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_x</span>
+
+<span class="nd">@x.setter</span>
+<span class="k">def</span> <span class="nf">x</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">value</span><span class="p">):</span>  <span class="c"># Note: Method must be named 'x' too.</span>
+  <span class="bp">self</span><span class="o">.</span><span class="n">_x</span> <span class="o">=</span> <span class="n">value</span>
+
+<span class="nd">@x.deleter</span>
+<span class="k">def</span> <span class="nf">x</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>  <span class="c"># Note: Method must be named 'x' too.</span>
+  <span class="k">del</span> <span class="bp">self</span><span class="o">.</span><span class="n">_x</span>
+
+
+<span class="c"># Bad.</span>
+<span class="k">def</span> <span class="nf">_get_units</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="o">...</span>
+<span class="n">units</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">_get_units</span><span class="p">)</span>
+
+
+<span class="c"># Also bad.</span>
+<span class="k">def</span> <span class="nf">getx</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_x</span>
+<span class="k">def</span> <span class="nf">setx</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">value</span><span class="p">):</span>
+  <span class="bp">self</span><span class="o">.</span><span class="n">_x</span> <span class="o">=</span> <span class="n">value</span>
+<span class="k">def</span> <span class="nf">delx</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+  <span class="k">del</span> <span class="bp">self</span><span class="o">.</span><span class="n">_x</span>
+<span class="n">x</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">getx</span><span class="p">,</span> <span class="n">setx</span><span class="p">,</span> <span class="n">delx</span><span class="p">,</span> <span class="s">"I'm the 'x' property."</span><span class="p">)</span>
+</pre></div>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" id="expressions-and-statements">
+<h2>Expressions and Statements<a class="headerlink" href="#expressions-and-statements" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="general-whitespace-rules">
+<h3>General whitespace rules<a class="headerlink" href="#general-whitespace-rules" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>No whitespace for unary operators that are not words (e.g.: <tt class="docutils literal"><span class="pre">-</span></tt>, <tt class="docutils literal"><span class="pre">~</span></tt>
+etc.) as well on the inner side of parentheses.</li>
+<li>Whitespace is placed between binary operators.</li>
+</ul>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># Good.</span>
+<span class="n">exp</span> <span class="o">=</span> <span class="o">-</span><span class="mf">1.05</span>
+<span class="n">value</span> <span class="o">=</span> <span class="p">(</span><span class="n">item_value</span> <span class="o">/</span> <span class="n">item_count</span><span class="p">)</span> <span class="o">*</span> <span class="n">offset</span> <span class="o">/</span> <span class="n">exp</span>
+<span class="n">value</span> <span class="o">=</span> <span class="n">my_list</span><span class="p">[</span><span class="n">index</span><span class="p">]</span>
+<span class="n">value</span> <span class="o">=</span> <span class="n">my_dict</span><span class="p">[</span><span class="s">'key'</span><span class="p">]</span>
+
+
+<span class="c"># Bad.</span>
+<span class="n">exp</span> <span class="o">=</span> <span class="o">-</span> <span class="mf">1.05</span>
+<span class="n">value</span> <span class="o">=</span> <span class="p">(</span> <span class="n">item_value</span> <span class="o">/</span> <span class="n">item_count</span> <span class="p">)</span> <span class="o">*</span> <span class="n">offset</span> <span class="o">/</span> <span class="n">exp</span>
+<span class="n">value</span> <span class="o">=</span> <span class="p">(</span><span class="n">item_value</span><span class="o">/</span><span class="n">item_count</span><span class="p">)</span><span class="o">*</span><span class="n">offset</span><span class="o">/</span><span class="n">exp</span>
+<span class="n">value</span><span class="o">=</span><span class="p">(</span> <span class="n">item_value</span><span class="o">/</span><span class="n">item_count</span> <span class="p">)</span> <span class="o">*</span> <span class="n">offset</span><span class="o">/</span><span class="n">exp</span>
+<span class="n">value</span> <span class="o">=</span> <span class="n">my_list</span><span class="p">[</span> <span class="n">index</span> <span class="p">]</span>
+<span class="n">value</span> <span class="o">=</span> <span class="n">my_dict</span> <span class="p">[</span><span class="s">'key'</span><span class="p">]</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="slice-notation">
+<h3>Slice notation<a class="headerlink" href="#slice-notation" title="Permalink to this headline">¶</a></h3>
+<p>While <span class="target" id="index-2"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0008"><strong>PEP 8</strong></a> calls for spaces around operators <tt class="docutils literal"><span class="pre">a</span> <span class="pre">=</span> <span class="pre">b</span> <span class="pre">+</span> <span class="pre">c</span></tt> this results in
+flags when you use <tt class="docutils literal"><span class="pre">a[b+1:c-1]</span></tt> but would allow the rather unreadable
+<tt class="docutils literal"><span class="pre">a[b</span> <span class="pre">+</span> <span class="pre">1:c</span> <span class="pre">-</span> <span class="pre">1]</span></tt> to pass. <span class="target" id="index-3"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0008"><strong>PEP 8</strong></a> is rather quiet on slice notation.</p>
+<ul>
+<li><p class="first">Don’t use spaces with simple variables or numbers</p>
+</li>
+<li><p class="first">Use brackets for expressions with spaces between binary operators</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># Good.</span>
+<span class="n">a</span><span class="p">[</span><span class="mi">1</span><span class="p">:</span><span class="mi">2</span><span class="p">]</span>
+<span class="n">a</span><span class="p">[</span><span class="n">start</span><span class="p">:</span><span class="n">end</span><span class="p">]</span>
+<span class="n">a</span><span class="p">[(</span><span class="n">start</span> <span class="o">-</span> <span class="mi">1</span><span class="p">):(</span><span class="n">end</span> <span class="o">+</span> <span class="n">var</span> <span class="o">+</span> <span class="mi">2</span><span class="p">)]</span>  <span class="c"># Brackets help group things and don't hide the slice</span>
+<span class="n">a</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">:(</span><span class="n">end</span> <span class="o">+</span> <span class="mi">1</span><span class="p">)]</span>
+
+
+<span class="c"># Bad.</span>
+<span class="n">a</span><span class="p">[</span><span class="n">start</span><span class="p">:</span> <span class="n">end</span><span class="p">]</span>  <span class="c"># No spaces around :</span>
+<span class="n">a</span><span class="p">[</span><span class="n">start</span><span class="o">-</span><span class="mi">1</span><span class="p">:</span><span class="n">end</span><span class="o">+</span><span class="n">var</span><span class="o">+</span><span class="mi">2</span><span class="p">]</span>  <span class="c"># Insanely hard to read, especially when your expressions are more complex</span>
+<span class="n">a</span><span class="p">[</span><span class="n">start</span> <span class="o">-</span> <span class="mi">1</span><span class="p">:</span><span class="n">end</span> <span class="o">+</span> <span class="mi">2</span><span class="p">]</span>  <span class="c"># You lose sight of the fact that it is a slice</span>
+<span class="n">a</span><span class="p">[</span><span class="o">-</span> <span class="mi">1</span><span class="p">:</span><span class="n">end</span><span class="p">]</span>  <span class="c"># -1 is unary, no space</span>
+</pre></div>
+</div>
+</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">String slice formatting is still under discussion.</p>
+</div>
+</div>
+<div class="section" id="comparisons">
+<h3>Comparisons<a class="headerlink" href="#comparisons" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Against arbitrary types: <tt class="docutils literal"><span class="pre">==</span></tt> and <tt class="docutils literal"><span class="pre">!=</span></tt></li>
+<li>Against singletons with <tt class="docutils literal"><span class="pre">is</span></tt> and <tt class="docutils literal"><span class="pre">is</span> <span class="pre">not</span></tt> (e.g.: <tt class="docutils literal"><span class="pre">foo</span> <span class="pre">is</span> <span class="pre">not</span> <span class="pre">None</span></tt>)</li>
+<li>Never compare something with <cite>True</cite> or <cite>False</cite> (for example never do <tt class="docutils literal"><span class="pre">foo</span> <span class="pre">==</span>
+<span class="pre">False</span></tt>, do <tt class="docutils literal"><span class="pre">not</span> <span class="pre">foo</span></tt> instead)</li>
+</ul>
+</div>
+<div class="section" id="negated-containment-checks">
+<h3>Negated containment checks<a class="headerlink" href="#negated-containment-checks" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Use <tt class="docutils literal"><span class="pre">foo</span> <span class="pre">not</span> <span class="pre">in</span> <span class="pre">bar</span></tt> instead of <tt class="docutils literal"><span class="pre">not</span> <span class="pre">foo</span> <span class="pre">in</span> <span class="pre">bar</span></tt></li>
+</ul>
+</div>
+<div class="section" id="instance-checks">
+<h3>Instance checks<a class="headerlink" href="#instance-checks" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">isinstance(a,</span> <span class="pre">C)</span></tt> instead of <tt class="docutils literal"><span class="pre">type(A)</span> <span class="pre">is</span> <span class="pre">C</span></tt>, but try to avoid instance
+checks in general.  Check for features.</li>
+</ul>
+</div>
+<div class="section" id="if-statements">
+<h3>If statements<a class="headerlink" href="#if-statements" title="Permalink to this headline">¶</a></h3>
+<ul>
+<li><p class="first">Use <tt class="docutils literal"><span class="pre">()</span></tt> brackets around complex if statements to allow easy wrapping,
+don’t use backslash to wrap an if statement.</p>
+</li>
+<li><p class="first">Wrap between <tt class="docutils literal"><span class="pre">and</span></tt>, <tt class="docutils literal"><span class="pre">or</span></tt>, etc.</p>
+</li>
+<li><p class="first">Keep <tt class="docutils literal"><span class="pre">not</span></tt> with the expression</p>
+</li>
+<li><p class="first">Use <tt class="docutils literal"><span class="pre">()</span></tt> alignment between expressions</p>
+</li>
+<li><p class="first">Use extra <tt class="docutils literal"><span class="pre">()</span></tt> to eliminate ambiguity, don’t rely on an understanding of
+Python operator precedence rules.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># Good.</span>
+<span class="k">if</span> <span class="n">length</span> <span class="o">>=</span> <span class="p">(</span><span class="n">upper</span> <span class="o">+</span> <span class="mi">2</span><span class="p">):</span>
+    <span class="o">...</span>
+
+<span class="k">if</span> <span class="p">(</span><span class="n">length</span> <span class="o">>=</span> <span class="mi">25</span> <span class="ow">and</span>
+    <span class="n">string</span> <span class="o">!=</span> <span class="s">"Something"</span> <span class="ow">and</span>
+    <span class="ow">not</span> <span class="n">careful</span><span class="p">):</span>
+    <span class="n">do_something</span><span class="p">()</span>
+
+
+<span class="c"># Bad.</span>
+<span class="k">if</span> <span class="n">length</span> <span class="o">>=</span> <span class="n">upper</span> <span class="o">+</span> <span class="mi">2</span><span class="p">:</span>
+    <span class="o">...</span>
+
+<span class="k">if</span> <span class="p">(</span><span class="n">length</span><span class="o">...</span>
+    <span class="ow">and</span> <span class="n">string</span> <span class="o">!=...</span>
+</pre></div>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" id="naming-conventions">
+<h2>Naming Conventions<a class="headerlink" href="#naming-conventions" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This has not been implemented or discussed.  The Translate code
+is not at all consistent with these conventions.</p>
+</div>
+<ul class="simple">
+<li>Class names: <tt class="docutils literal"><span class="pre">CamelCase</span></tt>, with acronyms kept uppercase (<tt class="docutils literal"><span class="pre">HTTPWriter</span></tt> and
+not <tt class="docutils literal"><span class="pre">HttpWriter</span></tt>)</li>
+<li>Variable names: <tt class="docutils literal"><span class="pre">lowercase_with_underscores</span></tt></li>
+<li>Method and function names: <tt class="docutils literal"><span class="pre">lowercase_with_underscores</span></tt></li>
+<li>Constants: <tt class="docutils literal"><span class="pre">UPPERCASE_WITH_UNDERSCORES</span></tt></li>
+<li>precompiled regular expressions: <tt class="docutils literal"><span class="pre">name_re</span></tt></li>
+</ul>
+<p>Protected members are prefixed with a single underscore.  Double underscores
+are reserved for mixin classes.</p>
+<p>To prevent name clashes with keywords, one trailing underscore may be appended.
+Clashes with builtins are allowed and <strong>must not</strong> be resolved by appending an
+underline to the name.  If your code needs to access a shadowed builtin, rebind
+the builtin to a different name instead.  Consider using a different name to
+avoid having to deal with either type of name clash, but don’t complicate names
+with prefixes or suffixes.</p>
+<div class="section" id="function-and-method-arguments">
+<h3>Function and method arguments<a class="headerlink" href="#function-and-method-arguments" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Class methods: <tt class="docutils literal"><span class="pre">cls</span></tt> as first parameter</li>
+<li>Instance methods: <tt class="docutils literal"><span class="pre">self</span></tt> as first parameter</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="section" id="documentation">
+<span id="styleguide-docs"></span><h1>Documentation<a class="headerlink" href="#documentation" title="Permalink to this headline">¶</a></h1>
+<p>We use <a class="reference external" href="http://sphinx-doc.org/">Sphinx</a> to generate our API and user documentation. Read the
+<a class="reference external" href="http://sphinx-doc.org/rest.html">reStructuredText primer</a> and <a class="reference external" href="http://sphinx-doc.org/contents.html">Sphinx documentation</a> as needed.</p>
+<div class="section" id="special-roles">
+<h2>Special roles<a class="headerlink" href="#special-roles" title="Permalink to this headline">¶</a></h2>
+<p>We introduce a number of special roles for documentation:</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">:bug:</span></tt> – links to a bug in Translate’s Bugzilla.<ul>
+<li><tt class="docutils literal"><span class="pre">:bug:`123`</span></tt> gives: <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=123">bug 123</a></li>
+<li><tt class="docutils literal"><span class="pre">:bug:`broken</span> <span class="pre"><123>`</span></tt> gives: <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=123">broken</a></li>
+</ul>
+</li>
+<li><tt class="docutils literal"><span class="pre">:opt:</span></tt> – mark command options and command values.<ul>
+<li><tt class="docutils literal"><span class="pre">:opt:`-P`</span></tt> gives <tt class="docutils literal"><span class="pre">-P</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">:opt:`--progress=dots`</span></tt> gives <tt class="docutils literal"><span class="pre">--progress=dots</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">:opt:`dots`</span></tt> gives <tt class="docutils literal"><span class="pre">dots</span></tt></li>
+</ul>
+</li>
+<li><tt class="docutils literal"><span class="pre">:man:</span></tt> – link to a Linux man page.<ul>
+<li><tt class="docutils literal"><span class="pre">:man:`msgfmt`</span></tt> gives <a class="reference external" href="http://linux.die.net/man/1/msgfmt">msgfmt</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="code-and-command-line-highlighting">
+<h2>Code and command line highlighting<a class="headerlink" href="#code-and-command-line-highlighting" title="Permalink to this headline">¶</a></h2>
+<p>All code examples and format snippets should be highlighted to make them easier
+to read.  By default Sphinx uses Python highlighting of code snippets (but it
+doesn’t always work).  You will want to change that in these situations:</p>
+<ul>
+<li><p class="first">The examples are not Python e.g. talking about INI file parsing.  In which
+case set the file level highlighting using:</p>
+<div class="highlight-rest"><div class="highlight"><pre><span class="p">..</span> <span class="ow">highlight</span><span class="p">::</span> ini
+</pre></div>
+</div>
+</li>
+<li><p class="first">There are multiple different code examples in the document, then use:</p>
+<div class="highlight-rest"><div class="highlight"><pre><span class="p">..</span> <span class="ow">code-block</span><span class="p">::</span> ruby
+</pre></div>
+</div>
+<p>before each code block.</p>
+</li>
+<li><p class="first">Python code highlighting isn’t working, then force Python highlighting using:</p>
+<div class="highlight-rest"><div class="highlight"><pre><span class="p">..</span> <span class="ow">code-block</span><span class="p">::</span> python
+</pre></div>
+</div>
+</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Generally we prefer explicit markup as this makes it easier for those
+following you to know what you intended.  So use <tt class="docutils literal"><span class="pre">..</span> <span class="pre">code-block::</span> <span class="pre">python</span></tt>
+even though in some cases this is not required.</p>
+</div>
+<p>With bash <em>command line examples</em>, to improve readability use:</p>
+<div class="highlight-rest"><div class="highlight"><pre><span class="p">..</span> <span class="ow">code-block</span><span class="p">::</span> bash
+</pre></div>
+</div>
+<p>Add <tt class="docutils literal"><span class="pre">$</span></tt> command prompt markers and <tt class="docutils literal"><span class="pre">#</span></tt> comments as required, as shown in
+this example:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span><span class="nb">cd </span>docs
+<span class="nv">$ </span>make html  <span class="c"># Build all Sphinx documentation</span>
+<span class="nv">$ </span>make linkcheck  <span class="c"># Report broken links</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="user-documentation">
+<h2>User documentation<a class="headerlink" href="#user-documentation" title="Permalink to this headline">¶</a></h2>
+<p>This is documentation found in <tt class="docutils literal"><span class="pre">docs/</span></tt> and that is published on Read the
+Docs. The target is the end user so our primary objective is to make accesible,
+readable and beautiful documents for them.</p>
+</div>
+<div class="section" id="docstrings">
+<h2>Docstrings<a class="headerlink" href="#docstrings" title="Permalink to this headline">¶</a></h2>
+<dl class="docutils">
+<dt>Docstring conventions:</dt>
+<dd><p class="first">All docstrings are formatted with reStructuredText as understood by
+Sphinx.  Depending on the number of lines in the docstring, they are
+laid out differently.  If it’s just one line, the closing triple
+quote is on the same line as the opening, otherwise the text is on
+the same line as the opening quote and the triple quote that closes
+the string on its own line:</p>
+<div class="last highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
+    <span class="sd">"""This is a simple docstring."""</span>
+
+
+<span class="k">def</span> <span class="nf">bar</span><span class="p">():</span>
+    <span class="sd">"""This is a longer docstring with so much information in there</span>
+<span class="sd">    that it spans three lines.  In this case the closing triple quote</span>
+<span class="sd">    is on its own line.</span>
+<span class="sd">    """</span>
+</pre></div>
+</div>
+</dd>
+</dl>
+<p>Please read <span class="target" id="index-4"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0257"><strong>PEP 257</strong></a> (Docstring Conventions) for a general overview,
+the important parts though are:</p>
+<ul class="simple">
+<li>A docstring should have a brief one-line summary, ending with a period. Use
+<tt class="docutils literal"><span class="pre">Do</span> <span class="pre">this</span></tt>, <tt class="docutils literal"><span class="pre">Return</span> <span class="pre">that</span></tt> rather than <tt class="docutils literal"><span class="pre">Does</span> <span class="pre">...</span></tt>, <tt class="docutils literal"><span class="pre">Returns</span> <span class="pre">...</span></tt>.</li>
+<li>If there are more details there should be a blank line between the one-line
+summary and the rest of the text.  Use paragraphs and formatting as needed.</li>
+<li>Use <a class="reference external" href="http://sphinx-doc.org/domains.html#info-field-lists">reST field lists</a> to describe the input parameters and/or return types
+as the last part of the docstring.</li>
+<li>Use proper capitalisation and punctuation.</li>
+<li>Don’t restate things that would appear in parameter descriptions.</li>
+</ul>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">addunit</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">unit</span><span class="p">):</span>
+    <span class="sd">"""Append the given unit to the object's list of units.</span>
+
+<span class="sd">    This method should always be used rather than trying to modify the</span>
+<span class="sd">    list manually.</span>
+
+<span class="sd">    :type unit: TranslationUnit</span>
+<span class="sd">    :param unit: Any object that inherits from :class:`TranslationUnit`.</span>
+<span class="sd">    """</span>
+    <span class="bp">self</span><span class="o">.</span><span class="n">units</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">unit</span><span class="p">)</span>
+</pre></div>
+</div>
+<dl class="docutils">
+<dt>Parameter documentation:</dt>
+<dd><p class="first">Document parameters using <a class="reference external" href="http://sphinx-doc.org/domains.html#info-field-lists">reST field lists</a> as follows:</p>
+<div class="last highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span><span class="p">(</span><span class="n">bar</span><span class="p">):</span>
+    <span class="sd">"""Simple docstring.</span>
+
+<span class="sd">    :param bar: Something</span>
+<span class="sd">    :type bar: Some type</span>
+<span class="sd">    :return: Returns something</span>
+<span class="sd">    :rtype: Return type</span>
+<span class="sd">    """</span>
+</pre></div>
+</div>
+</dd>
+<dt>Cross referencing code:</dt>
+<dd>When talking about other objects, methods, functions and variables
+it is good practice to cross-reference them with Sphinx’s <a class="reference external" href="http://sphinx-doc.org/domains.html#cross-referencing-python-objects">Python
+cross-referencing</a>.</dd>
+<dt>Other directives:</dt>
+<dd>Use <a class="reference external" href="http://sphinx-doc.org/markup/para.html#paragraph-level-markup">paragraph-level markup</a> when needed.</dd>
+</dl>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">We still need to gather the useful ones that we want you to use and how to use
+them.  E.g. how to talk about a parameter in the docstring.  How to reference
+classes in the module.  How to reference other modules, etc.</p>
+</div>
+<dl class="docutils">
+<dt>Module header:</dt>
+<dd><p class="first">The module header consists of an utf-8 encoding declaration, copyright
+attribution, license block and a standard docstring:</p>
+<div class="last highlight-python"><div class="highlight"><pre><span class="c"># -*- coding: utf-8 -*-</span>
+<span class="c">#</span>
+<span class="o">...</span> <span class="n">LICENSE</span> <span class="n">BLOCK</span><span class="o">...</span>
+
+<span class="sd">"""A brief description"""</span>
+</pre></div>
+</div>
+</dd>
+</dl>
+</div>
+<div class="section" id="comments">
+<h2>Comments<a class="headerlink" href="#comments" title="Permalink to this headline">¶</a></h2>
+<dl class="docutils">
+<dt>General:</dt>
+<dd><ul class="first simple">
+<li>The <tt class="docutils literal"><span class="pre">#</span></tt> symbol (pound or hash) is used to start comments.</li>
+<li>A space must follow the <tt class="docutils literal"><span class="pre">#</span></tt> between any written text.</li>
+<li>Line length must be observed.</li>
+<li>Inline comments are preceded by two spaces.</li>
+<li>Write sentences correctly: proper capitalisation and punctuation.</li>
+</ul>
+<div class="last highlight-python"><div class="highlight"><pre><span class="c"># Good comment with space before and full sentence.</span>
+<span class="n">statement</span>  <span class="c"># Good comment with two spaces</span>
+
+
+<span class="c">#Bad comment no space before</span>
+<span class="n">statement</span> <span class="c"># Bad comment, needs two spaces</span>
+</pre></div>
+</div>
+</dd>
+<dt>Docstring comments:</dt>
+<dd><p class="first">Rules for comments are similar to docstrings.  Both are formatted with
+reStructuredText.  If a comment is used to document an attribute, put a
+colon after the opening pound sign (<tt class="docutils literal"><span class="pre">#</span></tt>):</p>
+<div class="last highlight-python"><div class="highlight"><pre><span class="k">class</span> <span class="nc">User</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
+    <span class="c">#: the name of the user as unicode string</span>
+    <span class="n">name</span> <span class="o">=</span> <span class="n">Column</span><span class="p">(</span><span class="n">String</span><span class="p">)</span>
+    <span class="c">#: the sha1 hash of the password + inline salt</span>
+    <span class="n">pw_hash</span> <span class="o">=</span> <span class="n">Column</span><span class="p">(</span><span class="n">String</span><span class="p">)</span>
+</pre></div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/developers/testing.html b/docs/_build/html/developers/testing.html
new file mode 100644
index 0000000..59672bc
--- /dev/null
+++ b/docs/_build/html/developers/testing.html
@@ -0,0 +1,252 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Testing — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="next" title="Contributing" href="contributing.html" />
+    <link rel="prev" title="Building" href="building.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="building.html">Building</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Testing</a><ul>
+<li><a class="reference internal" href="#skipping-tests">Skipping tests</a><ul>
+<li><a class="reference internal" href="#importorskip">importorskip</a></li>
+<li><a class="reference internal" href="#skipif">skipif</a></li>
+<li><a class="reference internal" href="#xfail">xfail</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#testing-for-warnings">Testing for Warnings</a><ul>
+<li><a class="reference internal" href="#deprecated-call">deprecated_call</a></li>
+<li><a class="reference internal" href="#recwarn">recwarn</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="building.html"
+         title="previous chapter">« Building</a></li>
+  <li><a href="contributing.html"
+         title="next chapter">Contributing »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="testing">
+<span id="id1"></span><h1>Testing<a class="headerlink" href="#testing" title="Permalink to this headline">¶</a></h1>
+<p>Our aim is that all new functionality is adequately tested. Adding tests for
+existing functionality is highly recommended before any major reimplementation
+(refactoring, etcetera).</p>
+<p>We use <a class="reference external" href="http://pytest.org/">py.test</a> for (unit) testing. You need at least pytest >= 1.0.0, but
+pytest >= 2.1 is strongly recommended.</p>
+<p>To run tests in the current directory and its subdirectories:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>py.test  <span class="c"># runs all tests</span>
+<span class="nv">$ </span>py.test storage/test_dtd.py  <span class="c"># runs just a single test module</span>
+</pre></div>
+</div>
+<p>We use several py.test features to simplify testing, and to suppress errors in
+circumstances where the tests cannot possibly succeed (limitations of
+tests and missing dependencies).</p>
+<div class="section" id="skipping-tests">
+<h2>Skipping tests<a class="headerlink" href="#skipping-tests" title="Permalink to this headline">¶</a></h2>
+<p>Pytest allows tests, test classes, and modules to be skipped or marked as
+“expected to fail” (xfail).
+Generally you should <em>skip</em> only if the test cannot run at all (throws uncaught
+exception); otherwise <em>xfail</em> is preferred as it provides more test coverage.</p>
+<div class="section" id="importorskip">
+<h3>importorskip<a class="headerlink" href="#importorskip" title="Permalink to this headline">¶</a></h3>
+<p>Use the builtin <a class="reference external" href="http://pytest.org/latest/builtin.html#_pytest.runner.importorskip" title="(in pytest v2.5.2)"><tt class="xref py py-func docutils literal"><span class="pre">importorskip()</span></tt></a> function
+to skip a test module if a dependency cannot be imported:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">pytest</span> <span class="kn">import</span> <span class="n">importorskip</span>
+<span class="n">importorskip</span><span class="p">(</span><span class="s">"vobject"</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>If <em>vobject</em> can be imported, it will be; otherwise it raises an exception
+that causes pytest to skip the entire module rather than failing.</p>
+</div>
+<div class="section" id="skipif">
+<h3>skipif<a class="headerlink" href="#skipif" title="Permalink to this headline">¶</a></h3>
+<p>Use the <tt class="docutils literal"><span class="pre">skipif</span></tt> decorator to <a class="reference external" href="http://pytest.org/latest/skipping.html#skipif" title="(in pytest v2.5.2)"><em class="xref std std-ref">mark tests to be skipped</em></a>
+unless certain criteria are met.  The following skips a test if the version of
+<em>mymodule</em> is too old:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">import</span> <span class="nn">mymodule</span>
+
+<span class="nd">@pytest.mark.skipif</span><span class="p">(</span><span class="s">"mymodule.__version__ < '1.2'"</span><span class="p">)</span>
+<span class="k">def</span> <span class="nf">test_function</span><span class="p">():</span>
+    <span class="o">...</span>
+</pre></div>
+</div>
+<p>In Python 2.6 and later, you can apply this decorator to classes as well as
+functions and methods.</p>
+<p>It is also possible to skip an entire test module by creating a <tt class="docutils literal"><span class="pre">pytestmark</span></tt>
+static variable in the module:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># mark entire module as skipped for py.test if no indexer available</span>
+<span class="n">pytestmark</span> <span class="o">=</span> <span class="n">pytest</span><span class="o">.</span><span class="n">mark</span><span class="o">.</span><span class="n">skipif</span><span class="p">(</span><span class="s">"noindexer"</span><span class="p">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="xfail">
+<h3>xfail<a class="headerlink" href="#xfail" title="Permalink to this headline">¶</a></h3>
+<p>Use the <tt class="docutils literal"><span class="pre">xfail</span></tt> decorator to <a class="reference external" href="http://pytest.org/latest/skipping.html#xfail" title="(in pytest v2.5.2)"><em class="xref std std-ref">mark tests as expected to fail</em></a>. This allows you to do the following:</p>
+<ul class="simple">
+<li>Build tests for functionality that we haven’t implemented yet</li>
+<li>Mark tests that will fail on certain platforms or Python versions</li>
+<li>Mark tests that we should fix but haven’t got round to fixing yet</li>
+</ul>
+<p>The simplest form is the following:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">pytest</span> <span class="kn">import</span> <span class="n">pytest</span><span class="o">.</span><span class="n">mark</span>
+
+<span class="nd">@mark.xfail</span>
+<span class="k">def</span> <span class="nf">test_function</span><span class="p">():</span>
+    <span class="o">...</span>
+</pre></div>
+</div>
+<p>You can also pass parameters to the decorator to mark expected failure only
+under some condition (like <em>skipif</em>), to document the reason failure is
+expected, or to actually skip the test:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="nd">@mark.xfail</span><span class="p">(</span><span class="s">"sys.version_info >= (3,0)"</span><span class="p">)</span>  <span class="c"># only expect failure for Python 3</span>
+<span class="nd">@mark.xfail</span><span class="p">(</span><span class="o">...</span><span class="p">,</span> <span class="n">reason</span><span class="o">=</span><span class="s">"Not implemented"</span><span class="p">)</span>  <span class="c"># provide a reason for the xfail</span>
+<span class="nd">@mark.xfail</span><span class="p">(</span><span class="o">...</span><span class="p">,</span> <span class="n">run</span><span class="o">=</span><span class="bp">False</span><span class="p">)</span>  <span class="c"># skip the test but still regard it as xfailed</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="testing-for-warnings">
+<h2>Testing for Warnings<a class="headerlink" href="#testing-for-warnings" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="deprecated-call">
+<h3>deprecated_call<a class="headerlink" href="#deprecated-call" title="Permalink to this headline">¶</a></h3>
+<p>The builtin <a class="reference external" href="http://pytest.org/latest/builtin.html#pytest.deprecated_call" title="(in pytest v2.5.2)"><tt class="xref py py-func docutils literal"><span class="pre">deprecated_call()</span></tt></a> function checks that a
+function that we run raises a DeprecationWarning:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">pytest</span> <span class="kn">import</span> <span class="n">deprecated_call</span>
+
+<span class="k">def</span> <span class="nf">test_something</span><span class="p">():</span>
+    <span class="n">deprecated_call</span><span class="p">(</span><span class="n">function_to_run</span><span class="p">,</span> <span class="n">arguments_for_function</span><span class="p">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="recwarn">
+<h3>recwarn<a class="headerlink" href="#recwarn" title="Permalink to this headline">¶</a></h3>
+<p>The <a class="reference external" href="http://pytest.org/latest/recwarn.html"><em>recwarn plugin</em></a> allows us to test for other warnings. Note that
+<tt class="docutils literal"><span class="pre">recwarn</span></tt> is a funcargs plugin, which means that you need it in your test
+function parameters:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">test_example</span><span class="p">(</span><span class="n">recwarn</span><span class="p">):</span>
+    <span class="c"># do something</span>
+    <span class="n">w</span> <span class="o">=</span> <span class="n">recwarn</span><span class="o">.</span><span class="n">pop</span><span class="p">()</span>
+    <span class="c"># w.{message,category,filename,lineno}</span>
+    <span class="k">assert</span> <span class="s">'something'</span> <span class="ow">in</span> <span class="nb">str</span><span class="p">(</span><span class="n">w</span><span class="o">.</span><span class="n">message</span><span class="p">)</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/features.html b/docs/_build/html/features.html
index be455b6..2af31d5 100644
--- a/docs/_build/html/features.html
+++ b/docs/_build/html/features.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Features — Translate Toolkit 1.9.0 documentation</title>
+    <title>Features — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" />
     <link rel="next" title="Installation" href="installation.html" />
     <link rel="prev" title="Translate Toolkit" href="index.html" /> 
   </head>
@@ -37,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -87,10 +89,11 @@
   <li><a href="installation.html"
          title="next chapter">Installation »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -166,7 +169,7 @@ localisation tools, already used by our own and several other projects. See the
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/strings.html b/docs/_build/html/formats/android.html
similarity index 61%
copy from docs/_build/html/formats/strings.html
copy to docs/_build/html/formats/android.html
index 2977f66..49086b9 100644
--- a/docs/_build/html/formats/strings.html
+++ b/docs/_build/html/formats/android.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Mac OSX strings — Translate Toolkit 1.9.0 documentation</title>
+    <title>Android string resources — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,17 +27,17 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
-    <link rel="next" title="Adobe Flex properties files" href="flex.html" />
-    <link rel="prev" title="Windows RC files" href="rc.html" /> 
+    <link rel="next" title="TMX" href="tmx.html" />
+    <link rel="prev" title="Haiku catkeys" href="catkeys.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,27 +55,30 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
 <li class="dropdown">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">Mac OSX strings</a><ul>
+<li><a class="reference internal" href="#">Android string resources</a><ul>
 <li><a class="reference internal" href="#references">References</a></li>
 </ul>
 </li>
@@ -86,15 +88,16 @@
             
             
               
-  <li><a href="rc.html"
-         title="previous chapter">« Windows RC files</a></li>
-  <li><a href="flex.html"
-         title="next chapter">Adobe Flex properties files »</a></li>
+  <li><a href="catkeys.html"
+         title="previous chapter">« Haiku catkeys</a></li>
+  <li><a href="tmx.html"
+         title="next chapter">TMX »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -111,20 +114,22 @@
 
 <div class="container content">
    
-  <div class="section" id="mac-osx-strings">
-<span id="strings"></span><h1>Mac OSX strings<a class="headerlink" href="#mac-osx-strings" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.8.</span></p>
-<p>Mac OSX .strings files are used for some Cocoa / Carbon application
-localization, such as for the iPhone, iPod, and OSX. They are somewhat similar
-to Java properties, and therefore <a class="reference internal" href="../commands/prop2po.html"><em>prop2po</em></a> and
-po2prop are used for conversion.</p>
+  <div class="section" id="android-string-resources">
+<span id="android"></span><h1>Android string resources<a class="headerlink" href="#android-string-resources" title="Permalink to this headline">¶</a></h1>
+<p><a class="reference external" href="http://en.wikipedia.org/wiki/Android_%28operating_system%29">Android</a> programs make use of localisable
+string resources.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The toolkit supports this format, but still doesn’t provide any
+converter.</p>
+</div>
 <div class="section" id="references">
-<span id="strings-references"></span><h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
+<span id="android-references"></span><h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
-<li><a class="reference external" href="http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html#//apple_ref/doc/uid/20000005-SW1">Localising string resources</a></li>
-<li><a class="reference external" href="http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html#//apple_ref/doc/uid/10000051i-CH6-SW10">manual creation of .strings files</a></li>
-<li><a class="reference external" href="http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html">String format specifiers</a></li>
+<li>Android <a class="reference external" href="http://developer.android.com/guide/topics/resources/resources-i18n.html">Resource files reference</a></li>
+<li>Android <a class="reference external" href="http://developer.android.com/guide/topics/resources/available-resources.html#stringresources">String resources reference</a></li>
+<li><a class="reference external" href="http://www.linux-mag.com/id/7794">Localizing Android Applications</a> tutorial</li>
+<li>Reference for <a class="reference external" href="http://tools.android.com/recent/non-translatablestrings">translatable attribute</a></li>
 </ul>
 </div>
 </div>
@@ -141,7 +146,7 @@ po2prop are used for conversion.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/base_classes.html b/docs/_build/html/formats/base_classes.html
index ed0bbd1..ced4980 100644
--- a/docs/_build/html/formats/base_classes.html
+++ b/docs/_build/html/formats/base_classes.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Base classes — Translate Toolkit 1.9.0 documentation</title>
+    <title>Base classes — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Quoting and Escaping" href="quoting_and_escaping.html" />
     <link rel="prev" title="Standards conformance" href="conformance.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -99,10 +101,11 @@
   <li><a href="quoting_and_escaping.html"
          title="next chapter">Quoting and Escaping »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -121,8 +124,8 @@
    
   <div class="section" id="base-classes">
 <span id="id1"></span><h1>Base classes<a class="headerlink" href="#base-classes" title="Permalink to this headline">¶</a></h1>
-<p>NOTE: This page is mostly useful for <tt class="xref doc docutils literal"><span class="pre">developers</span></tt> as it describes some
-programming detail of the <a class="reference internal" href="index.html"><em>toolkit</em></a>.</p>
+<p>NOTE: This page is mostly useful for <a class="reference internal" href="../developers/developers.html"><em>developers</em></a> as it describes some programming detail of the
+<a class="reference internal" href="index.html"><em>toolkit</em></a>.</p>
 <p>For the implementation of the different storage classes that the toolkit
 supports, we want to define a set of base classes to form a common API for all
 formats. This will simplify implementation of new storage formats, and enable
@@ -150,7 +153,7 @@ format allows with msgid_plural, etc.)</li>
 <li>Support for variable number of languages in the format. Examples: .txt and
 .properties support one language, PO supports two, <a class="reference internal" href="tmx.html"><em>TMX</em></a> supports many.</li>
 <li>Support for “multifiles”, in other words a file that contain other entities
-that corresponds to files in other formats. Examples: ZIP, XPI and
+that corresponds to files in other formats. Examples: ZIP and
 <a class="reference internal" href="xliff.html"><em>XLIFF</em></a>. In reality this is only used by some of the converters. This
 isn’t present in the base class yet.</li>
 </ul>
@@ -215,7 +218,7 @@ disc. See “multifile” below.</p>
 <span id="base-classes-multifile"></span><h3>Multifile<a class="headerlink" href="#multifile" title="Permalink to this headline">¶</a></h3>
 <p>This abstraction is only used by a few converters.</p>
 <p>This class represents a storage format that contains other files or file like
-objects. Examples include ZIP, XPI and XLIFF, and OpenOffice SDF files. It must
+objects. Examples include ZIP, XLIFF, and OpenOffice SDF files. It must
 give access to the contained files, and possibly give access to the translation
 units contained in those files, as if they are contained natively.</p>
 </div>
@@ -233,7 +236,7 @@ what we discussed is related to the above.  A quick summary:</p>
 </ul>
 </li>
 <li><p class="first">We need to discuss the class hierarchy, e.g.:</p>
-<div class="highlight-python"><pre>base
+<div class="highlight-python"><div class="highlight"><pre>base
      -- po
      -- text
      -- xml
@@ -241,7 +244,8 @@ what we discussed is related to the above.  A quick summary:</p>
             -- lisa
                     -- xliff
                     -- tmx
-                    -- tbx</pre>
+                    -- tbx
+</pre></div>
 </div>
 </li>
 <li><p class="first">Clean up converters.</p>
@@ -315,7 +319,7 @@ store?</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/catkeys.html b/docs/_build/html/formats/catkeys.html
index f42150f..392c32b 100644
--- a/docs/_build/html/formats/catkeys.html
+++ b/docs/_build/html/formats/catkeys.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Haiku catkeys — Translate Toolkit 1.9.0 documentation</title>
+    <title>Haiku catkeys — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +27,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
-    <link rel="next" title="TMX" href="tmx.html" />
+    <link rel="next" title="Android string resources" href="android.html" />
     <link rel="prev" title="Adobe Flex properties files" href="flex.html" /> 
   </head>
   <body>
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -88,13 +90,14 @@
               
   <li><a href="flex.html"
          title="previous chapter">« Adobe Flex properties files</a></li>
-  <li><a href="tmx.html"
-         title="next chapter">TMX »</a></li>
+  <li><a href="android.html"
+         title="next chapter">Android string resources »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -113,15 +116,16 @@
    
   <div class="section" id="haiku-catkeys">
 <span id="catkeys"></span><h1>Haiku catkeys<a class="headerlink" href="#haiku-catkeys" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.8.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.8.</span></p>
+</div>
 <p>Localisation for the <a class="reference external" href="http://www.haiku-os.org/">Haiku</a> operating system is
 done with a file format called catkeys.  It is a bilingual file format.</p>
 <div class="section" id="links">
 <span id="catkeys-links"></span><h2>Links<a class="headerlink" href="#links" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="http://www.haiku-os.org/blog/pulkomandy/2009-09-24_haiku_locale_kit_translator_handbook">Some notes about the format</a></li>
-<li><a class="reference external" href="http://dev.haiku-os.org/browser/haiku/trunk/data/catalogs/">Some example files</a></li>
+<li><a class="reference external" href="http://cgit.haiku-os.org/haiku/tree/data/catalogs/">Some example files</a></li>
 </ul>
 </div>
 </div>
@@ -138,7 +142,7 @@ done with a file format called catkeys.  It is a bilingual file format.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/conformance.html b/docs/_build/html/formats/conformance.html
index 2c655ab..135f0b2 100644
--- a/docs/_build/html/formats/conformance.html
+++ b/docs/_build/html/formats/conformance.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Standards conformance — Translate Toolkit 1.9.0 documentation</title>
+    <title>Standards conformance — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Base classes" href="base_classes.html" />
     <link rel="prev" title="Wireless Markup Language" href="wml.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="base_classes.html"
          title="next chapter">Base classes »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -157,7 +160,7 @@ standards or file <a class="reference internal" href="index.html"><em>formats</e
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/csv.html b/docs/_build/html/formats/csv.html
index 63ac6e6..9ae7a54 100644
--- a/docs/_build/html/formats/csv.html
+++ b/docs/_build/html/formats/csv.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>CSV — Translate Toolkit 1.9.0 documentation</title>
+    <title>CSV — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="INI Files" href="ini.html" />
     <link rel="prev" title="PO Files" href="po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="ini.html"
          title="next chapter">INI Files »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -116,8 +119,8 @@
 <p>CSV (Comma Separated Values) is a simple file format for general data
 interchange. It can be used in the toolkit for simple data interchange, and can
 be edited with most spreadsheet programs. There is no formal specification for
-the CSV file format, but more information can be acquired from <a class="reference external" href="https://en.wikipedia.org/wiki/Comma-separated_values">Comma-Separated
-Values</a></p>
+the CSV file format, but more information can be acquired from
+<a class="reference external" href="http://en.wikipedia.org/wiki/Comma-separated_values">Comma-Separated Values</a></p>
 <div class="section" id="conformance">
 <span id="csv-conformance"></span><h2>Conformance<a class="headerlink" href="#conformance" title="Permalink to this headline">¶</a></h2>
 <p>CSV files were initially used to convert from and to <a class="reference internal" href="po.html"><em>po files</em></a>, and
@@ -169,7 +172,7 @@ is not sure whether this refers simply to the word <em>mono</em> or to the entry
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/dtd.html b/docs/_build/html/formats/dtd.html
index 5ae51b6..2dc5b9d 100644
--- a/docs/_build/html/formats/dtd.html
+++ b/docs/_build/html/formats/dtd.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Mozilla DTD format — Translate Toolkit 1.9.0 documentation</title>
+    <title>Mozilla DTD format — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="OpenOffice.org GSI/SDF format" href="gsi.html" />
     <link rel="prev" title="Mozilla and Java properties files" href="properties.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="gsi.html"
          title="next chapter">OpenOffice.org GSI/SDF format »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -154,7 +157,7 @@ break anything but it would be nicer to see © rather than &copy;</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/flex.html b/docs/_build/html/formats/flex.html
index fae96f1..1cc7ca0 100644
--- a/docs/_build/html/formats/flex.html
+++ b/docs/_build/html/formats/flex.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Adobe Flex properties files — Translate Toolkit 1.9.0 documentation</title>
+    <title>Adobe Flex properties files — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Haiku catkeys" href="catkeys.html" />
     <link rel="prev" title="Mac OSX strings" href="strings.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="catkeys.html"
          title="next chapter">Haiku catkeys »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -113,8 +116,9 @@
    
   <div class="section" id="adobe-flex-properties-files">
 <span id="flex"></span><h1>Adobe Flex properties files<a class="headerlink" href="#adobe-flex-properties-files" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.8.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.8.</span></p>
+</div>
 <p>Adobe Flex applications use .properties files similar to <a class="reference internal" href="properties.html"><em>Java properties</em></a>, but with UTF-8 encoding, and therefore <a class="reference internal" href="../commands/prop2po.html"><em>prop2po</em></a> and po2prop are used for conversion.</p>
 <p>We welcome more testing and feedback, but based on our solid support for
 properties, this probably works perfectly.</p>
@@ -138,7 +142,7 @@ properties, this probably works perfectly.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/gsi.html b/docs/_build/html/formats/gsi.html
index d901cbd..1264948 100644
--- a/docs/_build/html/formats/gsi.html
+++ b/docs/_build/html/formats/gsi.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>OpenOffice.org GSI/SDF format — Translate Toolkit 1.9.0 documentation</title>
+    <title>OpenOffice.org GSI/SDF format — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="PHP" href="php.html" />
     <link rel="prev" title="Mozilla DTD format" href="dtd.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="php.html"
          title="next chapter">PHP »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -139,7 +142,7 @@ comments</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/html.html b/docs/_build/html/formats/html.html
index 855f2fd..f0b0de5 100644
--- a/docs/_build/html/formats/html.html
+++ b/docs/_build/html/formats/html.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>HTML — Translate Toolkit 1.9.0 documentation</title>
+    <title>HTML — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="iCalendar" href="ical.html" />
     <link rel="prev" title="Universal Terminology eXchange (UTX)" href="utx.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="ical.html"
          title="next chapter">iCalendar »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -120,7 +123,7 @@
 <span id="html-conformance"></span><h2>Conformance<a class="headerlink" href="#conformance" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
 <li>Can identify almost all tags and attributes that are localisable.</li>
-<li>Does not convert HTML entities (e.g. &copy;) to normal strings</li>
+<li>Does not convert HTML entities (e.g. <tt class="docutils literal"><span class="pre">&copy;</span></tt>) to normal strings</li>
 <li>It does not handle inline elements well and will drop them, so complicated
 HTML might not make it through the filter</li>
 </ul>
@@ -146,7 +149,7 @@ HTML might not make it through the filter</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/ical.html b/docs/_build/html/formats/ical.html
index 262e197..4598206 100644
--- a/docs/_build/html/formats/ical.html
+++ b/docs/_build/html/formats/ical.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>iCalendar — Translate Toolkit 1.9.0 documentation</title>
+    <title>iCalendar — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +27,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
-    <link rel="next" title="OpenDocument Format" href="odf.html" />
+    <link rel="next" title="JSON" href="json.html" />
     <link rel="prev" title="HTML" href="html.html" /> 
   </head>
   <body>
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,13 +97,14 @@
               
   <li><a href="html.html"
          title="previous chapter">« HTML</a></li>
-  <li><a href="odf.html"
-         title="next chapter">OpenDocument Format »</a></li>
+  <li><a href="json.html"
+         title="next chapter">JSON »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -120,8 +123,8 @@
    
   <div class="section" id="icalendar">
 <span id="ical"></span><span id="id1"></span><h1>iCalendar<a class="headerlink" href="#icalendar" title="Permalink to this headline">¶</a></h1>
-<p>Support for <a class="reference external" href="https://en.wikipedia.org/wiki/ICalendar">iCalendar</a> (*.ics)
-files.  This allows calendars to be localised.</p>
+<p>Support for <a class="reference external" href="http://en.wikipedia.org/wiki/ICalendar">iCalendar</a> (*.ics) files.  This allows calendars
+to be localised.</p>
 <p>The format extracts certain properties from VEVENT objects.  The properties are
 limited to textual entries that would need to be localised, it does not include
 entries such as dates and durations that would indeed change for various
@@ -136,8 +139,8 @@ the rfc that makes it easy to refer to all sections, items and attributes.</li>
 <li><a class="reference external" href="http://vobject.skyhouseconsulting.com/">VObject</a> – the python library
 used to read the iCal file.</li>
 <li><a class="reference external" href="http://severinghaus.org/projects/icv/">iCalender validator</a></li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/ICalendar">iCalendar</a></li>
-<li><a class="reference external" href="http://upload.wikimedia.org/wikipedia/en/c/c0/ICalendarSpecification.png">Components and their properties</a></li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/ICalendar">iCalendar</a></li>
+<li><a class="reference external" href="https://upload.wikimedia.org/wikipedia/commons/c/c0/ICalendarSpecification.png">Components and their properties</a></li>
 </ul>
 </div>
 <div class="section" id="conformance">
@@ -161,7 +164,8 @@ rebuilding the file.  We rely on VObject to ensure correctness.</p>
 <div class="section" id="language-not-a-multilingual-solution">
 <span id="ical-language-not-a-multilingual-solution"></span><h3>LANGUAGE: not a multilingual solution<a class="headerlink" href="#language-not-a-multilingual-solution" title="Permalink to this headline">¶</a></h3>
 <p>It is possible to set the language attribute on an entry e.g.:</p>
-<div class="highlight-python"><pre>SUMMARY:LANGUAGE=af;New Year's Day</pre>
+<div class="highlight-python"><div class="highlight"><pre>SUMMARY:LANGUAGE=af;New Year's Day
+</pre></div>
 </div>
 <p>However since only one SUMMARY entry is allowed this does not allow you to
 specify multiple entries which would allow a single multilingual file.  With
@@ -197,7 +201,7 @@ in a given language.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/index.html b/docs/_build/html/formats/index.html
index 3d2df0b..61429e6 100644
--- a/docs/_build/html/formats/index.html
+++ b/docs/_build/html/formats/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Translation Related File Formats — Translate Toolkit 1.9.0 documentation</title>
+    <title>Translation Related File Formats — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="next" title="XLIFF" href="xliff.html" />
     <link rel="prev" title="Document translation" href="../guides/document_translation.html" /> 
   </head>
@@ -37,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1 current"><a class="current reference internal" href="">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -76,31 +78,15 @@
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
 <li><a class="reference internal" href="#">Translation Related File Formats</a><ul>
-<li><a class="reference internal" href="#primary-translation-formats">Primary translation formats</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#other-translation-formats">Other translation formats</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#translation-memory-formats">Translation Memory formats</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#glossary-formats">Glossary formats</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#formats-of-translatable-documents">Formats of translatable documents</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#machine-readable-formats">Machine readable formats</a><ul>
-</ul>
-</li>
+<li><a class="reference internal" href="#primary-translation-formats">Primary translation formats</a></li>
+<li><a class="reference internal" href="#other-translation-formats">Other translation formats</a></li>
+<li><a class="reference internal" href="#translation-memory-formats">Translation Memory formats</a></li>
+<li><a class="reference internal" href="#glossary-formats">Glossary formats</a></li>
+<li><a class="reference internal" href="#formats-of-translatable-documents">Formats of translatable documents</a></li>
+<li><a class="reference internal" href="#machine-readable-formats">Machine readable formats</a></li>
 <li><a class="reference internal" href="#in-development">In development</a></li>
-<li><a class="reference internal" href="#unsupported-formats">Unsupported formats</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#unlikely-to-be-supported">Unlikely to be supported</a><ul>
-</ul>
-</li>
+<li><a class="reference internal" href="#unsupported-formats">Unsupported formats</a></li>
+<li><a class="reference internal" href="#unlikely-to-be-supported">Unlikely to be supported</a></li>
 </ul>
 </li>
 </ul>
@@ -114,10 +100,11 @@
   <li><a href="xliff.html"
          title="next chapter">XLIFF »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -168,6 +155,7 @@ issues such as <a class="reference internal" href="quoting_and_escaping.html"><e
 <li>Mac OSX <a class="reference internal" href="strings.html"><em>Mac OSX strings</em></a> files (also used on the iPhone) (from version 1.8)</li>
 <li>Adobe <a class="reference internal" href="flex.html"><em>Adobe Flex properties files</em></a> files (from version 1.8)</li>
 <li>Haiku <a class="reference internal" href="catkeys.html"><em>Haiku catkeys</em></a> (from version 1.8)</li>
+<li><a class="reference internal" href="android.html"><em>Android string resources</em></a> (supports storage, not conversion)</li>
 </ul>
 </div>
 <div class="section" id="translation-memory-formats">
@@ -198,12 +186,10 @@ issues such as <a class="reference internal" href="quoting_and_escaping.html"><e
 <ul class="simple">
 <li><a class="reference internal" href="html.html"><em>HTML</em></a></li>
 <li><a class="reference internal" href="ical.html"><em>iCalendar</em></a></li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/JSON">JSON</a> (from v1.9.0)</li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/OpenDocument">OpenDocument</a> – all ODF file
-types</li>
+<li><a class="reference internal" href="json.html"><em>JSON</em></a></li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</a> – all ODF file types</li>
 <li><a class="reference internal" href="text.html"><em>Text</em></a> – plain text with blocks separated by whitespace</li>
-<li><a class="reference internal" href="wiki.html"><em>Wiki</em></a> – <a class="reference external" href="https://en.wikipedia.org/wiki/DokuWiki">DokuWiki</a>
-and <a class="reference external" href="https://en.wikipedia.org/wiki/MediaWiki">MediaWiki</a> supported</li>
+<li><a class="reference internal" href="wiki.html"><em>Wiki</em></a> – <a class="reference external" href="http://en.wikipedia.org/wiki/DokuWiki">DokuWiki</a> and <a class="reference external" href="http://en.wikipedia.org/wiki/MediaWiki">MediaWiki</a> supported</li>
 <li><a class="reference internal" href="subtitles.html"><em>Subtitles</em></a> – various formats (v1.4)</li>
 </ul>
 </div>
@@ -233,7 +219,7 @@ extension is required.</li>
 </li>
 <li>Apple:<ul>
 <li><a class="reference external" href="ftp://ftp.apple.com/developer/tool_chest/localization_tools/appleglot/appleglot_3.2_usersguide.pdf">AppleGlot</a></li>
-<li>.plist – see <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=633">bug 633</a> and <a class="reference external" href="http://docs.python.org/library/plistlib.html">plistlib</a> for Python</li>
+<li>.plist – see <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=633">bug 633</a> and <a class="reference external" href="http://docs.python.org/2/library/plistlib.html">plistlib</a> for Python</li>
 </ul>
 </li>
 <li>Adobe:<ul>
@@ -245,39 +231,33 @@ module</a>)</li>
 </li>
 <li>Microsoft<ul>
 <li>Word, Excel, etc (probably through usage of OpenOffice.org)</li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/OOXML">OOXML</a> (at least at the text level
-we don’t have to deal with much of the mess inside OOXML).  See also: <a class="reference external" href="http://go.microsoft.com/fwlink/?LinkId=120908">Open
-XML SDK v1</a></li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/Rich_Text_Format">Rich Text Format</a> (RTF)
-see also <a class="reference external" href="http://code.google.com/p/pyrtf-ng/">pyrtf-ng</a></li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/Open_XML_Paper_Specification">Open XML Paper Specification</a></li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/OOXML">OOXML</a> (at least at the text level we don’t have to deal with much of
+the mess inside OOXML).  See also: <a class="reference external" href="http://go.microsoft.com/fwlink/?LinkId=120908">Open XML SDK v1</a></li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/Rich_Text_Format">Rich Text Format</a> (RTF) see also <a class="reference external" href="http://code.google.com/p/pyrtf-ng/">pyrtf-ng</a></li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/Open_XML_Paper_Specification">Open XML Paper Specification</a></li>
 <li>.NET Resource files (.resx) – <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=396">Bug 396</a></li>
 </ul>
 </li>
 <li>XML related<ul>
 <li>Generic XML</li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/DocBook">DocBook</a> (can be handled by KDE’s
-<a class="reference external" href="http://linux.die.net/man/1/xml2pot">xml2pot</a>)</li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/DocBook">DocBook</a> (can be handled by KDE’s <a class="reference external" href="http://linux.die.net/man/1/xml2pot">xml2pot</a>)</li>
 <li><a class="reference external" href="http://www.w3.org/TR/SVG/">SVG</a></li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/Android_%28operating_system%29">Android</a>
-<a class="reference external" href="http://code.google.com/android/devel/resources-i18n.html">resource files</a> specifically
-<a class="reference external" href="http://code.google.com/android/reference/available-resources.html#stringresources">string resources</a>
-(<a class="reference external" href="http://www.linux-mag.com/id/7794">more background</a>)</li>
 </ul>
 </li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/Darwin_Information_Typing_Architecture">DITA</a></li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/Portable_Document_Format">PDF</a> see <a class="reference external" href="http://www.adobe.com/devnet/pdf/pdf_reference.html">spec</a>, <a class="reference external" href="http://pdfedit.petricek.net/en/index.html">PDFedit</a></li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/LaTeX">LaTeX</a> – see <a class="reference external" href="http://plastex.sourceforge.net/plastex/index.html">plasTeX</a>, a Python framework for
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/Darwin_Information_Typing_Architecture">DITA</a></li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/Portable_Document_Format">PDF</a> see <a class="reference external" href="http://www.adobe.com/devnet/pdf/pdf_reference.html">spec</a>, <a class="reference external" href="http://pdfedit.cz/en/index.html">PDFedit</a></li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/LaTeX">LaTeX</a> – see <a class="reference external" href="http://plastex.sourceforge.net/plastex/index.html">plasTeX</a>, a Python framework for
 processing LaTeX documents</li>
-<li><a class="reference external" href="http://dag.wieers.com/home-made/unoconv/">unoconv</a> – Python bindings to
+<li><a class="reference external" href="http://dag.wiee.rs/home-made/unoconv/">unoconv</a> – Python bindings to
 OpenOffice.org UNO which could allow manipulation of all formats understood
 by OpenOffice.org.</li>
 <li>Trados:<ul>
 <li>TTX (<a class="reference external" href="http://www.tracom.de/04/EN/techdoccenter/download/TRADOS_TTX-DTD.zip">Reverse Engineered DTD</a>,
-<a class="reference external" href="http://blogs.sun.com/timf/entry/beds_mattresses_and_open_standards">other discussion</a>)</li>
+<a class="reference external" href="http://timsfoster.wordpress.com/2005/07/05/beds-mattresses-and-open-standards/">other discussion</a>)</li>
 <li>Multiterm XML <a class="reference external" href="http://syntax.biz.pl/multiterm.html">TSV to MiltiTerm conversion script</a> or <a class="reference external" href="http://translationzone.eu/mtxml2txt.html">XLST</a></li>
 <li>.tmw</li>
-<li>.txt (You can interchange using TMX) <a class="reference external" href="http://uk.dir.groups.yahoo.com/group/Tradosuser/message/2318?o=1&d=-1">Format explanation</a> and <a class="reference external" href="http://translate.google.com/translate?js=y&prev=_t&hl=en&ie=UTF-8&layout=1&eotf=1&u=http%3A%2F%2Fwww.diemohrs.de%2Ftipps2_neu.html&sl=auto&tl=en">2</a> with some <a class="reference external" href="http://slaci.komarom.net/roli/Trados/TRADOS%206 [...]
+<li>.txt (You can interchange using TMX) <a class="reference external" href="http://translate.google.com/translate?js=y&prev=_t&hl=en&ie=UTF-8&layout=1&eotf=1&u=http%3A%2F%2Fwww.diemohrs.de%2Ftipps2_neu.html&sl=auto&tl=en">Format explanation</a>
+with some <a class="reference external" href="http://slaci.komarom.net/roli/Trados/TRADOS%206.5.5.439%20Freelance%20+%20TRADOS%20MultiTerm%20iX%206.0.1.209/TRADOS%206.5.5.439%20Freelance/Program%20Files/TRADOS/T65_FL/Samples/TW4Win/">examples</a>.</li>
 </ul>
 </li>
 <li>Tcl: .msg files.  <a class="reference external" href="http://www.google.com/codesearch?hl=en&q=show:XvsRBDCljVk:M2kzUbm70Ts:D5EHICz0aaQ&sa=N&ct=rd&cs_p=http://www.scilab.org/download/4.0/scilab-4.0-src.tar.gz&cs_f=scilab-4.0/tcl/scipadsources/msg_files/AddingTranslations.txt">Good documentation</a></li>
@@ -288,9 +268,9 @@ localisation</a>.
 This is a custom XML format, another one!</li>
 </ul>
 </li>
-<li>catgets/<a class="reference external" href="http://www.opengroup.org/onlinepubs/009695399/utilities/gencat.html">gencat</a>:
+<li>catgets/<a class="reference external" href="http://pubs.opengroup.org/onlinepubs/009695399/utilities/gencat.html">gencat</a>:
 precedes gettext, looking in man packages is the best information I could
-find.  Also <a class="reference external" href="http://dev.linuxfoundation.org/navigator/browse/cmd_single.php?cmd=list-by-name&Cname=gencat">LSB requires it</a>.
+find.  Also <a class="reference external" href="http://www.linuxbase.org/navigator/browse/cmd_single.php?cmd=list-by-name&Cname=gencat">LSB requires it</a>.
 There is some info about the source (msgfile) format on <a class="reference external" href="http://www.gnu.org/software/libc/manual/html_node/The-message-catalog-files.html#The-message-catalog-files">GNU website</a></li>
 <li><a class="reference internal" href="wml.html"><em>Wireless Markup Language</em></a></li>
 <li><a class="reference external" href="http://www.maxprograms.com/glossml/glossml.pdf">GlossML</a></li>
@@ -321,7 +301,7 @@ the effort.  Or some combination or these issues.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/ini.html b/docs/_build/html/formats/ini.html
index 819c7c5..8a337eb 100644
--- a/docs/_build/html/formats/ini.html
+++ b/docs/_build/html/formats/ini.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>INI Files — Translate Toolkit 1.9.0 documentation</title>
+    <title>INI Files — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Mozilla and Java properties files" href="properties.html" />
     <link rel="prev" title="CSV" href="csv.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="properties.html"
          title="next chapter">Mozilla and Java properties files »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -138,8 +141,8 @@ conventions</li>
 <span id="ini-references"></span><h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
 <p>Further information is available on .ini files:</p>
 <ul class="simple">
-<li>Wikipedia <a class="reference external" href="https://en.wikipedia.org/wiki/INI_file">INI file format</a> article</li>
-<li><a class="reference external" href="http://www.cloanto.com/specs/ini.html">Unofficial specification</a></li>
+<li>Wikipedia <a class="reference external" href="http://en.wikipedia.org/wiki/INI_file">INI file format</a> article</li>
+<li><a class="reference external" href="http://www.cloanto.com/specs/ini/">Unofficial specification</a></li>
 </ul>
 </div>
 </div>
@@ -156,7 +159,7 @@ conventions</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/odf.html b/docs/_build/html/formats/json.html
similarity index 53%
copy from docs/_build/html/formats/odf.html
copy to docs/_build/html/formats/json.html
index 98f097d..394a4c5 100644
--- a/docs/_build/html/formats/odf.html
+++ b/docs/_build/html/formats/json.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>OpenDocument Format — Translate Toolkit 1.9.0 documentation</title>
+    <title>JSON — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +27,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
-    <link rel="next" title="Simple Text Documents" href="text.html" />
+    <link rel="next" title="OpenDocument Format" href="odf.html" />
     <link rel="prev" title="iCalendar" href="ical.html" /> 
   </head>
   <body>
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,27 +55,30 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
 <li class="dropdown">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">OpenDocument Format</a></li>
+<li><a class="reference internal" href="#">JSON</a></li>
 </ul>
 </ul>
 </li>
@@ -85,13 +87,14 @@
               
   <li><a href="ical.html"
          title="previous chapter">« iCalendar</a></li>
-  <li><a href="text.html"
-         title="next chapter">Simple Text Documents »</a></li>
+  <li><a href="odf.html"
+         title="next chapter">OpenDocument Format »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -108,24 +111,36 @@
 
 <div class="container content">
    
-  <div class="section" id="opendocument-format">
-<span id="odf"></span><span id="id1"></span><h1>OpenDocument Format<a class="headerlink" href="#opendocument-format" title="Permalink to this headline">¶</a></h1>
-<p>This page summarises the support for the <a class="reference external" href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument format</a> (ODF) in the Translate Toolkit.
-This currently involves only the <a class="reference internal" href="../commands/odf2xliff.html"><em>odf2xliff</em></a> and
-xliff2odf converters.</p>
-<p>The Translate Toolkit aims to support version 1.1 of the ODF standard, although
-it should work reasonably well with older or newer files to the extent that
-they are similar.</p>
-<p>Our support is implemented to classify tags as not containing translatable
-text, or as being inline tags inside translatable tags. This approach means
-that new fields added in future versions will automatically be seen as
-translatable and should still be extracted successfully, even if the currently
-released versions of the Translate Toolkit are not aware of their existence.</p>
-<ul class="simple">
-<li><a class="reference external" href="https://github.com/translate/translate/blob/master/translate/storage/odf_shared.py#L23">Currently used and classified tags</a></li>
-</ul>
-<p>More complex tag uses are still needed to extract 100% correctly in some
-complex cases. For more information, see the list of <tt class="xref doc docutils literal"><span class="pre">issues</span> <span class="pre">from</span> <span class="pre">testing</span></tt>.</p>
+  <div class="section" id="json">
+<h1>JSON<a class="headerlink" href="#json" title="Permalink to this headline">¶</a></h1>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.9.0.</span></p>
+</div>
+<p><a class="reference external" href="http://en.wikipedia.org/wiki/JSON">JSON</a> is a common format for web data interchange.</p>
+<p>Example:</p>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>
+    <span class="nt">"firstName"</span><span class="p">:</span> <span class="s2">"John"</span><span class="p">,</span>
+    <span class="nt">"lastName"</span><span class="p">:</span> <span class="s2">"Smith"</span><span class="p">,</span>
+    <span class="nt">"age"</span><span class="p">:</span> <span class="mi">25</span><span class="p">,</span>
+    <span class="nt">"address"</span><span class="p">:</span> <span class="p">{</span>
+        <span class="nt">"streetAddress"</span><span class="p">:</span> <span class="s2">"21 2nd Street"</span><span class="p">,</span>
+        <span class="nt">"city"</span><span class="p">:</span> <span class="s2">"New York"</span><span class="p">,</span>
+        <span class="nt">"state"</span><span class="p">:</span> <span class="s2">"NY"</span><span class="p">,</span>
+        <span class="nt">"postalCode"</span><span class="p">:</span> <span class="mi">10021</span>
+    <span class="p">},</span>
+    <span class="nt">"phoneNumbers"</span><span class="p">:</span> <span class="p">[</span>
+        <span class="p">{</span>
+            <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"home"</span><span class="p">,</span>
+            <span class="nt">"number"</span><span class="p">:</span> <span class="s2">"212 555-1234"</span>
+        <span class="p">},</span>
+        <span class="p">{</span>
+            <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"fax"</span><span class="p">,</span>
+            <span class="nt">"number"</span><span class="p">:</span> <span class="s2">"646 555-4567"</span>
+        <span class="p">}</span>
+    <span class="p">]</span>
+<span class="p">}</span>
+</pre></div>
+</div>
 </div>
 
 
@@ -140,7 +155,7 @@ complex cases. For more information, see the list of <tt class="xref doc docutil
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/l20n.html b/docs/_build/html/formats/l20n.html
index 387bd97..9f793e9 100644
--- a/docs/_build/html/formats/l20n.html
+++ b/docs/_build/html/formats/l20n.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Mozilla l20n — Translate Toolkit 1.9.0 documentation</title>
+    <title>Mozilla l20n — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Wireless Markup Language" href="wml.html" />
     <link rel="prev" title="Qt .qm" href="qm.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -96,10 +98,11 @@
   <li><a href="wml.html"
          title="next chapter">Wireless Markup Language »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -128,7 +131,7 @@ tools.</p>
 target) pair, possibly containing more, like comments, state, etc. We prefer to
 build our richer tools against bilingual formats like <a class="reference internal" href="po.html"><em>PO Files</em></a>, <a class="reference internal" href="xliff.html"><em>XLIFF</em></a>,
 <a class="reference internal" href="ts.html"><em>Qt .ts</em></a>, etc. and provide converters to these formats when we want to support
-<tt class="xref doc docutils literal"><span class="pre">guide/monolingual</span></tt> formats. Pootle also implements its own bilingual
+<a class="reference external" href="http://translate.sourceforge.net/wiki/guide/monolingual">guide/monolingual</a> formats. Pootle also implements its own bilingual
 format in its database.</p>
 <p>l20n is based on the idea of entity soup, or object soup. Files are (at least
 in the first iteration) monolingual, and each language defines a set of objects
@@ -248,7 +251,7 @@ Addressing issues in point 5 and 6 would be the next steps.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/mo.html b/docs/_build/html/formats/mo.html
index 48e680a..1777652 100644
--- a/docs/_build/html/formats/mo.html
+++ b/docs/_build/html/formats/mo.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Gettext .mo — Translate Toolkit 1.9.0 documentation</title>
+    <title>Gettext .mo — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Qt .qm" href="qm.html" />
     <link rel="prev" title="Subtitles" href="subtitles.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="qm.html"
          title="next chapter">Qt .qm »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -122,14 +125,15 @@ optional hash can speed up the access to the translations.</p>
 <p>The toolkit can create .mo files from PO or XLIFF files, handling plurals and
 msgctxt.  It can also read .mo files, allowing counting, etc and also allowing
 the .mo files to act as a translation memory.</p>
-<p class="versionchanged">
-<span class="versionmodified">Changed in version 1.2: </span>The hash table is also generated (the Gettext .mo files works fine without
+<div class="versionchanged">
+<p><span class="versionmodified">Changed in version 1.2: </span>The hash table is also generated (the Gettext .mo files works fine without
 it). Due to slight differences in the construction of the hashing, the
 generated files are not identical to those generated by msgfmt, but they
 should be functionally equivalent and 100% usable. <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=326">Bug 326</a>
 tracked the implementation of the hashing. The hash is platform dependent.</p>
 </div>
 </div>
+</div>
 
 
 </div>
@@ -143,7 +147,7 @@ tracked the implementation of the hashing. The hash is platform dependent.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/odf.html b/docs/_build/html/formats/odf.html
index 98f097d..9fd2bdf 100644
--- a/docs/_build/html/formats/odf.html
+++ b/docs/_build/html/formats/odf.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>OpenDocument Format — Translate Toolkit 1.9.0 documentation</title>
+    <title>OpenDocument Format — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,17 +27,17 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Simple Text Documents" href="text.html" />
-    <link rel="prev" title="iCalendar" href="ical.html" /> 
+    <link rel="prev" title="JSON" href="json.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -83,15 +85,16 @@
             
             
               
-  <li><a href="ical.html"
-         title="previous chapter">« iCalendar</a></li>
+  <li><a href="json.html"
+         title="previous chapter">« JSON</a></li>
   <li><a href="text.html"
          title="next chapter">Simple Text Documents »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -110,9 +113,8 @@
    
   <div class="section" id="opendocument-format">
 <span id="odf"></span><span id="id1"></span><h1>OpenDocument Format<a class="headerlink" href="#opendocument-format" title="Permalink to this headline">¶</a></h1>
-<p>This page summarises the support for the <a class="reference external" href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument format</a> (ODF) in the Translate Toolkit.
-This currently involves only the <a class="reference internal" href="../commands/odf2xliff.html"><em>odf2xliff</em></a> and
-xliff2odf converters.</p>
+<p>This page summarises the support for the <a class="reference external" href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</a> format (ODF) in the
+Translate Toolkit.  This currently involves only the <a class="reference internal" href="../commands/odf2xliff.html"><em>odf2xliff</em></a> and xliff2odf converters.</p>
 <p>The Translate Toolkit aims to support version 1.1 of the ODF standard, although
 it should work reasonably well with older or newer files to the extent that
 they are similar.</p>
@@ -125,7 +127,7 @@ released versions of the Translate Toolkit are not aware of their existence.</p>
 <li><a class="reference external" href="https://github.com/translate/translate/blob/master/translate/storage/odf_shared.py#L23">Currently used and classified tags</a></li>
 </ul>
 <p>More complex tag uses are still needed to extract 100% correctly in some
-complex cases. For more information, see the list of <tt class="xref doc docutils literal"><span class="pre">issues</span> <span class="pre">from</span> <span class="pre">testing</span></tt>.</p>
+complex cases. For more information, see the list of <a class="reference external" href="http://translate.sourceforge.net/wiki/odf/testing">issues from testing</a>.</p>
 </div>
 
 
@@ -140,7 +142,7 @@ complex cases. For more information, see the list of <tt class="xref doc docutil
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/omegat_glossary.html b/docs/_build/html/formats/omegat_glossary.html
index 165ada5..3c2c750 100644
--- a/docs/_build/html/formats/omegat_glossary.html
+++ b/docs/_build/html/formats/omegat_glossary.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>OmegaT glossary — Translate Toolkit 1.9.0 documentation</title>
+    <title>OmegaT glossary — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Qt Phrase Book (.qph)" href="qt_phrase_book.html" />
     <link rel="prev" title="Wordfast Translation Memory" href="wordfast.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="qt_phrase_book.html"
          title="next chapter">Qt Phrase Book (.qph) »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -115,8 +118,9 @@
    
   <div class="section" id="omegat-glossary">
 <span id="id1"></span><h1>OmegaT glossary<a class="headerlink" href="#omegat-glossary" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.5.1.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.5.1.</span></p>
+</div>
 <p>OmegaT allows a translator to create a terminology list of glossary files.  It
 uses this file to provide its glossary matches to the OmegaT users.</p>
 <div class="section" id="format-specifications">
@@ -157,7 +161,7 @@ ASCII characters.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/php.html b/docs/_build/html/formats/php.html
index e1f4979..35aa9cc 100644
--- a/docs/_build/html/formats/php.html
+++ b/docs/_build/html/formats/php.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>PHP — Translate Toolkit 1.9.0 documentation</title>
+    <title>PHP — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Qt .ts" href="ts.html" />
     <link rel="prev" title="OpenOffice.org GSI/SDF format" href="gsi.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -77,7 +79,6 @@
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
 <li><a class="reference internal" href="#">PHP</a><ul>
-<li><a class="reference internal" href="#example">Example</a></li>
 <li><a class="reference internal" href="#conformance">Conformance</a></li>
 <li><a class="reference internal" href="#non-conformance">Non-Conformance</a></li>
 </ul>
@@ -93,10 +94,11 @@
   <li><a href="ts.html"
          title="next chapter">Qt .ts »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -115,59 +117,163 @@
    
   <div class="section" id="php">
 <span id="id1"></span><h1>PHP<a class="headerlink" href="#php" title="Permalink to this headline">¶</a></h1>
-<p>Many <a class="reference external" href="https://en.wikipedia.org/wiki/PHP">PHP</a> programs make use of a
-localisable string array.  The toolkit supports the full localisation of such
-files with <a class="reference internal" href="../commands/php2po.html"><em>php2po</em></a> and po2php.</p>
-<div class="section" id="example">
-<span id="php-example"></span><h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
-<p>The localisable string arrays appear like this:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
-<span class="nv">$string</span><span class="p">[</span><span class="s1">'name'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'value'</span>
-</pre></div>
-</div>
-</div>
+<p>Many <a class="reference external" href="http://en.wikipedia.org/wiki/PHP">PHP</a> programs make use of a localisable string array.  The toolkit
+supports the full localisation of such files with <a class="reference internal" href="../commands/php2po.html"><em>php2po</em></a> and
+po2php.</p>
 <div class="section" id="conformance">
 <span id="php-conformance"></span><h2>Conformance<a class="headerlink" href="#conformance" title="Permalink to this headline">¶</a></h2>
 <p>Our format support allows:</p>
-<ul class="simple">
-<li>PHP escaping (both for <a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single">single</a>
+<ul>
+<li><p class="first"><a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single">Single</a>
 and <a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double">double</a>
-quoted strings)</li>
-<li>Multiline entries</li>
-<li>PHP simple variable syntax</li>
-</ul>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$variable = 'string';</span>
-<span class="x">$another_variable = "another string";</span>
+quoted strings (both for keys and values)</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$variable</span> <span class="o">=</span> <span class="s1">'string'</span><span class="p">;</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s2">"language"</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Language'</span><span class="p">;</span>
+<span class="nb">define</span><span class="p">(</span><span class="s1">'item'</span><span class="p">,</span> <span class="s2">"another string"</span><span class="p">);</span>
 </pre></div>
 </div>
-<ul>
-<li><p class="first">Various layouts of the id</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$string['name'];</span>
-<span class="x">$string['name'] ;</span>
-<span class="x">$string[name];</span>
-<span class="x">$string[ 'name' ];</span>
+</li>
+<li><p class="first">PHP simple variable syntax</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$variable</span> <span class="o">=</span> <span class="s1">'string'</span><span class="p">;</span>
+<span class="nv">$another_variable</span> <span class="o">=</span> <span class="s2">"another string"</span><span class="p">;</span>
 </pre></div>
 </div>
 </li>
-<li><p class="first">PHP array syntax for localisation (since > 1.6.0)</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$lang = array(</span>
-<span class="x">   'name' => 'value',</span>
-<span class="x">   'name2' => 'value2',</span>
-<span class="x">);</span>
+<li><p class="first">PHP square bracket array syntax</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'language'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Language'</span><span class="p">;</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'file'</span><span class="p">]</span> <span class="o">=</span> <span class="s2">"File"</span><span class="p">;</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s2">"window"</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Window'</span><span class="p">;</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s2">"firewall"</span><span class="p">]</span> <span class="o">=</span> <span class="s2">"Firewall"</span><span class="p">;</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">PHP array syntax</p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.7.0.</span></p>
+</div>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="c1">// Can be 'array', 'Array' or 'ARRAY'.</span>
+<span class="nv">$lang</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+   <span class="s1">'name'</span> <span class="o">=></span> <span class="s1">'value'</span><span class="p">,</span>
+   <span class="s1">'name2'</span> <span class="o">=></span> <span class="s2">"value2"</span><span class="p">,</span>
+   <span class="s2">"key1"</span> <span class="o">=></span> <span class="s1">'value3'</span><span class="p">,</span>
+   <span class="s2">"key2"</span> <span class="o">=></span> <span class="s2">"value4"</span><span class="p">,</span>
+<span class="p">);</span>
 </pre></div>
 </div>
 </li>
 <li><p class="first">PHP define syntax</p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.10.0.</span></p>
+</div>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nb">define</span><span class="p">(</span><span class="s1">'item'</span><span class="p">,</span> <span class="s1">'string'</span><span class="p">);</span>
+<span class="nb">define</span><span class="p">(</span><span class="s1">'another_item'</span><span class="p">,</span> <span class="s2">"another string"</span><span class="p">);</span>
+<span class="nb">define</span><span class="p">(</span><span class="s2">"key"</span><span class="p">,</span> <span class="s1">'and another string'</span><span class="p">);</span>
+<span class="nb">define</span><span class="p">(</span><span class="s2">"another_key"</span><span class="p">,</span> <span class="s2">"yet another string"</span><span class="p">);</span>
+</pre></div>
+</div>
 </li>
-</ul>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">define('item', 'string');</span>
-<span class="x">define("another_item", "another string");</span>
+<li><p class="first">Escape sequences (both for <a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single">single</a>
+and <a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double">double</a>
+quoted strings)</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$variable</span> <span class="o">=</span> <span class="s1">'He said: "I\'ll be back"'</span><span class="p">;</span>
+<span class="nv">$another_variable</span> <span class="o">=</span> <span class="s2">"First line </span><span class="se">\n</span><span class="s2"> second line"</span><span class="p">;</span>
+<span class="nv">$key</span> <span class="o">=</span> <span class="s2">"</span><span class="se">\t</span><span class="s2">Indented string"</span><span class="p">;</span>
 </pre></div>
 </div>
-<ul>
+</li>
+<li><p class="first">Multiline entries</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$lang</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+   <span class="s1">'name'</span> <span class="o">=></span> <span class="s1">'value'</span><span class="p">,</span>
+   <span class="s1">'info'</span> <span class="o">=></span> <span class="s1">'Some hosts disable automated mail sending</span>
+<span class="s1">          on their servers. In this case the following features</span>
+<span class="s1">          cannot be implemented.'</span><span class="p">,</span>
+   <span class="s1">'name2'</span> <span class="o">=></span> <span class="s1">'value2'</span><span class="p">,</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Various layouts of the id</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$string</span><span class="p">[</span><span class="s1">'name'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'string'</span><span class="p">;</span>
+<span class="nv">$string</span><span class="p">[</span><span class="nx">name</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'string'</span><span class="p">;</span>
+<span class="nv">$string</span><span class="p">[</span> <span class="s1">'name'</span> <span class="p">]</span> <span class="o">=</span> <span class="s1">'string'</span><span class="p">;</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Comments</p>
+<div class="versionchanged">
+<p><span class="versionmodified">Changed in version 1.10.0.</span></p>
+</div>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="c1"># Hash one-line comment</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'language'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Language'</span><span class="p">;</span>
+
+<span class="c1">// Double slash one-line comment</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'file'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'File'</span><span class="p">;</span>
+
+<span class="cm">/*</span>
+<span class="cm">   Multi-line</span>
+<span class="cm">   comment</span>
+<span class="cm">*/</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'help'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Help'</span><span class="p">;</span>
+</pre></div>
+</div>
+</li>
 <li><p class="first">Whitespace before end delimiter</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="x">$string['name']     ;</span>
-<span class="x">$string['name'] ;</span>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.10.0.</span></p>
+</div>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$variable</span> <span class="o">=</span> <span class="s1">'string'</span>     <span class="p">;</span>
+
+<span class="nv">$string</span><span class="p">[</span><span class="s1">'name'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'string'</span>     <span class="p">;</span>
+
+<span class="nv">$lang</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+   <span class="s1">'name'</span> <span class="o">=></span> <span class="s1">'value'</span>           <span class="p">,</span>
+<span class="p">);</span>
+
+<span class="nb">define</span><span class="p">(</span><span class="s1">'item'</span><span class="p">,</span> <span class="s1">'string'</span>    <span class="p">);</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Nested arrays with any number of nesting levels</p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.11.0.</span></p>
+</div>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$lang</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+   <span class="s1">'name'</span> <span class="o">=></span> <span class="s1">'value'</span><span class="p">,</span>
+   <span class="s1">'datetime'</span> <span class="o">=></span> <span class="k">array</span><span class="p">(</span>
+      <span class="s1">'TODAY'</span> <span class="o">=></span> <span class="s1">'Today'</span><span class="p">,</span>
+      <span class="s1">'YESTERDAY'</span> <span class="o">=></span> <span class="s1">'Yesterday'</span><span class="p">,</span>
+      <span class="s1">'AGO'</span> <span class="o">=></span> <span class="k">array</span><span class="p">(</span>
+          <span class="mi">0</span> <span class="o">=></span> <span class="s1">'less than a minute ago'</span><span class="p">,</span>
+          <span class="mi">2</span> <span class="o">=></span> <span class="s1">'%d minutes ago'</span><span class="p">,</span>
+          <span class="mi">60</span> <span class="o">=></span> <span class="s1">'1 hour ago'</span><span class="p">,</span>
+      <span class="p">),</span>
+      <span class="s1">'Converted'</span> <span class="o">=></span> <span class="s1">'Converted'</span><span class="p">,</span>
+      <span class="s1">'LAST'</span> <span class="o">=></span> <span class="s1">'last'</span><span class="p">,</span>
+   <span class="p">),</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Whitespace in the array declaration</p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.11.0.</span></p>
+</div>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$variable</span> <span class="o">=</span> <span class="k">array</span>    <span class="p">(</span>
+   <span class="s2">"one"</span> <span class="o">=></span> <span class="s2">"this"</span><span class="p">,</span>
+   <span class="s2">"two"</span> <span class="o">=></span> <span class="s2">"that"</span><span class="p">,</span>
+<span class="p">);</span>
 </pre></div>
 </div>
 </li>
@@ -176,10 +282,50 @@ quoted strings)</li>
 <div class="section" id="non-conformance">
 <span id="php-non-conformance"></span><h2>Non-Conformance<a class="headerlink" href="#non-conformance" title="Permalink to this headline">¶</a></h2>
 <p>The following are not yet supported:</p>
-<ul class="simple">
-<li><a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.heredoc">herdoc</a>
-and <a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.nowdoc">nowdoc</a>
-are not managed</li>
+<ul>
+<li><p class="first">Keyless arrays:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$days</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="s1">'Sunday'</span><span class="p">,</span> <span class="s1">'Monday'</span><span class="p">,</span> <span class="s1">'Tuesday'</span><span class="p">,</span> <span class="s1">'Wednesday'</span><span class="p">,</span> <span class="s1">'Thursday'</span><span class="p">,</span> <span class="s1">'Friday'</span><span class="p [...]
+
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'days_short'</span><span class="p">]</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="s1">'Sun'</span><span class="p">,</span> <span class="s1">'Mon'</span><span class="p">,</span> <span class="s1">'Tue'</span><span class="p">,</span> <span class="s1">'Wed'</span><span class="p">,</span> <span class="s1">'Thu'</span><spa [...]
+</pre></div>
+</div>
+</li>
+<li><p class="first">Nested arrays without key for a nested array:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$lang</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="k">array</span><span class="p">(</span><span class="s2">"key"</span> <span class="o">=></span> <span class="s2">"value"</span><span class="p">));</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Array entries without ending comma:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$variable</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+   <span class="s2">"one"</span> <span class="o">=></span> <span class="s2">"this"</span><span class="p">,</span>
+   <span class="s2">"two"</span> <span class="o">=></span> <span class="s2">"that"</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">String concatenation:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'welcome'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Welcome '</span> <span class="o">.</span> <span class="nv">$name</span> <span class="o">.</span> <span class="s1">'!'</span><span class="p">;</span>
+<span class="nv">$messages</span><span class="p">[</span><span class="s1">'greeting'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Hi '</span> <span class="o">.</span> <span class="nv">$name</span><span class="p">;</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Assignment in the same line a multiline comment ends:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="cm">/*</span>
+<span class="cm">   Multi-line</span>
+<span class="cm">   comment</span>
+<span class="cm">*/</span> <span class="nv">$messages</span><span class="p">[</span><span class="s1">'help'</span><span class="p">]</span> <span class="o">=</span> <span class="s1">'Help'</span><span class="p">;</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first"><a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.heredoc">Heredoc</a></p>
+</li>
+<li><p class="first"><a class="reference external" href="http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.nowdoc">Nowdoc</a></p>
+</li>
 </ul>
 </div>
 </div>
@@ -196,7 +342,7 @@ are not managed</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/po.html b/docs/_build/html/formats/po.html
index a7b0207..b1b35b2 100644
--- a/docs/_build/html/formats/po.html
+++ b/docs/_build/html/formats/po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>PO Files — Translate Toolkit 1.9.0 documentation</title>
+    <title>PO Files — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="CSV" href="csv.html" />
     <link rel="prev" title="XLIFF" href="xliff.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -46,30 +45,33 @@
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
   <ul class="dropdown-menu globaltoc"><ul class="simple">
 </ul>
-<ul>
+<ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
-<li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -78,8 +80,6 @@
   <ul class="dropdown-menu localtoc"><ul>
 <li><a class="reference internal" href="#">PO Files</a><ul>
 <li><a class="reference internal" href="#supported-features">Supported Features</a></li>
-<li><a class="reference internal" href="#supported-comments">Supported comments</a></li>
-<li><a class="reference internal" href="#unsupported-features">Unsupported Features</a></li>
 </ul>
 </li>
 </ul>
@@ -93,10 +93,11 @@
   <li><a href="csv.html"
          title="next chapter">CSV »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -116,75 +117,74 @@
   <div class="section" id="po-files">
 <span id="po"></span><h1>PO Files<a class="headerlink" href="#po-files" title="Permalink to this headline">¶</a></h1>
 <p>PO files use the file format of the Gettext tools.</p>
-<div class="admonition-see-also admonition seealso">
+<div class="admonition seealso">
 <p class="first admonition-title">See also</p>
-<p class="last"><a class="reference external" href="http://www.gnu.org/software/gettext/">Gettext manual</a> and <a class="reference external" href="http://public.planetmirror.com/pub/kde/devel/gettext-kde/">KDE
-style PO files</a></p>
+<p class="last"><a class="reference external" href="http://www.gnu.org/software/gettext/">Gettext manual</a></p>
 </div>
 <div class="section" id="supported-features">
 <span id="po-supported-features"></span><h2>Supported Features<a class="headerlink" href="#supported-features" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li>Headers</li>
-<li>Plural forms and plural form handling</li>
-<li>Obsolete messages</li>
-<li>Message Context (msgctxt)</li>
-<li>Language header (since gettext version 0.17)</li>
-<li>Previous message ID and context (#| msgid and #| msgctxt)</li>
-</ul>
+<ul>
+<li><p class="first">Headers</p>
+</li>
+<li><p class="first">Language header (since gettext version 0.17)</p>
+</li>
+<li><p class="first">Plural forms and plural form handling</p>
+</li>
+<li><p class="first">Message context</p>
+<div class="highlight-po"><div class="highlight"><pre>msgctxt "noun"
+msgid "View"
+msgstr ""
+</pre></div>
 </div>
-<div class="section" id="supported-comments">
-<span id="po-supported-comments"></span><h2>Supported comments<a class="headerlink" href="#supported-comments" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li>normal comments</li>
-</ul>
+</li>
+<li><p class="first">Normal comments</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="c1"># this is another comment</span>
 </pre></div>
 </div>
-<ul class="simple">
-<li>automatic comments</li>
-</ul>
+</li>
+<li><p class="first">Automatic comments</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="c1">#. comment extracted from the source code</span>
 </pre></div>
 </div>
-<ul class="simple">
-<li>source location comments</li>
-</ul>
+</li>
+<li><p class="first">Source location comments</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="kd">#: sourcefile.xxx:35</span>
 </pre></div>
 </div>
-<ul class="simple">
-<li>typecomments</li>
-</ul>
+</li>
+<li><p class="first">Typecomments</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="kt">#, fuzzy</span>
 </pre></div>
 </div>
-<ul class="simple">
-<li>msgidcomments</li>
-</ul>
+</li>
+<li><p class="first">Msgidcomments, also known as KDE style comments as they are used by KDE for
+message disambiguation and comments to translators.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Support for this is being phased out in favor of <tt class="docutils literal"><span class="pre">msgctxt</span></tt>.</p>
+</div>
 <div class="highlight-po"><div class="highlight"><pre><span class="nv">msgid</span> <span class="s">"_: comment\n"</span>
 <span class="s">"translation"</span>
 </pre></div>
 </div>
-<p>Also know as KDE style comments as they are used by KDE for message
-disambiguation and comments to translators. (support for this is being phased
-out)</p>
-<ul class="simple">
-<li>obsolete messages</li>
-</ul>
+</li>
+<li><p class="first">Obsolete messages</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="c1">#~ msgid "Blah"</span>
 <span class="c1">#~ msgstr "Bleeh"</span>
 </pre></div>
 </div>
-<ul class="simple">
-<li>previous msgid and msgctxt</li>
-</ul>
+</li>
+<li><p class="first">Previous msgid</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="c1">#| msgid "previous message"</span>
 </pre></div>
 </div>
+</li>
+<li><p class="first">Previous msgctxt</p>
+<div class="highlight-po"><div class="highlight"><pre><span class="c1">#| msgctxt "previous context"</span>
+</pre></div>
 </div>
-<div class="section" id="unsupported-features">
-<span id="po-unsupported-features"></span><h2>Unsupported Features<a class="headerlink" href="#unsupported-features" title="Permalink to this headline">¶</a></h2>
-<p>None</p>
+</li>
+</ul>
 </div>
 </div>
 
@@ -200,7 +200,7 @@ out)</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/properties.html b/docs/_build/html/formats/properties.html
index 50253b0..dc5ddae 100644
--- a/docs/_build/html/formats/properties.html
+++ b/docs/_build/html/formats/properties.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Mozilla and Java properties files — Translate Toolkit 1.9.0 documentation</title>
+    <title>Mozilla and Java properties files — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Mozilla DTD format" href="dtd.html" />
     <link rel="prev" title="INI Files" href="ini.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="dtd.html"
          title="next chapter">Mozilla DTD format »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -152,10 +155,10 @@ files in the hierarchy to determine the translation.</li>
 <div class="section" id="references">
 <span id="properties-references"></span><h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
-<li>Java Properties Class <a class="reference external" href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#load(java.io.InputStream)">load method</a>
+<li>Java Properties Class’s <a class="reference external" href="http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Properties.html#load(java.io.InputStream)">load()</a>
 describes the properties format.</li>
-<li><a class="reference external" href="http://java.sun.com/dtd/properties.dtd">http://java.sun.com/dtd/properties.dtd</a> – alternate XML based property
-representation</li>
+<li><a class="reference external" href="http://www.oracle.com/webfolder/technetwork/jsc/dtd/properties.dtd">http://www.oracle.com/webfolder/technetwork/jsc/dtd/properties.dtd</a> –
+alternate XML based property representation</li>
 </ul>
 </div>
 </div>
@@ -172,7 +175,7 @@ representation</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/qm.html b/docs/_build/html/formats/qm.html
index 3e30196..5b9fff8 100644
--- a/docs/_build/html/formats/qm.html
+++ b/docs/_build/html/formats/qm.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Qt .qm — Translate Toolkit 1.9.0 documentation</title>
+    <title>Qt .qm — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Mozilla l20n" href="l20n.html" />
     <link rel="prev" title="Gettext .mo" href="mo.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="l20n.html"
          title="next chapter">Mozilla l20n »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -151,7 +154,7 @@ source format for a converter e.g. a possible qm2xliff converter.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/qt_phrase_book.html b/docs/_build/html/formats/qt_phrase_book.html
index 78a03ab..7fd70bc 100644
--- a/docs/_build/html/formats/qt_phrase_book.html
+++ b/docs/_build/html/formats/qt_phrase_book.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Qt Phrase Book (.qph) — Translate Toolkit 1.9.0 documentation</title>
+    <title>Qt Phrase Book (.qph) — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="TBX" href="tbx.html" />
     <link rel="prev" title="OmegaT glossary" href="omegat_glossary.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="tbx.html"
          title="next chapter">TBX »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -114,8 +117,9 @@
    
   <div class="section" id="qt-phrase-book-qph">
 <span id="qph"></span><span id="qt-phrase-book"></span><h1>Qt Phrase Book (.qph)<a class="headerlink" href="#qt-phrase-book-qph" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.2.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.2.</span></p>
+</div>
 <p>Qt Linguist allows a translator to collect common phrases into a phrase book.
 This plays a role of glossary lookup as opposed to translation memory.</p>
 <div class="section" id="conformance">
@@ -160,7 +164,7 @@ source of comments in a .qph.  This causes duplication on the offline editor.</l
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/quoting_and_escaping.html b/docs/_build/html/formats/quoting_and_escaping.html
index 4084300..a90fcc1 100644
--- a/docs/_build/html/formats/quoting_and_escaping.html
+++ b/docs/_build/html/formats/quoting_and_escaping.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Quoting and Escaping — Translate Toolkit 1.9.0 documentation</title>
+    <title>Quoting and Escaping — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +27,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
-    <link rel="next" title="Translate Styleguide" href="../styleguide.html" />
+    <link rel="next" title="Translate Styleguide" href="../developers/styleguide.html" />
     <link rel="prev" title="Base classes" href="base_classes.html" /> 
   </head>
   <body>
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -90,13 +92,14 @@
               
   <li><a href="base_classes.html"
          title="previous chapter">« Base classes</a></li>
-  <li><a href="../styleguide.html"
+  <li><a href="../developers/styleguide.html"
          title="next chapter">Translate Styleguide »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -127,7 +130,8 @@ i.e. it does not imply line breaks in the translated strings.</p>
 <p>Escaping is done with a backslash. An escaped double quote (<tt class="docutils literal"><span class="pre">\"</span></tt>) corresponds
 to a double quote in the original string. <tt class="docutils literal"><span class="pre">\n</span></tt> for newline, <tt class="docutils literal"><span class="pre">\t</span></tt> for tabs
 etc are used. Backslashes can be escaped to to give a native backslash.</p>
-<p>See also <a class="reference external" href="guide/translation/escaping">escaping</a> in the translation guide.</p>
+<p>See also <a class="reference external" href="http://translate.sourceforge.net/wiki/guide/translation/escaping">escaping</a> in the translation
+guide.</p>
 <p>Example:</p>
 <div class="highlight-po"><div class="highlight"><pre><span class="nv">msgid</span> <span class="s">""</span>
 <span class="s">"This is a long string with a \n newline, a \" double quote, and a \\ backslash."</span>
@@ -167,7 +171,7 @@ assumption of the toolkit.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/rc.html b/docs/_build/html/formats/rc.html
index aabaaf2..2a89c36 100644
--- a/docs/_build/html/formats/rc.html
+++ b/docs/_build/html/formats/rc.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Windows RC files — Translate Toolkit 1.9.0 documentation</title>
+    <title>Windows RC files — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Mac OSX strings" href="strings.html" />
     <link rel="prev" title="Qt .ts" href="ts.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="strings.html"
          title="next chapter">Mac OSX strings »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -116,17 +119,18 @@
    
   <div class="section" id="windows-rc-files">
 <span id="windows-rc"></span><span id="rc"></span><h1>Windows RC files<a class="headerlink" href="#windows-rc-files" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.2.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.2.</span></p>
+</div>
 <p>Windows .rc files, or resource files, are used to store translatable text,
 dialogs, menu, etc. for Windows applications.  The format can be handled by the
 Translate Toolkit <a class="reference internal" href="../commands/rc2po.html"><em>rc2po</em></a> and po2rc.</p>
 <div class="section" id="conformance">
 <span id="rc-conformance"></span><h2>Conformance<a class="headerlink" href="#conformance" title="Permalink to this headline">¶</a></h2>
 <p>The actual specification of .rc files is hard to come by.  The parser was built
-using <a class="reference external" href="https://en.wikipedia.org/wiki/Wine_%28software%29">WINE</a> .rc files as
-a reference.  This was done as WINE is a good target for .rc translations.  We
-are confident though that the extraction will prove robust for all .rc files.</p>
+using <a class="reference external" href="http://en.wikipedia.org/wiki/Wine_%28software%29">WINE</a> .rc files as a reference.  This was done
+as WINE is a good target for .rc translations.  We are confident though that
+the extraction will prove robust for all .rc files.</p>
 </div>
 <div class="section" id="useful-resource">
 <span id="rc-useful-resource"></span><h2>Useful resource<a class="headerlink" href="#useful-resource" title="Permalink to this headline">¶</a></h2>
@@ -167,7 +171,7 @@ ignored</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/strings.html b/docs/_build/html/formats/strings.html
index 2977f66..ff57ae6 100644
--- a/docs/_build/html/formats/strings.html
+++ b/docs/_build/html/formats/strings.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Mac OSX strings — Translate Toolkit 1.9.0 documentation</title>
+    <title>Mac OSX strings — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Adobe Flex properties files" href="flex.html" />
     <link rel="prev" title="Windows RC files" href="rc.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="flex.html"
          title="next chapter">Adobe Flex properties files »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -113,8 +116,9 @@
    
   <div class="section" id="mac-osx-strings">
 <span id="strings"></span><h1>Mac OSX strings<a class="headerlink" href="#mac-osx-strings" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.8.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.8.</span></p>
+</div>
 <p>Mac OSX .strings files are used for some Cocoa / Carbon application
 localization, such as for the iPhone, iPod, and OSX. They are somewhat similar
 to Java properties, and therefore <a class="reference internal" href="../commands/prop2po.html"><em>prop2po</em></a> and
@@ -122,9 +126,9 @@ po2prop are used for conversion.</p>
 <div class="section" id="references">
 <span id="strings-references"></span><h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
-<li><a class="reference external" href="http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html#//apple_ref/doc/uid/20000005-SW1">Localising string resources</a></li>
-<li><a class="reference external" href="http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html#//apple_ref/doc/uid/10000051i-CH6-SW10">manual creation of .strings files</a></li>
-<li><a class="reference external" href="http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html">String format specifiers</a></li>
+<li><a class="reference external" href="https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html#//apple_ref/doc/uid/20000005-SW1">Localising string resources</a></li>
+<li><a class="reference external" href="https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html#//apple_ref/doc/uid/10000051i-CH6-SW10">Manual creation of .strings files</a></li>
+<li><a class="reference external" href="https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html">String format specifiers</a></li>
 </ul>
 </div>
 </div>
@@ -141,7 +145,7 @@ po2prop are used for conversion.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/subtitles.html b/docs/_build/html/formats/subtitles.html
index 4b9b134..b3329d7 100644
--- a/docs/_build/html/formats/subtitles.html
+++ b/docs/_build/html/formats/subtitles.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Subtitles — Translate Toolkit 1.9.0 documentation</title>
+    <title>Subtitles — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Gettext .mo" href="mo.html" />
     <link rel="prev" title="Wiki Syntax" href="wiki.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="mo.html"
          title="next chapter">Gettext .mo »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -114,22 +117,23 @@
    
   <div class="section" id="subtitles">
 <span id="id1"></span><h1>Subtitles<a class="headerlink" href="#subtitles" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.4.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.4.</span></p>
+</div>
 <p>The translation of subtitles are supported in the toolkit with the commands
-<a class="reference internal" href="../commands/sub2po.html"><em>suc2po</em></a> and po2sub.</p>
+<a class="reference internal" href="../commands/sub2po.html"><em>sub2po</em></a> and po2sub.</p>
 <p>The following formats are supported for subtitles:</p>
 <ul class="simple">
 <li>MicroDVD</li>
 <li>MPL2</li>
 <li>MPsub</li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/SubRip">SubRip</a> (.srt)</li>
-<li><a class="reference external" href="https://en.wikipedia.org/wiki/SubViewer">SubViewer</a> 2.0 (.sub)</li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/SubRip">SubRip</a> (.srt)</li>
+<li><a class="reference external" href="http://en.wikipedia.org/wiki/SubViewer">SubViewer</a> 2.0 (.sub)</li>
 <li>TMPlayer</li>
 <li>Sub Station Alpha</li>
 <li>Advanced Sub Station Alpha</li>
 </ul>
-<p>Both .sub and .srt are the main formats <a class="reference external" href="http://help.youtube.com/support/youtube/bin/answer.py?answer=100077">supported by YouTube</a></p>
+<p>YouTube supports <a class="reference external" href="https://support.google.com/youtube/answer/2734698?hl=en&ref_topic=2734694">a number of formats</a></p>
 <div class="section" id="implementation-details">
 <span id="subtitles-implementation-details"></span><h2>Implementation details<a class="headerlink" href="#implementation-details" title="Permalink to this headline">¶</a></h2>
 <p>Format support is provided by <a class="reference external" href="http://home.gna.org/gaupol/">Gaupol</a> a
@@ -161,7 +165,7 @@ Gaupol to perform those reviews.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/tbx.html b/docs/_build/html/formats/tbx.html
index 62dad79..89d2d53 100644
--- a/docs/_build/html/formats/tbx.html
+++ b/docs/_build/html/formats/tbx.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>TBX — Translate Toolkit 1.9.0 documentation</title>
+    <title>TBX — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Universal Terminology eXchange (UTX)" href="utx.html" />
     <link rel="prev" title="Qt Phrase Book (.qph)" href="qt_phrase_book.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -78,26 +80,8 @@
   <ul class="dropdown-menu localtoc"><ul>
 <li><a class="reference internal" href="#">TBX</a><ul>
 <li><a class="reference internal" href="#references">References</a></li>
-<li><a class="reference internal" href="#standard-conformance">Standard conformance</a><ul>
-<li><a class="reference internal" href="#done">Done</a></li>
-<li><a class="reference internal" href="#todo">Todo</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#implementation-notes-for-missing-features">Implementation notes for missing features</a><ul>
-<li><a class="reference internal" href="#synonyms">Synonyms</a></li>
-<li><a class="reference internal" href="#definition">Definition</a></li>
-<li><a class="reference internal" href="#context">Context</a></li>
-<li><a class="reference internal" href="#parts-of-speech">Parts of speech</a></li>
-<li><a class="reference internal" href="#cross-reference">Cross reference</a></li>
-<li><a class="reference internal" href="#abbreviations">Abbreviations</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#tbx-cheat-sheet">TBX cheat sheet</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#tbx-requirements-by-galician-translation-team-proxecto-trasno">TBX requirements by Galician translation team (Proxecto Trasno)</a><ul>
-<li><a class="reference internal" href="#features-priorization">Features priorization</a></li>
-<li><a class="reference internal" href="#example-for-galician-tbx-requirements">Example for galician TBX requirements</a></li>
+<li><a class="reference internal" href="#conformance">Conformance</a></li>
+<li><a class="reference internal" href="#non-conformance">Non-Conformance</a></li>
 </ul>
 </li>
 </ul>
@@ -111,10 +95,11 @@
   <li><a href="utx.html"
          title="next chapter">Universal Terminology eXchange (UTX) »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -133,524 +118,52 @@
    
   <div class="section" id="tbx">
 <span id="id1"></span><h1>TBX<a class="headerlink" href="#tbx" title="Permalink to this headline">¶</a></h1>
-<p>TBX is the LISA standard for terminology and term exchange.</p>
+<p>TBX is the <a class="reference external" href="http://www.gala-global.org/lisa-oscar-standards">LISA OSCAR standard</a> for terminology and term
+exchange.</p>
 <p>For information on more file formats, see <a class="reference internal" href="conformance.html"><em>Standards conformance</em></a>.</p>
 <div class="section" id="references">
 <span id="tbx-references"></span><h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
-<li><a class="reference external" href="http://www.lisa.org/Term-Base-eXchange.32.0.html">Standard home page</a></li>
-<li><a class="reference external" href="http://www.lisa.org/TBX-Specification.33.0.html">Specification</a></li>
+<li><a class="reference external" href="http://www.gala-global.org/lisa-oscar-standards">Standard home page</a></li>
+<li><a class="reference external" href="http://www.gala-global.org/oscarStandards/tbx/tbx_oscar.pdf">Specification</a></li>
 <li><a class="reference external" href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=45797">ISO 30042</a>
 – TBX is an approved ISO standard</li>
-</ul>
-<p>You might also be interested in reading about <a class="reference external" href="http://www.lisa.org/TBX-Basic.926.0.html">TBX-Basic</a> – a simpler, reduced version of
-TBX with most of the useful features included.</p>
-</div>
-<div class="section" id="standard-conformance">
-<span id="tbx-standard-conformance"></span><h2>Standard conformance<a class="headerlink" href="#standard-conformance" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="done">
-<span id="tbx-done"></span><h3>Done<a class="headerlink" href="#done" title="Permalink to this headline">¶</a></h3>
-<ul class="simple">
-<li>Basic file creation</li>
-<li>Creating a bilingual list from CSV with <a class="reference internal" href="../commands/csv2tbx.html"><em>csv2tbx</em></a></li>
-<li>Using <tig> tags, not ntig</li>
-</ul>
-</div>
-<div class="section" id="todo">
-<span id="tbx-todo"></span><h3>Todo<a class="headerlink" href="#todo" title="Permalink to this headline">¶</a></h3>
-<ul class="simple">
-<li>id attributes for termEntry tags</li>
-<li>ntig, read and write</li>
-<li>multiple languages</li>
-<li>synonyms</li>
-<li>cross references</li>
-<li>abbreviations</li>
-<li>definitions</li>
-<li>context</li>
-<li>parts of speech</li>
-</ul>
-</div>
-</div>
-<div class="section" id="implementation-notes-for-missing-features">
-<span id="tbx-implementation-notes-for-missing-features"></span><h2>Implementation notes for missing features<a class="headerlink" href="#implementation-notes-for-missing-features" title="Permalink to this headline">¶</a></h2>
-<p>Note here:</p>
-<ul class="simple">
-<li>NLS – South African National Language Services – Multilingual Maths
-Dictionary</li>
-</ul>
-<div class="section" id="synonyms">
-<span id="tbx-synonyms"></span><h3>Synonyms<a class="headerlink" href="#synonyms" title="Permalink to this headline">¶</a></h3>
-<p>NLS: Extra listing</p>
-<p>TBX:</p>
-<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"termNote"</span><span class="nt">></span>synonym<span class="nt"></termNote></span>
-</pre></div>
-</div>
-<p>according to this TBX documentation. In another place:</p>
-<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"termType"</span><span class="nt">></span>synonym<span class="nt"></termNote></span>
-</pre></div>
-</div>
-<p>inside a <termGrp>, following <term></p>
-</div>
-<div class="section" id="definition">
-<span id="tbx-definition"></span><h3>Definition<a class="headerlink" href="#definition" title="Permalink to this headline">¶</a></h3>
-<p>NLS: term {definition/contextual information}</p>
-<p>TBX:</p>
-<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><descripGrp></span>
-   <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>The longish definition of the term<span class="nt"></descrip></span>
-<span class="nt"></descripGrp></span>
-</pre></div>
-</div>
-<p>inside langSet <descript> can probably be used directly under langSet</p>
-</div>
-<div class="section" id="context">
-<span id="tbx-context"></span><h3>Context<a class="headerlink" href="#context" title="Permalink to this headline">¶</a></h3>
-<p>NLS: term {definition/contextual information} (see above)</p>
-<p>TBX:</p>
-<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"context"</span><span class="nt">></span>A usually somewhat longer contextual sentence.<span class="nt"></descrip></span>
-</pre></div>
-</div>
-<p>inside <ntig></p>
-</div>
-<div class="section" id="parts-of-speech">
-<span id="tbx-parts-of-speech"></span><h3>Parts of speech<a class="headerlink" href="#parts-of-speech" title="Permalink to this headline">¶</a></h3>
-<p>NLS: term v.  (or adj, or n.)</p>
-<p>TBX:</p>
-<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"partOfSpeech"</span> <span class="nt">></span>noun<span class="nt"></termNote></span>
-</pre></div>
-</div>
-<p>following <term></p>
-</div>
-<div class="section" id="cross-reference">
-<span id="tbx-cross-reference"></span><h3>Cross reference<a class="headerlink" href="#cross-reference" title="Permalink to this headline">¶</a></h3>
-<p>NLS: alternate term -> real lemma</p>
-<p>TBX: <ref> TODO</p>
-</div>
-<div class="section" id="abbreviations">
-<span id="tbx-abbreviations"></span><h3>Abbreviations<a class="headerlink" href="#abbreviations" title="Permalink to this headline">¶</a></h3>
-<p>NLS: same as alternate term: a.m. -> before noon</p>
-<p>TBX: TODO</p>
-</div>
-</div>
-<div class="section" id="tbx-cheat-sheet">
-<span id="tbx-tbx-cheat-sheet"></span><h2>TBX cheat sheet<a class="headerlink" href="#tbx-cheat-sheet" title="Permalink to this headline">¶</a></h2>
+<li><a class="reference external" href="http://www.tbxconvert.gevterm.net/">Additional TBX resources</a></li>
+</ul>
+<p>You might also be interested in reading about <a class="reference external" href="http://www.gala-global.org/oscarStandards/tbx/tbx-basic.html">TBX-Basic</a> – a simpler,
+reduced version of TBX with most of the useful features included.</p>
+<p>Additionally notes and examples about TBX are available in <a class="reference external" href="http://terminator.readthedocs.org/en/latest/tbx_conformance.html">Terminator TBX
+conformance notes</a> which might
+help understanding this format.</p>
+<p>Also you might want to use <a class="reference external" href="http://sourceforge.net/projects/tbxutil/">TBXChecker</a> in order to check that TBX files
+are valid. Check the <a class="reference external" href="http://www.tbxconvert.gevterm.net/tbx_checker_explanation.html">TBXChecker explanation</a>.</p>
+</div>
+<div class="section" id="conformance">
+<span id="tbx-conformance"></span><h2>Conformance<a class="headerlink" href="#conformance" title="Permalink to this headline">¶</a></h2>
+<p>Translate Toolkit TBX format support allows:</p>
 <ul class="simple">
-<li>source word in English</li>
-<li>definition in English</li>
-<li>translation of source word to XX</li>
-<li>definition in XX</li>
-<li>comment</li>
-<li>syntactic group</li>
-<li>one or more tags</li>
-<li>a reference number</li>
+<li>Basic TBX file creation</li>
+<li>Creating a bilingual TBX from CSV using <a class="reference internal" href="../commands/csv2tbx.html"><em>csv2tbx</em></a></li>
+<li>Using <tt class="docutils literal"><span class="pre"><tig></span></tt> tags only</li>
 </ul>
-<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><termEntry</span> <span class="na">id=</span><span class="s">"4324 (8)"</span><span class="nt">></span>
-    <span class="nt"><note></span>tag1, tag2, tag3 (7) -
-(Actually not clear what the best mapping to TBX is in this case.)<span class="nt"></note></span>
-    <span class="nt"><langSet</span> <span class="na">xml:lang=</span><span class="s">"en"</span><span class="nt">></span>
-        <span class="nt"><tig></span>
-            <span class="nt"><term></span>sound (1)<span class="nt"></term></span>
-            <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"partOfSpeech"</span><span class="nt">></span>noun (6)<span class="nt"></termNote></span>
-        <span class="nt"></tig></span>
-        <span class="nt"><descripGrp></span>
-            <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>Something you can hear (2) -
-definition with an associated external source)<span class="nt"></descrip></span>
-            <span class="nt"><xref</span> <span class="na">type=</span><span class="s">"xSource"</span> <span class="na">target=</span><span class="s">"http://www.something.org/?id=234"</span><span class="nt">></span>Glossmaster<span class="nt"></xref></span>
-        <span class="nt"></descripGrp></span>
-        <span class="nt"><note></span>Any random note about the term. (5)
-(Actually there are ways of storing pretty specific stuff in specific spaces,
-but while it seems the comment could be a more verbose definition, examples,
-usage notes or anything else, we'll use this generic way.)
-        <span class="nt"></note></span>
-    <span class="nt"></langSet></span>
-    <span class="nt"><langSet</span> <span class="na">xml:lang=</span><span class="s">"af"</span><span class="nt">></span>
-        <span class="nt"><tig></span>
-            <span class="nt"><term></span>klank (3)<span class="nt"></term></span>
-        <span class="nt"></tig></span>
-        <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>Iets wat jy kan hoor (4) -
-definition without an external source)<span class="nt"></descrip></span>
-        <span class="nt"><note></span>A note in the target language (5).<span class="nt"></note></span>
-    <span class="nt"></langSet></span>
-<span class="nt"></termEntry></span>
-</pre></div>
-</div>
-<p>Note that the <xref> tags are optional (as are just about everything except
-termEntry, langSet and tig). They allow to link to an external source. An
-internal source can also be specified, or the definition can be specified
-without a source as shown for the term “klank”.</p>
 </div>
-</div>
-<div class="section" id="tbx-requirements-by-galician-translation-team-proxecto-trasno">
-<span id="tbx-tbx-requirements-by-galician-translation-team-proxecto-trasno"></span><h1>TBX requirements by Galician translation team (Proxecto Trasno)<a class="headerlink" href="#tbx-requirements-by-galician-translation-team-proxecto-trasno" title="Permalink to this headline">¶</a></h1>
-<p>Here you have a list of <a class="reference external" href="http://www.certima.net/glosima/?28-xustificacion-das-escollas-de">TBX requirements</a> needed by
-the <a class="reference external" href="http://www.trasno.net">Galician translation team (Proxecto Trasno)</a>. Its
-translation to english is below. You can see a terminology management system
-software specification draft in
-<a class="reference external" href="http://translate.sourceforge.net/wiki/developers/terminology_management_system">http://translate.sourceforge.net/wiki/developers/terminology_management_system</a></p>
-<p>A very important feature is to allow the exporting using pretty printing (like
-in the first example below) since the exported glossaries should be able to be
-read both by humans and software.</p>
-<p>Before the example you can see a list priorizing the features from more
-interesting and needed to less interesting and needed.</p>
-<p>The chosen TBX tags are determined by the needs of our terminology management
-system (the galician translation team one). That terminology management system
-needs several glossaries, each glossary has several concepts, and each concept
-can have several definitions (only one definition per language in a given
-concept), and also can have several translations for each concept (several
-translations per language in a given concept). The concepts will also have
-associated some links to get more information (several links per language in a
-given concept). Also is needed to have defined several languages.</p>
-<p>Now we have a list of all the needed entities lets go with the list of
-attributes for each of that entities:</p>
-<p>Each glossary has a name and a description.</p>
-<p>Each concept has an unique id, a subject field (which is another concept in the
-same glossary), it can have several concepts that people may wish to see (lets
-call it related concepts), and it can also have a parent concept (broader
-concept).</p>
-<p>Each link has a type (image, Wikipedia page,...), the address of the link, and
-a tiny description.</p>
-<p>Each definition has a definition text.</p>
-<p>We want to save the ISO 639 code of each language.</p>
-<p>Each translation can have a translation text, it has an unique id, the part of
-speech, the grammatical genre (if applicable), the grammatical number (if
-applicable), a field that indicates if the translation is an abbreviation or an
-acronym, an explaining note, examples of use (created by the people that make
-the terminology), links to examples of real use (a corpus or translation
-database), a field that indicates if the translation is completed or if it is
-still incomplete (completion status), and we also need to save the translation
-administrative status (if it is a recommedend translation, a not recommended
-one, or if it is a forbidden translation) and the reason why the translation
-has the actual administrative status (a simple text string) that only applies
-when the administrative status is other than “recommended”.</p>
-<p>Once listed the needs we proceeded with reading the TBX ISO 300042 standard in
-search of the elements that support these needs, and we found at least one tag
-(or attribute) for every need, except for only a few that doesn’t have. We
-should comment that TBX stores the information grouping it by concepts, and
-within each concept part of the information is stored at the beginning of the
-concept and other part of that information (the language-dependant information)
-is splited between the different languages, and within every language section
-it is splited another time between the translations of that language. This way
-it has a three level structure: concept level, language level and translation
-level (also called term level).</p>
-<p>Next we list the needs and the tag chosen for that need, indicating the level
-in which the tag goes:</p>
+<div class="section" id="non-conformance">
+<span id="tbx-non-conformance"></span><h2>Non-Conformance<a class="headerlink" href="#non-conformance" title="Permalink to this headline">¶</a></h2>
+<p>The following are not yet supported:</p>
 <ul class="simple">
-<li><strong>Glossary name:</strong> if we match glossary with TBX file, then the glossary name
-is the TBX file title, the label <title>. It goes on the file header.</li>
-<li><strong>Glossary description:</strong> if we match glossary with TBX file then we can use
-a <p> tag inside <sourceDesc> tag. It goes on the file header.</li>
-<li><strong>Concept:</strong> the <termEntry> tag from TBX standard represents a concept. This
-tag encloses the concept level.</li>
-<li><strong>Concept identifier:</strong> the <termEntry> tag has an attribute named “id”.</li>
-<li><strong>Concept subject field:</strong> the TBX standard defines the <descrip> tag with
-“subjectField” in its “type” attribute to represent the concept subject field
-(<strong>*<descrip type=”subjectField”>subject field name</descrip>*</strong>). Since
-there is no way to refer to another concept we should use some of the
-translations of the subject field concept (the concept that is the subject
-field of the current concept) to put inside the subject field tag. It goes in
-concept level. <strong>The lack of a way in TBX standard to refer to another
-concept within the same glossary as subject field to make self-contained
-glossaries is a real lack or we haven’t identified the way to do this using
-TBX??</strong></li>
-<li><strong>Related concepts:</strong> the TBX standard suggest the use of the tag <strong>*<ref
-type=”crossReference” target=”cid­23”>some text...</ref>*</strong> where “cid­23” is
-the value of the related concept id, and “some text...” is one of the related
-concept translations (the first english recommended one, for example). It
-goes on concept level.</li>
-<li><strong>Broader concept:</strong> TBX defines the use of the tag <descrip> with the value
-“broaderConceptGeneric” in its “type” attribute and a text between its
-opening and closing tags. Also it allows the use of the “target” attribute to
-refer to the broader concept. It goes on concept level. Example <strong>*<descrip
-type=”broaderConceptGeneric” target=”cid­23”>broader concept
-name</descrip>*</strong></li>
-<li><strong>Link:</strong> according to TBX standard the tag that defines external links to
-outside the current file is the <xref> tag. This tag has the following
-structure: <strong>*<xref type=”xGraphic” target=”sports/cricket/bat.jpg”>cricket
-bat</xref>*</strong> where “type” is the link type, “target” is the link address and
-the text between the opening and closing tags is a short description. It goes
-on language level.</li>
-<li><strong>Link type:</strong> the <xref> tag has an attribute named “type” that defines the
-link type. This attribute can have the values “xGraphic” if it is an image,
-“externalCrossReference” if it is a link to an external resource (for example
-a link to Wikipedia). It can have other values, but for now they are
-considered not important.</li>
-<li><strong>Link address:</strong> the <xref> tag has an attribute named “target” which is the
-link address.</li>
-<li><strong>Link description:</strong> the link description can go between the opening and
-closing tags</li>
-<li><strong>Definition:</strong> to save the definitions it should be used the <descrip> tag
-with the value “definition” in its “type” attribute. It goes on the language
-level. Example: <strong>*<descrip type=”definition”>alternate name for a
-person...</descrip>*</strong> can be the definition for “nickname”.</li>
-<li><strong>Definition text:</strong> the definition text goes between the opening and closing
-<descrip> tags.</li>
-<li><strong>Language:</strong> in TBX the <langSet> tag represents a language, but no language
-list is stored inside the TBX file. So if there is a <langSet> tag for a
-given language somewhere inside the TBX file, then this particular language
-is defined in that TBX file. Inside each concept only can exist one <langSet>
-per language, but a given language can have a <langSet> in each <termEntry>.
-It is essential that at least one <langSet> tag is present in every
-<termEntry> tag. The <langSet> tag encloses the language level. It goes on
-concept level.</li>
-<li><strong>Language code:</strong> the <langSet> tag has an attribute named “xml:lang” which
-stores some ISO 639 code value. Example: <strong>*<langSet xml:lang=”gl”>*</strong></li>
-<li><strong>Translation:</strong> the TBX standard defines two different tags to enclose the
-translation level: <tig> and <ntig>. The <tig> tag provides all the needed
-functionalities, like also the <ntig> tag does, but the <ntig> also has a lot
-of undesired and unnecessary functionalities that complicate the TBX file
-structure in an unnecessary way making its size grow and making dificult to a
-person read the file with a text editor. Besides the TBX-Basic standard only
-uses the <tig> tag. So we decided to only use the <tig> tag.</li>
-<li><strong>Translation text:</strong> the translation text goes between the opening and
-closing of the <term> tag that goes on the translation level (under the <tig>
-tag). Example: <strong>*<term>nickname</term>*</strong></li>
-<li><strong>Translation identifier:</strong> the <tig> tag has an attribute named “id” in
-which we put the identifier. Example: <strong>*<tig id=”tid­59”>...</tig>*</strong></li>
-<li><strong>Part of speech:</strong> for storing the part of speech TBX suggests the use of
-the <termNote> tag indicating in the “type” attribute the value
-“partOfSpeech”. The TBX standard doesn’t defines a part of speech values list
-(like noun, verb...), but the TBX-Basic standard (a simplified subset of TBX)
-defines a short list of part of speech values which we can reuse and that can
-be completed if necessary. It goes on translation level. Example:
-<strong>*<termNote type=”partOfSpeech”>noun</termNote>*</strong></li>
-<li><strong>Grammatical gender:</strong> TBX specifies that the grammatical gender should be
-specified using the <termNote> tag indicating the value “grammaticalGender”
-in the “type” attribute. Like in the previous point, TBX doesn’t define a
-gender list so we will have to use the defined in TBX-Basic. It goes on the
-translation level. Example: <strong>*<termNote
-type=”grammaticalGender”>masculine</termNote>*</strong></li>
-<li><strong>Grammatical number:</strong> TBX says that for saving the grammatical number it
-should be used a <termNote> tag with the value “grammaticalNumber” in its
-“type” attribute. For the grammatical number we are going to use the list
-defined in TBX-Basic. The grammatical should only be put when not putting it
-could lead to misunderstanding. It goes on the translation level. Example:
-<strong>*<termNote type=”grammaticalNumber”>plural</termNote>*</strong></li>
-<li><strong>Acronym:</strong> to indicate that a translation is an acronym we can use the
-<termNote> tag with the “termType” value on its attribute “type” and the text
-“acronym” between its opening and closing tags. It goes on the translation
-level. Example: <strong>*<termNote type=”termType”>acronym</termNote>*</strong></li>
-<li><strong>Abbreviation:</strong> Like in the previous point but putting now “abbreviation”
-between the opening and the closing tags. It goes on the translation level.</li>
-<li><strong>Translation explaining note:</strong> for the notes TBX defines the use of the
-<termNote> tag with the value “usageNote” on its “type” attribute with the
-explanatory note text between its opening and closing tags. It goes on the
-translation level. Example: <strong>*<termNote type=”usageNote”>Don’t abuse of that
-translation...</termNote>*</strong></li>
-<li><strong>Example of use:</strong> for the examples of use made ad hoc we are going to use
-the <descrip> tag with the value “context” on its “type” attribute and the
-example text between its opening and closing tags. It goes on the translation
-level. We are not going to use <descrip type=”sampleSentence”> since it
-doesn’t appear both in TBX and in TBX-Basic, and also we are not going to use
-<descrip type=”example”> since in it is not mandatory to include the
-translation text in the example. Example: <strong>*<descrip type=”context”>example
-text</descrip>*</strong></li>
-<li><strong>Link to real use example:</strong> it is used for references to corpus
-(translations databases, like open-tran.eu). TBX says that such references
-should be indicated using the <xref> tag with the value “corpusTrace” on its
-“type” attribute. It goes on the translation level. Example: <strong>*<xref
-type=”corpusTrace” target=”http:*en.gl.open-tran.eu/suggest/window”>Window on
-open-tran.eu</xref></strong>//</li>
-<li><strong>Completion status:</strong> we are going to use the <termNote> tag with the value
-“processStatus” in its “type” attribute and the text “provisionallyProcessed”
-between its opening and closing tags to indicate that not all the translation
-information is not approved or that some of that information are not included
-on the system yet. In case being completed this tag shouldn’t appear, despite
-TBX defines the values “unprocessed” and “finalized”. It goes on the
-translation level. Example: <strong>*<termNote
-type=”processStatus”>provisionallyProcessed</termNote>*</strong></li>
-<li><strong>Administrative status:</strong> to indicate the administrative status of the
-translation we are going to do the way TBX specifies and not how TBX-Basic
-does since we are using a superset of TBX-Basic. TBX specifies the use of the
-<termNote> tag with the value “administrativeStatus” on its “type” attribute
-and the text that indicates the status between its opening and closing tags.
-TBX defines a list of several states but we are only going to use three of
-them: “preferredTerm­admn­sts” to indicate that this is a recommended
-translation, “admittedTerm­admn­sts” to indicate that it is a valid
-translation but that be prefer not to use it since there is another one that
-is recommended, and “deprecatedTerm­admn­sts” to indicate that this
-translation is forbidden (for not being a valid translation for a given
-language for some reasons: false friend,...). It goes on the translation
-level. Example: <strong>*<termNote
-type=”administrativeStatus”>preferredTerm­admn­sts</termNote>*</strong></li>
-<li><strong>Administrative status reason:</strong> TBX doesn’t define any way to save the
-reason why a translation has a given administrative status. Due to that we
-decided to use the <note> tag for specifying the reason. Since this tag is
-also used for saving notes we are considering to use the <termNoteGrp> to
-group it together with the administrative status tag. Maybe some languages
-are not going to use that, but in galician it is very very important. Note
-that the reason is not specified if the administrative status is
-“preferredTerm­admn­sts”. It goes on the translation level. Example:
-<strong>galicism</strong></li>
+<li><tt class="docutils literal"><span class="pre">id</span></tt> attribute for <tt class="docutils literal"><span class="pre"><termEntry></span></tt> tags</li>
+<li>Definitions</li>
+<li>Multiple languages</li>
+<li>Parts of speech</li>
+<li>Multiple translations in the same language</li>
+<li>Cross references</li>
+<li>Context</li>
+<li>Abbreviations</li>
+<li>Synonyms</li>
+<li><tt class="docutils literal"><span class="pre"><ntig></span></tt> tag, read and write</li>
 </ul>
-<p>Below you can see a diagram that shows the levels and the data that goes in
-each level. Click on the image to enlarge.</p>
-<img alt="../_images/tbx_levels_structure.png" src="../_images/tbx_levels_structure.png" />
-<div class="section" id="features-priorization">
-<span id="tbx-features-priorization"></span><h2>Features priorization<a class="headerlink" href="#features-priorization" title="Permalink to this headline">¶</a></h2>
-<p>The upper ones are the most needed and interesting:</p>
-<ul class="simple">
-<li>Definition</li>
-<li>Several translations in the same language for the same concept</li>
-<li>Part of speech</li>
-<li>Grammatical gender</li>
-<li>Grammatical number</li>
-<li>Concept subject field</li>
-<li>Pretty printing</li>
-<li>Use of tig tag by default</li>
-<li>Link to external resources (including its type, address and description)</li>
-<li>Completion status</li>
-<li>Administrative status</li>
-<li>Administrative status reason</li>
-<li>Translation explaining note</li>
-<li>Translation identifier</li>
-<li>Related concepts</li>
-<li>Broader concept</li>
-<li>Acronym</li>
-<li>Abbreviation</li>
-<li>Example of use</li>
-<li>Link to real use example</li>
-</ul>
-</div>
-<div class="section" id="example-for-galician-tbx-requirements">
-<span id="tbx-example-for-galician-tbx-requirements"></span><h2>Example for galician TBX requirements<a class="headerlink" href="#example-for-galician-tbx-requirements" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-xml"><div class="highlight"><pre><span class="cp"><?xml version='1.0' encoding='UTF-8'?></span>
-<span class="cp"><!DOCTYPE martif SYSTEM 'TBXcoreStructV02.dtd'></span>
-<span class="nt"><martif</span> <span class="na">type=</span><span class="s">'TBX'</span> <span class="na">xml:lang=</span><span class="s">'en'</span><span class="nt">></span>
-    <span class="nt"><martifHeader></span>
-        <span class="nt"><fileDesc></span>
-            <span class="nt"><titleStmt></span>
-                <span class="nt"><title></span>Localization glossary<span class="nt"></title></span>
-            <span class="nt"></titleStmt></span>
-            <span class="nt"><sourceDesc></span>
-                <span class="nt"><p></span>Test glossary with concepts from software localization...<span class="nt"></p></span>
-            <span class="nt"></sourceDesc></span>
-        <span class="nt"></fileDesc></span>
-        <span class="nt"><encodingDesc></span>
-            <span class="nt"><p</span> <span class="na">type=</span><span class="s">'XCSURI'</span><span class="nt">></span>http://www.lisa.org/fileadmin/standards/tbx/TBXXCSV02.xcs<span class="nt"></p></span>
-        <span class="nt"></encodingDesc></span>
-    <span class="nt"></martifHeader></span>
-    <span class="nt"><text></span>
-        <span class="nt"><body></span>
-
-            <span class="nt"><termEntry</span> <span class="na">id=</span><span class="s">"cid-23"</span><span class="nt">></span>
-                <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"subjectField"</span><span class="nt">></span>computer science<span class="nt"></descrip></span><span class="c"><!-- enclosed text in english since it is the glossary</span>
-<span class="c">                language (see martif opening tag) --></span>
-                <span class="nt"><ref</span> <span class="na">type=</span><span class="s">"crossReference"</span> <span class="na">target=</span><span class="s">"cid-12"</span><span class="nt">></span>microprocessor<span class="nt"></ref></span><span class="c"><!-- enclosed text in english since it is the</span>
-<span class="c">                glossary language (see martif opening tag) --></span>
-                <span class="nt"><ref</span> <span class="na">type=</span><span class="s">"crossReference"</span> <span class="na">target=</span><span class="s">"cid-16"</span><span class="nt">></span>keyboard<span class="nt"></ref></span><span class="c"><!-- enclosed text in english since it is the glossary</span>
-<span class="c">                language (see martif opening tag) --></span>
-                <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"broaderConceptGeneric"</span> <span class="na">target=</span><span class="s">"cid-7"</span><span class="nt">></span>hardware<span class="nt"></descrip></span><span class="c"><!-- enclosed text in english since it is</span>
-<span class="c">                the glossary language (see martif opening tag) --></span>
-
-                <span class="nt"><langSet</span> <span class="na">xml:lang=</span><span class="s">"en"</span><span class="nt">></span>
-                    <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>A computer is a programmable machine that receives input, stores and manipulates
-data, and provides output in a useful format.<span class="nt"></descrip></span>
-                    <span class="nt"><xref</span> <span class="na">type=</span><span class="s">"xGraphic"</span> <span class="na">target=</span><span class="s">"http://en.wikipedia.org/wiki/File:HPLaptopzv6000series.jpg"</span><span class="nt">></span>computer image<span class="nt"></xref></span>
-                    <span class="nt"><xref</span> <span class="na">type=</span><span class="s">"externalCrossReference"</span> <span class="na">target=</span><span class="s">"http://en.wikipedia.org/wiki/Computer"</span><span class="nt">></span>English Wikipedia computer page<span class="nt"></xref></span>
-
-                    <span class="nt"><tig</span> <span class="na">id=</span><span class="s">"tid-59"</span><span class="nt">></span>
-                        <span class="nt"><term></span>computer<span class="nt"></term></span>
-                    <span class="nt"></tig></span>
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>PC<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"termType"</span><span class="nt">></span>acronym<span class="nt"></termNote></span><span class="c"><!-- "PC" is an acronym of "Personal Computer" --></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>admittedTerm-admn-sts<span class="nt"></termNote></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"usageNote"</span><span class="nt">></span>Do not abuse of using this translation.<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>comp.<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"termType"</span><span class="nt">></span>abbreviation<span class="nt"></termNote></span><span class="c"><!-- "comp." is an abbreviation of "computer" --></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>admittedTerm-admn-sts<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-                <span class="nt"></langSet></span>
-
-                <span class="nt"><langSet</span> <span class="na">xml:lang=</span><span class="s">"es"</span><span class="nt">></span>
-                    <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>Máquina  electrónica que recibe y procesa datos para convertirlos en información
-útil<span class="nt"></descrip></span><span class="c"><!-- definition text in spanish --></span>
-
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>sistema<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>admittedTerm-admn-sts<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>equipo<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>deprecatedTerm-admn-sts<span class="nt"></termNote></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"processStatus"</span><span class="nt">></span>provisionallyProcessed<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>ordenador<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"partOfSpeech"</span><span class="nt">></span>noun<span class="nt"></termNote></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"grammaticalGender"</span><span class="nt">></span>masculine<span class="nt"></termNote></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"grammaticalNumber"</span><span class="nt">></span>singular<span class="nt"></termNote></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>preferredTerm-admn-sts<span class="nt"></termNote></span>
-                        <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"context"</span><span class="nt">></span>El ordenador personal ha supuesto la generalización de la informática.<span class="nt"></descrip></span><span class="c"><!-- example phrase --></span>
-                        <span class="nt"><xref</span> <span class="na">type=</span><span class="s">"corpusTrace"</span> <span class="na">target=</span><span class="s">"http://es.en.open-tran.eu/suggest/ordenador"</span><span class="nt">></span>ordenador en open-tran.eu<span class="nt"></xref></span><span class="c"><!-- enclosed text in spanish --></span>
-                    <span class="nt"></tig></span>
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>computador<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>deprecatedTerm-admn-sts<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>computadora<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>deprecatedTerm-admn-sts<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-                <span class="nt"></langSet></span>
-
-                <span class="nt"><langSet</span> <span class="na">xml:lang=</span><span class="s">"fr"</span><span class="nt">></span>
-                    <span class="nt"><descripGrp></span><span class="c"><!-- Using descripGrp tags for enclosing the definition and its source --></span>
-                        <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>Un ordinateur est une machine dotée d'une unité de traitement lui permettant
-d'exécuter des programmes enregistrés. C'est un ensemble de circuits électroniques permettant de manipuler des données sous forme
-binaire, ou bits. Cette machine permet de traiter automatiquement les données, ou informations, selon des séquences d'instructions
-prédéfinies appelées aussi programmes.
-                        Elle interagit avec l'environnement grâce à des périphériques comme le moniteur, le clavier, la souris,
-l'imprimante, le modem, le lecteur de CD (liste non-exhaustive). Les ordinateurs peuvent être classés selon plusieurs critères
-(domaine d'application, taille ou architecture).<span class="nt"></descrip></span>
-                        <span class="nt"><xref</span> <span class="na">type=</span><span class="s">"xSource"</span> <span class="na">target=</span><span class="s">"http://fr.wikipedia.org/wiki/Ordinateur"</span><span class="nt">></span>Wikipedia: ordinateur<span class="nt"></xref></span>
-                    <span class="nt"></descripGrp></span>
-
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>ordinateur<span class="nt"></term></span>
-                    <span class="nt"></tig></span>
-                <span class="nt"></langSet></span>
-            <span class="nt"></termEntry></span>
-
-            <span class="nt"><termEntry</span> <span class="na">id=</span><span class="s">"cid-27"</span><span class="nt">></span><span class="c"><!-- Another concept --></span>
-                <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"subjectField"</span><span class="nt">></span>computer science<span class="nt"></descrip></span>
-
-                <span class="nt"><langSet</span> <span class="na">xml:lang=</span><span class="s">"en"</span><span class="nt">></span>
-                    <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>A technical standard is an established norm or requirement. It is usually a formal
-document that establishes uniform engineering or technical criteria, methods, processes and practices. In contrast, a custom,
-convention, company product, corporate standard, etc. which becomes generally accepted and dominant is often called a de facto standard.<span class="nt"></descrip></span>
-
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>standard<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"partOfSpeech"</span><span class="nt">></span>noun<span class="nt"></termNote></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>preferredTerm-admn-sts<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-                <span class="nt"></langSet></span>
-
-                <span class="nt"><langSet</span> <span class="na">xml:lang=</span><span class="s">"gl"</span><span class="nt">></span>
-                    <span class="nt"><descrip</span> <span class="na">type=</span><span class="s">"definition"</span><span class="nt">></span>Norma que mediante documentos técnicos fixa a especificación de determinado tema.<span class="nt"></descrip></span>
-
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>estándar<span class="nt"></term></span>
-                        <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>preferredTerm-admn-sts<span class="nt"></termNote></span>
-                    <span class="nt"></tig></span>
-
-                    <span class="nt"><tig></span>
-                        <span class="nt"><term></span>standard<span class="nt"></term></span>
-                        <span class="nt"><termGrp></span><span class="c"><!-- Example of administrative status along with its reason --></span>
-                            <span class="nt"><termNote</span> <span class="na">type=</span><span class="s">"administrativeStatus"</span><span class="nt">></span>deprecatedTerm­admn­sts<span class="nt"></termNote></span>
-                            <span class="nt"><note></span>Razón: anglicismo<span class="nt"></note></span><span class="c"><!-- the translation of the enclosed text is: "Reason: anglicism" --></span>
-                        <span class="nt"></termGrp></span>
-                    <span class="nt"></tig></span>
-                <span class="nt"></langSet></span>
-            <span class="nt"></termEntry></span>
-
-        <span class="nt"></body></span>
-    <span class="nt"></text></span>
-<span class="nt"></martif></span>
-</pre></div>
-</div>
+<p>Other features can be picked from the <a class="reference external" href="http://terminator.readthedocs.org/en/latest/tbx_conformance.html">Terminator TBX conformance notes</a> which also
+include examples and notes about the TBX format.</p>
 </div>
 </div>
 
@@ -666,7 +179,7 @@ convention, company product, corporate standard, etc. which becomes generally ac
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/text.html b/docs/_build/html/formats/text.html
index 9bb3a25..5216071 100644
--- a/docs/_build/html/formats/text.html
+++ b/docs/_build/html/formats/text.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Simple Text Documents — Translate Toolkit 1.9.0 documentation</title>
+    <title>Simple Text Documents — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Wiki Syntax" href="wiki.html" />
     <link rel="prev" title="OpenDocument Format" href="odf.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="wiki.html"
          title="next chapter">Wiki Syntax »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -121,14 +124,15 @@ management to work well.  This is because the text file format support
 considered units to be space separated blocks of text.</p>
 <div class="section" id="example">
 <span id="text-example"></span><h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>Heading
+<div class="highlight-python"><div class="highlight"><pre>Heading
 =======
 
 Paragraph One
 
 Paragraph Two:
 * First bullet
-* Second bullet</pre>
+* Second bullet
+</pre></div>
 </div>
 <p>This example will result in three units.  The first will include the underline
 in the header.  The third will include all the bullet points in one paragraph
@@ -148,7 +152,7 @@ together with the paragraph lead in.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/tmx.html b/docs/_build/html/formats/tmx.html
index 8a317b3..4e70c09 100644
--- a/docs/_build/html/formats/tmx.html
+++ b/docs/_build/html/formats/tmx.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>TMX — Translate Toolkit 1.9.0 documentation</title>
+    <title>TMX — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,17 +27,17 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Wordfast Translation Memory" href="wordfast.html" />
-    <link rel="prev" title="Haiku catkeys" href="catkeys.html" /> 
+    <link rel="prev" title="Android string resources" href="android.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -86,15 +88,16 @@
             
             
               
-  <li><a href="catkeys.html"
-         title="previous chapter">« Haiku catkeys</a></li>
+  <li><a href="android.html"
+         title="previous chapter">« Android string resources</a></li>
   <li><a href="wordfast.html"
          title="next chapter">Wordfast Translation Memory »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -113,15 +116,14 @@
    
   <div class="section" id="tmx">
 <span id="id1"></span><h1>TMX<a class="headerlink" href="#tmx" title="Permalink to this headline">¶</a></h1>
-<p>TMX is the LISA standard for translation memories. See
-<a class="reference external" href="http://www.lisa.org/standards/tmx">http://www.lisa.org/standards/tmx</a>.</p>
+<p>TMX is the <a class="reference external" href="http://www.gala-global.org/lisa-oscar-standards">LISA OSCAR standard</a> for translation memories.</p>
 <div class="section" id="standard-conformance">
 <span id="tmx-standard-conformance"></span><h2>Standard conformance<a class="headerlink" href="#standard-conformance" title="Permalink to this headline">¶</a></h2>
-<p>Summary: TMX version 1.4 conformance to Level 1, except that no markup is
-stripped.</p>
+<p>Summary: <a class="reference external" href="http://www.gala-global.org/oscarStandards/tmx/tmx14b.html">TMX version 1.4</a> conformance to
+Level 1, except that no markup is stripped.</p>
 <ul class="simple">
 <li>All required header fields are supplied.</li>
-<li>The adminlang field in the header is always English.</li>
+<li>The <tt class="docutils literal"><span class="pre">adminlang</span></tt> field in the header is always English.</li>
 <li>None of the optional header fields are supplied.</li>
 <li>We assume that only two languages are used (source and single target
 language).</li>
@@ -145,7 +147,7 @@ Level 1 conformance.</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/ts.html b/docs/_build/html/formats/ts.html
index ff5c232..4e7cb0c 100644
--- a/docs/_build/html/formats/ts.html
+++ b/docs/_build/html/formats/ts.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Qt .ts — Translate Toolkit 1.9.0 documentation</title>
+    <title>Qt .ts — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Windows RC files" href="rc.html" />
     <link rel="prev" title="PHP" href="php.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -94,10 +96,11 @@
   <li><a href="rc.html"
          title="next chapter">Windows RC files »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -120,10 +123,10 @@
 traditionally edited using Qt Linguist.</p>
 <div class="section" id="references">
 <span id="ts-references"></span><h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
-<p>The format is XML and seems to only have been documented properly in Qt 4.3</p>
+<p>The format is XML and seems to only have been documented properly since Qt 4.3</p>
 <ul class="simple">
-<li><a class="reference external" href="http://doc.trolltech.com/4.5/linguist-ts-file-format.html">Current DTD Specification</a> for Qt 4.5,
-older versions; <a class="reference external" href="http://doc.trolltech.com/4.3/linguist-ts-file-format.html">Qt 4.3</a></li>
+<li><a class="reference external" href="http://qt-project.org/doc/qt-5.0/qtlinguist/linguist-ts-file-format.html">Current DTD Specification</a> for Wt 5.0,
+older versions; <a class="reference external" href="http://doc.qt.digia.com/4.3/linguist-ts-file-format.html">Qt 4.3</a></li>
 <li><a class="reference external" href="http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt">http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt</a></li>
 </ul>
 </div>
@@ -184,7 +187,7 @@ mean moving this format properly onto the base class).</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/utx.html b/docs/_build/html/formats/utx.html
index 4ce25ba..df6e17c 100644
--- a/docs/_build/html/formats/utx.html
+++ b/docs/_build/html/formats/utx.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Universal Terminology eXchange (UTX) — Translate Toolkit 1.9.0 documentation</title>
+    <title>Universal Terminology eXchange (UTX) — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="HTML" href="html.html" />
     <link rel="prev" title="TBX" href="tbx.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="html.html"
          title="next chapter">HTML »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -114,14 +117,16 @@
    
   <div class="section" id="universal-terminology-exchange-utx">
 <span id="utx"></span><h1>Universal Terminology eXchange (UTX)<a class="headerlink" href="#universal-terminology-exchange-utx" title="Permalink to this headline">¶</a></h1>
-<p class="versionadded">
-<span class="versionmodified">New in version 1.9.</span></p>
+<div class="versionadded">
+<p><span class="versionmodified">New in version 1.9.</span></p>
+</div>
 <p>UTX is implemented by the Asia-Pacific Association for Machine Translation</p>
 <div class="section" id="resources">
 <span id="utx-resources"></span><h2>Resources<a class="headerlink" href="#resources" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="http://www.aamt.info/english/utx/index.htm">UTX site</a></li>
-<li><a class="reference external" href="http://www.aamt.info/english/utx/utx-simple-1.00-specification-e.pdf">Specification</a> (v1.0)</li>
+<li><a class="reference external" href="http://www.aamt.info/english/utx/#Download">Current Specification</a>
+(implementation is based on UTX 1.0 which is no longer available)</li>
 </ul>
 </div>
 <div class="section" id="conformance">
@@ -157,7 +162,7 @@ the column titles</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/wiki.html b/docs/_build/html/formats/wiki.html
index 8bbecb8..4999e58 100644
--- a/docs/_build/html/formats/wiki.html
+++ b/docs/_build/html/formats/wiki.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Wiki Syntax — Translate Toolkit 1.9.0 documentation</title>
+    <title>Wiki Syntax — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Subtitles" href="subtitles.html" />
     <link rel="prev" title="Simple Text Documents" href="text.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -93,10 +95,11 @@
   <li><a href="subtitles.html"
          title="next chapter">Subtitles »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -130,7 +133,7 @@ add them.</p>
 <p>The following is a list of the wikis supported together with a list of the
 items that we can process:</p>
 <ul class="simple">
-<li><a class="reference external" href="http://wiki.splitbrain.org/wiki:dokuwiki">docuwiki</a> – heading, bullet,
+<li><a class="reference external" href="http://wiki.splitbrain.org/wiki:dokuwiki">dokuwiki</a> – heading, bullet,
 numbered list</li>
 <li><a class="reference external" href="http://www.mediawiki.org/wiki/MediaWiki">MediaWiki</a> – heading, bullet,
 numbered list</li>
@@ -166,7 +169,7 @@ disabled on most wikis so not directly usable currently.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/wml.html b/docs/_build/html/formats/wml.html
index 0e465d7..8d26f48 100644
--- a/docs/_build/html/formats/wml.html
+++ b/docs/_build/html/formats/wml.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Wireless Markup Language — Translate Toolkit 1.9.0 documentation</title>
+    <title>Wireless Markup Language — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="Standards conformance" href="conformance.html" />
     <link rel="prev" title="Mozilla l20n" href="l20n.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -88,10 +90,11 @@
   <li><a href="conformance.html"
          title="next chapter">Standards conformance »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -110,10 +113,10 @@
    
   <div class="section" id="wireless-markup-language">
 <span id="wml"></span><h1>Wireless Markup Language<a class="headerlink" href="#wireless-markup-language" title="Permalink to this headline">¶</a></h1>
-<p>This page documents the support for <a class="reference external" href="https://en.wikipedia.org/wiki/Wireless_Markup_Language">WML</a> and is used for
-planning our work on it.</p>
+<p>This page documents the support for <a class="reference external" href="http://en.wikipedia.org/wiki/Wireless_Markup_Language">WML</a> and is
+used for planning our work on it.</p>
 <p>This is implemented as a generic XML document type that is handled similarly to
-the way the <tt class="xref doc docutils literal"><span class="pre">developers/projects/odf</span></tt> project handles ODF documents.</p>
+the way the <a class="reference external" href="http://translate.sourceforge.net/wiki/developers/projects/odf">developers/projects/odf</a> project handles ODF documents.</p>
 </div>
 
 
@@ -128,7 +131,7 @@ the way the <tt class="xref doc docutils literal"><span class="pre">developers/p
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/wordfast.html b/docs/_build/html/formats/wordfast.html
index 568aaf0..afe9ef1 100644
--- a/docs/_build/html/formats/wordfast.html
+++ b/docs/_build/html/formats/wordfast.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Wordfast Translation Memory — Translate Toolkit 1.9.0 documentation</title>
+    <title>Wordfast Translation Memory — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="OmegaT glossary" href="omegat_glossary.html" />
     <link rel="prev" title="TMX" href="tmx.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,10 +93,11 @@
   <li><a href="omegat_glossary.html"
          title="next chapter">OmegaT glossary »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -113,8 +116,8 @@
    
   <div class="section" id="wordfast-translation-memory">
 <span id="wordfast"></span><h1>Wordfast Translation Memory<a class="headerlink" href="#wordfast-translation-memory" title="Permalink to this headline">¶</a></h1>
-<p>The Wordfast format, as used by the <a class="reference external" href="https://en.wikipedia.org/wiki/Wordfast">Wordfast</a> translation tool, is a simple tab
-delimited file.</p>
+<p>The Wordfast format, as used by the <a class="reference external" href="http://en.wikipedia.org/wiki/Wordfast">Wordfast</a> translation tool, is a
+simple tab delimited file.</p>
 <p>The storage format can read and write Wordfast TM files.</p>
 <div class="section" id="conformance">
 <span id="wordfast-conformance"></span><h2>Conformance<a class="headerlink" href="#conformance" title="Permalink to this headline">¶</a></h2>
@@ -143,7 +146,7 @@ is used as a delimiter (see <a class="reference external" href="http://bugs.loca
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/formats/xliff.html b/docs/_build/html/formats/xliff.html
index e2b24bb..9001b36 100644
--- a/docs/_build/html/formats/xliff.html
+++ b/docs/_build/html/formats/xliff.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>XLIFF — Translate Toolkit 1.9.0 documentation</title>
+    <title>XLIFF — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Translation Related File Formats" href="index.html" />
     <link rel="next" title="PO Files" href="po.html" />
     <link rel="prev" title="Translation Related File Formats" href="index.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -46,30 +45,33 @@
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
   <ul class="dropdown-menu globaltoc"><ul class="simple">
 </ul>
-<ul>
+<ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
-<li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -77,15 +79,18 @@
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
 <li><a class="reference internal" href="#">XLIFF</a><ul>
+<li><a class="reference internal" href="#references">References</a><ul>
 <li><a class="reference internal" href="#flavours">Flavours</a></li>
-<li><a class="reference internal" href="#standard-conformance">Standard conformance</a><ul>
-<li><a class="reference internal" href="#done">Done</a></li>
+<li><a class="reference internal" href="#standard-conformance">Standard conformance</a></li>
 </ul>
 </li>
+<li><a class="reference internal" href="#done">Done</a><ul>
 <li><a class="reference internal" href="#xliff-and-other-tools">XLIFF and other tools</a></li>
 </ul>
 </li>
 </ul>
+</li>
+</ul>
 </ul>
 </li>
             
@@ -96,10 +101,11 @@
   <li><a href="po.html"
          title="next chapter">PO Files »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -118,10 +124,21 @@
    
   <div class="section" id="xliff">
 <span id="id1"></span><h1>XLIFF<a class="headerlink" href="#xliff" title="Permalink to this headline">¶</a></h1>
-<p>XLIFF is the OASIS standard for translation. See
-<a class="reference external" href="http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm">http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm</a>.</p>
+<p>XLIFF[*] is the <a class="reference external" href="https://www.oasis-open.org/">OASIS</a> standard for translation.</p>
+<table class="docutils footnote" frame="void" id="id2" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[*]</td><td>XML Localization Interchange File Format</td></tr>
+</tbody>
+</table>
+<div class="section" id="references">
+<h2>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="http://docs.oasis-open.org/xliff/xliff-core/xliff-core.html">XLIFF Standard</a></li>
+<li><a class="reference external" href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff">OASIS XLIFF Technical Committee</a> website</li>
+</ul>
 <div class="section" id="flavours">
-<span id="xliff-flavours"></span><h2>Flavours<a class="headerlink" href="#flavours" title="Permalink to this headline">¶</a></h2>
+<span id="xliff-flavours"></span><h3>Flavours<a class="headerlink" href="#flavours" title="Permalink to this headline">¶</a></h3>
 <p>XLIFF also has documents that specify the conversion from various standard
 source documents and localisation formats.</p>
 <ul class="simple">
@@ -142,9 +159,11 @@ source documents and localisation formats.</p>
 </ul>
 </div>
 <div class="section" id="standard-conformance">
-<span id="xliff-standard-conformance"></span><h2>Standard conformance<a class="headerlink" href="#standard-conformance" title="Permalink to this headline">¶</a></h2>
+<span id="xliff-standard-conformance"></span><h3>Standard conformance<a class="headerlink" href="#standard-conformance" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
 <div class="section" id="done">
-<span id="xliff-done"></span><h3>Done<a class="headerlink" href="#done" title="Permalink to this headline">¶</a></h3>
+<span id="xliff-done"></span><h2>Done<a class="headerlink" href="#done" title="Permalink to this headline">¶</a></h2>
 <ul>
 <li><p class="first">File creation and parsing</p>
 </li>
@@ -182,12 +201,10 @@ file)</p>
 <li><p class="first">alt-trans</p>
 </li>
 </ul>
-</div>
-</div>
 <div class="section" id="xliff-and-other-tools">
-<span id="xliff-xliff-and-other-tools"></span><h2>XLIFF and other tools<a class="headerlink" href="#xliff-and-other-tools" title="Permalink to this headline">¶</a></h2>
-<p>Here is a small report on the <tt class="xref doc docutils literal"><span class="pre">guide/tools/xliff</span> <span class="pre">support</span> <span class="pre">by</span> <span class="pre">ms</span> <span class="pre">windows</span>
-<span class="pre">programs</span></tt>.</p>
+<span id="xliff-xliff-and-other-tools"></span><h3>XLIFF and other tools<a class="headerlink" href="#xliff-and-other-tools" title="Permalink to this headline">¶</a></h3>
+<p>Here is a small report on <a class="reference external" href="http://translate.sourceforge.net/wiki/guide/tools/xliff_support_by_ms_windows_programs">XLIFF support by Windows programs</a>.</p>
+</div>
 </div>
 </div>
 
@@ -203,7 +220,7 @@ file)</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
index 0536339..f17e1d1 100644
--- a/docs/_build/html/genindex.html
+++ b/docs/_build/html/genindex.html
@@ -1,6 +1,4 @@
 
-
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -9,7 +7,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Index — Translate Toolkit 1.9.0 documentation</title>
+    <title>Index — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -18,8 +16,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -30,14 +28,14 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" /> 
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +53,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -83,10 +84,11 @@
               
             
 
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -150,7 +152,7 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.Selector.add">add() (translate.misc.selector.Selector method)</a>
+  <dt><a href="api/storage.html#translate.storage.versioncontrol.bzr.bzr.add">add() (translate.storage.versioncontrol.bzr.bzr method)</a>
   </dt>
 
       <dd><dl>
@@ -159,10 +161,6 @@
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.versioncontrol.bzr.bzr.add">(translate.storage.versioncontrol.bzr.bzr method)</a>
-  </dt>
-
-        
   <dt><a href="api/storage.html#translate.storage.versioncontrol.cvs.cvs.add">(translate.storage.versioncontrol.cvs.cvs method)</a>
   </dt>
 
@@ -256,6 +254,16 @@
   </dt>
 
       
+  <dt><a href="api/convert.html#translate.convert.convert.ArchiveConvertOptionParser.add_threshold_option">add_threshold_option() (translate.convert.convert.ArchiveConvertOptionParser method)</a>
+  </dt>
+
+      <dd><dl>
+        
+  <dt><a href="api/convert.html#translate.convert.convert.ConvertOptionParser.add_threshold_option">(translate.convert.convert.ConvertOptionParser method)</a>
+  </dt>
+
+      </dl></dd>
+      
   <dt><a href="api/storage.html#translate.storage.base.TranslationStore.add_unit_to_index">add_unit_to_index() (translate.storage.base.TranslationStore method)</a>
   </dt>
 
@@ -337,6 +345,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.add_unit_to_index">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.add_unit_to_index">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.add_unit_to_index">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.add_unit_to_index">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.add_unit_to_index">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.add_unit_to_index">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -384,10 +412,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.addcatcher">addcatcher() (translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      
   <dt><a href="api/storage.html#translate.storage.base.TranslationUnit.adderror">adderror() (translate.storage.base.TranslationUnit method)</a>
   </dt>
 
@@ -457,6 +481,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.adderror">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.adderror">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -571,6 +599,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.addlocation">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.addlocation">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -661,6 +693,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.addlocations">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.addlocations">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -747,6 +783,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.addnote">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.addnote">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -775,12 +815,12 @@
   </dt>
 
       </dl></dd>
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.poxliff.PoXliffFile.addplural">addplural() (translate.storage.poxliff.PoXliffFile method)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.base.TranslationStore.addsourceunit">addsourceunit() (translate.storage.base.TranslationStore method)</a>
   </dt>
@@ -863,6 +903,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.addsourceunit">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.addsourceunit">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.addsourceunit">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.addsourceunit">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.addsourceunit">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.addsourceunit">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -973,6 +1033,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.addunit">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.addunit">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.addunit">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.addunit">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.addunit">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tiki.TikiStore.addunit">(translate.storage.tiki.TikiStore method)</a>
   </dt>
 
@@ -998,6 +1078,10 @@
 
       </dl></dd>
       
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile">AdvSubStationAlphaFile (class in translate.storage.subtitles)</a>
+  </dt>
+
+      
   <dt><a href="api/lang.html#translate.lang.af.af">af (class in translate.lang.af)</a>
   </dt>
 
@@ -1187,6 +1271,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.apply_to_strings">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.apply_to_strings">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -1226,6 +1314,10 @@
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%" valign="top"><dl>
       
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable">BasePlaceable (class in translate.storage.placeables.interfaces)</a>
+  </dt>
+
+      
   <dt><a href="api/filters.html#translate.filters.checks.batchruntests">batchruntests() (in module translate.filters.checks)</a>
   </dt>
 
@@ -1239,6 +1331,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.begin_transaction">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.begin_transaction">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -1259,12 +1355,12 @@
   <dt><a href="api/filters.html#translate.filters.pofilter.build_checkerconfig">build_checkerconfig() (in module translate.filters.pofilter)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.xml_extract.extract.build_store">build_store() (in module translate.storage.xml_extract.extract)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.xml_extract.unit_tree.build_unit_tree">build_unit_tree() (in module translate.storage.xml_extract.unit_tree)</a>
   </dt>
@@ -1343,6 +1439,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.buildfromunit">(translate.storage.subtitles.SubtitleUnit class method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.buildfromunit">(translate.storage.tbx.tbxunit class method)</a>
   </dt>
 
@@ -1390,10 +1490,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.ByMethod">ByMethod (class in translate.misc.selector)</a>
-  </dt>
-
-      
   <dt><a href="api/storage.html#translate.storage.versioncontrol.bzr.bzr">bzr (class in translate.storage.versioncontrol.bzr)</a>
   </dt>
 
@@ -1417,6 +1513,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.cancel_transaction">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.cancel_transaction">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -1560,10 +1660,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/storage.html#translate.storage.xpi.CatchPotentialOutput">CatchPotentialOutput (class in translate.storage.xpi)</a>
-  </dt>
-
-      
   <dt><a href="api/misc.html#translate.misc.wStringIO.CatchStringOutput">CatchStringOutput (class in translate.misc.wStringIO)</a>
   </dt>
 
@@ -2003,25 +2099,9 @@
 
       <dd><dl>
         
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.close">(translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-        
   <dt><a href="api/storage.html#translate.storage.project.Project.close">(translate.storage.project.Project method)</a>
   </dt>
 
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.CatchPotentialOutput.close">(translate.storage.xpi.CatchPotentialOutput method)</a>
-  </dt>
-
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.FixedStringIO.close">(translate.storage.xpi.FixedStringIO method)</a>
-  </dt>
-
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.close">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
       </dl></dd>
       
   <dt><a href="api/misc.html#translate.misc.contextlib.closing">closing (class in translate.misc.contextlib)</a>
@@ -2079,6 +2159,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.commit_transaction">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.commit_transaction">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -2193,12 +2277,12 @@
   <dt><a href="api/convert.html#translate.convert.dtd2po.convertdtd">convertdtd() (in module translate.convert.dtd2po)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/convert.html#translate.convert.csv2tbx.csv2tbx.convertfile">convertfile() (translate.convert.csv2tbx.csv2tbx method)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/convert.html#translate.convert.html2po.converthtml">converthtml() (in module translate.convert.html2po)</a>
   </dt>
@@ -2409,6 +2493,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.copy">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.copy">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -2654,16 +2742,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.delete">delete() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.delete">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/search.html#translate.search.indexing.CommonIndexer.CommonDatabase.delete_doc">delete_doc() (translate.search.indexing.CommonIndexer.CommonDatabase method)</a>
   </dt>
 
@@ -2683,6 +2761,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.delete_document_by_id">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.delete_document_by_id">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -2701,6 +2783,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.delete_range">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.delete_range">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -2727,6 +2813,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.depth_first">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.depth_first">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -2997,6 +3087,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.elem_at_offset">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.elem_at_offset">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -3023,6 +3117,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.elem_offset">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.elem_offset">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -3091,6 +3189,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.encode">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.encode">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -3128,10 +3230,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.EnvironDispatcher">EnvironDispatcher (class in translate.misc.selector)</a>
-  </dt>
-
-      
   <dt><a href="api/convert.html#translate.convert.convert.ArchiveConvertOptionParser.error">error() (translate.convert.convert.ArchiveConvertOptionParser method)</a>
   </dt>
 
@@ -3177,12 +3275,12 @@
   <dt><a href="api/storage.html#translate.storage.oo.escape_help_text">escape_help_text() (in module translate.storage.oo)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.oo.escape_text">escape_text() (in module translate.storage.oo)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.rc.escape_to_python">escape_to_python() (in module translate.storage.rc)</a>
   </dt>
@@ -3216,10 +3314,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.expose">expose() (in module translate.misc.selector)</a>
-  </dt>
-
-      
   <dt><a href="api/search.html#translate.search.match.matcher.extendtm">extendtm() (translate.search.match.matcher method)</a>
   </dt>
 
@@ -3242,30 +3336,12 @@
   <dt><a href="api/misc.html#translate.misc.quote.extract">(in module translate.misc.quote)</a>
   </dt>
 
-        
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.extract">(translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.extract">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
       </dl></dd>
       
   <dt><a href="api/storage.html#translate.storage.pocommon.extract_msgid_comment">extract_msgid_comment() (in module translate.storage.pocommon)</a>
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.extractall">extractall() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.extractall">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/storage.html#translate.storage.pypo.extractpoline">extractpoline() (in module translate.storage.pypo)</a>
   </dt>
 
@@ -3461,6 +3537,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.find">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.find">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -3505,6 +3585,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.find_elems_with">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.find_elems_with">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -3611,6 +3695,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.findid">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.findid">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.findid">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.findid">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.findid">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.findid">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -3737,6 +3841,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.findunit">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.findunit">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.findunit">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.findunit">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.findunit">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.findunit">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -3855,6 +3979,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.findunits">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.findunits">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.findunits">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.findunits">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.findunits">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.findunits">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -3892,10 +4036,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/storage.html#translate.storage.xpi.FixedStringIO">FixedStringIO (class in translate.storage.xpi)</a>
-  </dt>
-
-      
   <dt><a href="api/storage.html#translate.storage.placeables.general.AltAttrPlaceable.flatten">flatten() (translate.storage.placeables.general.AltAttrPlaceable method)</a>
   </dt>
 
@@ -3909,6 +4049,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.flatten">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.flatten">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -3935,11 +4079,11 @@
   </dt>
 
         
-  <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.flush">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.flush">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.xpi.CatchPotentialOutput.flush">(translate.storage.xpi.CatchPotentialOutput method)</a>
+  <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.flush">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
       </dl></dd>
@@ -4057,6 +4201,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.get_field_analyzers">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.get_field_analyzers">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -4103,6 +4251,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.get_index_data">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.get_index_data">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -4161,6 +4313,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.get_parent_elem">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.get_parent_elem">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -4197,6 +4353,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.get_query_result">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.get_query_result">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -4284,6 +4444,10 @@
   </dt>
 
       
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.XMLWrapper.getattr">getattr() (translate.misc.xmlwrapper.XMLWrapper method)</a>
+  </dt>
+
+      
   <dt><a href="api/storage.html#translate.storage.poxliff.PoXliffUnit.getautomaticcomments">getautomaticcomments() (translate.storage.poxliff.PoXliffUnit method)</a>
   </dt>
 
@@ -4298,6 +4462,14 @@
 
       </dl></dd>
       
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.XMLWrapper.getchild">getchild() (translate.misc.xmlwrapper.XMLWrapper method)</a>
+  </dt>
+
+      
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.XMLWrapper.getchildren">getchildren() (translate.misc.xmlwrapper.XMLWrapper method)</a>
+  </dt>
+
+      
   <dt><a href="api/storage.html#translate.storage.factory.getclass">getclass() (in module translate.storage.factory)</a>
   </dt>
 
@@ -4397,6 +4569,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.getcontext">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.getcontext">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -4551,6 +4727,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.geterrors">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.geterrors">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -4785,12 +4965,12 @@
   <dt><a href="api/filters.html#translate.filters.decoration.getfunctions">getfunctions() (in module translate.filters.decoration)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.wordfast.WordfastHeader.getheader">getheader() (translate.storage.wordfast.WordfastHeader method)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.poxliff.PoXliffFile.getheadernode">getheadernode() (translate.storage.poxliff.PoXliffFile method)</a>
   </dt>
@@ -4967,6 +5147,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.getids">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.getids">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.getids">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.getids">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.getids">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.getids">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -5000,16 +5200,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.getinfo">getinfo() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.getinfo">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/storage.html#translate.storage.oo.ooline.getkey">getkey() (translate.storage.oo.ooline method)</a>
   </dt>
 
@@ -5477,6 +5667,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.getprojectstyle">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.getprojectstyle">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.getprojectstyle">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.getprojectstyle">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.getprojectstyle">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.getprojectstyle">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -5611,6 +5821,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.getsourcelanguage">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.getsourcelanguage">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.getsourcelanguage">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.getsourcelanguage">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.getsourcelanguage">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.getsourcelanguage">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -5767,6 +5997,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.gettargetlanguage">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.gettargetlanguage">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.gettargetlanguage">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.gettargetlanguage">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.gettargetlanguage">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.gettargetlanguage">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -5865,6 +6115,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.gettargetlen">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.gettargetlen">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -5936,9 +6190,15 @@
   </dt>
 
       
-  <dt><a href="api/storage.html#translate.storage.oo.ooline.gettext">gettext() (translate.storage.oo.ooline method)</a>
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.XMLWrapper.gettext">gettext() (translate.misc.xmlwrapper.XMLWrapper method)</a>
+  </dt>
+
+      <dd><dl>
+        
+  <dt><a href="api/storage.html#translate.storage.oo.ooline.gettext">(translate.storage.oo.ooline method)</a>
   </dt>
 
+      </dl></dd>
       
   <dt><a href="api/lang.html#translate.lang.data.gettext_country">gettext_country() (in module translate.lang.data)</a>
   </dt>
@@ -6109,6 +6369,30 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.getunits">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.getunits">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.getunits">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.getunits">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.getunits">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.getunits">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.getunits">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -6254,6 +6538,10 @@
 
       </dl></dd>
       
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.XMLWrapper.getvalues">getvalues() (translate.misc.xmlwrapper.XMLWrapper method)</a>
+  </dt>
+
+      
   <dt><a href="api/filters.html#translate.filters.decoration.getvariables">getvariables() (in module translate.filters.decoration)</a>
   </dt>
 
@@ -6373,6 +6661,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.hasplural">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.hasplural">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -6505,6 +6797,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.index_document">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.index_document">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -6583,6 +6879,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.infer_state">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.infer_state">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -6616,16 +6916,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.infolist">infolist() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.infolist">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/convert.html#translate.convert.ini2po.ini2po">ini2po (class in translate.convert.ini2po)</a>
   </dt>
 
@@ -6747,6 +7037,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.insert">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.insert">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -6773,6 +7067,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.insert_between">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.insert_between">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -6929,6 +7227,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.isblank">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.isblank">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -7047,6 +7349,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.isempty">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.isempty">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.isempty">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.isempty">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.isempty">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.isempty">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -7195,6 +7517,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.isfuzzy">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.isfuzzy">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -7285,6 +7611,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.isheader">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.isheader">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -7331,6 +7661,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.isleaf">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.isleaf">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -7425,6 +7759,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.isobsolete">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.isobsolete">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -7569,6 +7907,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.isreview">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.isreview">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -7667,6 +8009,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.istranslatable">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.istranslatable">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -7749,6 +8095,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.istranslated">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.istranslated">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -7841,6 +8191,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.iter_depth_first">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.iter_depth_first">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -7976,10 +8330,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.SimpleParser.lastly">lastly() (translate.misc.selector.SimpleParser method)</a>
-  </dt>
-
-      
   <dt><a href="api/misc.html#translate.misc.wsgi.launch_server">launch_server() (in module translate.misc.wsgi)</a>
   </dt>
 
@@ -8150,10 +8500,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.SimpleParser.lookup">lookup() (translate.misc.selector.SimpleParser method)</a>
-  </dt>
-
-      
   <dt><a href="api/misc.html#translate.misc.lru.LRUCachingDict">LRUCachingDict (class in translate.misc.lru)</a>
   </dt>
 
@@ -8204,6 +8550,10 @@
   </dt>
 
       
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.makefixtagproc">makefixtagproc() (in module translate.misc.xmlwrapper)</a>
+  </dt>
+
+      
   <dt><a href="api/storage.html#translate.storage.fpo.pofile.makeheader">makeheader() (translate.storage.fpo.pofile method)</a>
   </dt>
 
@@ -8333,6 +8683,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.makeindex">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.makeindex">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.makeindex">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.makeindex">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.makeindex">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.makeindex">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -8443,6 +8813,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.makeobsolete">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.makeobsolete">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -8489,6 +8863,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.map">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.map">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -8573,6 +8951,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.markfuzzy">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.markfuzzy">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -8667,6 +9049,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.markreviewneeded">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.markreviewneeded">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -8821,6 +9207,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.merge">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.merge">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -8927,6 +9317,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.merge_on">(translate.storage.subtitles.AdvSubStationAlphaFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.merge_on">(translate.storage.subtitles.MicroDVDFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.merge_on">(translate.storage.subtitles.SubRipFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.merge_on">(translate.storage.subtitles.SubStationAlphaFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.merge_on">(translate.storage.subtitles.SubtitleFile attribute)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.merge_on">(translate.storage.tbx.tbxfile attribute)</a>
   </dt>
 
@@ -9034,11 +9444,7 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.method_not_allowed">method_not_allowed() (in module translate.misc.selector)</a>
-  </dt>
-
-      
-  <dt><a href="api/misc.html#translate.misc.selector.MiddlewareComposer">MiddlewareComposer (class in translate.misc.selector)</a>
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile">MicroDVDFile (class in translate.storage.subtitles)</a>
   </dt>
 
       
@@ -9104,6 +9510,10 @@
   </dt>
 
       
+  <dt><a href="api/lang.html#translate.lang.common.Common.mozilla_pluralequation">mozilla_pluralequation (translate.lang.common.Common attribute)</a>
+  </dt>
+
+      
   <dt><a href="api/misc.html#translate.misc.quote.mozillapropertiesencode">mozillapropertiesencode() (in module translate.misc.quote)</a>
   </dt>
 
@@ -9189,6 +9599,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.multistring_to_rich">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.multistring_to_rich">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -9232,24 +9646,10 @@
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%" valign="top"><dl>
       
-  <dt><a href="api/misc.html#translate.misc.selector.Naked">Naked (class in translate.misc.selector)</a>
-  </dt>
-
-      
   <dt><a href="api/storage.html#translate.storage.base.TranslationStore.Name">Name (translate.storage.base.TranslationStore attribute)</a>
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.namelist">namelist() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.namelist">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/misc.html#translate.misc.xml_helpers.namespaced">namespaced() (in module translate.misc.xml_helpers)</a>
   </dt>
 
@@ -9358,10 +9758,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.not_found">not_found() (in module translate.misc.selector)</a>
-  </dt>
-
-      
   <dt><a href="api/filters.html#translate.filters.checks.StandardChecker.notranslatewords">notranslatewords() (translate.filters.checks.StandardChecker method)</a>
   </dt>
 
@@ -9557,27 +9953,13 @@
   <dt><a href="api/storage.html#translate.storage.oo.oounit">oounit (class in translate.storage.oo)</a>
   </dt>
 
-      
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.open">open() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.open">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/convert.html#translate.convert.convert.ArchiveConvertOptionParser.openarchive">openarchive() (translate.convert.convert.ArchiveConvertOptionParser method)</a>
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.SimpleParser.openended">openended() (translate.misc.selector.SimpleParser method)</a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
   <dt><a href="api/convert.html#translate.convert.convert.ArchiveConvertOptionParser.openinputfile">openinputfile() (translate.convert.convert.ArchiveConvertOptionParser method)</a>
   </dt>
 
@@ -9722,10 +10104,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/misc.html#translate.misc.selector.opliant">opliant() (in module translate.misc.selector)</a>
-  </dt>
-
-      
   <dt><a href="api/filters.html#translate.filters.checks.StandardChecker.options">options() (translate.filters.checks.StandardChecker method)</a>
   </dt>
 
@@ -9734,10 +10112,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.SimpleParser.outermost_optionals_split">outermost_optionals_split() (translate.misc.selector.SimpleParser method)</a>
-  </dt>
-
-      
   <dt><a href="api/tools.html#translate.tools.poconflicts.ConflictOptionParser.outputconflicts">outputconflicts() (translate.tools.poconflicts.ConflictOptionParser method)</a>
   </dt>
 
@@ -9745,10 +10119,6 @@
   <dt><a href="api/tools.html#translate.tools.poterminology.TerminologyOptionParser.outputterminology">outputterminology() (translate.tools.poterminology.TerminologyOptionParser method)</a>
   </dt>
 
-      
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.overwritestr">overwritestr() (translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
   </dl></td>
 </tr></table>
 
@@ -9769,10 +10139,6 @@
   </dt>
 
         
-  <dt><a href="api/misc.html#translate.misc.selector.SimpleParser.parse">(translate.misc.selector.SimpleParser method)</a>
-  </dt>
-
-        
   <dt><a href="api/storage.html#translate.storage.base.TranslationStore.parse">(translate.storage.base.TranslationStore method)</a>
   </dt>
 
@@ -9940,7 +10306,7 @@
 
       </dl></dd>
       
-  <dt><a href="api/storage.html#translate.storage.benchmark.TranslateBenchmarker.parse_file">parse_file() (translate.storage.benchmark.TranslateBenchmarker method)</a>
+  <dt><a href="api/storage.html#translate.storage.benchmark.TranslateBenchmarker.parse_files">parse_files() (translate.storage.benchmark.TranslateBenchmarker method)</a>
   </dt>
 
       
@@ -9948,6 +10314,10 @@
   </dt>
 
       
+  <dt><a href="api/storage.html#translate.storage.benchmark.TranslateBenchmarker.parse_placeables">parse_placeables() (translate.storage.benchmark.TranslateBenchmarker method)</a>
+  </dt>
+
+      
   <dt><a href="api/storage.html#translate.storage.xml_extract.misc.parse_tag">parse_tag() (in module translate.storage.xml_extract.misc)</a>
   </dt>
 
@@ -10033,6 +10403,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.parsefile">(translate.storage.subtitles.AdvSubStationAlphaFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.parsefile">(translate.storage.subtitles.MicroDVDFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.parsefile">(translate.storage.subtitles.SubRipFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.parsefile">(translate.storage.subtitles.SubStationAlphaFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.parsefile">(translate.storage.subtitles.SubtitleFile class method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.parsefile">(translate.storage.tbx.tbxfile class method)</a>
   </dt>
 
@@ -10189,6 +10579,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.parsestring">(translate.storage.subtitles.AdvSubStationAlphaFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.parsestring">(translate.storage.subtitles.MicroDVDFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.parsestring">(translate.storage.subtitles.SubRipFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.parsestring">(translate.storage.subtitles.SubStationAlphaFile class method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.parsestring">(translate.storage.subtitles.SubtitleFile class method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.parsestring">(translate.storage.tbx.tbxfile class method)</a>
   </dt>
 
@@ -10282,10 +10692,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.pliant">pliant() (in module translate.misc.selector)</a>
-  </dt>
-
-      
   <dt><a href="api/lang.html#translate.lang.common.Common.pluralequation">pluralequation (translate.lang.common.Common attribute)</a>
   </dt>
 
@@ -10327,12 +10733,12 @@
   <dt><a href="api/storage.html#translate.storage.poheader.poheader">poheader (class in translate.storage.poheader)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/misc.html#translate.misc.dictutils.ordereddict.pop">pop() (translate.misc.dictutils.ordereddict method)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/misc.html#translate.misc.dictutils.ordereddict.popitem">popitem() (translate.misc.dictutils.ordereddict method)</a>
   </dt>
@@ -10449,6 +10855,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.print_tree">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.print_tree">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -10530,16 +10940,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.printdir">printdir() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.printdir">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/filters.html#translate.filters.checks.StandardChecker.printf">printf() (translate.filters.checks.StandardChecker method)</a>
   </dt>
 
@@ -10549,10 +10949,6 @@
 
       <dd><dl>
         
-  <dt><a href="api/convert.html#translate.convert.convert.ConvertOptionParser.processfile">(translate.convert.convert.ConvertOptionParser method)</a>
-  </dt>
-
-        
   <dt><a href="api/filters.html#translate.filters.pofilter.FilterOptionParser.processfile">(translate.filters.pofilter.FilterOptionParser method)</a>
   </dt>
 
@@ -10631,6 +11027,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.prune">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.prune">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -10805,6 +11205,12 @@
   <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer.PyLuceneDatabase">PyLuceneDatabase (class in translate.search.indexing.PyLuceneIndexer)</a>
   </dt>
 
+      <dd><dl>
+        
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase">(class in translate.search.indexing.PyLuceneIndexer1)</a>
+  </dt>
+
+      </dl></dd>
       
   <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer.PyLuceneHits">PyLuceneHits (class in translate.search.indexing.PyLuceneIndexer)</a>
   </dt>
@@ -10816,11 +11222,11 @@
 
       <dd><dl>
         
-  <dt><a href="styleguide.html#index-3">PEP 257</a>
+  <dt><a href="developers/styleguide.html#index-4">PEP 257</a>
   </dt>
 
         
-  <dt><a href="styleguide.html#index-0">PEP 8</a>, <a href="styleguide.html#index-1">[1]</a>, <a href="styleguide.html#index-2">[2]</a>
+  <dt><a href="developers/styleguide.html#index-0">PEP 8</a>, <a href="developers/styleguide.html#index-1">[1]</a>, <a href="developers/styleguide.html#index-2">[2]</a>, <a href="developers/styleguide.html#index-3">[3]</a>
   </dt>
 
       </dl></dd>
@@ -10907,16 +11313,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.read">read() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.read">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/storage.html#translate.storage.poparser.read_obsolete_lines">read_obsolete_lines() (in module translate.storage.poparser)</a>
   </dt>
 
@@ -11100,6 +11496,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.remove_type">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.remove_type">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -11194,6 +11594,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.remove_unit_from_index">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.remove_unit_from_index">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.remove_unit_from_index">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.remove_unit_from_index">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.remove_unit_from_index">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.remove_unit_from_index">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -11314,6 +11734,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.removenotes">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.removenotes">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -11478,6 +11902,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.require_index">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.require_index">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.require_index">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.require_index">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.require_index">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.require_index">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -11602,6 +12046,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.rich_to_multistring">(translate.storage.subtitles.SubtitleUnit class method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.rich_to_multistring">(translate.storage.tbx.tbxunit class method)</a>
   </dt>
 
@@ -11840,6 +12288,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.save">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.save">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.save">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.save">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.save">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.save">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -11926,31 +12394,51 @@
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.omegat.OmegaTFileTab.savefile">(translate.storage.omegat.OmegaTFileTab method)</a>
+  <dt><a href="api/storage.html#translate.storage.omegat.OmegaTFileTab.savefile">(translate.storage.omegat.OmegaTFileTab method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.php.phpfile.savefile">(translate.storage.php.phpfile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.poxliff.PoXliffFile.savefile">(translate.storage.poxliff.PoXliffFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.properties.propfile.savefile">(translate.storage.properties.propfile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.pypo.pofile.savefile">(translate.storage.pypo.pofile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.qph.QphFile.savefile">(translate.storage.qph.QphFile method)</a>
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.php.phpfile.savefile">(translate.storage.php.phpfile method)</a>
+  <dt><a href="api/storage.html#translate.storage.rc.rcfile.savefile">(translate.storage.rc.rcfile method)</a>
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.poxliff.PoXliffFile.savefile">(translate.storage.poxliff.PoXliffFile method)</a>
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.savefile">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.properties.propfile.savefile">(translate.storage.properties.propfile method)</a>
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.savefile">(translate.storage.subtitles.MicroDVDFile method)</a>
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.pypo.pofile.savefile">(translate.storage.pypo.pofile method)</a>
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.savefile">(translate.storage.subtitles.SubRipFile method)</a>
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.qph.QphFile.savefile">(translate.storage.qph.QphFile method)</a>
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.savefile">(translate.storage.subtitles.SubStationAlphaFile method)</a>
   </dt>
 
         
-  <dt><a href="api/storage.html#translate.storage.rc.rcfile.savefile">(translate.storage.rc.rcfile method)</a>
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.savefile">(translate.storage.subtitles.SubtitleFile method)</a>
   </dt>
 
         
@@ -12014,6 +12502,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.search">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.search">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -12035,18 +12527,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.Selector.select">select() (translate.misc.selector.Selector method)</a>
-  </dt>
-
-      
-  <dt><a href="api/misc.html#translate.misc.selector.Selector">Selector (class in translate.misc.selector)</a>
-  </dt>
-
-      
-  <dt><a href="api/misc.html#translate.misc.textwrap.TextWrapper.sentence_end_re">sentence_end_re (translate.misc.textwrap.TextWrapper attribute)</a>
-  </dt>
-
-      
   <dt><a href="api/search.html#translate.search.segment.sentence_iter">sentence_iter() (in module translate.search.segment)</a>
   </dt>
 
@@ -12494,6 +12974,10 @@
   </dt>
 
         
+  <dt><a href="api/search.html#translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase.set_field_analyzers">(translate.search.indexing.PyLuceneIndexer1.PyLuceneDatabase method)</a>
+  </dt>
+
+        
   <dt><a href="api/search.html#translate.search.indexing.XapianIndexer.XapianDatabase.set_field_analyzers">(translate.search.indexing.XapianIndexer.XapianDatabase method)</a>
   </dt>
 
@@ -12644,6 +13128,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.setcontext">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.setcontext">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -12830,6 +13318,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.setid">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.setid">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -12907,16 +13399,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.setpassword">setpassword() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.setpassword">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/convert.html#translate.convert.convert.ArchiveConvertOptionParser.setpotoption">setpotoption() (translate.convert.convert.ArchiveConvertOptionParser method)</a>
   </dt>
 
@@ -13046,6 +13528,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.setprojectstyle">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.setprojectstyle">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.setprojectstyle">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.setprojectstyle">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.setprojectstyle">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.setprojectstyle">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -13120,6 +13622,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.setsource">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tiki.TikiUnit.setsource">(translate.storage.tiki.TikiUnit method)</a>
   </dt>
 
@@ -13206,6 +13712,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.setsourcelanguage">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.setsourcelanguage">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.setsourcelanguage">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.setsourcelanguage">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.setsourcelanguage">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.setsourcelanguage">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -13302,6 +13828,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.settarget">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxunit.settarget">(translate.storage.tbx.tbxunit method)</a>
   </dt>
 
@@ -13404,6 +13934,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.settargetlanguage">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.settargetlanguage">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.settargetlanguage">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.settargetlanguage">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.settargetlanguage">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.settargetlanguage">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -13437,6 +13987,16 @@
   </dt>
 
       
+  <dt><a href="api/convert.html#translate.convert.convert.ArchiveConvertOptionParser.settimestampoption">settimestampoption() (translate.convert.convert.ArchiveConvertOptionParser method)</a>
+  </dt>
+
+      <dd><dl>
+        
+  <dt><a href="api/convert.html#translate.convert.convert.ConvertOptionParser.settimestampoption">(translate.convert.convert.ConvertOptionParser method)</a>
+  </dt>
+
+      </dl></dd>
+      
   <dt><a href="api/misc.html#translate.misc.xml_helpers.setXMLlang">setXMLlang() (in module translate.misc.xml_helpers)</a>
   </dt>
 
@@ -13449,6 +14009,10 @@
   </dt>
 
       
+  <dt><a href="api/convert.html#translate.convert.convert.should_output_store">should_output_store() (in module translate.convert.convert)</a>
+  </dt>
+
+      
   <dt><a href="api/misc.html#translate.misc.progressbar.DotsProgressBar.show">show() (translate.misc.progressbar.DotsProgressBar method)</a>
   </dt>
 
@@ -13462,8 +14026,6 @@
   </dt>
 
       </dl></dd>
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/lang.html#translate.lang.si.si">si (class in translate.lang.si)</a>
   </dt>
@@ -13472,16 +14034,12 @@
   <dt><a href="api/filters.html#translate.filters.checks.StandardChecker.simplecaps">simplecaps() (translate.filters.checks.StandardChecker method)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
-  <dt><a href="api/misc.html#translate.misc.selector.SimpleParser">SimpleParser (class in translate.misc.selector)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/misc.html#translate.misc.sparse.SimpleParser">(class in translate.misc.sparse)</a>
+  <dt><a href="api/misc.html#translate.misc.sparse.SimpleParser">SimpleParser (class in translate.misc.sparse)</a>
   </dt>
 
-      </dl></dd>
       
   <dt><a href="api/filters.html#translate.filters.checks.StandardChecker.simpleplurals">simpleplurals() (translate.filters.checks.StandardChecker method)</a>
   </dt>
@@ -13502,20 +14060,6 @@
   <dt><a href="api/misc.html#translate.misc.wStringIO.CatchStringOutput.slam">slam() (translate.misc.wStringIO.CatchStringOutput method)</a>
   </dt>
 
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.CatchPotentialOutput.slam">(translate.storage.xpi.CatchPotentialOutput method)</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="api/misc.html#translate.misc.selector.Selector.slurp">slurp() (translate.misc.selector.Selector method)</a>
-  </dt>
-
-      
-  <dt><a href="api/misc.html#translate.misc.selector.Selector.slurp_file">slurp_file() (translate.misc.selector.Selector method)</a>
-  </dt>
-
       
   <dt><a href="api/storage.html#translate.storage.dtd.dtdunit.source">source (translate.storage.dtd.dtdunit attribute)</a>
   </dt>
@@ -13553,6 +14097,10 @@
   </dt>
 
       
+  <dt><a href="api/lang.html#translate.lang.common.Common.specialchars">specialchars (translate.lang.common.Common attribute)</a>
+  </dt>
+
+      
   <dt><a href="api/filters.html#translate.filters.checks.StandardChecker.spellcheck">spellcheck() (translate.filters.checks.StandardChecker method)</a>
   </dt>
 
@@ -13707,14 +14255,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.selector.Selector.status404">status404() (translate.misc.selector.Selector static method)</a>
-  </dt>
-
-      
-  <dt><a href="api/misc.html#translate.misc.selector.Selector.status405">status405() (translate.misc.selector.Selector static method)</a>
-  </dt>
-
-      
   <dt><a href="api/tools.html#translate.tools.pomerge.str2bool">str2bool() (in module translate.tools.pomerge)</a>
   </dt>
 
@@ -13751,6 +14291,22 @@
   </dt>
 
       
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile">SubRipFile (class in translate.storage.subtitles)</a>
+  </dt>
+
+      
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile">SubStationAlphaFile (class in translate.storage.subtitles)</a>
+  </dt>
+
+      
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile">SubtitleFile (class in translate.storage.subtitles)</a>
+  </dt>
+
+      
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit">SubtitleUnit (class in translate.storage.subtitles)</a>
+  </dt>
+
+      
   <dt><a href="api/storage.html#translate.storage.base.TranslationStore.suggestions_in_format">suggestions_in_format (translate.storage.base.TranslationStore attribute)</a>
   </dt>
 
@@ -13919,16 +14475,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.testzip">testzip() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.testzip">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/storage.html#translate.storage.oo.ooline.text">text (translate.storage.oo.ooline attribute)</a>
   </dt>
 
@@ -14092,6 +14638,10 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.placeables.interfaces.BasePlaceable.translate">(translate.storage.placeables.interfaces.BasePlaceable method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.placeables.strelem.StringElem.translate">(translate.storage.placeables.strelem.StringElem method)</a>
   </dt>
 
@@ -14124,6 +14674,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.translate">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.translate">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.translate">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.translate">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.translate">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.translate">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -14405,7 +14975,7 @@
   </dt>
 
       
-  <dt><a href="api/index.html#module-translate.lang">translate.lang (module)</a>, <a href="api/lang.html#module-translate.lang">[1]</a>
+  <dt><a href="api/lang.html#module-translate.lang">translate.lang (module)</a>, <a href="api/index.html#module-translate.lang">[1]</a>
   </dt>
 
       
@@ -14584,12 +15154,12 @@
   <dt><a href="api/misc.html#module-translate.misc.contextlib">translate.misc.contextlib (module)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/misc.html#module-translate.misc.dictutils">translate.misc.dictutils (module)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/misc.html#module-translate.misc.diff_match_patch">translate.misc.diff_match_patch (module)</a>
   </dt>
@@ -14635,10 +15205,6 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#module-translate.misc.selector">translate.misc.selector (module)</a>
-  </dt>
-
-      
   <dt><a href="api/misc.html#module-translate.misc.sparse">translate.misc.sparse (module)</a>
   </dt>
 
@@ -14683,7 +15249,7 @@
   </dt>
 
       
-  <dt><a href="api/misc.html#module-translate.misc.zipfileext">translate.misc.zipfileext (module)</a>
+  <dt><a href="api/misc.html#module-translate.misc.xmlwrapper">translate.misc.xmlwrapper (module)</a>
   </dt>
 
       
@@ -14703,6 +15269,10 @@
   </dt>
 
       
+  <dt><a href="api/search.html#module-translate.search.indexing.PyLuceneIndexer1">translate.search.indexing.PyLuceneIndexer1 (module)</a>
+  </dt>
+
+      
   <dt><a href="api/search.html#module-translate.search.indexing.XapianIndexer">translate.search.indexing.XapianIndexer (module)</a>
   </dt>
 
@@ -14919,6 +15489,10 @@
   </dt>
 
       
+  <dt><a href="api/storage.html#module-translate.storage.subtitles">translate.storage.subtitles (module)</a>
+  </dt>
+
+      
   <dt><a href="api/storage.html#module-translate.storage.symbian">translate.storage.symbian (module)</a>
   </dt>
 
@@ -15027,15 +15601,11 @@
   </dt>
 
       
-  <dt><a href="api/storage.html#module-translate.storage.xpi">translate.storage.xpi (module)</a>
-  </dt>
-
-      
   <dt><a href="api/storage.html#module-translate.storage.zip">translate.storage.zip (module)</a>
   </dt>
 
       
-  <dt><a href="api/index.html#module-translate.tools">translate.tools (module)</a>, <a href="api/tools.html#module-translate.tools">[1]</a>
+  <dt><a href="api/tools.html#module-translate.tools">translate.tools (module)</a>, <a href="api/index.html#module-translate.tools">[1]</a>
   </dt>
 
       
@@ -15344,6 +15914,30 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.unit_iter">(translate.storage.subtitles.AdvSubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.unit_iter">(translate.storage.subtitles.MicroDVDFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.unit_iter">(translate.storage.subtitles.SubRipFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.unit_iter">(translate.storage.subtitles.SubStationAlphaFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.unit_iter">(translate.storage.subtitles.SubtitleFile method)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleUnit.unit_iter">(translate.storage.subtitles.SubtitleUnit method)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.unit_iter">(translate.storage.tbx.tbxfile method)</a>
   </dt>
 
@@ -15494,6 +16088,26 @@
   </dt>
 
         
+  <dt><a href="api/storage.html#translate.storage.subtitles.AdvSubStationAlphaFile.UnitClass">(translate.storage.subtitles.AdvSubStationAlphaFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.MicroDVDFile.UnitClass">(translate.storage.subtitles.MicroDVDFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubRipFile.UnitClass">(translate.storage.subtitles.SubRipFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubStationAlphaFile.UnitClass">(translate.storage.subtitles.SubStationAlphaFile attribute)</a>
+  </dt>
+
+        
+  <dt><a href="api/storage.html#translate.storage.subtitles.SubtitleFile.UnitClass">(translate.storage.subtitles.SubtitleFile attribute)</a>
+  </dt>
+
+        
   <dt><a href="api/storage.html#translate.storage.tbx.tbxfile.UnitClass">(translate.storage.tbx.tbxfile attribute)</a>
   </dt>
 
@@ -16040,6 +16654,8 @@
   <dt><a href="api/storage.html#translate.storage.wordfast.WordfastHeader">WordfastHeader (class in translate.storage.wordfast)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.wordfast.WordfastTime">WordfastTime (class in translate.storage.wordfast)</a>
   </dt>
@@ -16048,8 +16664,6 @@
   <dt><a href="api/storage.html#translate.storage.wordfast.WordfastTMFile">WordfastTMFile (class in translate.storage.wordfast)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
       
   <dt><a href="api/storage.html#translate.storage.wordfast.WordfastUnit">WordfastUnit (class in translate.storage.wordfast)</a>
   </dt>
@@ -16215,23 +16829,13 @@
 
       </dl></dd>
       
-  <dt><a href="api/storage.html#translate.storage.pypo.wrapline">wrapline() (in module translate.storage.pypo)</a>
-  </dt>
-
-      
   <dt><a href="api/convert.html#translate.convert.po2txt.po2txt.wrapmessage">wrapmessage() (translate.convert.po2txt.po2txt method)</a>
   </dt>
 
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.write">write() (translate.misc.zipfileext.ZipFileExt method)</a>
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.XMLWrapper.write">write() (translate.misc.xmlwrapper.XMLWrapper method)</a>
   </dt>
 
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.write">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
       
   <dt><a href="api/tools.html#translate.tools.pydiff.DirDiffer.writediff">writediff() (translate.tools.pydiff.DirDiffer method)</a>
   </dt>
@@ -16243,26 +16847,6 @@
 
       </dl></dd>
       
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.writeendrec">writeendrec() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.writeendrec">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt.writestr">writestr() (translate.misc.zipfileext.ZipFileExt method)</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher.writestr">(translate.storage.xpi.ZipFileCatcher method)</a>
-  </dt>
-
-      </dl></dd>
-      
   <dt><a href="api/misc.html#translate.misc.ourdom.writexml_helper">writexml_helper() (in module translate.misc.ourdom)</a>
   </dt>
 
@@ -16315,6 +16899,10 @@
   </dt>
 
       
+  <dt><a href="api/misc.html#translate.misc.xmlwrapper.XMLWrapper">XMLWrapper (class in translate.misc.xmlwrapper)</a>
+  </dt>
+
+      
   <dt><a href="api/storage.html#translate.storage.xml_extract.xpath_breadcrumb.XPathBreadcrumb">XPathBreadcrumb (class in translate.storage.xml_extract.xpath_breadcrumb)</a>
   </dt>
 
@@ -16328,18 +16916,10 @@
   <dt><a href="api/lang.html#translate.lang.zh.zh">zh (class in translate.lang.zh)</a>
   </dt>
 
-      
-  <dt><a href="api/storage.html#translate.storage.zip.ZIPFile">ZIPFile (class in translate.storage.zip)</a>
-  </dt>
-
   </dl></td>
   <td style="width: 33%" valign="top"><dl>
       
-  <dt><a href="api/storage.html#translate.storage.xpi.ZipFileCatcher">ZipFileCatcher (class in translate.storage.xpi)</a>
-  </dt>
-
-      
-  <dt><a href="api/misc.html#translate.misc.zipfileext.ZipFileExt">ZipFileExt (class in translate.misc.zipfileext)</a>
+  <dt><a href="api/storage.html#translate.storage.zip.ZIPFile">ZIPFile (class in translate.storage.zip)</a>
   </dt>
 
   </dl></td>
@@ -16358,7 +16938,7 @@
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/checking_for_inconsistencies.html b/docs/_build/html/guides/checking_for_inconsistencies.html
index 49b6eeb..666ef20 100644
--- a/docs/_build/html/guides/checking_for_inconsistencies.html
+++ b/docs/_build/html/guides/checking_for_inconsistencies.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Checking for inconsistencies in your translations — Translate Toolkit 1.9.0 documentation</title>
+    <title>Checking for inconsistencies in your translations — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Creating a terminology list from your existing translations" href="creating_a_terminology_list_from_your_existing_translations.html" />
     <link rel="prev" title="Creating OpenOffice.org POT files" href="using_oo2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -98,10 +100,11 @@
   <li><a href="creating_a_terminology_list_from_your_existing_translations.html"
          title="next chapter">Creating a terminology list from your existing translations »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -153,7 +156,8 @@ same English word for different English words, possibly this will confuse a
 user.</p>
 <div class="section" id="step-1-extracting-conflicting-target-text-translations">
 <span id="checking-for-inconsistencies-step-1-extracting-conflicting-target-text-translations"></span><h3>Step 1: Extracting conflicting target text translations<a class="headerlink" href="#step-1-extracting-conflicting-target-text-translations" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>poconflicts -I --accelerator="&" af af-conflicts</pre>
+<div class="highlight-python"><div class="highlight"><pre>poconflicts -I --accelerator="&" af af-conflicts
+</pre></div>
 </div>
 <p>From our existing translation in <em>af</em> we extract conflicts and place them in
 <em>af-conflicts</em>.  We are ignoring case with <tt class="docutils literal"><span class="pre">-I</span></tt> so that <tt class="docutils literal"><span class="pre">Save</span> <span class="pre">as</span></tt> is
@@ -162,7 +166,7 @@ to ignore accelerators so that <tt class="docutils literal"><span class="pre">Fi
 the same as <tt class="docutils literal"><span class="pre">Fi&le</span></tt></p>
 <p>If we browse into <em>af-conflicts</em> we will see a flat structure of words with
 conflicts.</p>
-<div class="highlight-python"><pre>$ cd af-conflicts
+<div class="highlight-python"><div class="highlight"><pre>$ cd af-conflicts
 $ ls
 change.po         disc.po         functionality.po  letter.po          overwrite.po       restored.po
 changes.po        document.po     gb.po             library.po         page.po            restore.po
@@ -170,7 +174,8 @@ character.po      dots.po         graphic.po        light.po           pager.po
 chart.po          double.po       grayscale.po      limit.po           percent.po         return.po
 check.po          down.po         grid.po           line.po            pies.po            right.po
 circle.po         drawing.po      group.po
-etc...</pre>
+etc...
+</pre></div>
 </div>
 <p>These are normal PO files which you can edit in any PO editor or text editor.
 If we look at the first file <tt class="docutils literal"><span class="pre">change.po</span></tt> we can see that the source text
@@ -184,12 +189,14 @@ files.</p>
 <span id="checking-for-inconsistencies-step-2-merging-our-corrections-back-into-the-original-files"></span><h3>Step 2: Merging our corrections back into the original files<a class="headerlink" href="#step-2-merging-our-corrections-back-into-the-original-files" title="Permalink to this headline">¶</a></h3>
 <p>Our files in <em>af-conflicts</em> are in a flat structure.  We need to structure them
 into the hierarchy of the existing PO files.</p>
-<div class="highlight-python"><pre>porestructure af-conflicts af-restructured</pre>
+<div class="highlight-python"><div class="highlight"><pre>porestructure af-conflicts af-restructured
+</pre></div>
 </div>
 <p>The entries that where in the files in <em>af-conflicts</em> have been placed in
 <em>af-restrucured</em>, they now appear in the correct place in the directory
 structure and also appear in the correct file.  We are now ready to merge.</p>
-<div class="highlight-python"><pre>pomerge -t af -i af-restructure -o af</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t af -i af-restructure -o af
+</pre></div>
 </div>
 <p>Using the existing files in <em>af</em> we merge the corrected and restructured file
 from <em>af-restructure</em> and place them back into <em>af</em>.  Note: use a different
@@ -206,19 +213,21 @@ you could have created a conflict of meaning.  For instance in our Xhosa
 translations the word <tt class="docutils literal"><span class="pre">Cima</span></tt> was used for both <tt class="docutils literal"><span class="pre">Delete</span></tt> and <tt class="docutils literal"><span class="pre">Cancel</span></tt>.
 Clearly this is a serious issue.  This step will allow us to find those errors
 and take action.</p>
-<div class="highlight-python"><pre>poconflicts -v -I --accelerator="&" af af-conflicts-invert</pre>
+<div class="highlight-python"><div class="highlight"><pre>poconflicts -v -I --accelerator="&" af af-conflicts-invert
+</pre></div>
 </div>
 <p>We use the same command line as in <strong>Step 1</strong> but add <tt class="docutils literal"><span class="pre">-v</span></tt> to allow us to
 invert the match.  We are also now outputting to <em>af-conflicts-invert</em> to make
 things clear.</p>
 <p>This time the PO files that are created have Afrikaans names</p>
-<div class="highlight-python"><pre>$ cd af-conflicts-invert
+<div class="highlight-python"><div class="highlight"><pre>$ cd af-conflicts-invert
 $ ls
 dataveld.po              grys.po             lisensieooreenkoms.po  paragraaf.po        sny.po
 datumgekoop.po           hallo.po            lysinhoud.po           pasmaak.po          soek.po
 datum.po                 hiperboliese.po     maateenheid.po         persentasie.po      sorteer.po
 deaktiveer.po            hoekbeheer.po       maatskappynaam.po      posadres.po         sorteervolgorde.po
-etc...</pre>
+etc...
+</pre></div>
 </div>
 <p>We edit these as usual.  You need to remember that you will see a normal PO
 file but that you are looking at how the translation might be confusing to a
@@ -251,7 +260,7 @@ have seen.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/cleanup_translator_comments.html b/docs/_build/html/guides/cleanup_translator_comments.html
index e74a23a..07a6ef7 100644
--- a/docs/_build/html/guides/cleanup_translator_comments.html
+++ b/docs/_build/html/guides/cleanup_translator_comments.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Cleanup translator comments — Translate Toolkit 1.9.0 documentation</title>
+    <title>Cleanup translator comments — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Creating Mozilla POT files" href="creating_mozilla_pot_files.html" />
     <link rel="prev" title="Running the tools on Microsoft Windows" href="running_the_tools_on_microsoft_windows.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -92,10 +94,11 @@
   <li><a href="creating_mozilla_pot_files.html"
          title="next chapter">Creating Mozilla POT files »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -146,11 +149,13 @@ once.</p>
 that you actually want to keep then you will need to manual editing</p>
 </div>
 <p>Removal is simple using <a class="reference internal" href="../commands/pocommentclean.html"><em>pocommentclean</em></a>:</p>
-<div class="highlight-python"><pre>pocommentclean my-po-dir</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocommentclean my-po-dir
+</pre></div>
 </div>
 <p>Which will clean all your PO files in <tt class="docutils literal"><span class="pre">my-po-dir</span></tt></p>
 <p><tt class="docutils literal"><span class="pre">pocommentclean</span></tt> is simply a nice wrapper for this sed command:</p>
-<div class="highlight-python"><pre>sed -i "/^#$/d;/^#[^\:\~,\.]/d" $(find po -name "*.po")</pre>
+<div class="highlight-python"><div class="highlight"><pre>sed -i "/^#$/d;/^#[^\:\~,\.]/d" $(find po -name "*.po")
+</pre></div>
 </div>
 <p>This will delete all lines starting with # that are not used by PO for
 locations (#:), automatic/developer comments (#.), state (#,) and obsolete
@@ -172,7 +177,7 @@ locations (#:), automatic/developer comments (#.), state (#,) and obsolete
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/creating_a_terminology_list_from_your_existing_translations.html b/docs/_build/html/guides/creating_a_terminology_list_from_your_existing_translations.html
index 9df9ed5..454549d 100644
--- a/docs/_build/html/guides/creating_a_terminology_list_from_your_existing_translations.html
+++ b/docs/_build/html/guides/creating_a_terminology_list_from_your_existing_translations.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Creating a terminology list from your existing translations — Translate Toolkit 1.9.0 documentation</title>
+    <title>Creating a terminology list from your existing translations — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Running the tools on Microsoft Windows" href="running_the_tools_on_microsoft_windows.html" />
     <link rel="prev" title="Checking for inconsistencies in your translations" href="checking_for_inconsistencies.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -99,10 +101,11 @@
   <li><a href="running_the_tools_on_microsoft_windows.html"
          title="next chapter">Running the tools on Microsoft Windows »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -151,7 +154,8 @@ and will give better results than following this process.</p>
 <p>We will not be able to identify terminology within bodies of text, we are only
 going to extract short bit of text i.e. ones that are between 1 and 3 words
 long.</p>
-<div class="highlight-python"><pre>pogrep --header --search=msgid -e '^\w+(\s+\w+){0,2}$' zulu zulu-short</pre>
+<div class="highlight-python"><div class="highlight"><pre>pogrep --header --search=msgid -e '^\w+(\s+\w+){0,2}$' zulu zulu-short
+</pre></div>
 </div>
 <p>We use <tt class="docutils literal"><span class="pre">--header</span></tt> to ensure that the PO files have a header entry (which
 is important for encoding).  We are searching only in the msgid and the regular
@@ -163,7 +167,8 @@ are searching through the folder <em>zulu</em> and outputting the result in
 <span id="creating-a-terminology-list-from-your-existing-translations-remove-any-translations-with-issues"></span><h2>Remove any translations with issues<a class="headerlink" href="#remove-any-translations-with-issues" title="Permalink to this headline">¶</a></h2>
 <p>You can for instance remove all entries with only a single letter.  Useful for
 eliminating all those spurious accelerator keys.</p>
-<div class="highlight-python"><pre>pogrep --header --search=msgid -v -e "^.$" zulu-short zulu-short-clean</pre>
+<div class="highlight-python"><div class="highlight"><pre>pogrep --header --search=msgid -v -e "^.$" zulu-short zulu-short-clean
+</pre></div>
 </div>
 <p>We use the <tt class="docutils literal"><span class="pre">-v</span></tt> option to invert the search.  Our <em>cleaner</em> potential
 glossary words are now in <em>zulu-short-clean</em>.  What you can eliminate is only
@@ -177,7 +182,8 @@ limited by your ability to build regular expressions but yu could eliminate:</p>
 <span id="creating-a-terminology-list-from-your-existing-translations-create-a-compendium"></span><h2>Create a compendium<a class="headerlink" href="#create-a-compendium" title="Permalink to this headline">¶</a></h2>
 <p>Now that we have our words we want to create a sinlge files of all terminology.
 Thus we create a PO compendium:</p>
-<div class="highlight-python"><pre>~/path/to/pocompendium -i -su zulu-gnome-glossary.po -d zulu-short-clean</pre>
+<div class="highlight-python"><div class="highlight"><pre>~/path/to/pocompendium -i -su zulu-gnome-glossary.po -d zulu-short-clean
+</pre></div>
 </div>
 <p>You can use various methods but our bash script is quite good.  Here we ignore
 case, <tt class="docutils literal"><span class="pre">-i</span></tt>, and ignore the underscore (_) accelerator key, <tt class="docutils literal"><span class="pre">-su</span></tt>,
@@ -188,7 +194,8 @@ review can begin.</p>
 <div class="section" id="split-the-file">
 <span id="creating-a-terminology-list-from-your-existing-translations-split-the-file"></span><h2>Split the file<a class="headerlink" href="#split-the-file" title="Permalink to this headline">¶</a></h2>
 <p>We want to split the file into translated, untranslated and fuzzy entries:</p>
-<div class="highlight-python"><pre>~/path/to/posplit ./zulu-gnome-glossary.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>~/path/to/posplit ./zulu-gnome-glossary.po
+</pre></div>
 </div>
 <p>This will create three files:</p>
 <ul class="simple">
@@ -196,7 +203,8 @@ review can begin.</p>
 <li>zulu-gnome-glossary-untranslated.po – messages with no translation</li>
 <li>zulu-gnome-glossary-fuzzy.po – words that need investigation</li>
 </ul>
-<div class="highlight-python"><pre>rm zulu-gnome-glossary-untranslated.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>rm zulu-gnome-glossary-untranslated.po
+</pre></div>
 </div>
 <p>We discard <tt class="docutils literal"><span class="pre">zulu-gnome-glossary-untranslated.po</span></tt> since they are of no use to
 us.</p>
@@ -207,11 +215,13 @@ us.</p>
 and those where there was more then one translation for a given term.  So if
 someone had translated ‘File’ differently across the translations we’d have an
 entry that was marked fuzzy with the two options displayed.</p>
-<div class="highlight-python"><pre>pofilter -t compendiumconflicts zulu-gnome-glossary-fuzzy.po zulu-gnome-glossary-conflicts.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter -t compendiumconflicts zulu-gnome-glossary-fuzzy.po zulu-gnome-glossary-conflicts.po
+</pre></div>
 </div>
 <p>These compedium conflicts are what we are interested in so we use pofilter to
 filter them from the other fuzzies.</p>
-<div class="highlight-python"><pre>rm zulu-gnome-glossary-fuzzy.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>rm zulu-gnome-glossary-fuzzy.po
+</pre></div>
 </div>
 <p>We discard the other fuzzies as they where probably wrong in the first place.
 You could review these but it is not recommended.</p>
@@ -221,8 +231,9 @@ can edit them however you like but we usually follow the format:</p>
 </pre></div>
 </div>
 <p>You can get them into that layout by doing the following:</p>
-<div class="highlight-python"><pre>sed '/#, fuzzy/d; /\"#-#-#-#-# /d; /# (pofilter) compendiumconflicts:/d; s/\\n"$/, "/' zulu-gnome-glossary-conflicts.po > tmp.po
-msgcat tmp.po > zulu-gnome-glossary-conflicts.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>sed '/#, fuzzy/d; /\"#-#-#-#-# /d; /# (pofilter) compendiumconflicts:/d; s/\\n"$/, "/' zulu-gnome-glossary-conflicts.po > tmp.po
+msgcat tmp.po > zulu-gnome-glossary-conflicts.po
+</pre></div>
 </div>
 <p>Of course if a word is clearly wrong, misspelled etc. then you can eliminate
 it.  Often you will find the “problem” relates to the part of speech of the
@@ -231,7 +242,8 @@ source word and that indeed there are two options depending on the context.</p>
 </div>
 <div class="section" id="put-it-back-together-again">
 <span id="creating-a-terminology-list-from-your-existing-translations-put-it-back-together-again"></span><h2>Put it back together again<a class="headerlink" href="#put-it-back-together-again" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-python"><pre>msgcat zulu-gnome-glossary-translated.po zulu-gnome-glossary-conflicts.po > zulu-gnome-glossary.po</pre>
+<div class="highlight-python"><div class="highlight"><pre>msgcat zulu-gnome-glossary-translated.po zulu-gnome-glossary-conflicts.po > zulu-gnome-glossary.po
+</pre></div>
 </div>
 <p>We now have a single file <tt class="docutils literal"><span class="pre">zulu-gnome-glossary.po</span></tt> which contains our
 glossary texts.</p>
@@ -240,8 +252,9 @@ glossary texts.</p>
 <span id="creating-a-terminology-list-from-your-existing-translations-create-other-formats"></span><h2>Create other formats<a class="headerlink" href="#create-other-formats" title="Permalink to this headline">¶</a></h2>
 <p>It is probably good to make your terminology available in other formats.  You
 can create CSV and TMX files from your PO.</p>
-<div class="highlight-python"><pre>po2csv zulu-gnome-glossary.po zulu-gnome-glossary.csv
-po2tmx -l zu zulu-gnome-glossary.po zulu-gnome-glossary.tmx</pre>
+<div class="highlight-python"><div class="highlight"><pre>po2csv zulu-gnome-glossary.po zulu-gnome-glossary.csv
+po2tmx -l zu zulu-gnome-glossary.po zulu-gnome-glossary.tmx
+</pre></div>
 </div>
 <p>For the terminology to be usable by Trados or Wordfast translators they need to
 be in the following formats:</p>
@@ -277,7 +290,7 @@ prompting as to how to translate a term.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/creating_mozilla_pot_files.html b/docs/_build/html/guides/creating_mozilla_pot_files.html
index 552fe41..8785a6f 100644
--- a/docs/_build/html/guides/creating_mozilla_pot_files.html
+++ b/docs/_build/html/guides/creating_mozilla_pot_files.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Creating Mozilla POT files — Translate Toolkit 1.9.0 documentation</title>
+    <title>Creating Mozilla POT files — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +27,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
-    <link rel="next" title="Migrating Mozilla Translations to Firefox" href="migrating_to_firefox.html" />
+    <link rel="next" title="Document translation" href="document_translation.html" />
     <link rel="prev" title="Cleanup translator comments" href="cleanup_translator_comments.html" /> 
   </head>
   <body>
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -79,7 +81,6 @@
 <li><a class="reference internal" href="#">Creating Mozilla POT files</a><ul>
 <li><a class="reference internal" href="#using-mercurial">Using Mercurial</a></li>
 <li><a class="reference internal" href="#using-cvs">Using CVS</a></li>
-<li><a class="reference internal" href="#using-an-en-us-xpi-file">Using an en-US XPI file</a></li>
 </ul>
 </li>
 </ul>
@@ -90,13 +91,14 @@
               
   <li><a href="cleanup_translator_comments.html"
          title="previous chapter">« Cleanup translator comments</a></li>
-  <li><a href="migrating_to_firefox.html"
-         title="next chapter">Migrating Mozilla Translations to Firefox »</a></li>
+  <li><a href="document_translation.html"
+         title="next chapter">Document translation »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -115,23 +117,21 @@
    
   <div class="section" id="creating-mozilla-pot-files">
 <span id="id1"></span><h1>Creating Mozilla POT files<a class="headerlink" href="#creating-mozilla-pot-files" title="Permalink to this headline">¶</a></h1>
-<p>You can do this two ways:</p>
-<ul class="simple">
-<li>Using Mozilla source (from CVS or Mercurial)</li>
-<li>Using an en-US XPI file</li>
-</ul>
+<p>You can do this using Mozilla source from CVS or Mercurial</p>
 <div class="section" id="using-mercurial">
 <span id="creating-mozilla-pot-files-using-mercurial"></span><h2>Using Mercurial<a class="headerlink" href="#using-mercurial" title="Permalink to this headline">¶</a></h2>
 <p>Since Firefox 3.1 and Thunderbird 3.0, Mozilla has switched to using Mercurial
-for version control. See the Mozilla’s <a class="reference external" href="https://developer.mozilla.org/en/l10n_on_mercurial">L10n on Mercurial</a> page for instructions on
-how to checkout and update your Mozilla sources and l10n files.</p>
-<p>You can use <a class="reference internal" href="../commands/mozilla_l10n_scripts.html#mozilla-l10n-scripts-get-moz-enus-py"><em>get_moz_enUS.py</em></a> to
+for version control. See the Mozilla’s <a class="reference external" href="https://developer.mozilla.org/docs/Localizing_with_Mercurial">L10n on Mercurial</a> page for
+instructions on how to checkout and update your Mozilla sources and l10n files.</p>
+<p>You can use <a class="reference internal" href="../commands/mozilla_l10n_scripts.html#get-moz-enus-py"><em>get_moz_enUS.py</em></a> to
 extract an en-US directory from the source tree:</p>
-<div class="highlight-python"><pre>get_moz_enUS.py -s mozilla-central/ -d l10n/ -p browser</pre>
+<div class="highlight-python"><div class="highlight"><pre>get_moz_enUS.py -s mozilla-central/ -d l10n/ -p browser
+</pre></div>
 </div>
 <p>This will move the correct en-US files to <tt class="docutils literal"><span class="pre">l10n/en-US</span></tt>.  You can now create
 POT files as follows:</p>
-<div class="highlight-python"><pre>moz2po -P l10n/en-US l10n/pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -P l10n/en-US l10n/pot
+</pre></div>
 </div>
 <p>This will create the POT files in <tt class="docutils literal"><span class="pre">l10n/pot</span></tt> using the American English files
 from <tt class="docutils literal"><span class="pre">en-US</span></tt>.  You now have a set of POT files that you can use for
@@ -144,30 +144,26 @@ help with creating and updating POT and PO files for Mozilla localisation.</p>
 <p>Firefox versions before 3.1 and Thunderbird versions before 3.0 still has its
 source in CVS. Check out files from the Mozilla repository. If you don’t want
 to checkout all files do:</p>
-<div class="highlight-python"><pre>make -f client.mk l10n-checkout</pre>
+<div class="highlight-python"><div class="highlight"><pre>make -f client.mk l10n-checkout
+</pre></div>
 </div>
 <p>The English files are in the <tt class="docutils literal"><span class="pre">mozilla/</span></tt> module, while the translated files
 all reside in the <tt class="docutils literal"><span class="pre">l10n/</span></tt> module.  They have different structure but not
 enough to kill you.</p>
 <p>Once you have checked out <tt class="docutils literal"><span class="pre">mozilla/</span></tt> you will need to get the correct files
 for en-US.  To do this we will create en-US as a pseudo language.</p>
-<div class="highlight-python"><pre>make -f tools/l10n/l10n.mk create-en-US</pre>
+<div class="highlight-python"><div class="highlight"><pre>make -f tools/l10n/l10n.mk create-en-US
+</pre></div>
 </div>
 <p>This will move the correct en-US files to <tt class="docutils literal"><span class="pre">l10n/en-US</span></tt>.  You can now create
 POT files as follows:</p>
-<div class="highlight-python"><pre>moz2po -P l10n/en-US l10n/pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>moz2po -P l10n/en-US l10n/pot
+</pre></div>
 </div>
 <p>This will create the POT files in <tt class="docutils literal"><span class="pre">l10n/pot</span></tt> using the American English files
 from <tt class="docutils literal"><span class="pre">en-US</span></tt>.  You now have a set of POT files that you can use for
 translation or updating your existing PO files.</p>
 </div>
-<div class="section" id="using-an-en-us-xpi-file">
-<span id="creating-mozilla-pot-files-using-an-en-us-xpi-file"></span><h2>Using an en-US XPI file<a class="headerlink" href="#using-an-en-us-xpi-file" title="Permalink to this headline">¶</a></h2>
-<p>Download an XPI file and run the following:</p>
-<div class="highlight-python"><pre>moz2po -P en-US.xpi pot</pre>
-</div>
-<p>You now have a set of POT files in <tt class="docutils literal"><span class="pre">pot</span></tt>.</p>
-</div>
 </div>
 
 
@@ -182,7 +178,7 @@ translation or updating your existing PO files.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/document_translation.html b/docs/_build/html/guides/document_translation.html
index e62ba10..b3757be 100644
--- a/docs/_build/html/guides/document_translation.html
+++ b/docs/_build/html/guides/document_translation.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Document translation — Translate Toolkit 1.9.0 documentation</title>
+    <title>Document translation — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,17 +27,17 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Translation Related File Formats" href="../formats/index.html" />
-    <link rel="prev" title="Migrating Mozilla Translations to Firefox" href="migrating_to_firefox.html" /> 
+    <link rel="prev" title="Creating Mozilla POT files" href="creating_mozilla_pot_files.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -88,15 +90,16 @@
             
             
               
-  <li><a href="migrating_to_firefox.html"
-         title="previous chapter">« Migrating Mozilla Translations to Firefox</a></li>
+  <li><a href="creating_mozilla_pot_files.html"
+         title="previous chapter">« Creating Mozilla POT files</a></li>
   <li><a href="../formats/index.html"
          title="next chapter">Translation Related File Formats »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -171,7 +174,7 @@ variables</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/index.html b/docs/_build/html/guides/index.html
index e06b447..713098c 100644
--- a/docs/_build/html/guides/index.html
+++ b/docs/_build/html/guides/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Use Cases — Translate Toolkit 1.9.0 documentation</title>
+    <title>Use Cases — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="next" title="Migrating your translations" href="migrating_translations.html" />
     <link rel="prev" title="posplit" href="../commands/posplit.html" /> 
   </head>
@@ -37,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,29 +54,30 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
 <li class="dropdown">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">Use Cases</a><ul>
-</ul>
-</li>
+<li><a class="reference internal" href="#">Use Cases</a></li>
 </ul>
 </ul>
 </li>
@@ -89,10 +89,11 @@
   <li><a href="migrating_translations.html"
          title="next chapter">Migrating your translations »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -125,7 +126,6 @@ whole roundtrip from PO to CSV and back)</li>
 <li>Using <tt class="docutils literal"><span class="pre">phase</span></tt> for the complete translation roundtrip</li>
 <li><a class="reference internal" href="cleanup_translator_comments.html"><em>Cleanup translator comments</em></a></li>
 <li><a class="reference internal" href="creating_mozilla_pot_files.html"><em>Creating Mozilla POT files</em></a></li>
-<li><a class="reference internal" href="migrating_to_firefox.html"><em>Migrating older Mozilla XPI based translations to Firefox</em></a></li>
 <li><a class="reference internal" href="document_translation.html"><em>Document translation</em></a></li>
 </ul>
 </div>
@@ -142,7 +142,7 @@ whole roundtrip from PO to CSV and back)</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/migrating_to_firefox.html b/docs/_build/html/guides/migrating_to_firefox.html
deleted file mode 100644
index ef5eca4..0000000
--- a/docs/_build/html/guides/migrating_to_firefox.html
+++ /dev/null
@@ -1,280 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Migrating Mozilla Translations to Firefox — Translate Toolkit 1.9.0 documentation</title>
-    
-    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
-    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
-    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
-    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '../',
-        VERSION:     '1.9.0',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="../_static/jquery.js"></script>
-    <script type="text/javascript" src="../_static/underscore.js"></script>
-    <script type="text/javascript" src="../_static/doctools.js"></script>
-    <script type="text/javascript" src="../_static/bootstrap.js"></script>
-    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
-    <link rel="up" title="Use Cases" href="index.html" />
-    <link rel="next" title="Document translation" href="document_translation.html" />
-    <link rel="prev" title="Creating Mozilla POT files" href="creating_mozilla_pot_files.html" /> 
-  </head>
-  <body>
-  <div id="navbar" class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container-fluid">
-        <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
-          <ul class="nav">
-            <li class="divider-vertical"></li>
-            
-              <li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc"><ul class="simple">
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
-<li class="toctree-l1"><a class="reference internal" href="index.html">Use Cases</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
-</ul>
-</ul>
-</li>
-              
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
-  <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">Migrating Mozilla Translations to Firefox</a><ul>
-<li><a class="reference internal" href="#quick-start">Quick Start</a></li>
-<li><a class="reference internal" href="#detailed-description">Detailed Description</a><ul>
-<li><a class="reference internal" href="#make-sure-your-mozilla-is-in-po-format">Make sure your Mozilla is in PO format</a><ul>
-<li><a class="reference internal" href="#get-the-correct-en-us-xpi">Get the correct en-US xpi</a></li>
-<li><a class="reference internal" href="#create-mozilla-po-files-for-your-language">Create Mozilla PO files for your language</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#create-firefox-pot-files">Create Firefox POT files</a><ul>
-<li><a class="reference internal" href="#getting-the-en-us-xpi">Getting the en-US.xpi</a></li>
-<li><a class="reference internal" href="#create-the-pot-files">Create the POT files</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#migrate-the-mozilla-po-files-to-firefox">Migrate the Mozilla PO files to Firefox</a><ul>
-<li><a class="reference internal" href="#how-does-it-do-the-migration">How does it do the migration?</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#begin-translating">Begin translating</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</ul>
-</li>
-            
-            
-              
-  <li><a href="creating_mozilla_pot_files.html"
-         title="previous chapter">« Creating Mozilla POT files</a></li>
-  <li><a href="document_translation.html"
-         title="next chapter">Document translation »</a></li>
-            
-            
-              
-            
-          </ul>
-          
-            
-<form class="navbar-search pull-right" action="../search.html" method="get">
-  <input type="text" name="q" placeholder="Search" />
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-          
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-
-<div class="container content">
-   
-  <div class="section" id="migrating-mozilla-translations-to-firefox">
-<span id="migrating-to-firefox"></span><span id="id1"></span><h1>Migrating Mozilla Translations to Firefox<a class="headerlink" href="#migrating-mozilla-translations-to-firefox" title="Permalink to this headline">¶</a></h1>
-<p>This quickstart shows you how to migrate your existing translations of the
-Mozilla suite to the Firefox web-browser.  The same instructions can be used to
-migrate Thunderbird§.</p>
-<p>Note: This guide assumes that you are or will be using PO files.</p>
-<p>FIXME this page needs to be rewriten now that Mozilla is using CSV.  The steps
-are more or less the same.  Look at <a class="reference internal" href="creating_mozilla_pot_files.html"><em>Creating Mozilla POT files</em></a> which
-talks about creating POT file from CVS. Then the process is mostly the same
-except swap any reference to XPI to be the translations in Mozilla CVS.</p>
-<div class="section" id="quick-start">
-<span id="migrating-to-firefox-quick-start"></span><h2>Quick Start<a class="headerlink" href="#quick-start" title="Permalink to this headline">¶</a></h2>
-<ol class="arabic simple">
-<li><a class="reference internal" href="../commands/moz2po.html"><em>moz2po</em></a> -t mozilla-1.7.3-langenus.xpi langXXYY.xpi xxYY-1.7.3</li>
-<li><a class="reference internal" href="../commands/moz2po.html"><em>moz2po</em></a> -P firefox-1.0-en-US.xpi templates-ff-1.0</li>
-<li><a class="reference internal" href="../commands/pomigrate2.html"><em>pomigrate2</em></a> xxYY-1.7.3 xxYY-ff-1.0 templates-ff-1.0</li>
-</ol>
-</div>
-<div class="section" id="detailed-description">
-<span id="migrating-to-firefox-detailed-description"></span><h2>Detailed Description<a class="headerlink" href="#detailed-description" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="make-sure-your-mozilla-is-in-po-format">
-<span id="migrating-to-firefox-make-sure-your-mozilla-is-in-po-format"></span><h3>Make sure your Mozilla is in PO format<a class="headerlink" href="#make-sure-your-mozilla-is-in-po-format" title="Permalink to this headline">¶</a></h3>
-<p>If you are not currently using PO files to do your translations then you can
-migrate an existing XPI to PO format.</p>
-<div class="section" id="get-the-correct-en-us-xpi">
-<span id="migrating-to-firefox-get-the-correct-en-us-xpi"></span><h4>Get the correct en-US xpi<a class="headerlink" href="#get-the-correct-en-us-xpi" title="Permalink to this headline">¶</a></h4>
-<p>Firstly make sure you have an XPI for your language then download a Mozilla
-English (US) XPI for the same release:</p>
-<div class="highlight-python"><pre>ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.3/linux-xpi/langenus.xpi</pre>
-</div>
-<p>Change 1.7.3 to the release that you need.  Note: Linux and Windows
-langenus.xpi are the same so no need to worry about that.</p>
-</div>
-<div class="section" id="create-mozilla-po-files-for-your-language">
-<span id="migrating-to-firefox-create-mozilla-po-files-for-your-language"></span><h4>Create Mozilla PO files for your language<a class="headerlink" href="#create-mozilla-po-files-for-your-language" title="Permalink to this headline">¶</a></h4>
-<p>Now create the Mozilla PO files for your language using your existing XPI and
-the en-US XPI.</p>
-<div class="highlight-python"><pre>moz2po -t mozilla-1.7.3-langenus.xpi langXXYY.xpi xxYY-1.7.3</pre>
-</div>
-<p>Where:</p>
-<ul class="simple">
-<li>mozilla-1.7.3-langenus.xpi is the langenus.xpi downloaded above</li>
-<li>langXXYY.xpi is your existing translated XPI with the same version and the
-en-US one downloaded.</li>
-<li>xxYY-1.7.3 is an output directory for the PO files</li>
-</ul>
-</div>
-</div>
-<div class="section" id="create-firefox-pot-files">
-<span id="migrating-to-firefox-create-firefox-pot-files"></span><h3>Create Firefox POT files<a class="headerlink" href="#create-firefox-pot-files" title="Permalink to this headline">¶</a></h3>
-<p>You need to create a set of Firefox PO Template files that you will use as
-templates when you migrate your Mozilla translations.  Template files are
-simply blank PO files.</p>
-<div class="section" id="getting-the-en-us-xpi">
-<span id="migrating-to-firefox-getting-the-en-us-xpi"></span><h4>Getting the en-US.xpi<a class="headerlink" href="#getting-the-en-us-xpi" title="Permalink to this headline">¶</a></h4>
-<p>Rumour has it that the en-US XPI files for Firefox are different for Windows
-and Linux.</p>
-<ul class="simple">
-<li>Linux – Firefox 1.0:
-<a class="reference external" href="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/linux-i686/xpi/en-US.xpi">ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/linux-i686/xpi/en-US.xpi</a></li>
-<li>Windows – Firefox 1.0:
-<a class="reference external" href="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/win32/xpi/en-US.xpi">ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/win32/xpi/en-US.xpi</a></li>
-</ul>
-</div>
-<div class="section" id="create-the-pot-files">
-<span id="migrating-to-firefox-create-the-pot-files"></span><h4>Create the POT files<a class="headerlink" href="#create-the-pot-files" title="Permalink to this headline">¶</a></h4>
-<div class="highlight-python"><pre>moz2po -P firefox-1.0-en-US.xpi templates-ff-1.0</pre>
-</div>
-<p>Where:</p>
-<ul class="simple">
-<li><em>-P</em> specifies that you want to create POT files instead of PO files</li>
-<li><em>firefox-1.0-en-US.xpi</em> is an en-US.xpi for Firefox downloaded earlier</li>
-<li><em>templates-ff-1.0</em> is the new directory that will contain the POT files</li>
-</ul>
-</div>
-</div>
-<div class="section" id="migrate-the-mozilla-po-files-to-firefox">
-<span id="migrating-to-firefox-migrate-the-mozilla-po-files-to-firefox"></span><h3>Migrate the Mozilla PO files to Firefox<a class="headerlink" href="#migrate-the-mozilla-po-files-to-firefox" title="Permalink to this headline">¶</a></h3>
-<p>We will now take the existing Mozilla PO files and migrate them to Firefox.
-Note that this tool only works on Linux (or an operating environment with bash
-and the gettext tools).  If you need help ask at
-<a class="reference external" href="mailto:translate-devel%40lists.sourceforge.net">translate-devel<span>@</span>lists<span>.</span>sourceforge<span>.</span>net</a>.</p>
-<div class="highlight-python"><pre>pomigrate2 xxYY-1.7.3 xxYY-ff-1.0 templates-ff-1.0</pre>
-</div>
-<p>Where:</p>
-<ul class="simple">
-<li><em>xxYY-1.7.3</em> contains your Mozilla PO files</li>
-<li><em>xxYY-ff-1.0</em> will contain your new Firefox files</li>
-<li><em>templates-ff-1.0</em> contains the Firefox template files</li>
-</ul>
-<div class="section" id="how-does-it-do-the-migration">
-<span id="migrating-to-firefox-how-does-it-do-the-migration"></span><h4>How does it do the migration?<a class="headerlink" href="#how-does-it-do-the-migration" title="Permalink to this headline">¶</a></h4>
-<p>Things that are fully automated scare most people and justifiably so!  The
-migration will do the following:</p>
-<ol class="arabic simple">
-<li>For each Firefox PO Template file<ul>
-<li>If there is one in your Mozilla folder<ul>
-<li>If there is only one file with that name<ul>
-<li>copy it to the correct Firefox PO location</li>
-</ul>
-</li>
-<li>Else<ul>
-<li>combine all the copies you find and then copy them to the Firefox PO
-location</li>
-</ul>
-</li>
-</ul>
-</li>
-<li>Else<ul>
-<li>Initialise a blank PO file</li>
-</ul>
-</li>
-</ul>
-</li>
-<li>Create a compendium file of all Mozilla PO files</li>
-<li>Update all Firefox PO files optionally using the compendium</li>
-</ol>
-<p>The result is that all Firefox files are at least initialised.  Many of them
-are populated with conflicting entries clearly highlighted and ready for you to
-fix.</p>
-</div>
-</div>
-<div class="section" id="begin-translating">
-<span id="migrating-to-firefox-begin-translating"></span><h3>Begin translating<a class="headerlink" href="#begin-translating" title="Permalink to this headline">¶</a></h3>
-<p>Your PO files are ready.  Begin translating with any of your usual PO editing
-tools.</p>
-</div>
-</div>
-</div>
-
-
-</div>
-<hr>
-
-<footer class="footer">
-  <div class="container">
-    <p class="pull-right"><a href="#">Back to top ↑</a></p>
-    <ul class="unstyled muted">
-      <li><small>
-        © 2012, Translate.org.za.<br/>
-      </small></li>
-      <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
-      </small></li>
-    </ul>
-  </div>
-</footer>
-  </body>
-</html>
\ No newline at end of file
diff --git a/docs/_build/html/guides/migrating_translations.html b/docs/_build/html/guides/migrating_translations.html
index fc50a14..6c75030 100644
--- a/docs/_build/html/guides/migrating_translations.html
+++ b/docs/_build/html/guides/migrating_translations.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Migrating your translations — Translate Toolkit 1.9.0 documentation</title>
+    <title>Migrating your translations — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Checking your files with PO filter" href="using_pofilter.html" />
     <link rel="prev" title="Use Cases" href="index.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -100,10 +102,11 @@
   <li><a href="using_pofilter.html"
          title="next chapter">Checking your files with PO filter »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -147,7 +150,8 @@ OpenOffice.org 1.1.3 to OpenOffice.org 2.0.</p>
 them using <a class="reference internal" href="../commands/moz2po.html"><em>moz2po</em></a>, <a class="reference internal" href="../commands/oo2po.html"><em>oo2po</em></a> or the other tools
 of the Translate Toolkit.  The POT files are templates for the destination
 files that we will be creating.</p>
-<div class="highlight-python"><pre>oo2po -P en-US.sdf ooo-20-pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po -P en-US.sdf ooo-20-pot
+</pre></div>
 </div>
 <p>This will create new POT files in <em>ooo-20-pot</em>.</p>
 </div>
@@ -156,7 +160,8 @@ files that we will be creating.</p>
 <p>We will be migrating your old PO files into the new POT files.  This is a good
 opportunity to check for encoding errors and inconsistencies.</p>
 <p>We use <a class="reference internal" href="../commands/pocompendium.html"><em>pocompendium</em></a> to check for encoding errors:</p>
-<div class="highlight-python"><pre>pocompendium check.po -d ooo-113-old</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocompendium check.po -d ooo-113-old
+</pre></div>
 </div>
 <p>This will create a compendium PO files, <em>check.po</em>, from all the PO files in
 the directory <em>ooo-113-old</em>, where <em>ooo-113-old</em> contains all your old
@@ -175,7 +180,8 @@ fixed they’re usually gone for good, so it is time well spent.</p>
 </div>
 <p>We now look at consistency within the translations.  The first check extracts
 situations were the same English string was translated in two different ways:</p>
-<div class="highlight-python"><pre>pocompendium --ignore-case --accel-amp --errors check.po -d ooo-113-old</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocompendium --ignore-case --accel-amp --errors check.po -d ooo-113-old
+</pre></div>
 </div>
 <p>In <em>check.po</em> you will find all situations where the same English text was
 translated differently.  We use <tt class="docutils literal"><span class="pre">--accel-amp</span></tt> to remove accelerator
@@ -188,7 +194,8 @@ or removed.</p>
 <p>Then we check for words in your language that are used for more than one
 English concept.  You don’t for instance want the same word for <em>Cancel</em> and
 <em>Delete</em>.  For this we invert the compendium:</p>
-<div class="highlight-python"><pre>pocompendium --invert --ignore-case --accel-amp --errors check.po -d ooo-113-old</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocompendium --invert --ignore-case --accel-amp --errors check.po -d ooo-113-old
+</pre></div>
 </div>
 <p>We now have a file similar to the previous one except your language appears in
 the msgid and the English appears in the msgstr.  Look for inconsistencies that
@@ -199,7 +206,8 @@ would cause problems for the user and correct them in the source files.</p>
 <p>You are now ready to migrate using <a class="reference internal" href="../commands/pomigrate2.html"><em>pomigrate2</em></a>.  You have
 created your destination POT files and all your PO files are clean and ready to
 migrate.</p>
-<div class="highlight-python"><pre>pomigrate2 ooo-113-old ooo-20-new ooo-20-pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomigrate2 ooo-113-old ooo-20-new ooo-20-pot
+</pre></div>
 </div>
 <p>This will take all translations from <em>ooo-113-old</em> and migrate them to
 <em>ooo-20-new</em> using <em>ooo-20-pot</em> as templates.  By default pomigrate2 migrates
@@ -238,7 +246,8 @@ compendium otherwise they will be untranslated.</p>
 <p>Congratulations! Your files are now migrated.</p>
 <p>You might want to see how much of your old work was reusable in the new
 version:</p>
-<div class="highlight-python"><pre>pocount ooo-20-new</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocount ooo-20-new
+</pre></div>
 </div>
 <p>This will use <a class="reference internal" href="../commands/pocount.html"><em>pocount</em></a> to count the words in your new files and
 you can compare the number of translate and untranslated messages from your old
@@ -264,7 +273,7 @@ most of that work translated.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/running_the_tools_on_microsoft_windows.html b/docs/_build/html/guides/running_the_tools_on_microsoft_windows.html
index 67a4d8a..27c3cfe 100644
--- a/docs/_build/html/guides/running_the_tools_on_microsoft_windows.html
+++ b/docs/_build/html/guides/running_the_tools_on_microsoft_windows.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Running the tools on Microsoft Windows — Translate Toolkit 1.9.0 documentation</title>
+    <title>Running the tools on Microsoft Windows — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Cleanup translator comments" href="cleanup_translator_comments.html" />
     <link rel="prev" title="Creating a terminology list from your existing translations" href="creating_a_terminology_list_from_your_existing_translations.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -96,10 +98,11 @@
   <li><a href="cleanup_translator_comments.html"
          title="next chapter">Cleanup translator comments »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -125,7 +128,8 @@
 <span id="running-the-tools-on-microsoft-windows-windows-95-98"></span><h3>Windows 95/98<a class="headerlink" href="#windows-95-98" title="Permalink to this headline">¶</a></h3>
 <p>You might need to add the installation directory of the translate toolkit to
 your path</p>
-<div class="highlight-python"><pre>path "C:\Program Files\translate-toolkit\"</pre>
+<div class="highlight-python"><div class="highlight"><pre>path "C:\Program Files\translate-toolkit\"
+</pre></div>
 </div>
 <p>This will work for one session, but will be lost when you reboot again.
 Therefore you might want to add it to the autoexec.bat file.</p>
@@ -134,11 +138,13 @@ Therefore you might want to add it to the autoexec.bat file.</p>
 <span id="running-the-tools-on-microsoft-windows-windows-2000-xp"></span><h3>Windows 2000/XP<a class="headerlink" href="#windows-2000-xp" title="Permalink to this headline">¶</a></h3>
 <p>You can add to the path permanently.  Check <a class="reference external" href="http://www.computerhope.com/issues/ch000549.htm">this</a> useful guide.  You should
 add the following to your path:</p>
-<div class="highlight-python"><pre>C:\Programs Files\translate-toolkit\</pre>
+<div class="highlight-python"><div class="highlight"><pre>C:\Programs Files\translate-toolkit\
+</pre></div>
 </div>
 <p>If you have the <a class="reference external" href="http://gnuwin32.sourceforge.net/packages/gettext.htm">Gettext tools</a> installed, add it to
 your path as well:</p>
-<div class="highlight-python"><pre>C:\Program Files\GnuWin32\bin\</pre>
+<div class="highlight-python"><div class="highlight"><pre>C:\Program Files\GnuWin32\bin\
+</pre></div>
 </div>
 </div>
 </div>
@@ -162,7 +168,7 @@ drop it to the dos2unix.exe utility from <a class="reference external" href="htt
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/using_csv2po.html b/docs/_build/html/guides/using_csv2po.html
index 544a6a8..184c3de 100644
--- a/docs/_build/html/guides/using_csv2po.html
+++ b/docs/_build/html/guides/using_csv2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Using csv2po — Translate Toolkit 1.9.0 documentation</title>
+    <title>Using csv2po — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Creating OpenOffice.org POT files" href="using_oo2po.html" />
     <link rel="prev" title="Checking your files with PO filter" href="using_pofilter.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -105,10 +107,11 @@
   <li><a href="using_oo2po.html"
          title="next chapter">Creating OpenOffice.org POT files »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -159,15 +162,17 @@ these.</p>
 <p>This step is optional.</p>
 <p>To send a translator only those messages that are untranslated, fuzzy or need
 review run:</p>
-<div class="highlight-python"><pre>pofilter --isfuzzy --isreview -t untranslated <po-dir> <po-filtered-dir></pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter --isfuzzy --isreview -t untranslated <po-dir> <po-filtered-dir>
+</pre></div>
 </div>
 </div>
 <div class="section" id="divide-into-sections">
 <span id="using-csv2po-divide-into-sections"></span><h3>Divide into sections<a class="headerlink" href="#divide-into-sections" title="Permalink to this headline">¶</a></h3>
 <p>You might want to divide the work into sections if you are apportioning it to
 different translators.  In that case create new directories:</p>
-<div class="highlight-python"><pre>e.g. po-filtered-dir-1 po-filtered-dir-2
-or  po-filtered-dir-bob po-filtered-dir-mary</pre>
+<div class="highlight-python"><div class="highlight"><pre>e.g. po-filtered-dir-1 po-filtered-dir-2
+or  po-filtered-dir-bob po-filtered-dir-mary
+</pre></div>
 </div>
 <p>Copy files from <em>po-filtered-dir</em> to <em>po-filtered-dir-N</em> in a way that balance
 the work or apportions the amounts you want for each translator.  Try to keep
@@ -179,7 +184,8 @@ separate directory.</p>
 </div>
 <div class="section" id="creating-the-csv-files">
 <span id="using-csv2po-creating-the-csv-files"></span><h3>Creating the CSV files<a class="headerlink" href="#creating-the-csv-files" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>po2csv <po-dir|po-filtered-dir> <csv-out></pre>
+<div class="highlight-python"><div class="highlight"><pre>po2csv <po-dir|po-filtered-dir> <csv-out>
+</pre></div>
 </div>
 <p>This will create a set of CSV files in <em>csv-out</em> which you can compress using
 zip (we use zip because most people are Windows users)</p>
@@ -188,7 +194,8 @@ zip (we use zip because most people are Windows users)</p>
 <span id="using-csv2po-creating-a-word-count"></span><h3>Creating a word count<a class="headerlink" href="#creating-a-word-count" title="Permalink to this headline">¶</a></h3>
 <p>Professional translators work on source word counts.  So we create a word count
 to go with the file:</p>
-<div class="highlight-python"><pre>pocount `find po-dir|po-filtered-dir -name "*.po"`</pre>
+<div class="highlight-python"><div class="highlight"><pre>pocount `find po-dir|po-filtered-dir -name "*.po"`
+</pre></div>
 </div>
 <p>We work on source words regardless of whether the string is fuzzy or not.  You
 might want to get a lower rate for work on fuzzy strings.</p>
@@ -198,7 +205,8 @@ including something that you didn’t want in.</p>
 </div>
 <div class="section" id="package-the-csv-files">
 <span id="using-csv2po-package-the-csv-files"></span><h3>Package the CSV files<a class="headerlink" href="#package-the-csv-files" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>zip -r9 work.zip <csv-out></pre>
+<div class="highlight-python"><div class="highlight"><pre>zip -r9 work.zip <csv-out>
+</pre></div>
 </div>
 </div>
 <div class="section" id="translating">
@@ -223,14 +231,16 @@ escape them as + - +-</li>
 <p>You can, and should, keep your files as CSV files.  However, many translators
 are not the best wizzes at using their spreadsheet.  In this case many files
 will have been changed to XLS files.  To convert them by hand is tedious and
-error prone.  Rather make use of <a class="reference external" href="http://freshmeat.net/projects/xlhtml/">xlHtml</a> which can do all the work for you.</p>
-<div class="highlight-python"><pre>xlhtml -xp:0 -csv file.xls > file.csv</pre>
+error prone.  Rather make use of <a class="reference external" href="http://freecode.com/projects/xlhtml/">xlHtml</a> which can do all the work for you.</p>
+<div class="highlight-python"><div class="highlight"><pre>xlhtml -xp:0 -csv file.xls > file.csv
+</pre></div>
 </div>
 </div>
 <div class="section" id="converting-csv-back-to-po">
 <span id="using-csv2po-converting-csv-back-to-po"></span><h3>Converting CSV back to PO<a class="headerlink" href="#converting-csv-back-to-po" title="Permalink to this headline">¶</a></h3>
 <p>Extract the CSV files here we assume they are in <em>csv-in</em>:</p>
-<div class="highlight-python"><pre>csv2po --charset=windows-1250 -t <templates> <csv-in> <po-in></pre>
+<div class="highlight-python"><div class="highlight"><pre>csv2po --charset=windows-1250 -t <templates> <csv-in> <po-in>
+</pre></div>
 </div>
 <p>This will create new PO files in <em>po-in</em> based on the CSV files in the <em>csv-in</em>
 and the template PO files in <em>templates</em>.  You shouldn’t run the csv2po command
@@ -278,7 +288,8 @@ po-dir<span class="o">=</span>your-existing-po-files
 <p>This step would not be necessary if the CSV contained the complete PO file.  It
 is only needed when the translator has been editing a subset of the whole PO
 file.</p>
-<div class="highlight-python"><pre>pomerge --mergeblank=no -t po-dir -i po-in -o po-dir</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge --mergeblank=no -t po-dir -i po-in -o po-dir
+</pre></div>
 </div>
 <p>This will take PO files from <em>po-in</em> merge them with those in <em>po-dir</em> using
 <em>po-dir</em> as the template – i.e. overwriting files in <em>po-dir</em>. It will also
@@ -306,7 +317,7 @@ fuzzies.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/using_oo2po.html b/docs/_build/html/guides/using_oo2po.html
index e29e4ac..2936442 100644
--- a/docs/_build/html/guides/using_oo2po.html
+++ b/docs/_build/html/guides/using_oo2po.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Creating OpenOffice.org POT files — Translate Toolkit 1.9.0 documentation</title>
+    <title>Creating OpenOffice.org POT files — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Checking for inconsistencies in your translations" href="checking_for_inconsistencies.html" />
     <link rel="prev" title="Using csv2po" href="using_csv2po.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -97,10 +99,11 @@
   <li><a href="checking_for_inconsistencies.html"
          title="next chapter">Checking for inconsistencies in your translations »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -144,14 +147,16 @@ of <a class="reference internal" href="../commands/oo2po.html"><em>oo2po</em></a
 </div>
 <div class="section" id="produce-the-pot-files-using-oo2po">
 <span id="using-oo2po-produce-the-pot-files-using-oo2po"></span><h3>Produce the POT files using oo2po<a class="headerlink" href="#produce-the-pot-files-using-oo2po" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><pre>oo2po -P <gsi> <new-pots>
-oo2po -P en-US.gsi pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po -P <gsi> <new-pots>
+oo2po -P en-US.gsi pot
+</pre></div>
 </div>
 <p>This takes the <em>en-US.gsi</em> file and creates POT files in the <em>pot</em> directory.
 The <tt class="docutils literal"><span class="pre">-P</span></tt> option ensures that .pot files are created instead of .po file.</p>
 <p>If you want to create one large .pot file instead of a lot of small ones, you
 should use the:</p>
-<div class="highlight-python"><pre>oo2po -P --multifile=onefile en-US.gsi pot</pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po -P --multifile=onefile en-US.gsi pot
+</pre></div>
 </div>
 <p>option as described in <a class="reference internal" href="../commands/oo2po.html"><em>oo2po</em></a>.</p>
 </div>
@@ -159,7 +164,8 @@ should use the:</p>
 <span id="using-oo2po-produce-a-pot-files-with-french-source-text"></span><h3>Produce a POT files with French source text<a class="headerlink" href="#produce-a-pot-files-with-french-source-text" title="Permalink to this headline">¶</a></h3>
 <p>You will need to have access to a French GSI file.  The following commands will
 create a set of POT files with French as the source language:</p>
-<div class="highlight-python"><pre>oo2po -P --source-language=fr fr.gsi pot-fr</pre>
+<div class="highlight-python"><div class="highlight"><pre>oo2po -P --source-language=fr fr.gsi pot-fr
+</pre></div>
 </div>
 <p>This will take translations from <em>fr.gsi</em> and create a set of POT files in
 <em>pot-fr</em>.  These POT files will have French as the source language.  You need
@@ -180,7 +186,7 @@ to make sure that fr.gsi is in fact up to date.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/guides/using_pofilter.html b/docs/_build/html/guides/using_pofilter.html
index 3e2899b..6315b62 100644
--- a/docs/_build/html/guides/using_pofilter.html
+++ b/docs/_build/html/guides/using_pofilter.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Checking your files with PO filter — Translate Toolkit 1.9.0 documentation</title>
+    <title>Checking your files with PO filter — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
     <link rel="up" title="Use Cases" href="index.html" />
     <link rel="next" title="Using csv2po" href="using_csv2po.html" />
     <link rel="prev" title="Migrating your translations" href="migrating_translations.html" /> 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -98,10 +100,11 @@
   <li><a href="using_csv2po.html"
          title="next chapter">Using csv2po »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -162,7 +165,8 @@ are the ones most likely to break programs at runtime.  We are also working
 with OpenOffice.org PO files created using <a class="reference internal" href="../commands/oo2po.html"><em>oo2po</em></a> so we want to
 ensure that we set the accelerator key marker and variables definitions
 correctly:</p>
-<div class="highlight-python"><pre>pofilter -t accelerators -t escapes -t variables -t xmltags --openoffice existing_files errors</pre>
+<div class="highlight-python"><div class="highlight"><pre>pofilter -t accelerators -t escapes -t variables -t xmltags --openoffice existing_files errors
+</pre></div>
 </div>
 <p>Any messages that fail one of the 4 checks will be placed in files in <em>errors</em>.
 We also used the <tt class="docutils literal"><span class="pre">--openoffice</span></tt> option to ensure that the tool is aware of
@@ -202,8 +206,9 @@ allows you to simply merge them back into you PO files and then rely on the
 fact that all po2* tools will ignore a message marked fuzzy.  This allows you
 to quickly eliminate messages that can break builds.</p>
 <p>To edit run:</p>
-<div class="highlight-python"><pre>vi `find errors -name "*.po"`
-virtaal `find errors -name "*.po"`</pre>
+<div class="highlight-python"><div class="highlight"><pre>vi `find errors -name "*.po"`
+virtaal `find errors -name "*.po"`
+</pre></div>
 </div>
 <p>or similar command.</p>
 <p>The pofilter marker helps you determine what error was discovered:</p>
@@ -226,7 +231,8 @@ for better checks, then let us know.</p>
 <span id="using-pofilter-merging-your-corrections-back-into-the-originals"></span><h3>Merging your corrections back into the originals<a class="headerlink" href="#merging-your-corrections-back-into-the-originals" title="Permalink to this headline">¶</a></h3>
 <p>After correcting the errors in the PO files its time to merge these corrections
 back into the originals using <a class="reference internal" href="../commands/pomerge.html"><em>pomerge</em></a>.</p>
-<div class="highlight-python"><pre>pomerge -t existing_files -i errors -o files_without_errors</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t existing_files -i errors -o files_without_errors
+</pre></div>
 </div>
 <p>If <tt class="docutils literal"><span class="pre">-t</span></tt> and <tt class="docutils literal"><span class="pre">-o</span></tt> are the same directory, the corrections will be
 merged into the existing files.  Do this only if you are using some kind of
@@ -238,14 +244,17 @@ version control system so that you can check the changes made by
 <p>We have done this against CVS but you could run a normal diff between a good
 copy and your modifications.  Thus we assume in the last step that we merged
 the corrections into the existing translations:</p>
-<div class="highlight-python"><pre>pomerge -t existing_files -i errors -o existing_files</pre>
+<div class="highlight-python"><div class="highlight"><pre>pomerge -t existing_files -i errors -o existing_files
+</pre></div>
 </div>
 <p>Now we check the changes using <em>cvs diff</em>:</p>
-<div class="highlight-python"><pre>cvs diff -u existing_files > x.diff</pre>
+<div class="highlight-python"><div class="highlight"><pre>cvs diff -u existing_files > x.diff
+</pre></div>
 </div>
 <p>This creates a unified diff (one with + and - lines so you can see what was
 added and what was removed) in the file x.diff:</p>
-<div class="highlight-python"><pre>vim x.diff</pre>
+<div class="highlight-python"><div class="highlight"><pre>vim x.diff
+</pre></div>
 </div>
 <p>Check the diff file in any editor, here we use vim.  You should check to see
 that the changes you requested are going in and that something major did not go
@@ -254,7 +263,8 @@ description” which should have been deleted from the error checking PO fil
 Also check for stray fuzzy markers that shouldn’t have been added.  You will
 have to make corrections in the files in <em>existing_files</em> not in <em>errors</em>.</p>
 <p>When you are happy that the changes are correct run:</p>
-<div class="highlight-python"><pre>cvs ci existing_files</pre>
+<div class="highlight-python"><div class="highlight"><pre>cvs ci existing_files
+</pre></div>
 </div>
 <p>Congratulations you have helped eliminate a number of errors that could give
 problems when running the application.  Now you might want to look at running
@@ -275,7 +285,7 @@ some of the other tests that check for style and uniformity in translation.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/history.html b/docs/_build/html/history.html
index 13057b0..0f27cc9 100644
--- a/docs/_build/html/history.html
+++ b/docs/_build/html/history.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>History of the Translate Toolkit — Translate Toolkit 1.9.0 documentation</title>
+    <title>History of the Translate Toolkit — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,16 +27,16 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" />
     <link rel="next" title="License" href="license.html" />
-    <link rel="prev" title="Important Changes" href="changelog.html" /> 
+    <link rel="prev" title="Translate Toolkit 1.8.1" href="releases/1.8.1.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -91,15 +93,16 @@
             
             
               
-  <li><a href="changelog.html"
-         title="previous chapter">« Important Changes</a></li>
+  <li><a href="releases/1.8.1.html"
+         title="previous chapter">« Translate Toolkit 1.8.1</a></li>
   <li><a href="license.html"
          title="next chapter">License »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -165,13 +168,12 @@ tool was created.</p>
 </div>
 <div class="section" id="wordforge-project">
 <span id="history-wordforge-project"></span><h2>WordForge project<a class="headerlink" href="#wordforge-project" title="Permalink to this headline">¶</a></h2>
-<p>In 2006 with funding from the <a class="reference external" href="http://www.soros.org/">Open Society Institute</a>
-(OSI) and <a class="reference external" href="http://www.idrc.ca/">IDRC</a> the toolkit was adapted to allow many
-core changes.  The first being to introduce the concept of a base class from
-which PO and XLIFF storage formats are derived.  This allowed tools to be
-adapted to allow output to XLIFF or PO files.  The tools themselves where
-adapted to allow them to work with the core formats XLIFF and PO as well as all
-base class derived formats.  Thus we can count XLIFF, PO, MO and other formats.</p>
+<p>In 2006 with funding from the <a class="reference external" href="http://www.opensocietyfoundations.org/">Open Society Institute</a> (OSI) and <a class="reference external" href="http://www.idrc.ca/">IDRC</a> the toolkit was adapted to allow many core changes.
+The first being to introduce the concept of a base class from which PO and
+XLIFF storage formats are derived.  This allowed tools to be adapted to allow
+output to XLIFF or PO files.  The tools themselves where adapted to allow them
+to work with the core formats XLIFF and PO as well as all base class derived
+formats.  Thus we can count XLIFF, PO, MO and other formats.</p>
 <p>Additional contributions during this phase where the adaptation of Pootle to
 use XLIFF as well as PO.  The creation of tools to manage translation memory
 files and glossary files.</p>
@@ -223,7 +225,7 @@ Pootle.  Key new features:</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
index 54e1149..f9c9fe3 100644
--- a/docs/_build/html/index.html
+++ b/docs/_build/html/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Translate Toolkit — Translate Toolkit 1.9.0 documentation</title>
+    <title>Translate Toolkit — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="#" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="#" />
     <link rel="next" title="Features" href="features.html" /> 
   </head>
   <body>
@@ -36,7 +35,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="#">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -54,20 +53,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -75,18 +77,10 @@
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
 <li><a class="reference internal" href="#">Translate Toolkit</a><ul>
-<li><a class="reference internal" href="#user-s-guide">User’s Guide</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#developer-s-guide">Developer’s Guide</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#api-reference">API Reference</a><ul>
-</ul>
-</li>
-<li><a class="reference internal" href="#additional-notes">Additional Notes</a><ul>
-</ul>
-</li>
+<li><a class="reference internal" href="#user-s-guide">User’s Guide</a></li>
+<li><a class="reference internal" href="#developer-s-guide">Developer’s Guide</a></li>
+<li><a class="reference internal" href="#additional-notes">Additional Notes</a></li>
+<li><a class="reference internal" href="#api-reference">API Reference</a></li>
 </ul>
 </li>
 </ul>
@@ -98,10 +92,11 @@
   <li><a href="features.html"
          title="next chapter">Features »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -144,15 +139,29 @@ Translate Toolkit.</p>
 </div>
 <div class="section" id="developer-s-guide">
 <h2>Developer’s Guide<a class="headerlink" href="#developer-s-guide" title="Permalink to this headline">¶</a></h2>
-<p>If you are a developer and are willing to use the Translate Toolkit for
+<p>If you are a developer interested in using the Translate Toolkit for
 building new tools, make sure to read through this part.</p>
 <div class="toctree-wrapper compound">
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+</div>
+</div>
+<div class="section" id="additional-notes">
+<h2>Additional Notes<a class="headerlink" href="#additional-notes" title="Permalink to this headline">¶</a></h2>
+<p>Changelog and legal information are included here.</p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
 </div>
 </div>
@@ -171,17 +180,6 @@ localization tools.</p>
 </ul>
 </div>
 </div>
-<div class="section" id="additional-notes">
-<h2>Additional Notes<a class="headerlink" href="#additional-notes" title="Permalink to this headline">¶</a></h2>
-<p>Changelog and legal information are included here.</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
-<li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
-<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
-</ul>
-</div>
-</div>
 </div>
 
 
@@ -196,7 +194,7 @@ localization tools.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/installation.html b/docs/_build/html/installation.html
index b70ad9d..926b482 100644
--- a/docs/_build/html/installation.html
+++ b/docs/_build/html/installation.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Installation — Translate Toolkit 1.9.0 documentation</title>
+    <title>Installation — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" />
     <link rel="next" title="Converters" href="commands/index.html" />
     <link rel="prev" title="Features" href="features.html" /> 
   </head>
@@ -37,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -55,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -95,10 +97,11 @@
   <li><a href="commands/index.html"
          title="next chapter">Converters »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -134,18 +137,20 @@ what steps are required to install it.</p>
 <p>The dollowing advice only applies to manual installation from tar ball.</p>
 <ol class="arabic">
 <li><p class="first">Find location of your python packages:</p>
-<div class="highlight-python"><pre>python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"</pre>
+<div class="highlight-python"><div class="highlight"><pre>python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+</pre></div>
 </div>
 </li>
 <li><p class="first">Delete toolkit package from your Python site-packages directory e.g.:</p>
-<div class="highlight-python"><pre>rm /usr/local/lib/python2.5/dist-packages/translate -R</pre>
+<div class="highlight-python"><div class="highlight"><pre>rm /usr/local/lib/python2.5/dist-packages/translate -R
+</pre></div>
 </div>
 </li>
 </ol>
 </div>
 <div class="section" id="building">
 <span id="installation-building"></span><h2>Building<a class="headerlink" href="#building" title="Permalink to this headline">¶</a></h2>
-<p>For build instructions, see the <a class="reference internal" href="development/building.html"><em>Building</em></a> page.</p>
+<p>For build instructions, see the <a class="reference internal" href="developers/building.html"><em>Building</em></a> page.</p>
 </div>
 <div class="section" id="download">
 <span id="installation-download"></span><h2>Download<a class="headerlink" href="#download" title="Permalink to this headline">¶</a></h2>
@@ -193,21 +198,25 @@ dependencies already installed</td>
 </tbody>
 </table>
 <p>The RPM package can be installed by using the following command:</p>
-<div class="highlight-python"><pre>rpm -Uvh translate-toolkit-1.0.1.rpm</pre>
+<div class="highlight-python"><div class="highlight"><pre>rpm -Uvh translate-toolkit-1.0.1.rpm
+</pre></div>
 </div>
 <p>To install a tar.bz2:</p>
-<div class="highlight-python"><pre>tar xvjf translate-toolkit-1.1.0.tar.bz2
+<div class="highlight-python"><div class="highlight"><pre>tar xvjf translate-toolkit-1.1.0.tar.bz2
 cd translate-toolkit-1.1.0
 su
-./setup.py install</pre>
+./setup.py install
+</pre></div>
 </div>
 <p>On Windows simply click on the .exe file and follow the instructions.</p>
 <p>On Debian (if you are on etch), just type the following command:</p>
-<div class="highlight-python"><pre>aptitude install translate-toolkit</pre>
+<div class="highlight-python"><div class="highlight"><pre>aptitude install translate-toolkit
+</pre></div>
 </div>
 <p>If you are using an old Debian stable system, you might want to install the
 .tar.bz2 version. Be sure to install python and python development first with:</p>
-<div class="highlight-python"><pre>apt-get install python python-dev</pre>
+<div class="highlight-python"><div class="highlight"><pre>apt-get install python python-dev
+</pre></div>
 </div>
 <p>Alternatively newer packages might be in testing.</p>
 </div>
@@ -215,24 +224,28 @@ su
 <span id="installation-installing-from-git"></span><h2>Installing from Git<a class="headerlink" href="#installing-from-git" title="Permalink to this headline">¶</a></h2>
 <p>If you want to try the bleeding edge, or just want to have the latest fixes
 from a stabilising branch then you need to use Git to get your sources.:</p>
-<div class="highlight-python"><pre>git clone https://github.com/translate/translate.git</pre>
+<div class="highlight-python"><div class="highlight"><pre>git clone https://github.com/translate/translate.git
+</pre></div>
 </div>
 <p>This will retrieve the <tt class="docutils literal"><span class="pre">master</span></tt> branch of the Toolkit.  Further Git
 <a class="reference external" href="http://git.or.cz/course/svn.html">instructions</a> are also available.</p>
 <p>Once you have the sources you have two options, a full install:</p>
-<div class="highlight-python"><pre>su
-./setup.py install</pre>
+<div class="highlight-python"><div class="highlight"><pre>su
+./setup.py install
+</pre></div>
 </div>
 <p>or, running the tools from the source directory</p>
-<div class="highlight-python"><pre>./setuppath # Only needed the first time
-. setpath  # Do this once for a session</pre>
+<div class="highlight-python"><div class="highlight"><pre>./setuppath # Only needed the first time
+. setpath  # Do this once for a session
+</pre></div>
 </div>
 </div>
 <div class="section" id="verify-installed-version">
 <span id="installation-verify-installed-version"></span><h2>Verify installed version<a class="headerlink" href="#verify-installed-version" title="Permalink to this headline">¶</a></h2>
 <p>To verify which version of the toolkit you have installed run:</p>
-<div class="highlight-python"><pre>[l10n at server]# moz2po --version
-moz2po 1.1.0</pre>
+<div class="highlight-python"><div class="highlight"><pre>[l10n at server]# moz2po --version
+moz2po 1.1.0
+</pre></div>
 </div>
 </div>
 </div>
@@ -249,7 +262,7 @@ moz2po 1.1.0</pre>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/license.html b/docs/_build/html/license.html
index 4e9c41b..0ce161c 100644
--- a/docs/_build/html/license.html
+++ b/docs/_build/html/license.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>License — Translate Toolkit 1.9.0 documentation</title>
+    <title>License — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,8 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" />
+    <link rel="next" title="API" href="api/index.html" />
     <link rel="prev" title="History of the Translate Toolkit" href="history.html" /> 
   </head>
   <body>
@@ -36,7 +36,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -54,20 +54,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -83,11 +86,14 @@
               
   <li><a href="history.html"
          title="previous chapter">« History of the Translate Toolkit</a></li>
+  <li><a href="api/index.html"
+         title="next chapter">API »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -122,7 +128,7 @@ License (GPL)</a>.</p>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
index 8b19da9..7c10ac7 100644
Binary files a/docs/_build/html/objects.inv and b/docs/_build/html/objects.inv differ
diff --git a/docs/_build/html/py-modindex.html b/docs/_build/html/py-modindex.html
index cf34a26..4692cc6 100644
--- a/docs/_build/html/py-modindex.html
+++ b/docs/_build/html/py-modindex.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Python Module Index — Translate Toolkit 1.9.0 documentation</title>
+    <title>Python Module Index — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,7 +27,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" />
  
 
 
@@ -38,7 +37,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -56,20 +55,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -81,10 +83,11 @@
             
               
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="search.html" method="get">
@@ -121,7 +124,7 @@
      <tr class="cg-1">
        <td></td>
        <td>   
-       <a href="api/index.html#module-translate.convert"><tt class="xref">translate.convert</tt></a></td><td>
+       <a href="api/convert.html#module-translate.convert"><tt class="xref">translate.convert</tt></a></td><td>
        <em></em></td></tr>
      <tr class="cg-1">
        <td></td>
@@ -386,7 +389,7 @@
      <tr class="cg-1">
        <td></td>
        <td>   
-       <a href="api/index.html#module-translate.filters"><tt class="xref">translate.filters</tt></a></td><td>
+       <a href="api/filters.html#module-translate.filters"><tt class="xref">translate.filters</tt></a></td><td>
        <em></em></td></tr>
      <tr class="cg-1">
        <td></td>
@@ -711,11 +714,6 @@
      <tr class="cg-1">
        <td></td>
        <td>   
-       <a href="api/misc.html#module-translate.misc.selector"><tt class="xref">translate.misc.selector</tt></a></td><td>
-       <em></em></td></tr>
-     <tr class="cg-1">
-       <td></td>
-       <td>   
        <a href="api/misc.html#module-translate.misc.sparse"><tt class="xref">translate.misc.sparse</tt></a></td><td>
        <em></em></td></tr>
      <tr class="cg-1">
@@ -771,7 +769,7 @@
      <tr class="cg-1">
        <td></td>
        <td>   
-       <a href="api/misc.html#module-translate.misc.zipfileext"><tt class="xref">translate.misc.zipfileext</tt></a></td><td>
+       <a href="api/misc.html#module-translate.misc.xmlwrapper"><tt class="xref">translate.misc.xmlwrapper</tt></a></td><td>
        <em></em></td></tr>
      <tr class="cg-1">
        <td></td>
@@ -796,6 +794,11 @@
      <tr class="cg-1">
        <td></td>
        <td>   
+       <a href="api/search.html#module-translate.search.indexing.PyLuceneIndexer1"><tt class="xref">translate.search.indexing.PyLuceneIndexer1</tt></a></td><td>
+       <em></em></td></tr>
+     <tr class="cg-1">
+       <td></td>
+       <td>   
        <a href="api/search.html#module-translate.search.indexing.XapianIndexer"><tt class="xref">translate.search.indexing.XapianIndexer</tt></a></td><td>
        <em></em></td></tr>
      <tr class="cg-1">
@@ -1066,6 +1069,11 @@
      <tr class="cg-1">
        <td></td>
        <td>   
+       <a href="api/storage.html#module-translate.storage.subtitles"><tt class="xref">translate.storage.subtitles</tt></a></td><td>
+       <em></em></td></tr>
+     <tr class="cg-1">
+       <td></td>
+       <td>   
        <a href="api/storage.html#module-translate.storage.symbian"><tt class="xref">translate.storage.symbian</tt></a></td><td>
        <em></em></td></tr>
      <tr class="cg-1">
@@ -1096,7 +1104,7 @@
      <tr class="cg-1">
        <td></td>
        <td>   
-       <a href="api/storage.html#module-translate.storage.ts"><tt class="xref">translate.storage.ts</tt></a></td><td>
+       <a href="api/storage.html#module-translate.storage.ts"><tt class="xref">translate.storage.ts</tt></a></td><td><strong>Deprecated:</strong>
        <em></em></td></tr>
      <tr class="cg-1">
        <td></td>
@@ -1201,11 +1209,6 @@
      <tr class="cg-1">
        <td></td>
        <td>   
-       <a href="api/storage.html#module-translate.storage.xpi"><tt class="xref">translate.storage.xpi</tt></a></td><td>
-       <em></em></td></tr>
-     <tr class="cg-1">
-       <td></td>
-       <td>   
        <a href="api/storage.html#module-translate.storage.zip"><tt class="xref">translate.storage.zip</tt></a></td><td>
        <em></em></td></tr>
      <tr class="cg-1">
@@ -1307,7 +1310,7 @@
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/releases/1.10.0.html b/docs/_build/html/releases/1.10.0.html
new file mode 100644
index 0000000..e26586b
--- /dev/null
+++ b/docs/_build/html/releases/1.10.0.html
@@ -0,0 +1,248 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Translate Toolkit 1.10.0 — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="up" title="Release Notes" href="index.html" />
+    <link rel="next" title="Translate Toolkit 1.9.0 Released" href="1.9.0.html" />
+    <link rel="prev" title="Translate Toolkit 1.11.0-rc1" href="1.11.0-rc1.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Translate Toolkit 1.10.0</a><ul>
+<li><a class="reference internal" href="#highlighted-improvements">Highlighted improvements</a><ul>
+<li><a class="reference internal" href="#most-important-for-pootle">Most important for Pootle</a></li>
+<li><a class="reference internal" href="#formats-and-converters">Formats and Converters</a></li>
+<li><a class="reference internal" href="#version-control-improvements">Version Control improvements</a></li>
+<li><a class="reference internal" href="#checks">Checks</a></li>
+<li><a class="reference internal" href="#language-specific-fixes">Language specific fixes</a></li>
+<li><a class="reference internal" href="#documentation">Documentation</a></li>
+<li><a class="reference internal" href="#mozilla-tooling-fixes">Mozilla tooling fixes</a></li>
+<li><a class="reference internal" href="#contributors">Contributors</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="1.11.0-rc1.html"
+         title="previous chapter">« Translate Toolkit 1.11.0-rc1</a></li>
+  <li><a href="1.9.0.html"
+         title="next chapter">Translate Toolkit 1.9.0 Released »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="translate-toolkit-1-10-0">
+<h1>Translate Toolkit 1.10.0<a class="headerlink" href="#translate-toolkit-1-10-0" title="Permalink to this headline">¶</a></h1>
+<p><em>Released on 12 March 2013</em></p>
+<p>This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes for the
+upcoming <a class="reference external" href="http://pootle.translatehouse.org/">Pootle</a> 2.5.0.</p>
+<p>It is just over a year since the last release so there are many improvements
+across the board.  A number of people contributed to this release and we’ve
+tried to credit them wherever possible (sorry if somehow we missed you).</p>
+<div class="section" id="highlighted-improvements">
+<h2>Highlighted improvements<a class="headerlink" href="#highlighted-improvements" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Android format support</li>
+<li>Version control improvements</li>
+<li>Source now on Github - all our code is now on github</li>
+<li>Documentation - migrated all from our wiki into the code and Read The Docs</li>
+<li>Continuous Integration using Travis</li>
+</ul>
+<div class="section" id="most-important-for-pootle">
+<h3>Most important for Pootle<a class="headerlink" href="#most-important-for-pootle" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Version control improvements</li>
+<li>Categorize pofilter checks into critical, functional, cosmetic, etc</li>
+</ul>
+</div>
+<div class="section" id="formats-and-converters">
+<h3>Formats and Converters<a class="headerlink" href="#formats-and-converters" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Android format support [Michal Čihař]</li>
+<li>Mozilla .lang, many improvements</li>
+<li>PHP support for defintions, // comments and improved whitespace preservation</li>
+<li>PO: X-Merge-On header to explicitly demand a conversion strategy instead of
+guessing</li>
+<li>.properties: BOMs in messages and C style comments [Roman Imankulov]</li>
+<li>Mac OS String formatting improved [Roman Imankulov]</li>
+</ul>
+</div>
+<div class="section" id="version-control-improvements">
+<h3>Version Control improvements<a class="headerlink" href="#version-control-improvements" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Interface for adding files to a repository & Implement .add() for all VCSs.</li>
+<li>Caching of VC version info</li>
+<li>Don’t look for VCS if it’s not available</li>
+<li>Stop looking for VCS at a given parent</li>
+<li>Subversion VC tests</li>
+<li>Alway pass -m to ‘commit’ in Subversion to prevent blocking</li>
+</ul>
+</div>
+<div class="section" id="checks">
+<h3>Checks<a class="headerlink" href="#checks" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>New OpenOffice variables style used in extensions</li>
+<li>Check for self-closing tags in the xmltags test [Seb M].</li>
+<li>GConf test fixes</li>
+<li>Terminology checker type for future terminology features</li>
+<li>Categorize pofilter checks into critical, functional, cosmetic, etc</li>
+<li>Added support for Objective-C %@ printf specifiers</li>
+</ul>
+</div>
+<div class="section" id="language-specific-fixes">
+<h3>Language specific fixes<a class="headerlink" href="#language-specific-fixes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Correct plurals: Scottish Gaelic (gd), Irish</li>
+<li>Plural rules: Fulah, Brazilian Portuguese</li>
+<li>Punctuation rules and tests to ignore for: Burmese, Urdu, Afrikaans, Wolof</li>
+</ul>
+</div>
+<div class="section" id="documentation">
+<h3>Documentation<a class="headerlink" href="#documentation" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Moved to Git and we are now using reStructured Text and Sphinx</li>
+<li>Published in Read The Docs (RTD).</li>
+<li>Old wiki migrated to RTD.</li>
+<li>New clean theme for documentation and website</li>
+<li>API and code epydoc moved to reStructured Text.</li>
+<li>Translate code Style Guide written</li>
+</ul>
+</div>
+<div class="section" id="mozilla-tooling-fixes">
+<h3>Mozilla tooling fixes<a class="headerlink" href="#mozilla-tooling-fixes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Mozilla specific test for dialog size settings</li>
+<li>Gaia properties dialect and plural handling</li>
+<li>Fixes and imporovement to the Firefox build scripts</li>
+<li>Improved accesskey detection</li>
+<li>Improved DTD escaping for &quote, %, etc</li>
+<li>Improvement of DTD to align with Base classes</li>
+<li>Support new {{xx}} variable style introduced in PDF viewer</li>
+</ul>
+<p>...and refactoring, PEP8, test coverage and of course many many bugfixes.</p>
+</div>
+<div class="section" id="contributors">
+<h3>Contributors<a class="headerlink" href="#contributors" title="Permalink to this headline">¶</a></h3>
+<p>This release was made possible by the following people:</p>
+<p>Dwayne Bailey, Friedel Wolff, Leandro Regueiro, Julen Ruiz Aizpuru,
+Michal Čihař, Roman Imankulov, Alexander Dupuy, Frank Tetzel,
+Luiz Fernando Ranghetti, Laurette Pretorius, Jiro Matsuzawa, Henrik Saari,
+Luca De Petrillo, Khaled Hosny, Dave Dash & Chris Oelmueller.</p>
+<p>And to all our bug finder, testers and <a class="reference external" href="http://pootle.locamotion.org/projects/pootle/">localisers</a>, a Very BIG Thank You.</p>
+</div>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/releases/1.11.0-rc1.html b/docs/_build/html/releases/1.11.0-rc1.html
new file mode 100644
index 0000000..81dfd45
--- /dev/null
+++ b/docs/_build/html/releases/1.11.0-rc1.html
@@ -0,0 +1,275 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Translate Toolkit 1.11.0-rc1 — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="up" title="Release Notes" href="index.html" />
+    <link rel="next" title="Translate Toolkit 1.10.0" href="1.10.0.html" />
+    <link rel="prev" title="Translate Toolkit 1.11.0" href="1.11.0.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Translate Toolkit 1.11.0-rc1</a><ul>
+<li><a class="reference internal" href="#highlighted-improvements">Highlighted improvements</a><ul>
+<li><a class="reference internal" href="#major-changes">Major changes</a></li>
+<li><a class="reference internal" href="#formats-and-converters">Formats and Converters</a></li>
+<li><a class="reference internal" href="#language-specific-fixes">Language specific fixes</a></li>
+<li><a class="reference internal" href="#checks">Checks</a></li>
+<li><a class="reference internal" href="#mozilla-tooling-fixes">Mozilla tooling fixes</a></li>
+<li><a class="reference internal" href="#general">General</a></li>
+<li><a class="reference internal" href="#contributors">Contributors</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="1.11.0.html"
+         title="previous chapter">« Translate Toolkit 1.11.0</a></li>
+  <li><a href="1.10.0.html"
+         title="next chapter">Translate Toolkit 1.10.0 »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="translate-toolkit-1-11-0-rc1">
+<h1>Translate Toolkit 1.11.0-rc1<a class="headerlink" href="#translate-toolkit-1-11-0-rc1" title="Permalink to this headline">¶</a></h1>
+<p><em>Released on 28 November 2013</em></p>
+<p>This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes and
+optimizations for the upcoming <a class="reference external" href="http://pootle.translatehouse.org/">Pootle</a>
+2.5.1 and <a class="reference external" href="http://virtaal.translatehouse.org">Virtaal</a> releases.</p>
+<p>It is just over a eight months since the last release and there are many
+improvements across the board.  A number of people contributed to this release
+and we’ve tried to credit them wherever possible (sorry if somehow we missed
+you).</p>
+<div class="section" id="highlighted-improvements">
+<h2>Highlighted improvements<a class="headerlink" href="#highlighted-improvements" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="major-changes">
+<h3>Major changes<a class="headerlink" href="#major-changes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>The PO format now matches Gettext more closely</li>
+<li>PHP format adds a number of new features</li>
+<li>Support for Python 2.5 has been dropped</li>
+</ul>
+</div>
+<div class="section" id="formats-and-converters">
+<h3>Formats and Converters<a class="headerlink" href="#formats-and-converters" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Gettext PO:<ul>
+<li>cPO now handles fuzzy obsolete messages correctly</li>
+<li>Line wrapping improvement allow PO files to more closely match Gettext</li>
+<li>Optimization to increase performance</li>
+</ul>
+</li>
+<li>PHP:<ul>
+<li>Warn about duplicate entries</li>
+<li>Allow blank spaces in array declaration (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2646">bug 2646</a>)</li>
+<li>Support nested arrays (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2240">bug 2240</a>)</li>
+</ul>
+</li>
+<li>XLIFF:<ul>
+<li>Correctly parse XLIFF 1.2</li>
+</ul>
+</li>
+<li>Properties<ul>
+<li>Blank source text is now always translated</li>
+<li>Fuzzy units are discarded with –remove-untranslated</li>
+<li>prop2po no longer drops entries that are translated the same as the source</li>
+</ul>
+</li>
+<li>TMX:<ul>
+<li>po2tmx support comments</li>
+</ul>
+</li>
+<li>Android:<ul>
+<li>Detect untranslatable resource strings</li>
+<li>Various format improvements</li>
+</ul>
+</li>
+<li>New conversion options:<ul>
+<li><em class="xref std std-option">--timestamp</em> – skip conversion if the output file has a newer
+timestamp (Makefile-alike)</li>
+<li><em class="xref std std-option">--threshold</em> – in po2* converters this allows you to specify a
+percentage complete threshold.  If the PO files passes this theshold then
+the file is output (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2998">bug 2998</a>)</li>
+<li><em class="xref std std-option">--removeuntranslated</em> – Extend this option to po2dtd and thus
+po2moz – don’t output untranslated text (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=1718">bug 1718</a>)</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="language-specific-fixes">
+<h3>Language specific fixes<a class="headerlink" href="#language-specific-fixes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>The toolkit now supports: Sakha, N’ko, Turkish, improvements for Bengali &
+Hindi</li>
+<li>Pootle special characters are now stored on Toolkit and available for other
+tools to use</li>
+<li>Rules for language <tt class="docutils literal"><span class="pre">ab</span></tt> are now available for language <tt class="docutils literal"><span class="pre">ab_CD</span></tt></li>
+</ul>
+</div>
+<div class="section" id="checks">
+<h3>Checks<a class="headerlink" href="#checks" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Spelling test improvements including speed and optimization</li>
+<li>Reduce false positive for the filepath test in cases of self closing tags
+e.g. <tt class="docutils literal"><span class="pre"><br</span> <span class="pre">/></span></tt></li>
+<li>Lowered the accelerator check severity to reduce false positive impact</li>
+</ul>
+</div>
+<div class="section" id="mozilla-tooling-fixes">
+<h3>Mozilla tooling fixes<a class="headerlink" href="#mozilla-tooling-fixes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Better decoding of some characters in DTD e.g » and &x0022 (”)</li>
+<li>.lang – Improved support for untranslated entries</li>
+<li><tt class="docutils literal"><span class="pre">buildxpi</span></tt>:<ul>
+<li>Can now build multiple languages at once (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2999">bug 2999</a>)</li>
+<li>Set a max product version to allow the language pack to continue to work
+once the browser version has moved out of Aurora channel</li>
+</ul>
+</li>
+<li>Dropped native XPI building support (untested and no longer used)</li>
+<li>Add Mozilla plural formulas, in time we’ll handle Mozilla plurals correctly</li>
+</ul>
+</div>
+<div class="section" id="general">
+<h3>General<a class="headerlink" href="#general" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Dropped support for Python 2.5 – 2.5 has reached end-of-life</li>
+<li>Dropped psyco support – it is no longer maintained</li>
+<li>Use logging throught instead of <tt class="docutils literal"><span class="pre">sys.stderr</span></tt></li>
+<li>Lots of cleanups on docs: TBX, PHP, added Android and JSON docs</li>
+<li>Use requirements files for documenting all requirements and make it easy to
+install Translate Toolkit using <tt class="docutils literal"><span class="pre">pip</span></tt></li>
+<li>Added some functional tests</li>
+<li>Improve searching to find words with hyphens</li>
+<li>Choose the closest repo in nested VCS</li>
+<li>Test suite down to zero failing tests</li>
+</ul>
+<p>...and loads of internal changes to improve maintainability, remove unused
+imports, remove unused code and general code cleanups, some changes to ensure
+future Python 3 portability and of course many many bugfixes.</p>
+</div>
+<div class="section" id="contributors">
+<h3>Contributors<a class="headerlink" href="#contributors" title="Permalink to this headline">¶</a></h3>
+<p>This release was made possible by the following people:</p>
+<p>Dwayne Bailey, Leandro Regueiro, Alexander Dupuy, Friedel Wolff, Khaled Hosny,
+Michal Čihař, Jordi Mas, Stuart Prescott, Trung Ngo, Ronald Sterckx, Rail
+Aliev, Michael Schlenker, Martin-Zack Mekkaoui, Iskren Chernev, Luiz Fernando
+Ranghetti & Christian Hitz</p>
+<p>And to all our bug finders, testers and <a class="reference external" href="http://pootle.locamotion.org/projects/pootle/">localisers</a>, a Very BIG Thank You.</p>
+</div>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/releases/1.11.0.html b/docs/_build/html/releases/1.11.0.html
new file mode 100644
index 0000000..2f24e55
--- /dev/null
+++ b/docs/_build/html/releases/1.11.0.html
@@ -0,0 +1,285 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Translate Toolkit 1.11.0 — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="up" title="Release Notes" href="index.html" />
+    <link rel="next" title="Translate Toolkit 1.11.0-rc1" href="1.11.0-rc1.html" />
+    <link rel="prev" title="Release Notes" href="index.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Translate Toolkit 1.11.0</a><ul>
+<li><a class="reference internal" href="#highlighted-improvements">Highlighted improvements</a><ul>
+<li><a class="reference internal" href="#vs-1-11-0-rc1">1.11.0 vs 1.11.0-rc1</a></li>
+<li><a class="reference internal" href="#major-changes">Major changes</a></li>
+<li><a class="reference internal" href="#formats-and-converters">Formats and Converters</a></li>
+<li><a class="reference internal" href="#language-specific-fixes">Language specific fixes</a></li>
+<li><a class="reference internal" href="#checks">Checks</a></li>
+<li><a class="reference internal" href="#mozilla-tooling-fixes">Mozilla tooling fixes</a></li>
+<li><a class="reference internal" href="#general">General</a></li>
+<li><a class="reference internal" href="#contributors">Contributors</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="index.html"
+         title="previous chapter">« Release Notes</a></li>
+  <li><a href="1.11.0-rc1.html"
+         title="next chapter">Translate Toolkit 1.11.0-rc1 »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="translate-toolkit-1-11-0">
+<h1>Translate Toolkit 1.11.0<a class="headerlink" href="#translate-toolkit-1-11-0" title="Permalink to this headline">¶</a></h1>
+<p><em>Released on 22 January 2014</em></p>
+<p>This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes and
+optimizations for the upcoming <a class="reference external" href="http://pootle.translatehouse.org/">Pootle</a>
+2.5.1 and <a class="reference external" href="http://virtaal.translatehouse.org">Virtaal</a> releases.</p>
+<p>It is just over a ten months since the last release and there are many
+improvements across the board.  A number of people contributed to this release
+and we’ve tried to credit them wherever possible (sorry if somehow we missed
+you).</p>
+<div class="section" id="highlighted-improvements">
+<h2>Highlighted improvements<a class="headerlink" href="#highlighted-improvements" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="vs-1-11-0-rc1">
+<h3>1.11.0 vs 1.11.0-rc1<a class="headerlink" href="#vs-1-11-0-rc1" title="Permalink to this headline">¶</a></h3>
+<p>Changes since 1.11.0 RC1:</p>
+<ul class="simple">
+<li>Improve handling of escapes in wrapping</li>
+<li>Handle a broken version of python-Levenshtein</li>
+<li>Output HTML source in po2html when a unit is fuzzy (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=3145">bug 3145</a>)</li>
+</ul>
+</div>
+<div class="section" id="major-changes">
+<h3>Major changes<a class="headerlink" href="#major-changes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>The PO format now matches Gettext more closely</li>
+<li>PHP format adds a number of new features</li>
+<li>Support for Python 2.5 has been dropped</li>
+</ul>
+</div>
+<div class="section" id="formats-and-converters">
+<h3>Formats and Converters<a class="headerlink" href="#formats-and-converters" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Gettext PO:<ul>
+<li>cPO now handles fuzzy obsolete messages correctly</li>
+<li>Line wrapping improvement allow PO files to more closely match Gettext</li>
+<li>Optimization to increase performance</li>
+</ul>
+</li>
+<li>PHP:<ul>
+<li>Warn about duplicate entries</li>
+<li>Allow blank spaces in array declaration (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2646">bug 2646</a>)</li>
+<li>Support nested arrays (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2240">bug 2240</a>)</li>
+</ul>
+</li>
+<li>XLIFF:<ul>
+<li>Correctly parse XLIFF 1.2</li>
+</ul>
+</li>
+<li>Properties<ul>
+<li>Blank source text is now always translated</li>
+<li>Fuzzy units are discarded with –remove-untranslated</li>
+<li>prop2po no longer drops entries that are translated the same as the source</li>
+</ul>
+</li>
+<li>TMX:<ul>
+<li>po2tmx support comments</li>
+</ul>
+</li>
+<li>Android:<ul>
+<li>Detect untranslatable resource strings</li>
+<li>Various format improvements</li>
+</ul>
+</li>
+<li>New conversion options:<ul>
+<li><em class="xref std std-option">--timestamp</em> – skip conversion if the output file has a newer
+timestamp (Makefile-alike)</li>
+<li><em class="xref std std-option">--threshold</em> – in po2* converters this allows you to specify a
+percentage complete threshold.  If the PO files passes this theshold then
+the file is output (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2998">bug 2998</a>)</li>
+<li><em class="xref std std-option">--removeuntranslated</em> – Extend this option to po2dtd and thus
+po2moz – don’t output untranslated text (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=1718">bug 1718</a>)</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="language-specific-fixes">
+<h3>Language specific fixes<a class="headerlink" href="#language-specific-fixes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>The toolkit now supports: Sakha, N’ko, Turkish, improvements for Bengali &
+Hindi</li>
+<li>Pootle special characters are now stored on Toolkit and available for other
+tools to use</li>
+<li>Rules for language <tt class="docutils literal"><span class="pre">ab</span></tt> are now available for language <tt class="docutils literal"><span class="pre">ab_CD</span></tt></li>
+</ul>
+</div>
+<div class="section" id="checks">
+<h3>Checks<a class="headerlink" href="#checks" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Spelling test improvements including speed and optimization</li>
+<li>Reduce false positive for the filepath test in cases of self closing tags
+e.g. <tt class="docutils literal"><span class="pre"><br</span> <span class="pre">/></span></tt></li>
+<li>Lowered the accelerator check severity to reduce false positive impact</li>
+</ul>
+</div>
+<div class="section" id="mozilla-tooling-fixes">
+<h3>Mozilla tooling fixes<a class="headerlink" href="#mozilla-tooling-fixes" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Better decoding of some characters in DTD e.g » and &x0022 (”)</li>
+<li>.lang – Improved support for untranslated entries</li>
+<li><tt class="docutils literal"><span class="pre">buildxpi</span></tt>:<ul>
+<li>Can now build multiple languages at once (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=2999">bug 2999</a>)</li>
+<li>Set a max product version to allow the language pack to continue to work
+once the browser version has moved out of Aurora channel</li>
+</ul>
+</li>
+<li>Dropped native XPI building support (untested and no longer used)</li>
+<li>Add Mozilla plural formulas, in time we’ll handle Mozilla plurals correctly</li>
+</ul>
+</div>
+<div class="section" id="general">
+<h3>General<a class="headerlink" href="#general" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Dropped support for Python 2.5 – 2.5 has reached end-of-life</li>
+<li>Dropped psyco support – it is no longer maintained</li>
+<li>Use logging throught instead of <tt class="docutils literal"><span class="pre">sys.stderr</span></tt></li>
+<li>Lots of cleanups on docs: TBX, PHP, added Android and JSON docs</li>
+<li>Use requirements files for documenting all requirements and make it easy to
+install Translate Toolkit using <tt class="docutils literal"><span class="pre">pip</span></tt></li>
+<li>Added some functional tests</li>
+<li>Improve searching to find words with hyphens</li>
+<li>Choose the closest repo in nested VCS</li>
+<li>Test suite down to zero failing tests</li>
+</ul>
+<p>...and loads of internal changes to improve maintainability, remove unused
+imports, remove unused code and general code cleanups, some changes to ensure
+future Python 3 portability and of course many many bugfixes.</p>
+</div>
+<div class="section" id="contributors">
+<h3>Contributors<a class="headerlink" href="#contributors" title="Permalink to this headline">¶</a></h3>
+<p>This release was made possible by the following people:</p>
+<p>Dwayne Bailey, Leandro Regueiro, Alexander Dupuy, Friedel Wolff, Khaled Hosny,
+Michal Čihař, Jordi Mas, Stuart Prescott, Trung Ngo, Ronald Sterckx, Rail
+Aliev, Michael Schlenker, Martin-Zack Mekkaoui, Iskren Chernev, Luiz Fernando
+Ranghetti & Christian Hitz</p>
+<p>And to all our bug finders, testers and <a class="reference external" href="http://pootle.locamotion.org/projects/pootle/">localisers</a>, a Very BIG Thank You.</p>
+</div>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/releases/1.11.1.html b/docs/_build/html/releases/1.11.1.html
new file mode 100644
index 0000000..1fe05f1
--- /dev/null
+++ b/docs/_build/html/releases/1.11.1.html
@@ -0,0 +1,435 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title><no title> — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul class="simple">
+</ul>
+</ul>
+</li>
+            
+            
+              
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <p>commit 14820c4b20ce90cd4e5681d7ee1a8bdcc3dda352
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Jan 29 10:41:07 2014 +0000</p>
+<blockquote>
+<div><p>PHP: Another array variant</p>
+<p>If we see arrray() then we don’t assume that the user will be using
+array synx x => y but rather leave parsing as normal.</p>
+</div></blockquote>
+<p>commit 589b217e41e952e2f73ac99f48eb00f88c4fd6db
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Fri Jan 24 22:23:45 2014 +0100</p>
+<blockquote>
+<div>Styleguide: Add guideline on using opposite quoting to avoid escaping</div></blockquote>
+<p>commit 5f12db1efe410d1f895d24c526fc9ecd7dbe3ade
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Fri Jan 24 22:23:07 2014 +0100</p>
+<blockquote>
+<div>Styleguide: Add guideline on using single quoted strings for dict keys</div></blockquote>
+<p>commit 91d3aa2f3f6dbef89313aa18b236eb88e1ea69c1
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Fri Jan 24 21:52:56 2014 +0000</p>
+<blockquote>
+<div><p>Drop obsolete __future__ imports</p>
+<ul class="simple">
+<li>Generators became mandatory in Python 2.3</li>
+<li>with statement mandatory in 2.6</li>
+</ul>
+<p>Since Python 2.6 is our minimum supported version we can drop these.</p>
+</div></blockquote>
+<p>commit c06d50d589b53a4df475821b5c089a27cccbcfc7
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Fri Jan 24 22:02:38 2014 +0000</p>
+<blockquote>
+<div>Clarify that Python 2.6 is our new minimum</div></blockquote>
+<p>commit bef763fea1c399c3a6cd953759d7e2e66f689615
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Fri Jan 24 22:19:35 2014 +0100</p>
+<blockquote>
+<div>Styleguide: Add section to encompass all Python guidelines</div></blockquote>
+<p>commit ae422ae7435ff44025f53b31662d398e85334951
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 16:22:41 2013 +0000</p>
+<blockquote>
+<div><p>pypy: Enable travis testing for pypy</p>
+<p>Travis allows failures in pypy tests</p>
+<p>Note: lxml was a blocker but seems to build now</p>
+</div></blockquote>
+<p>commit e66f77715540c7572493fa6afc5be8f3b86c0961
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Thu Nov 28 03:06:24 2013 +0000</p>
+<blockquote>
+<div>PEP8: E303 too many blank lines</div></blockquote>
+<p>commit dbbff4612eb8788ad10859ef7aba34e7bd1f3f28
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Thu Nov 28 03:04:06 2013 +0000</p>
+<blockquote>
+<div>PEP8: W291 trailing whitespace</div></blockquote>
+<p>commit 267c811a4990a2e097fd0bd970a88e3f991dda55
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Thu Nov 28 03:01:33 2013 +0000</p>
+<blockquote>
+<div>PEP8: E124 closing bracket does not match visual indentation</div></blockquote>
+<p>commit 1ec84e9baa13e417a2bd2c4856fb185114a8e035
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Thu Nov 28 02:41:47 2013 +0000</p>
+<blockquote>
+<div>PEP8: E501 line too long</div></blockquote>
+<p>commit bd25be2fdc125e968dda29727928fea4593980f8
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Thu Nov 28 02:15:18 2013 +0000</p>
+<blockquote>
+<div>PEP8: E502 the backslash is redundant between brackets</div></blockquote>
+<p>commit adc1681ce6d093555422c91190438ab786cbe92d
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Thu Nov 28 01:47:23 2013 +0000</p>
+<blockquote>
+<div>PEP8: E302 expected 2 blank lines, found 1</div></blockquote>
+<p>commit 8380295f2702c73c528329616c7607daa71f7c28
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Thu Nov 28 01:43:01 2013 +0000</p>
+<blockquote>
+<div>PEP8: E301 expected 1 blank line, found 0</div></blockquote>
+<p>commit d2a26f871863948a536c5d10746889c7ddc41813
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 19:10:39 2013 +0000</p>
+<blockquote>
+<div>PEP8: W293 blank line contains whitespace</div></blockquote>
+<p>commit 65b6031556881a153e26be465e9a876cc341b60b
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 18:50:01 2013 +0000</p>
+<blockquote>
+<div>PEP8: E124 closing bracket does not match visual indentation</div></blockquote>
+<p>commit daca9c9cace0eed25f0feea4464043c134cee57e
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 18:45:19 2013 +0000</p>
+<blockquote>
+<div>PEP8: E123 closing bracket does not match indentation of opening bracket’s line</div></blockquote>
+<p>commit 09e9f701994cc649fdcb73cefa34ede319a0b1ac
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 18:35:45 2013 +0000</p>
+<blockquote>
+<div>PEP8: E122 continuation line missing indentation or outdented</div></blockquote>
+<p>commit 33d969f2502204e5dae216343bc723c005191151
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 18:10:57 2013 +0000</p>
+<blockquote>
+<div>PEP8: E251 unexpected spaces around keyword / parameter equals</div></blockquote>
+<p>commit fdef31274c46426b9d4ab05767e7209a1550a79d
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:52:29 2013 +0000</p>
+<blockquote>
+<div>PEP8: E272 multiple spaces before keyword</div></blockquote>
+<p>commit bfe9527b075decf2015ea9e70f1e0284529d630f
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:51:07 2013 +0000</p>
+<blockquote>
+<div>PEP8: E271 multiple spaces after keyword</div></blockquote>
+<p>commit 0eb9562ea6cc86643f615aef863b32495cc10eef
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:50:14 2013 +0000</p>
+<blockquote>
+<div>PEP8: E261 at least two spaces before inline comment</div></blockquote>
+<p>commit fcc19cee8107478e0a8e2c21917112793b39ed68
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:48:08 2013 +0000</p>
+<blockquote>
+<div><p>PEP8: E712 comparison to True/False</p>
+<p>Fixes to poheader.py break things so are left out for now</p>
+</div></blockquote>
+<p>commit f26bf7013836e3167593675e8bc21941790af7d5
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:37:16 2013 +0000</p>
+<blockquote>
+<div>PEP8: E225 missing whitespace around operator</div></blockquote>
+<p>commit ea2103d71585619a39ebed436249e6b336033391
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:22:32 2013 +0000</p>
+<blockquote>
+<div>PEP8: W293 blank line contains whitespace</div></blockquote>
+<p>commit 53450c4b98d61e653c0d11d508c2d870816f93b2
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:11:04 2013 +0000</p>
+<blockquote>
+<div>PEP8: E202 whitespace before ‘]’</div></blockquote>
+<p>commit 1b1914d0642e792f0443eff3588c7268f33c1a6c
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 17:05:56 2013 +0000</p>
+<blockquote>
+<div>PEP8: W191 indentation contains tabs</div></blockquote>
+<p>commit 2c36d05aac6eaf0b3131b8026393999ebc8b0b75
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 16:40:42 2013 +0000</p>
+<blockquote>
+<div>PEP8: E711 comparison to None</div></blockquote>
+<p>commit c39b7aa54138275aa0c40ccd5d058c790cd1e503
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:29:41 2013 +0000</p>
+<blockquote>
+<div>PEP8: E502 the backslash is redundant between brackets</div></blockquote>
+<p>commit 20d5708f53245f6aaaddc1267660026dfb6c191a
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:19:04 2013 +0000</p>
+<blockquote>
+<div>PEP8: E302 expected 2 blank lines, found 1</div></blockquote>
+<p>commit 674f5e44426e1cb8a556a409996deaec12c6db15
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:11:31 2013 +0000</p>
+<blockquote>
+<div>PEP8: W391 blank line at end of file</div></blockquote>
+<p>commit d6306a900928760c2abb82b749293d5dd12e0255
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:10:24 2013 +0000</p>
+<blockquote>
+<div>PEP8: E225 missing whitespace around operator</div></blockquote>
+<p>commit 0b59be74efbf21a2c7628bd05ef51d26d65eab2a
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:08:53 2013 +0000</p>
+<blockquote>
+<div>PEP8: E272 multiple spaces before keyword</div></blockquote>
+<p>commit d998eae808223a7f00c71e8e378a1f6465f01a51
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:07:29 2013 +0000</p>
+<blockquote>
+<div>PEP8: E271 multiple spaces after keyword</div></blockquote>
+<p>commit 87136a6a74a4c3978d8e9f0062604a86aeec04e7
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:04:34 2013 +0000</p>
+<blockquote>
+<div>PEP8: E261 at least two spaces before inline comment</div></blockquote>
+<p>commit fbb1dfb18458b999872ccd9ffdcfce6b0cdaedc5
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 03:02:20 2013 +0000</p>
+<blockquote>
+<div>PEP8: W293 blank line contains whitespace</div></blockquote>
+<p>commit d09c9ac1c43a1556e030492496ae6f022c49dc6d
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 02:58:40 2013 +0000</p>
+<blockquote>
+<div>PEP8: W291 trailing whitespace</div></blockquote>
+<p>commit 6a1f00edba962d6bcc20668d9acd8d95e396f9fa
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sat Nov 23 02:42:17 2013 +0000</p>
+<blockquote>
+<div>PEP8: E101 indentation contains mixed spaces and tabs</div></blockquote>
+<p>commit 76cb4dc58a551e192c60a862ad447c155deef3c2
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 19:24:10 2013 +0000</p>
+<blockquote>
+<div>PEP8: Travis runs pep8 checks and builds docs</div></blockquote>
+<p>commit 6be74539ebf89c4c38478f51e17de8c090f5a00f
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Jan 22 14:18:04 2014 +0000</p>
+<blockquote>
+<div>PEP8: make tool usable by Pootle and Toolkit</div></blockquote>
+<p>commit 5a740909953d86291f6bfe09ef447bb2974ee48a
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Nov 27 19:14:41 2013 +0000</p>
+<blockquote>
+<div><p>PEP8: A pep8 test wrapper</p>
+<p>Has the following features:
+- Excludes files we don’t want to check e.g. those we don’t maintain.
+- Allow you to test all of the Toolkit or just a single file.
+- Check everything, a type of check or a travis selection, where travis means</p>
+<blockquote>
+<div>checks we that are consistent and we think you should pass when you check in
+code.</div></blockquote>
+</div></blockquote>
+<p>commit fca4078bfc819f58f8fe9048e5ae41dfb56ecbac
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Jan 22 21:46:05 2014 +0000</p>
+<blockquote>
+<div>Bump version to 0.11.0 final</div></blockquote>
+<p>commit deb64f104a8b8b92e71a3a04c689d83d2a9c34ca
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Jan 22 17:02:27 2014 +0000</p>
+<blockquote>
+<div>Add 1.11.0 release notes</div></blockquote>
+<p>commit f4076e317420373760697dec04a3e399063d65f4
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Jan 22 22:58:38 2014 +0000</p>
+<blockquote>
+<div>Update releasing docs post 1.11.0</div></blockquote>
+<p>commit 681628f9570c6506edb0ea1ce4d6a28693b610f3
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Jan 22 15:07:55 2014 +0000</p>
+<blockquote>
+<div><p>Allow older python-Levenshtein to be used</p>
+<p>Just prohibit the broken version of python-Levenshtein. But all others
+are still valid.</p>
+</div></blockquote>
+<p>commit ed9298bb97e649e2afd6cb7234a84b20aa18b45d
+Author: Khaled Hosny <<a class="reference external" href="mailto:khaledhosny%40eglug.org">khaledhosny<span>@</span>eglug<span>.</span>org</a>>
+Date:   Thu Dec 19 15:51:08 2013 +0200</p>
+<blockquote>
+<div>Exclude ALSA, too</div></blockquote>
+<p>commit 24e7114f49349833658f2bcc0c6eab0922f41db8
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Wed Dec 18 21:32:26 2013 +0000</p>
+<blockquote>
+<div>Exclude pulse audio when building XPI</div></blockquote>
+<p>commit fb00c82ceb93a71d17f8e8744d1a7d7bb6162bfe
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Wed Dec 4 18:17:42 2013 +0100</p>
+<blockquote>
+<div>Extend NewlinePlaceable to support more cases</div></blockquote>
+<p>commit e52e6fa1387bd14d403bafc839c576bae2608a70
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Mon Dec 2 14:42:08 2013 +0000</p>
+<blockquote>
+<div>PEP8: fix some tab whitespace errors</div></blockquote>
+<p>commit d29002e4083e40368f94accfd0bc13b495f48ca9
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Mon Dec 2 14:27:12 2013 +0000</p>
+<blockquote>
+<div><p>Improve po2tmx for cPO and fPO</p>
+<p>Slight changes to code and tests to ensure that the extraction works for other
+PO parsers.</p>
+</div></blockquote>
+<p>commit 2cdf3e29496af76a8bd0190be8b1bfa4e08d166f
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sun Dec 1 19:58:01 2013 +0000</p>
+<blockquote>
+<div>Release: retrieve the releasers sourceforge username</div></blockquote>
+<p>commit c160dff91e1a93c9d0de50f45bbb15d845c8df7f
+Author: Dwayne Bailey <<a class="reference external" href="mailto:dwayne%40translate.org.za">dwayne<span>@</span>translate<span>.</span>org<span>.</span>za</a>>
+Date:   Sun Dec 1 19:56:55 2013 +0000</p>
+<blockquote>
+<div>Docs: Toolkit born circa 2002</div></blockquote>
+<p>commit 586250c6d57200eae6651fc5db9cdd34ed9c9afd
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Sun Dec 1 20:00:27 2013 +0100</p>
+<blockquote>
+<div>Minor change in Travis config</div></blockquote>
+<p>commit cbb2435f108b485d1ba6038aaf7193e14dc46ed2
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Sun Dec 1 19:26:52 2013 +0100</p>
+<blockquote>
+<div>Cleanups</div></blockquote>
+<p>commit a7bbe0602d429e714dc1d1abd7086011cd132904
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Sun Dec 1 18:34:20 2013 +0100</p>
+<blockquote>
+<div>Cleanups</div></blockquote>
+<p>commit 696821f95b375e036530cdf1915a935392e24103
+Author: Leandro Regueiro <<a class="reference external" href="mailto:leandro.regueiro%40gmail.com">leandro<span>.</span>regueiro<span>@</span>gmail<span>.</span>com</a>>
+Date:   Sat Nov 30 14:44:52 2013 +0100</p>
+<blockquote>
+<div><p>Travis: Install the development requirements</p>
+<p>Previously used requirements was not providing pytest nor Sphinx.</p>
+</div></blockquote>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2002-2013, Translate.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/releases/1.8.1.html b/docs/_build/html/releases/1.8.1.html
new file mode 100644
index 0000000..4283af2
--- /dev/null
+++ b/docs/_build/html/releases/1.8.1.html
@@ -0,0 +1,191 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Translate Toolkit 1.8.1 — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="up" title="Release Notes" href="index.html" />
+    <link rel="next" title="History of the Translate Toolkit" href="../history.html" />
+    <link rel="prev" title="Translate Toolkit 1.9.0 Released" href="1.9.0.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Translate Toolkit 1.8.1</a><ul>
+<li><a class="reference internal" href="#highlighted-improvements">Highlighted improvements</a></li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="1.9.0.html"
+         title="previous chapter">« Translate Toolkit 1.9.0 Released</a></li>
+  <li><a href="../history.html"
+         title="next chapter">History of the Translate Toolkit »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="translate-toolkit-1-8-1">
+<h1>Translate Toolkit 1.8.1<a class="headerlink" href="#translate-toolkit-1-8-1" title="Permalink to this headline">¶</a></h1>
+<p><em>Released on 19 Novermber 2010</em></p>
+<p>Today the Translate team released version 1.8.1 of the Translate Toolkit.  The
+Translate Toolkit contains many useful tools for translation, management, and
+quality control. It is the technology platform for Pootle, Virtaal, and other
+software.</p>
+<p>This release contains many improvements and bug fixes. It is a recommended
+upgrade for users of Pootle and Virtaal. There were over 200 commits since
+version 1.8.0.</p>
+<dl class="docutils">
+<dt>This work was made possible by volunteers and our funders:</dt>
+<dd><ul class="first last simple">
+<li><a class="reference external" href="http://africanlocalisation.net/">ANLoc</a>, funded by IDRC</li>
+</ul>
+</dd>
+</dl>
+<div class="section" id="highlighted-improvements">
+<h2>Highlighted improvements<a class="headerlink" href="#highlighted-improvements" title="Permalink to this headline">¶</a></h2>
+<p>File formats:</p>
+<ul class="simple">
+<li>A rewrite and major improvement of the html format and <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/html2po.html">html2po</a> converter</li>
+<li>New JSON format introduced</li>
+<li>Support for <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/utx.html">Universal Terminology Exchange (UTX)</a> format</li>
+<li>Support for <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/properties.html">Java properties</a> files encoded in UTF-8</li>
+<li>Improvements to <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/csv.html">CSV</a> format, and improved compatibility with Excel exports</li>
+<li>Bug fixes to <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/ts.html">Qt .ts</a></li>
+<li>Support for <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/xliff.html">XLIFF</a>‘s state attributes (<a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pocount.html">pocount</a> now lists detailed state
+statistics)</li>
+<li>Minor bug fixes for <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/php.html">PHP</a> format</li>
+</ul>
+<p>Languages and quality checks:</p>
+<ul class="simple">
+<li>Support for Persian quotations</li>
+<li>Major performance improvements to quality checks</li>
+</ul>
+<p>Pootle will regenerate all statistics with the new Translate Toolkit installed.
+Read about the <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter_tests.html">quality checks</a>.</p>
+<p>Other improvements:</p>
+<ul class="simple">
+<li>Improvements to stability of Lucene text indexing (affecting Pootle)</li>
+<li>Parameter for <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/prop2po.html">po2prop</a> to ignore untranslated strings</li>
+<li>Many improvements to <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pot2po.html">pot2po</a> including Qt ts support, improved handling of
+extra XML namespaces in XLIFF, and performance improvements.</li>
+</ul>
+<p>Further resources:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/features.html">Full feature list</a></li>
+<li><a class="reference external" href="http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.8.1/">Download</a></li>
+<li><a class="reference external" href="http://bugs.locamotion.org/">Bugs</a></li>
+</ul>
+<p>Happy translating!</p>
+<p>The Translate team</p>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/releases/1.9.0.html b/docs/_build/html/releases/1.9.0.html
new file mode 100644
index 0000000..130df71
--- /dev/null
+++ b/docs/_build/html/releases/1.9.0.html
@@ -0,0 +1,187 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Translate Toolkit 1.9.0 Released — Translate Toolkit 1.11.0 documentation</title>
+    
+    <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '1.11.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap.js"></script>
+    <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="up" title="Release Notes" href="index.html" />
+    <link rel="next" title="Translate Toolkit 1.8.1" href="1.8.1.html" />
+    <link rel="prev" title="Translate Toolkit 1.10.0" href="1.10.0.html" /> 
+  </head>
+  <body>
+  <div id="navbar" class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <a class="brand" href="../index.html">Translate Toolkit</a>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
+          <ul class="nav">
+            <li class="divider-vertical"></li>
+            
+              <li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
+  <ul class="dropdown-menu globaltoc"><ul class="simple">
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html">Converters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
+</ul>
+</li>
+              
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
+  <ul class="dropdown-menu localtoc"><ul>
+<li><a class="reference internal" href="#">Translate Toolkit 1.9.0 Released</a><ul>
+<li><a class="reference internal" href="#highlighted-improvements">Highlighted improvements</a><ul>
+<li><a class="reference internal" href="#most-relevant-for-pootle">Most relevant for Pootle</a></li>
+<li><a class="reference internal" href="#format-support">Format support</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</ul>
+</li>
+            
+            
+              
+  <li><a href="1.10.0.html"
+         title="previous chapter">« Translate Toolkit 1.10.0</a></li>
+  <li><a href="1.8.1.html"
+         title="next chapter">Translate Toolkit 1.8.1 »</a></li>
+            
+          </ul>
+          <ul class="nav pull-right">
+            
+              
+            
+          
+            
+<form class="navbar-search pull-right" action="../search.html" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+          
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<div class="container content">
+   
+  <div class="section" id="translate-toolkit-1-9-0-released">
+<h1>Translate Toolkit 1.9.0 Released<a class="headerlink" href="#translate-toolkit-1-9-0-released" title="Permalink to this headline">¶</a></h1>
+<p><em>Released on 12 April 2011</em></p>
+<p>This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes for the
+upcoming <a class="reference external" href="http://pootle.translatehouse.org">Pootle</a> 2.1.6 and <a class="reference external" href="http://virtaal.translatehouse.org/">Virtaal</a> 0.7.</p>
+<div class="section" id="highlighted-improvements">
+<h2>Highlighted improvements<a class="headerlink" href="#highlighted-improvements" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Faster terminology matching</li>
+<li>Several small optimisations to performance and memory use</li>
+<li>More advanced state support (visible in <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pocount.html">pocount</a>
+and <a class="reference external" href="http://virtaal.translatehouse.org/">Virtaal</a> 0.7)</li>
+<li>Improved language detection models (+South African languages)</li>
+<li>Improve handling of printf variable reordering [Jacques Beaurain]</li>
+<li>Review of the wording of the messages of <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter.html">pofilter</a>
+checks</li>
+<li>Better sentence segmentation for some non-Latin languages</li>
+<li>More supported formats for <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/podebug.html">podebug</a></li>
+<li>Extra options for <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pomerge.html">pomerge</a>,
+<a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pogrep.html">pogrep</a>
+and po2oo/xliff2oo.</li>
+</ul>
+<p>The new <a class="reference external" href="http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pogrep.html">pogrep</a>
+options made this <a class="reference external" href="http://translate.org.za/blogs/friedel/en/content/better-lies-about-gnome-localisation">possible for GNOME</a>.</p>
+<div class="section" id="most-relevant-for-pootle">
+<h3>Most relevant for Pootle<a class="headerlink" href="#most-relevant-for-pootle" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Support for Xapian 1.2 (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=1766">bug 1766</a>) [Rimas Kudelis]</li>
+<li>Work around some changes introduced in Django 1.2.5/1.3</li>
+</ul>
+</div>
+<div class="section" id="format-support">
+<h3>Format support<a class="headerlink" href="#format-support" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>Always use UNIX line endings for PO (even on Windows)</li>
+<li>XLIFF and .ts files now shows “fuzzy” only the target present</li>
+<li>Improved support for .ts comment as context (<a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=1739">bug 1739</a>)</li>
+<li>Support for Java properties in UTF-8 encoding</li>
+<li>More natural string ordering in json converter</li>
+<li>Improved handling of trailing spaces in Mozilla DTD files</li>
+<li>Removed unused support for _old_ KDE plurals in pocount</li>
+</ul>
+<p>...and several small bugfixes</p>
+</div>
+</div>
+</div>
+
+
+</div>
+<hr>
+
+<footer class="footer">
+  <div class="container">
+    <p class="pull-right"><a href="#">Back to top ↑</a></p>
+    <ul class="unstyled muted">
+      <li><small>
+        © 2012, Translate.org.za.<br/>
+      </small></li>
+      <li><small>
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
+      </small></li>
+    </ul>
+  </div>
+</footer>
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/_build/html/formats/gsi.html b/docs/_build/html/releases/index.html
similarity index 62%
copy from docs/_build/html/formats/gsi.html
copy to docs/_build/html/releases/index.html
index d901cbd..f254878 100644
--- a/docs/_build/html/formats/gsi.html
+++ b/docs/_build/html/releases/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>OpenOffice.org GSI/SDF format — Translate Toolkit 1.9.0 documentation</title>
+    <title>Release Notes — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -17,7 +16,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '1.9.0',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,17 +27,16 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/bootstrap.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="../index.html" />
-    <link rel="up" title="Translation Related File Formats" href="index.html" />
-    <link rel="next" title="PHP" href="php.html" />
-    <link rel="prev" title="Mozilla DTD format" href="dtd.html" /> 
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="../index.html" />
+    <link rel="next" title="Translate Toolkit 1.11.0" href="1.11.0.html" />
+    <link rel="prev" title="Changelog" href="../changelog.html" /> 
   </head>
   <body>
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="../index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -53,48 +51,49 @@
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html#tools">Tools</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commands/index.html#scripts">Scripts</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../guides/index.html">Use Cases</a></li>
-<li class="toctree-l1"><a class="reference internal" href="index.html">Supported formats</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Important Changes</a></li>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
 <li class="dropdown">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
   <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">OpenOffice.org GSI/SDF format</a><ul>
-<li><a class="reference internal" href="#features">Features</a></li>
-</ul>
-</li>
+<li><a class="reference internal" href="#">Release Notes</a></li>
 </ul>
 </ul>
 </li>
             
             
               
-  <li><a href="dtd.html"
-         title="previous chapter">« Mozilla DTD format</a></li>
-  <li><a href="php.html"
-         title="next chapter">PHP »</a></li>
+  <li><a href="../changelog.html"
+         title="previous chapter">« Changelog</a></li>
+  <li><a href="1.11.0.html"
+         title="next chapter">Translate Toolkit 1.11.0 »</a></li>
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
 <form class="navbar-search pull-right" action="../search.html" method="get">
@@ -111,18 +110,17 @@
 
 <div class="container content">
    
-  <div class="section" id="openoffice-org-gsi-sdf-format">
-<span id="sdf"></span><span id="gsi"></span><h1>OpenOffice.org GSI/SDF format<a class="headerlink" href="#openoffice-org-gsi-sdf-format" title="Permalink to this headline">¶</a></h1>
-<p>OpenOffice.org uses an internal format called SDF to manage localisation text.
-The toolkit can successfully manage all features of this format converting it
-to XLIFF or PO format with the <a class="reference internal" href="../commands/oo2po.html"><em>oo2po</em></a> and oo2xliff
-tools.</p>
-<div class="section" id="features">
-<span id="gsi-features"></span><h2>Features<a class="headerlink" href="#features" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li>Handles all translatable text from the SDF</li>
-<li>Can also use ‘x-comments’ ‘language’ found in the SDF to provide translator
-comments</li>
+  <div class="section" id="release-notes">
+<span id="id1"></span><h1>Release Notes<a class="headerlink" href="#release-notes" title="Permalink to this headline">¶</a></h1>
+<p>The following are release notes used on PyPI, Sourceforge and mailing lists for
+Pootle releases.</p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="1.11.0.html">1.11.0</a></li>
+<li class="toctree-l1"><a class="reference internal" href="1.11.0-rc1.html">1.11.0-rc1</a></li>
+<li class="toctree-l1"><a class="reference internal" href="1.10.0.html">1.10.0</a></li>
+<li class="toctree-l1"><a class="reference internal" href="1.9.0.html">1.9.0</a></li>
+<li class="toctree-l1"><a class="reference internal" href="1.8.1.html">1.8.1</a></li>
 </ul>
 </div>
 </div>
@@ -139,7 +137,7 @@ comments</li>
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
index 2c7a2c6..bfa6d68 100644
--- a/docs/_build/html/search.html
+++ b/docs/_build/html/search.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -7,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Search — Translate Toolkit 1.9.0 documentation</title>
+    <title>Search — Translate Toolkit 1.11.0 documentation</title>
     
     <link rel="stylesheet" href="_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,8 +15,8 @@
     
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
+        URL_ROOT:    './',
+        VERSION:     '1.11.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,10 +28,12 @@
     <script type="text/javascript" src="_static/searchtools.js"></script>
     <script type="text/javascript" src="_static/bootstrap.js"></script>
     <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
+    <link rel="top" title="Translate Toolkit 1.11.0 documentation" href="index.html" />
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("searchindex.js"); });
   </script>
+  
+  <script type="text/javascript" id="searchindexloader"></script>
    
 
   </head>
@@ -41,7 +42,7 @@
     <div class="navbar-inner">
       <div class="container-fluid">
         <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
+        <span class="navbar-text pull-left"><b>1.11.0</b></span>
           <ul class="nav">
             <li class="divider-vertical"></li>
             
@@ -59,20 +60,23 @@
 <li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="styleguide.html#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html">Translate Styleguide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/styleguide.html#documentation">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/building.html">Building</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/testing.html">Testing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/contributing.html">Contributing</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/developers.html">Translate Toolkit Developers Guide</a></li>
+<li class="toctree-l1"><a class="reference internal" href="developers/releasing.html">Making a Translate Toolkit Release</a></li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a></li>
+<li class="toctree-l1"><a class="reference internal" href="releases/index.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
+</ul>
 </ul>
 </li>
               
@@ -80,10 +84,11 @@
             
               
             
+          </ul>
+          <ul class="nav pull-right">
             
               
             
-          </ul>
           
             
           
@@ -131,7 +136,7 @@
         © 2012, Translate.org.za.<br/>
       </small></li>
       <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
+      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.2.1.
       </small></li>
     </ul>
   </div>
diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
index b2020ea..5e2dbd8 100644
--- a/docs/_build/html/searchindex.js
+++ b/docs/_build/html/searchindex.js
@@ -1 +1 @@
-Search.setIndex({objects:{"translate.misc.lru.LRUCachingDict":{cull:[97,2,1,""],valuerefs:[97,2,1,""],itervaluerefs:[97,2,1,""]},"translate.convert.convert.Replacer":{searchreplaceinput:[80,2,1,""],doreplace:[80,2,1,""],searchreplacetemplate:[80,2,1,""]},"translate.storage.xpi":{ZipFileCatcher:[9,1,1,""],FixedStringIO:[9,1,1,""],CatchPotentialOutput:[9,1,1,""]},"translate.lang.fr.fr":{length_difference:[44,3,1,""],sentence_iter:[44,3,1,""],capsstart:[44,3,1,""],numstart:[44,3,1,""],alter [...]
\ No newline at end of file
+Search.setIndex({envversion:42,terms:{doreplac:83,diff_cleanupsemanticlossless:102,func:[102,87],templatepath:[102,83,115,87],varfilt:87,sco:117,kinyarwanda:[46,117],interchang:[39,94,22,95,34,8,81,111,101,92],four:[91,102],rapid:[33,71],prefix:[91,83,66,102],asian:117,upsid:54,savea:96,path_part:102,consider:[119,35,50,125],whose:[78,101],authorit:[8,64],typeerror:40,spellcheck:[],pgsql:117,plural_form:8,reshuffl:119,xlifffil:[8,83],invas:22,errortext:8,attr4list:8,swap:[84,115],under:[ [...]
\ No newline at end of file
diff --git a/docs/_build/html/styleguide.html b/docs/_build/html/styleguide.html
deleted file mode 100644
index b3b9781..0000000
--- a/docs/_build/html/styleguide.html
+++ /dev/null
@@ -1,501 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Translate Styleguide — Translate Toolkit 1.9.0 documentation</title>
-    
-    <link rel="stylesheet" href="_static/basic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <link rel="stylesheet" href="_static/bootstrap.css" type="text/css" />
-    <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.9.0',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <script type="text/javascript" src="_static/bootstrap.js"></script>
-    <script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
-    <link rel="top" title="Translate Toolkit 1.9.0 documentation" href="index.html" />
-    <link rel="next" title="Building" href="development/building.html" />
-    <link rel="prev" title="Quoting and Escaping" href="formats/quoting_and_escaping.html" /> 
-  </head>
-  <body>
-  <div id="navbar" class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container-fluid">
-        <a class="brand" href="index.html">Translate Toolkit</a>
-        <span class="navbar-text pull-left"><b>1.9.0</b></span>
-          <ul class="nav">
-            <li class="divider-vertical"></li>
-            
-              <li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Site <b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc"><ul class="simple">
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="features.html">Features</a></li>
-<li class="toctree-l1"><a class="reference internal" href="installation.html">Installation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="commands/index.html">Converters</a></li>
-<li class="toctree-l1"><a class="reference internal" href="commands/index.html#tools">Tools</a></li>
-<li class="toctree-l1"><a class="reference internal" href="commands/index.html#scripts">Scripts</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guides/index.html">Use Cases</a></li>
-<li class="toctree-l1"><a class="reference internal" href="formats/index.html">Supported formats</a></li>
-</ul>
-<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="">Translate Styleguide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="#documentation">Documentation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/building.html">Building</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/contributing.html">Contributing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development/developers.html">Translate Toolkit Developers Guide</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="api/index.html">API</a></li>
-</ul>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="changelog.html">Important Changes</a></li>
-<li class="toctree-l1"><a class="reference internal" href="history.html">History of the Translate Toolkit</a></li>
-<li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
-</ul>
-</ul>
-</li>
-              
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Page <b class="caret"></b></a>
-  <ul class="dropdown-menu localtoc"><ul>
-<li><a class="reference internal" href="#">Translate Styleguide</a><ul>
-<li><a class="reference internal" href="#general">General</a></li>
-<li><a class="reference internal" href="#expressions-and-statements">Expressions and Statements</a></li>
-<li><a class="reference internal" href="#naming-conventions">Naming Conventions</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#documentation">Documentation</a><ul>
-<li><a class="reference internal" href="#special-roles">Special roles</a></li>
-<li><a class="reference internal" href="#docstrings">Docstrings</a></li>
-<li><a class="reference internal" href="#comments">Comments</a></li>
-</ul>
-</li>
-</ul>
-</ul>
-</li>
-            
-            
-              
-  <li><a href="formats/quoting_and_escaping.html"
-         title="previous chapter">« Quoting and Escaping</a></li>
-  <li><a href="development/building.html"
-         title="next chapter">Building »</a></li>
-            
-            
-              
-            
-          </ul>
-          
-            
-<form class="navbar-search pull-right" action="search.html" method="get">
-  <input type="text" name="q" placeholder="Search" />
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-          
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-
-<div class="container content">
-   
-  <div class="section" id="translate-styleguide">
-<span id="styleguide"></span><h1>Translate Styleguide<a class="headerlink" href="#translate-styleguide" title="Permalink to this headline">¶</a></h1>
-<p>The Translate styleguide is the styleguide for all Translate projects,
-including Translate Toolkit, Pootle, Virtaal and others.  Patches are required
-to follow these guidelines.</p>
-<p>This Styleguide follows <span class="target" id="index-0"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0008"><strong>PEP 8</strong></a> with some clarifications. It is based almost
-verbatim on the <a class="reference external" href="http://flask.pocoo.org/docs/styleguide/">Flask Styleguide</a>.</p>
-<div class="section" id="general">
-<span id="styleguide-general"></span><h2>General<a class="headerlink" href="#general" title="Permalink to this headline">¶</a></h2>
-<dl class="docutils">
-<dt>Indentation:</dt>
-<dd>4 real spaces, no tabs. Exceptions, modules that have copied into
-the source that don’t follow this guideline.</dd>
-<dt>Maximum line length:</dt>
-<dd>79 characters with a soft limit for 84 if absolutely necessary.  Try
-to avoid too nested code by cleverly placing <cite>break</cite>, <cite>continue</cite> and
-<cite>return</cite> statements.</dd>
-<dt>Continuing long statements:</dt>
-<dd><p class="first">To continue a statement you can use backslashes (preceeded by a space)
-in which case you should align the next line with the last dot or
-equal sign, or indent four spaces:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="n">MyModel</span><span class="o">.</span><span class="n">query</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">scalar</span> <span class="o">></span> <span class="mi">120</span><span class="p">)</span> \
-             <span class="o">.</span><span class="n">order_by</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">desc</span><span class="p">())</span> \
-             <span class="o">.</span><span class="n">limit</span><span class="p">(</span><span class="mi">10</span><span class="p">)</span>
-
-<span class="n">my_long_assignment</span> <span class="o">=</span> <span class="n">MyModel</span><span class="o">.</span><span class="n">query</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">scalar</span> <span class="o">></span> <span class="mi">120</span><span class="p">)</span> \
-                     <span class="o">.</span><span class="n">order_by</span><span class="p">(</span><span class="n">MyModel</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">desc</span><span class="p">())</span> \
-                     <span class="o">.</span><span class="n">limit</span><span class="p">(</span><span class="mi">10</span><span class="p">)</span>
-
-<span class="n">this_is_a_very_long</span><span class="p">(</span><span class="n">function_call</span><span class="p">,</span> <span class="s">'with many parameters'</span><span class="p">)</span> \
-    <span class="o">.</span><span class="n">that_returns_an_object_with_an_attribute</span>
-</pre></div>
-</div>
-<p>If you break in a statement with parentheses or braces, align to the
-braces:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="n">this_is_a_very_long</span><span class="p">(</span><span class="n">function_call</span><span class="p">,</span> <span class="s">'with many parameters'</span><span class="p">,</span>
-                    <span class="mi">23</span><span class="p">,</span> <span class="mi">42</span><span class="p">,</span> <span class="s">'and even more'</span><span class="p">)</span>
-</pre></div>
-</div>
-<p>For lists or tuples with many items, break immediately after the
-opening brace:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="n">items</span> <span class="o">=</span> <span class="p">[</span>
-    <span class="s">'this is the first'</span><span class="p">,</span> <span class="s">'set of items'</span><span class="p">,</span> <span class="s">'with more items'</span><span class="p">,</span>
-    <span class="s">'to come in this line'</span><span class="p">,</span> <span class="s">'like this'</span>
-<span class="p">]</span>
-</pre></div>
-</div>
-</dd>
-<dt>Blank lines:</dt>
-<dd><p class="first">Top level functions and classes are separated by two lines, everything
-else by one.  Do not use too many blank lines to separate logical
-segments in code.  Example:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">hello</span><span class="p">(</span><span class="n">name</span><span class="p">):</span>
-    <span class="k">print</span> <span class="s">'Hello </span><span class="si">%s</span><span class="s">!'</span> <span class="o">%</span> <span class="n">name</span>
-
-
-<span class="k">def</span> <span class="nf">goodbye</span><span class="p">(</span><span class="n">name</span><span class="p">):</span>
-    <span class="k">print</span> <span class="s">'See you </span><span class="si">%s</span><span class="s">.'</span> <span class="o">%</span> <span class="n">name</span>
-
-
-<span class="k">class</span> <span class="nc">MyClass</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
-    <span class="sd">"""This is a simple docstring"""</span>
-
-    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="p">):</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">name</span> <span class="o">=</span> <span class="n">name</span>
-
-    <span class="k">def</span> <span class="nf">get_annoying_name</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">+</span> <span class="s">'!!!!111'</span>
-</pre></div>
-</div>
-</dd>
-</dl>
-</div>
-<div class="section" id="expressions-and-statements">
-<h2>Expressions and Statements<a class="headerlink" href="#expressions-and-statements" title="Permalink to this headline">¶</a></h2>
-<dl class="docutils">
-<dt>General whitespace rules:</dt>
-<dd><ul class="first simple">
-<li>No whitespace for unary operators that are not words
-(e.g.: <tt class="docutils literal"><span class="pre">-</span></tt>, <tt class="docutils literal"><span class="pre">~</span></tt> etc.) as well on the inner side of parentheses.</li>
-<li>Whitespace is placed between binary operators.</li>
-</ul>
-<p>Good:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="n">exp</span> <span class="o">=</span> <span class="o">-</span><span class="mf">1.05</span>
-<span class="n">value</span> <span class="o">=</span> <span class="p">(</span><span class="n">item_value</span> <span class="o">/</span> <span class="n">item_count</span><span class="p">)</span> <span class="o">*</span> <span class="n">offset</span> <span class="o">/</span> <span class="n">exp</span>
-<span class="n">value</span> <span class="o">=</span> <span class="n">my_list</span><span class="p">[</span><span class="n">index</span><span class="p">]</span>
-<span class="n">value</span> <span class="o">=</span> <span class="n">my_dict</span><span class="p">[</span><span class="s">'key'</span><span class="p">]</span>
-</pre></div>
-</div>
-<p>Bad:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="n">exp</span> <span class="o">=</span> <span class="o">-</span> <span class="mf">1.05</span>
-<span class="n">value</span> <span class="o">=</span> <span class="p">(</span> <span class="n">item_value</span> <span class="o">/</span> <span class="n">item_count</span> <span class="p">)</span> <span class="o">*</span> <span class="n">offset</span> <span class="o">/</span> <span class="n">exp</span>
-<span class="n">value</span> <span class="o">=</span> <span class="p">(</span><span class="n">item_value</span><span class="o">/</span><span class="n">item_count</span><span class="p">)</span><span class="o">*</span><span class="n">offset</span><span class="o">/</span><span class="n">exp</span>
-<span class="n">value</span><span class="o">=</span><span class="p">(</span> <span class="n">item_value</span><span class="o">/</span><span class="n">item_count</span> <span class="p">)</span> <span class="o">*</span> <span class="n">offset</span><span class="o">/</span><span class="n">exp</span>
-<span class="n">value</span> <span class="o">=</span> <span class="n">my_list</span><span class="p">[</span> <span class="n">index</span> <span class="p">]</span>
-<span class="n">value</span> <span class="o">=</span> <span class="n">my_dict</span> <span class="p">[</span><span class="s">'key'</span><span class="p">]</span>
-</pre></div>
-</div>
-</dd>
-<dt>Slice notation:</dt>
-<dd><p class="first">While <span class="target" id="index-1"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0008"><strong>PEP 8</strong></a> calls for spaces around operators <tt class="docutils literal"><span class="pre">a</span> <span class="pre">=</span> <span class="pre">b</span> <span class="pre">+</span> <span class="pre">c</span></tt> this
-results in flags when you use <tt class="docutils literal"><span class="pre">a[b+1:c-1]</span></tt> but would allow
-the rather unreadable <tt class="docutils literal"><span class="pre">a[b</span> <span class="pre">+</span> <span class="pre">1:c</span> <span class="pre">-</span> <span class="pre">1]</span></tt> to pass. <span class="target" id="index-2"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0008"><strong>PEP 8</strong></a> is
-rather quiet on slice notation.</p>
-<ul class="simple">
-<li>Don’t use spaces with simple variables or numbers</li>
-<li>Use brackets for expressions with spaces between binary operators</li>
-</ul>
-<p>Good:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="n">a</span><span class="p">[</span><span class="mi">1</span><span class="p">:</span><span class="mi">2</span><span class="p">]</span>
-<span class="n">a</span><span class="p">[</span><span class="n">start</span><span class="p">:</span><span class="n">end</span><span class="p">]</span>
-<span class="n">a</span><span class="p">[(</span><span class="n">start</span> <span class="o">-</span> <span class="mi">1</span><span class="p">):(</span><span class="n">end</span> <span class="o">+</span> <span class="n">var</span> <span class="o">+</span> <span class="mi">2</span><span class="p">)]</span>  <span class="c"># Brackets help group things and don't hide the slice</span>
-<span class="n">a</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">:(</span><span class="n">end</span> <span class="o">+</span> <span class="mi">1</span><span class="p">)]</span>
-</pre></div>
-</div>
-<p>Bad:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="n">a</span><span class="p">[</span><span class="n">start</span><span class="p">:</span> <span class="n">end</span><span class="p">]</span>  <span class="c"># No spaces around :</span>
-<span class="n">a</span><span class="p">[</span><span class="n">start</span><span class="o">-</span><span class="mi">1</span><span class="p">:</span><span class="n">end</span><span class="o">+</span><span class="n">var</span><span class="o">+</span><span class="mi">2</span><span class="p">]</span>  <span class="c"># Insanely hard to read, especially when your expressions are more complex</span>
-<span class="n">a</span><span class="p">[</span><span class="n">start</span> <span class="o">-</span> <span class="mi">1</span><span class="p">:</span><span class="n">end</span> <span class="o">+</span> <span class="mi">2</span><span class="p">]</span>  <span class="c"># You lose sight of the fact that it is a slice</span>
-<span class="n">a</span><span class="p">[</span><span class="o">-</span> <span class="mi">1</span><span class="p">:</span><span class="n">end</span><span class="p">]</span>  <span class="c"># -1 is unary, no space</span>
-</pre></div>
-</div>
-</dd>
-</dl>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">String slice formating is still under discussion.</p>
-</div>
-<dl class="docutils">
-<dt>Comparisons:</dt>
-<dd><ul class="first last simple">
-<li>against arbitrary types: <tt class="docutils literal"><span class="pre">==</span></tt> and <tt class="docutils literal"><span class="pre">!=</span></tt></li>
-<li>against singletons with <tt class="docutils literal"><span class="pre">is</span></tt> and <tt class="docutils literal"><span class="pre">is</span> <span class="pre">not</span></tt> (eg: <tt class="docutils literal"><span class="pre">foo</span> <span class="pre">is</span> <span class="pre">not</span>
-<span class="pre">None</span></tt>)</li>
-<li>never compare something with <cite>True</cite> or <cite>False</cite> (for example never
-do <tt class="docutils literal"><span class="pre">foo</span> <span class="pre">==</span> <span class="pre">False</span></tt>, do <tt class="docutils literal"><span class="pre">not</span> <span class="pre">foo</span></tt> instead)</li>
-</ul>
-</dd>
-<dt>Negated containment checks:</dt>
-<dd>use <tt class="docutils literal"><span class="pre">foo</span> <span class="pre">not</span> <span class="pre">in</span> <span class="pre">bar</span></tt> instead of <tt class="docutils literal"><span class="pre">not</span> <span class="pre">foo</span> <span class="pre">in</span> <span class="pre">bar</span></tt></dd>
-<dt>Instance checks:</dt>
-<dd><tt class="docutils literal"><span class="pre">isinstance(a,</span> <span class="pre">C)</span></tt> instead of <tt class="docutils literal"><span class="pre">type(A)</span> <span class="pre">is</span> <span class="pre">C</span></tt>, but try to avoid
-instance checks in general.  Check for features.</dd>
-<dt>If statements:</dt>
-<dd><ul class="first simple">
-<li>Use <tt class="docutils literal"><span class="pre">()</span></tt> brackets around complex if statements to allow easy wrapping,
-don’t use backslash to wrap an if statements.</li>
-<li>Wrap between <tt class="docutils literal"><span class="pre">and</span></tt>, <tt class="docutils literal"><span class="pre">or</span></tt>, etc.</li>
-<li>Keep <tt class="docutils literal"><span class="pre">not</span></tt> with the expression</li>
-<li>Use <tt class="docutils literal"><span class="pre">()</span></tt> alignment between expressions</li>
-<li>Use extra <tt class="docutils literal"><span class="pre">()</span></tt> to eliminate abiguity, don’t rely on an understanding of
-Python operator precedent rules.</li>
-</ul>
-<p>Good:</p>
-<div class="highlight-python"><pre>if length >= (upper + 2)
-
-if (length >= 25 and
-    string != "Something" and
-    not careful):
-    do_something()</pre>
-</div>
-<p>Bad:</p>
-<div class="last highlight-python"><pre>if length >= upper + 2:
-
-if (length...
-    and string !=...</pre>
-</div>
-</dd>
-</dl>
-</div>
-<div class="section" id="naming-conventions">
-<h2>Naming Conventions<a class="headerlink" href="#naming-conventions" title="Permalink to this headline">¶</a></h2>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">This has not been implemented or discussed.  The Translate code
-is not at all consistent with these conventions.</p>
-</div>
-<ul class="simple">
-<li>Class names: <tt class="docutils literal"><span class="pre">CamelCase</span></tt>, with acronyms kept uppercase (<tt class="docutils literal"><span class="pre">HTTPWriter</span></tt> and
-not <tt class="docutils literal"><span class="pre">HttpWriter</span></tt>)</li>
-<li>Variable names: <tt class="docutils literal"><span class="pre">lowercase_with_underscores</span></tt></li>
-<li>Method and function names: <tt class="docutils literal"><span class="pre">lowercase_with_underscores</span></tt></li>
-<li>Constants: <tt class="docutils literal"><span class="pre">UPPERCASE_WITH_UNDERSCORES</span></tt></li>
-<li>precompiled regular expressions: <tt class="docutils literal"><span class="pre">name_re</span></tt></li>
-</ul>
-<p>Protected members are prefixed with a single underscore.  Double underscores
-are reserved for mixin classes.</p>
-<p>On classes with keywords, trailing underscores are appended.  Clashes with
-builtins are allowed and <strong>must not</strong> be resolved by appending an underline to
-the variable name.  If the function needs to access a shadowed builtin, rebind
-the builtin to a different name instead.</p>
-<dl class="docutils">
-<dt>Function and method arguments:</dt>
-<dd><ul class="first last simple">
-<li>class methods: <tt class="docutils literal"><span class="pre">cls</span></tt> as first parameter</li>
-<li>instance methods: <tt class="docutils literal"><span class="pre">self</span></tt> as first parameter</li>
-<li>lambdas for properties might have the first parameter replaced with <tt class="docutils literal"><span class="pre">x</span></tt>
-like in <tt class="docutils literal"><span class="pre">display_name</span> <span class="pre">=</span> <span class="pre">property(lambda</span> <span class="pre">x:</span> <span class="pre">x.real_name</span> <span class="pre">or</span> <span class="pre">x.username)</span></tt></li>
-</ul>
-</dd>
-</dl>
-</div>
-</div>
-<div class="section" id="documentation">
-<span id="styleguide-docs"></span><h1>Documentation<a class="headerlink" href="#documentation" title="Permalink to this headline">¶</a></h1>
-<p>We use <a class="reference external" href="http://sphinx.pocoo.org/">Sphinx</a> to generate our API and user documentation. Read the
-<a class="reference external" href="http://sphinx.pocoo.org/rest.html">reStructuredText primer</a> and <a class="reference external" href="http://sphinx.pocoo.org/contents.html">Sphinx documentation</a> as needed.</p>
-<div class="section" id="special-roles">
-<h2>Special roles<a class="headerlink" href="#special-roles" title="Permalink to this headline">¶</a></h2>
-<p>We introduce a number of special roles for documentation:</p>
-<ul class="simple">
-<li><tt class="docutils literal"><span class="pre">:bug:</span></tt> – links to a bug in Translate’s Bugzilla.<ul>
-<li><tt class="docutils literal"><span class="pre">:bug:`123`</span></tt> gives: <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=123">bug 123</a></li>
-<li><tt class="docutils literal"><span class="pre">:bug:`broken</span> <span class="pre"><123>`</span></tt> gives: <a class="reference external" href="http://bugs.locamotion.org/show_bug.cgi?id=123">broken</a></li>
-</ul>
-</li>
-<li><tt class="docutils literal"><span class="pre">:opt:</span></tt> – mark command options and command values.<ul>
-<li><tt class="docutils literal"><span class="pre">:opt:`-P`</span></tt> gives <tt class="docutils literal"><span class="pre">-P</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">:opt:`--progress=dots`</span></tt> gives <tt class="docutils literal"><span class="pre">--proress=dots</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">:opt:`dots`</span></tt> gives <tt class="docutils literal"><span class="pre">dots</span></tt></li>
-</ul>
-</li>
-<li><tt class="docutils literal"><span class="pre">:man:</span></tt> – link to a Linux man page.<ul>
-<li><tt class="docutils literal"><span class="pre">:man:`msgfmt`</span></tt> gives :man:msgfmt</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="docstrings">
-<h2>Docstrings<a class="headerlink" href="#docstrings" title="Permalink to this headline">¶</a></h2>
-<dl class="docutils">
-<dt>Docstring conventions:</dt>
-<dd><p class="first">All docstrings are formatted with reStructuredText as understood by
-Sphinx.  Depending on the number of lines in the docstring, they are
-laid out differently.  If it’s just one line, the closing triple
-quote is on the same line as the opening, otherwise the text is on
-the same line as the opening quote and the triple quote that closes
-the string on its own line:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
-    <span class="sd">"""This is a simple docstring."""</span>
-
-
-<span class="k">def</span> <span class="nf">bar</span><span class="p">():</span>
-    <span class="sd">"""This is a longer docstring with so much information in there</span>
-<span class="sd">    that it spans three lines.  In this case the closing triple quote</span>
-<span class="sd">    is on its own line.</span>
-<span class="sd">    """</span>
-</pre></div>
-</div>
-</dd>
-</dl>
-<p>Please read <span class="target" id="index-3"></span><a class="pep reference external" href="http://www.python.org/dev/peps/pep-0257"><strong>PEP 257</strong></a> (Docstring Conventions) for a general overview,
-the important parts though are:</p>
-<ul class="simple">
-<li>A docstring should have a brief one-line summary, ending with a period.</li>
-<li>If there are more details there should be a blank line between the one-line
-summary and the rest of the text.  Use pragraphs and formating as needed.</li>
-<li>Use <a class="reference external" href="http://sphinx.pocoo.org/domains.html#info-field-lists">reST field lists</a> to describe the input parameters and/or return types
-as the last part of the docstring.</li>
-<li>Use proper capitalisation and punctuation.</li>
-<li>Don’t restate things that would appear in parameter descriptions.</li>
-</ul>
-<div class="highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span><span class="p">(</span><span class="n">bar</span><span class="p">):</span>
-    <span class="sd">"""One line description.</span>
-
-<span class="sd">    Further explanations that might be needed.</span>
-
-<span class="sd">    :param bar: Parameter descriptions.</span>
-<span class="sd">    """</span>
-</pre></div>
-</div>
-<div class="highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">addunit</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">unit</span><span class="p">):</span>
-    <span class="sd">"""Appends the given unit to the object's list of units.</span>
-
-<span class="sd">    This method should always be used rather than trying to modify the</span>
-<span class="sd">    list manually.</span>
-
-<span class="sd">    :type unit: TranslationUnit</span>
-<span class="sd">    :param unit: Any object that inherits from :class:`TranslationUnit`.</span>
-<span class="sd">    """</span>
-    <span class="bp">self</span><span class="o">.</span><span class="n">units</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">unit</span><span class="p">)</span>
-</pre></div>
-</div>
-<dl class="docutils">
-<dt>Parameter documentation:</dt>
-<dd><p class="first">Document parameters using <a class="reference external" href="http://sphinx.pocoo.org/domains.html#info-field-lists">reST field lists</a> as follows:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span><span class="p">(</span><span class="n">bar</span><span class="p">):</span>
-    <span class="sd">"""Simple docstring</span>
-
-<span class="sd">    :param bar: Something</span>
-<span class="sd">    :type bar: Some type</span>
-<span class="sd">    :return: Returns something</span>
-<span class="sd">    :rtype: Return type</span>
-<span class="sd">    """</span>
-</pre></div>
-</div>
-</dd>
-<dt>Cross refencing code:</dt>
-<dd>When talking about other objects, methods, functions and variables
-it is good practice to cross-reference them with Sphinx’s <a class="reference external" href="http://sphinx.pocoo.org/domains.html#cross-referencing-python-objects">Python
-cross-referencing</a>.</dd>
-<dt>Other directives:</dt>
-<dd>Use <a class="reference external" href="http://sphinx.pocoo.org/markup/para.html#paragraph-level-markup">paragraph-level markup</a> when needed.</dd>
-</dl>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">We still Need to gather the useful ones that we want you to use and how to use
-then.  E.g. how to talk about a paramter in the docstring.  How to reference
-classes in the module.  How to reference other modules, etc.</p>
-</div>
-<dl class="docutils">
-<dt>Module header:</dt>
-<dd><p class="first">The module header consists of an utf-8 encoding declaration, copyright
-attribution, license block and a standard docstring:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="c"># -*- coding: utf-8 -*-</span>
-<span class="c">#</span>
-<span class="o">...</span> <span class="n">LICENSE</span> <span class="n">BLOCK</span><span class="o">...</span>
-
-<span class="sd">"""A brief description"""</span>
-</pre></div>
-</div>
-</dd>
-</dl>
-</div>
-<div class="section" id="comments">
-<h2>Comments<a class="headerlink" href="#comments" title="Permalink to this headline">¶</a></h2>
-<dl class="docutils">
-<dt>General:</dt>
-<dd><ul class="first simple">
-<li>The <tt class="docutils literal"><span class="pre">#</span></tt> symbol (pound or hash) is used to start comments.</li>
-<li>A space must follow the <tt class="docutils literal"><span class="pre">#</span></tt> between any written text.</li>
-<li>Line length must be observed.</li>
-<li>Inline comments are preceeded by two spaces.</li>
-<li>Write sentences correctly: proper capitalisation and punctuation.</li>
-</ul>
-<p>Good:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="c"># Good comment with space before and full sentence.</span>
-<span class="n">statement</span>  <span class="c"># Good comment with two spaces</span>
-</pre></div>
-</div>
-<p>Bad:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="c">#Bad comment no space before</span>
-<span class="n">statement</span> <span class="c"># Bad comment, needs two spaces</span>
-</pre></div>
-</div>
-</dd>
-<dt>Docstring comments:</dt>
-<dd><p class="first">Rules for comments are similar to docstrings.  Both are formatted with
-reStructuredText.  If a comment is used to document an attribute, put a
-colon after the opening pound sign (<tt class="docutils literal"><span class="pre">#</span></tt>):</p>
-<div class="last highlight-python"><div class="highlight"><pre><span class="k">class</span> <span class="nc">User</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
-    <span class="c">#: the name of the user as unicode string</span>
-    <span class="n">name</span> <span class="o">=</span> <span class="n">Column</span><span class="p">(</span><span class="n">String</span><span class="p">)</span>
-    <span class="c">#: the sha1 hash of the password + inline salt</span>
-    <span class="n">pw_hash</span> <span class="o">=</span> <span class="n">Column</span><span class="p">(</span><span class="n">String</span><span class="p">)</span>
-</pre></div>
-</div>
-</dd>
-</dl>
-</div>
-</div>
-
-
-</div>
-<hr>
-
-<footer class="footer">
-  <div class="container">
-    <p class="pull-right"><a href="#">Back to top ↑</a></p>
-    <ul class="unstyled muted">
-      <li><small>
-        © 2012, Translate.org.za.<br/>
-      </small></li>
-      <li><small>
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
-      </small></li>
-    </ul>
-  </div>
-</footer>
-  </body>
-</html>
\ No newline at end of file
diff --git a/docs/_ext/translate_docs.pyc b/docs/_ext/translate_docs.pyc
index 03037cd..f4c130d 100644
Binary files a/docs/_ext/translate_docs.pyc and b/docs/_ext/translate_docs.pyc differ
diff --git a/docs/_static/README.txt b/docs/_static/README.txt
new file mode 100644
index 0000000..47ec725
--- /dev/null
+++ b/docs/_static/README.txt
@@ -0,0 +1 @@
+In this directory go static files, for example images.
diff --git a/docs/_static/tbx_levels_structure.png b/docs/_static/tbx_levels_structure.png
deleted file mode 100644
index 16d10d2..0000000
Binary files a/docs/_static/tbx_levels_structure.png and /dev/null differ
diff --git a/docs/_themes/sphinx-bootstrap/layout.html b/docs/_themes/sphinx-bootstrap/layout.html
index fe72577..e2a950c 100644
--- a/docs/_themes/sphinx-bootstrap/layout.html
+++ b/docs/_themes/sphinx-bootstrap/layout.html
@@ -19,10 +19,11 @@
             {% block sidebarrel %}
               {% include "relations.html" %}
             {% endblock %}
-            {% block sidebarsourcelink %}
+          </ul>
+          <ul class="nav pull-right">
+            {% block sidebarsourcelink2 %}
               {% include "sourcelink.html" %}
             {% endblock %}
-          </ul>
           {% block sidebarsearch %}
             {% include "searchbox.html" %}
           {% endblock %}
diff --git a/docs/_themes/sphinx-bootstrap/sourcelink.html b/docs/_themes/sphinx-bootstrap/sourcelink.html
index 21ae2d8..1996ec7 100644
--- a/docs/_themes/sphinx-bootstrap/sourcelink.html
+++ b/docs/_themes/sphinx-bootstrap/sourcelink.html
@@ -1,4 +1,7 @@
 {%- if show_source and has_source and sourcename %}
   <li><a href="{{ pathto('_sources/' + sourcename, true)|e }}"
-         rel="nofollow">{{ _('Source') }}</a></li>
+	  rel="nofollow"><i class="icon-file"></i> {{ _('Source') }}</a></li>
+{%- endif %}
+{%- if READTHEDOCS %}
+  <li><a href="https://github.com/{{ github_user }}/{{ github_repo }}/edit/{{ github_version }}{{ conf_py_path }}{{ pagename }}.rst"><i class="icon-pencil"></i> {{ _('Edit') }}</a></li>
 {%- endif %}
diff --git a/docs/api/misc.rst b/docs/api/misc.rst
index d1ca4e6..406e1d5 100644
--- a/docs/api/misc.rst
+++ b/docs/api/misc.rst
@@ -125,14 +125,6 @@ quote
    :inherited-members:
 
 
-selector
---------
-
-.. automodule:: translate.misc.selector
-   :members:
-   :inherited-members:
-
-
 sparse
 ------
 
@@ -226,11 +218,3 @@ xmlwrapper
 .. automodule:: translate.misc.xmlwrapper
    :members:
    :inherited-members:
-
-
-zipfileext
-----------
-
-.. automodule:: translate.misc.zipfileext
-   :members:
-   :inherited-members:
diff --git a/docs/api/storage.rst b/docs/api/storage.rst
index 7583aa7..212ebf9 100644
--- a/docs/api/storage.rst
+++ b/docs/api/storage.rst
@@ -442,6 +442,7 @@ ts
 .. automodule:: translate.storage.ts
    :members:
    :inherited-members:
+   :deprecated:
 
 
 txt
@@ -595,14 +596,6 @@ xml_name
    :inherited-members:
 
 
-xpi
----
-
-.. automodule:: translate.storage.xpi
-   :members:
-   :inherited-members:
-
-
 zip
 ---
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index cea3fae..2199162 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,15 +1,25 @@
 
 .. _changelog:
-.. _important_changes:
 
-Important Changes
-*****************
+Changelog
+*********
 
 The Translate Toolkit might have changed how it functions in certain cases.
 This page lists what has changed, how it might affect you and how to work
 around the change either to bring your files in line or to use the old
 behaviour if required.
 
+.. _changelog#1.11:
+
+1.11
+====
+
+- Dropped support for Python 2.5 since it is no longer supported by the Python
+  Foundation. Also sticking to it was preventing us from using features that
+  are not supported on Python 2.5 but they are on later versions.
+- Properties will no longer drop entries where source and translation are
+  identical.
+
 .. _changelog#1.10:
 
 1.10
@@ -142,10 +152,10 @@ Valid accelerators
 The :doc:`/commands/pofilter` accelerator test is now able to make use of a
 list of valid accelerators.  This allows translators to control the behaviour
 of the test for their language and add or remove characters that can be used as
-accelerators.  Please define :doc:`l10n/valid accelerators` for your language
-and these will then be included in future releases of the toolkit.  By default
-the old process if followed so if you take no action then this check will
-continue to work as expected.
+accelerators.  Please define the :ref:`valid accelerators
+<guide:valid-accelerators>` for your language and these will then be included
+in future releases of the toolkit.  By default the old process is followed so
+that if you take no action then this check will continue to work as expected.
 
 .. _changelog#branches:
 
@@ -653,8 +663,3 @@ use Unicode in UTF-8 encoding for these files.  Thus in 0.9 of the Toolkit we
 now output UTF-8 encoded properties files. :bug:`Bug 114 <114>` tracks the
 status of this and we hope to add a feature to prop2po to restore the correct
 Java convention as an option.
-
-.. _changelog#0.8:
-
-0.8
-===
diff --git a/docs/commands/csv2po.rst b/docs/commands/csv2po.rst
index 51d255b..eaeb05f 100644
--- a/docs/commands/csv2po.rst
+++ b/docs/commands/csv2po.rst
@@ -45,8 +45,7 @@ Options (csv2po):
 -xEXCLUDE, --exclude=EXCLUDE    exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in pot, po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 --charset=CHARSET     set charset to decode from csv files
 --columnorder=COLUMNORDER   specify the order and position of columns (location,source,target)
 --duplicates=DUPLICATESTYLE
@@ -66,8 +65,7 @@ Options (po2csv):
 -iINPUT, --input=INPUT    read from INPUT in po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in csv format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot             output PO Templates (.pot) rather than PO files (.po)
 --columnorder=COLUMNORDER    specify the order and position of columns (location,source,target)
 
diff --git a/docs/commands/csv2tbx.rst b/docs/commands/csv2tbx.rst
index 9c9998f..debd1b0 100644
--- a/docs/commands/csv2tbx.rst
+++ b/docs/commands/csv2tbx.rst
@@ -36,8 +36,7 @@ Options (csv2tbx):
 -iINPUT, --input=INPUT    read from INPUT in csv format
 -xEXCLUDE, --exclude=EXCLUDE    exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in tbx format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 --charset=CHARSET    set charset to decode from csv files
 --columnorder=COLUMNORDER   specify the order and position of columns (comment,source,target)
 
diff --git a/docs/commands/html2po.rst b/docs/commands/html2po.rst
index ebe673c..e6821f8 100644
--- a/docs/commands/html2po.rst
+++ b/docs/commands/html2po.rst
@@ -37,8 +37,7 @@ Options (html2po):
 -iINPUT, --input=INPUT   read from INPUT in htm, html, xhtml formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 -u, --untagged       include untagged sections
 --duplicates=DUPLICATESTYLE
@@ -59,10 +58,10 @@ Options (po2html):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in htm, html formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in htm, html formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -wWRAP, --wrap=WRAP  set number of columns to wrap html at
 --notidy             don't use tidy to clean up HTML, even if installed (new in version 1.2.1)
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/commands/ical2po.rst b/docs/commands/ical2po.rst
index 3ce76d1..c777a75 100644
--- a/docs/commands/ical2po.rst
+++ b/docs/commands/ical2po.rst
@@ -40,8 +40,7 @@ Options (ical2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -61,8 +60,8 @@ Options (po2ical):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -112,7 +111,6 @@ The converter does not make use of the LANGUAGE attribute which is permitted in
 the format.  The LANGUAGE attribute does not aid multilingualism in this
 context so is ignored.
 
-The converter could conceivably also process `vCard
-<https://en.wikipedia.org/wiki/Vcard>`_ files, but this has not been
-implemented for lack of a clear need.  Please raise a bug with an example if
-you have such a file that could benefit from localisation.
+The converter could conceivably also process :wp:`vCard <Vcard>` files, but
+this has not been implemented for lack of a clear need.  Please raise a bug
+with an example if you have such a file that could benefit from localisation.
diff --git a/docs/commands/index.rst b/docs/commands/index.rst
index cec4e7e..6b9a948 100644
--- a/docs/commands/index.rst
+++ b/docs/commands/index.rst
@@ -42,7 +42,6 @@ Converters
    option_progress
    option_filteraction
    option_multifile
-   option_psyco
    option_personality
    option_accelerator
 
diff --git a/docs/commands/ini2po.rst b/docs/commands/ini2po.rst
index 4ccab8f..bd75a11 100644
--- a/docs/commands/ini2po.rst
+++ b/docs/commands/ini2po.rst
@@ -38,8 +38,7 @@ Options (ini2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -59,8 +58,8 @@ Options (po2ini):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/commands/json2po.rst b/docs/commands/json2po.rst
index 9774307..c466be4 100644
--- a/docs/commands/json2po.rst
+++ b/docs/commands/json2po.rst
@@ -34,12 +34,11 @@ Options (json2po):
 --errorlevel=ERRORLEVEL
                       show errorlevel as: :doc:`none, message, exception,
                       traceback <option_errorlevel>`
--i INPUT, --input=INPUT      read from INPUT in php format
+-i INPUT, --input=INPUT      read from INPUT in JSON format
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
--t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in JSON format
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --filter=FILTER  leaves to extract e.g. 'name,desc': (default: extract everything)
 --duplicates=DUPLICATESTYLE
@@ -58,10 +57,10 @@ Options (po2json):
                       traceback <option_errorlevel>`
 -i INPUT, --input=INPUT  read from INPUT in po, pot formats
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
--o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
--t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-o OUTPUT, --output=OUTPUT      write to OUTPUT in JSON format
+-t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in JSON format
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/commands/levenshtein_distance.rst b/docs/commands/levenshtein_distance.rst
index 9a671d6..1d1792f 100644
--- a/docs/commands/levenshtein_distance.rst
+++ b/docs/commands/levenshtein_distance.rst
@@ -3,35 +3,39 @@
 
 Levenshtein distance
 ********************
-The `levenshtein distance
-<https://en.wikipedia.org/wiki/Levenshtein_distance>`_ is used for measuring
-the "distance" or similarity of two character strings. Other similarity
-algorithms can be supplied to the code that does the matching.
+The :wp:`levenshtein distance <Levenshtein_distance>` is used for measuring the
+*"distance"* or similarity of two character strings. Other similarity algorithms
+can be supplied to the code that does the matching.
 
 This code is used in :doc:`pot2po`, :doc:`tmserver` and `Virtaal
-<http://virtaal.org>`_. It is implemented in the toolkit, but can optionally
-use the fast C implementation provided by `python-Levenshtein
-<http://sourceforge.net/projects/translate/files/python-Levenshtein/>`_ if it
-is installed. It is strongly recommended that python-levenshtein be installed.
+<http://virtaal.org>`_. It is implemented in the toolkit, but can optionally use
+the fast C implementation provided by `python-Levenshtein
+<https://pypi.python.org/pypi/python-Levenshtein>`_ if it is installed. It is
+strongly recommended to have **python-levenshtein** installed.
 
-To exercise the code the classfile "Levenshtein.py" can be executed directly
-with::
+To exercise the code the classfile *"Levenshtein.py"* can be executed directly
+with:
+
+.. code-block:: bash
+
+    $ python Levenshtein.py "The first string." "The second string"
 
-  python Levenshtein.py "The first string." "The second string"
 
 .. note:: Remember to quote the two parameters.
 
+
 The following things should be noted:
 
-*  Only the first MAX_LEN characters are considered. Long strings differing at
-   the end will therefore seem to match better than they should. A penalty is
-   awarded if strings are shortened.
+* Only the first ``MAX_LEN`` characters are considered. Long strings differing
+  at the end will therefore seem to match better than they should. A penalty is
+  awarded if strings are shortened.
 * The calculation can stop prematurely as soon as it realise that the supplied
   minimum required similarity can not be reached. Strings with widely different
   lengths give the opportunity for this shortcut. This is by definition of the
   Levenshtein distance: the distance will be at least as much as the difference
   in string length. Similarities lower than your supplied minimum (or the
-  default) should therefore not be considered authoritive.
+  default) should therefore not be considered authoritative.
+
 
 .. _levenshtein_distance#shortcommings:
 
@@ -40,17 +44,17 @@ Shortcommings
 
 The following shortcommings have been identified:
 
-* Cases sensitivity: 'E' and 'e' are considered different characters and
-  according differ as much as 'z' and 'e'. This is not ideal, as case
+* **Cases sensitivity:** *'E'* and *'e'* are considered different characters and
+  according differ as much as *'z'* and *'e'*. This is not ideal, as case
   differences should be considered less of a difference.
-* Diacritics: 'ê' and 'e' are considered different characters and according
-  differ as much as 'z' and 'e'. This is not ideal, as missing diacritics could
-  be due to small input errors, or even input data that simply do not have the
-  correct diacritics.
-* Words that have similar characters, but are different, could increase the
-  similarity beyond what is wanted. The sentences "It is though." and "It is
-  dough." differ markedly semantically, but score similarity of almost 85%. A
-  possible solution is to do an additional calculation based on words, instead
-  of characters.
-* Whitespace: Differences in tabs, newlines, and space usage should perhaps be
-  considered as a special case.
+* **Diacritics:** *'ê'* and *'e'* are considered different characters and
+  according differ as much as *'z'* and *'e'*. This is not ideal, as missing
+  diacritics could be due to small input errors, or even input data that simply
+  do not have the correct diacritics.
+* **Similar but different words:** Words that have similar characters, but are
+  different, could increase the similarity beyond what is wanted. The sentences
+  *"It is though."* and *"It is dough."* differ markedly semantically, but score
+  similarity of almost 85%. A possible solution is to do an additional
+  calculation based on words, instead of characters.
+* **Whitespace:** Differences in tabs, newlines, and space usage should perhaps
+  be considered as a special case.
diff --git a/docs/commands/moz-l10n-builder.rst b/docs/commands/moz-l10n-builder.rst
index a48c841..6afdf27 100644
--- a/docs/commands/moz-l10n-builder.rst
+++ b/docs/commands/moz-l10n-builder.rst
@@ -9,14 +9,14 @@ migrate them to the latest Mozilla source, building XPIs and repackaging hte
 Windows .exe file as needed.
 
 Please also check the page on `creating a language pack
-<http://developer.mozilla.org/en/docs/Creating_a_Language_Pack>`_ on the
+<https://developer.mozilla.org/en/docs/Creating_a_Language_Pack>`_ on the
 Mozilla wiki, to stay abreast of the latest Mozilla way of doing things.
 
 .. note:: This page is only applicable to Mozilla products with its source
    hosted in CVS. This includes Firefox versions before 3.1 and Thunderbird
-    versions before 3.0.
+   versions before 3.0.
 
-    For information about working with the new source trees in Mercurial, see the :doc:`mozilla_l10n_scripts` page.
+   For information about working with the new source trees in Mercurial, see the :doc:`mozilla_l10n_scripts` page.
 
 .. _moz-l10n-builder#prerequisites:
 
@@ -28,9 +28,9 @@ Prerequisites
   * :doc:`Translate Toolkit </installation>`
   * Existing Mozilla translations in PO format
   * A checkout of `Mozilla sources
-    <http://developer.mozilla.org/en/docs/Mozilla_Source_Code_Via_CVS>`_
+    <https://developer.mozilla.org/en-US/docs/Developer_Guide/Source_Code/CVS>`_
     updated to the correct `BRANCH or RELEASE
-    <http://developer.mozilla.org/en/docs/CVS_Tags>`_
+    <https://developer.mozilla.org/en/docs/CVS_Tags>`_
 
 * Building Windows executables
 
@@ -42,7 +42,7 @@ Prerequisites
   * `Nullsoft installer <http://nsis.sourceforge.net/Main_Page>`_ to package
     the installer.
   * `7zip <http://www.7-zip.org/>`_ for various compression
-  * Linux: `WINE <http://winehq.com/>`_ to run the Nullsoft installer
+  * Linux: `WINE <http://www.winehq.org/>`_ to run the Nullsoft installer
 
 * Directory structure under the directory you want to run moz-l10n-builder in:
 
diff --git a/docs/commands/moz2po.rst b/docs/commands/moz2po.rst
index 480e891..48bd220 100644
--- a/docs/commands/moz2po.rst
+++ b/docs/commands/moz2po.rst
@@ -6,8 +6,8 @@ moz2po
 ******
 
 moz2po converts Mozilla files to PO files.  It wraps converters that handle
-.properties, .dtd and some strange Mozilla files.  The tool can extract from an
-XPI file or work with files from Mozilla's Mercurial repository.  The tools
+.properties, .dtd and some strange Mozilla files.  The tool can work with files
+from Mozilla's Mercurial repository.  The tools
 thus provides a complete roundtrip for Mozilla localisation using PO files and
 PO editors.
 
@@ -16,10 +16,6 @@ PO editors.
    and PO files for translating Mozilla products, please see the page on
    :doc:`mozilla_l10n_scripts`.
 
-.. warning:: The conversion to and from XPI files is no longer actively
-   supported.  The preffered method is to work directly with files in Mozilla's
-   Mercurial version control system.
-
 .. _moz2po#usage:
 
 Usage
@@ -27,19 +23,19 @@ Usage
 
 ::
 
-  moz2po [options] <xpi|dir> <po>
-  po2moz [options] <po> <xpi|dir>
+  moz2po [options] <dir> <po>
+  po2moz [options] <po> <dir>
 
 Where:
 
 +---------+---------------------------------------------------+
-| <xpi>   | is a Mozilla language pack                        |
-+---------+---------------------------------------------------+
 | <dir>   | is a directory containing valid Mozilla files     |
 +---------+---------------------------------------------------+
 | <po>    | is a directory of PO or POT files                 |
 +---------+---------------------------------------------------+
 
+.. program:: moz2po
+
 Options (moz2po):
 
 --version            show program's version number and exit
@@ -53,14 +49,15 @@ Options (moz2po):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in it.po, it.pot, manifest, xhtml.po, xhtml.pot, ini.po, ini.pot, rdf, js, \*, html.po, html.pot, inc.po, inc.pot, dtd.po, dtd.pot, properties.po, properties.pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in it, \*, properties, dtd, inc formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
                       text): :doc:`merge, msgctxt <option_duplicates>`
                       (default: 'msgctxt')
 
+.. program:: po2moz
+
 Options (po2moz):
 
 --version            show program's version number and exit
@@ -74,10 +71,10 @@ Options (po2moz):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in dtd, \*, inc, it, properties formats
 -tTEMPLATE, --template=TEMPLATE  read from TEMPLATE in dtd, \*, inc, it, properties formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -lLOCALE, --locale=LOCALE  set output locale (required as this sets the directory names)
---clonexpi=CLONEXPI  clone xpi structure from the given xpi file
+--removeuntranslated  remove untranslated strings from output
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -99,17 +96,12 @@ After extracting the en-US l10n files, you can run the following command::
   moz2po -P l10n/en-US pot
 
 This creates a set of POT (:opt:`-P`) files in the ``pot`` directory from the
-Mozilla files in ``l10n/en-US``. ::
-
-  moz2po -P en-US.xpi pot
-
-Creating set of POT (:opt:`-P`) files from the American English XPI
-(``en-US.xpi``) and placing them in ``pot`` for use as PO Templates.
+Mozilla files in ``l10n/en-US`` for use as PO Templates.
 
 If you want to create a set of POT files with another base language try the
 following::
 
-  moz2po -P fr-FR.xpi fr-pot
+  moz2po -P l10n/fr-FR fr-pot
 
 This will create a set of POT files in ``fr-pot`` that have French as your
 source language.
@@ -138,19 +130,13 @@ languages is not English but French, Spanish or Portuguese.  Please make sure
 that the source languages i.e. the ``msgid`` language is fully translated as
 against en-US.
 
-.. _moz2po#creating_an_xpi_or_cvs_ready_translations:
+.. _moz2po#creating_mercurial_ready_translations:
 
-Creating an XPI or CVS ready translations
+Creating Mercurial ready translations
 -----------------------------------------
 
 ::
 
-  po2moz -lzu-ZA -t en-US.xpi zu zu-ZA.xpi
-
-Create a Zulu language (:opt:`-lzu-ZA`) XPI called ``zu-ZA.xpi`` from translations
-found in ``zu`` using ``en-US.xpi`` as a template.  We use a template to ensure
-that our DTD and .properties files appear exactly as those in en-US::
-
   po2moz -t l10n/en-US po/xh l10n/xh
 
 Create Mozilla files using the templates files in ``l10n/en-US`` (see above for
diff --git a/docs/commands/mozilla_l10n_scripts.rst b/docs/commands/mozilla_l10n_scripts.rst
index 33b917b..d3ffc1f 100644
--- a/docs/commands/mozilla_l10n_scripts.rst
+++ b/docs/commands/mozilla_l10n_scripts.rst
@@ -34,12 +34,12 @@ Requirements
 * All scripts in the ``tools/mozilla`` directory (from the project sources)
   should be executable and in your ``PATH``.
 
-.. _mozilla_l10n_scripts#build_ff3.1_langs.sh:
+.. _build_ff3.1_langs.sh:
 
 build_ff3.1_langs.sh
 ====================
 
-.. _mozilla_l10n_scripts#description:
+.. _build_ff3.1_langs.sh#description:
 
 Description
 -----------
@@ -51,7 +51,7 @@ does the following:
    <http://hg.mozilla.org/l10n-central>`_ Mercurial repository.
 #. Replace old l10n en-US files with a fresh copy from the updated source tree.
 #. :doc:`Create new POT files </guides/creating_mozilla_pot_files>` from the
-   :ref:`en-US <mozilla_l10n_scripts#get_moz_enus.py>` l10n files.
+   :ref:`en-US <get_moz_enus.py>` l10n files.
 #. Create archives of the POT files.
 #. For each language:
 
@@ -62,7 +62,7 @@ does the following:
    #. :doc:`Create Mozilla l10n files <moz2po>` for the language based on the
       migrated PO files.
    #. Create archives of the PO files.
-   #. :ref:`Build langpack <mozilla_l10n_scripts#buildxpi.py>` for the
+   #. :ref:`Build langpack <buildxpi.py>` for the
       language.
 
 This script is used on the l10n.mozilla.org server to create most (if not all)
@@ -71,7 +71,7 @@ written as a stable way to provide these files and as such making it as general
 as possible was not the biggest requirement. This is evident in the script's
 very narrow focus.
 
-.. _mozilla_l10n_scripts#usage:
+.. _build_ff3.1_langs.sh#usage:
 
 Usage
 -----
@@ -127,7 +127,7 @@ The variables are used in the following ways:
    ``popacks``, ``potpacks``, ``po-updated`` and ``xpi`` (if used). This way
    the only variable that need to be changed is ``BUILD_DIR``.
 
-.. _mozilla_l10n_scripts#build_tb3_langs.sh:
+.. _build_tb3_langs.sh:
 
 build_tb3_langs.sh
 ==================
@@ -136,21 +136,21 @@ adapted from. It is 90% similar with the obvious exception that it is aimed at
 building Thunderbird 3.0 packages in stead of Firefox 3.1. Also note that this
 script uses the comm-central repository in stead of mozilla-central.
 
-.. _mozilla_l10n_scripts#buildxpi.py:
+.. _buildxpi.py:
 
 buildxpi.py
 ===========
 
-.. _mozilla_l10n_scripts#description:
+.. _buildxpi.py#description:
 
 Description
 -----------
-Creats a XPI language pack from Mozilla sources and translated l10n files. This
+Creates XPI language packs from Mozilla sources and translated l10n files. This
 script has only been tested with Firefox 3.1 beta sources.
 
 It is basically the scripted version of the process described on Mozilla's
 `"Creating a language pack"
-<https://developer.mozilla.org/en/creating_a_language_pack>`_ page.
+<https://developer.mozilla.org/en-US/docs/Creating_a_Language_Pack>`_ page.
 
 This script is used by ``build_ff3.1_langs.sh`` to build language packs in its
 final step.
@@ -159,17 +159,17 @@ final step.
    existing ``.mozconfig`` is renamed to ``.mozconfig.bak`` during operation
    and copied back afterwards.
 
-.. _mozilla_l10n_scripts#usage:
+.. _buildxpi.py#usage:
 
 Usage
 -----
 ::
 
-  buildxpi.py [<options>] <lang>
+  buildxpi.py [<options>] <lang> [<lang2> ...]
 
 Example::
 
-  buildxpi.py -L /path/to/l10n -s /path/to/mozilla-central -o /path/to/xpi_output af
+  buildxpi.py -L /path/to/l10n -s /path/to/mozilla-central -o /path/to/xpi_output af ar
 
 Options:
 
@@ -186,12 +186,12 @@ Options:
 -d, --delete-dest     Delete output XPI if it already exists.
 -v, --verbose         Be more noisy
 
-.. _mozilla_l10n_scripts#get_moz_enus.py:
+.. _get_moz_enus.py:
 
 get_moz_enUS.py
 ===============
 
-.. _mozilla_l10n_scripts#description:
+.. _get_moz_enus.py#description:
 
 Description
 -----------
@@ -199,7 +199,7 @@ A simple script to collect the en-US l10n files from a Mozilla source tree
 (``'comm-central``' or ``'mozilla-central``') by traversing the product's
 ``l10n.ini`` file.
 
-.. _mozilla_l10n_scripts#usage:
+.. _get_moz_enus.py#usage:
 
 Usage
 -----
@@ -221,7 +221,7 @@ Options:
 --delete-dest         Delete the destination directory (if it exists).
 -v, --verbose         Be more noisy
 
-.. _mozilla_l10n_scripts#moz-l10n-builder:
+.. _moz-l10n-builder#deprecated:
 
 moz-l10n-builder
 ================
@@ -234,7 +234,7 @@ Mozilla l10n.
 For more information about this script see its :doc:`dedicated page
 <moz-l10n-builder>`.
 
-.. _mozilla_l10n_scripts#moz_l10n_builder.py:
+.. _moz_l10n_builder.py:
 
 moz_l10n_builder.py
 ===================
diff --git a/docs/commands/odf2xliff.rst b/docs/commands/odf2xliff.rst
index a4508d4..a1e1ab6 100644
--- a/docs/commands/odf2xliff.rst
+++ b/docs/commands/odf2xliff.rst
@@ -10,7 +10,7 @@ ODF files by combining the original ODF files with XLIFF files containing
 translations of strings in the original document.
 
 XLIFF is the XML Localization Interchange File Format developed by `OASIS
-<http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_ (The
+<https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_ (The
 Organization for the Advancement of Structured Information Standards) to allow
 translation work to be standardised no matter what the source format and to
 allow the work to be freely moved from tool to tool.
@@ -52,8 +52,7 @@ Options (odf2xliff):
                       traceback <option_errorlevel>`
 -i INPUT, --input=INPUT   read from INPUT in ODF format
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in XLIFF format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 Options (xliff2odf):
 
@@ -67,8 +66,7 @@ Options (xliff2odf):
 -i INPUT, --input=INPUT     read from INPUT in XLIFF formats
 -o OUTPUT, --output=OUTPUT  write to OUTPUT in ODF format
 -t TEMPLATE, --template=TEMPLATE   read from TEMPLATE in ODF format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 .. _odf2xliff#examples:
 
diff --git a/docs/commands/oo2po.rst b/docs/commands/oo2po.rst
index 8ae2cc0..1002625 100644
--- a/docs/commands/oo2po.rst
+++ b/docs/commands/oo2po.rst
@@ -37,8 +37,8 @@ Where:
 +--------------+-----------------------------------------------------------+
 | <input>      | is a directory of translated PO/XLIFF files               |
 +--------------+-----------------------------------------------------------+
-| <targetlang> | is the `ISO 639 <https://en.wikipedia.org/wiki/ISO_639>`_ |
-|              | language code used in the sdf file, e.g. af               |
+| <targetlang> | is the :wp:`ISO 639 <ISO_639>` language code used in the  |
+|              | sdf file, e.g. af                                         |
 +--------------+-----------------------------------------------------------+
 
 Options (oo2po and oo2xliff):
@@ -53,8 +53,7 @@ Options (oo2po and oo2xliff):
 -iINPUT, --input=INPUT   read from INPUT in oo format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po) (only available in oo2po
 -lLANG, --language=LANG  set target language to extract from oo file (e.g. af-ZA) (required for oo2xliff)
 --source-language=LANG   set source language code (default en-US)
@@ -80,8 +79,7 @@ Options (po2oo and xliff2oo):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in oo format
 -tTEMPLATE, --template=TEMPLATE  read from TEMPLATE in oo format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp          skip conversion if the output file has newer timestamp
 -lLANG, --language=LANG  set target language code (e.g. af-ZA) [required]
 --source-language=LANG   set source language code (default en-US)
 -T, --keeptimestamp      don't change the timestamps of the strings
@@ -90,6 +88,7 @@ Options (po2oo and xliff2oo):
 --filteraction=ACTION
                       action on pofilter failure: :doc:`none (default), warn,
                       exclude-serious, exclude-all <option_filteraction>`
+--threshold=PERCENT      only convert files where the translation completion is above PERCENT
 --fuzzy                  use translations marked fuzzy
 --nofuzzy                don't use translations marked fuzzy (default)
 --multifile=MULTIFILESTYLE
@@ -137,8 +136,8 @@ them into a single message (This is the default behaviour for traditional PO
 files).  You might want to use :doc:`pomigrate2` to ensure that your PO files
 match the latest POT files.::
 
-  cat GSI_af.sdf GSI_xh.sdf > GSI_af-xh.sdf oo2po --source-language=af -l xh
-GSI_af-xh.sdf af-xh-po
+  cat GSI_af.sdf GSI_xh.sdf > GSI_af-xh.sdf
+  oo2po --source-language=af -l xh GSI_af-xh.sdf af-xh-po
 
 Here we are creating PO files with your existing translations but a different
 source language.  Firstly we combine the two SDF files.  Then oo2po creates a
diff --git a/docs/commands/option_accelerator.rst b/docs/commands/option_accelerator.rst
index c41e582..a06c518 100644
--- a/docs/commands/option_accelerator.rst
+++ b/docs/commands/option_accelerator.rst
@@ -12,9 +12,9 @@
 |              | <http://mozilla.org>`_ (when using :doc:`moz2po           |
 |              | <moz2po>`)                                                |
 +--------------+-----------------------------------------------------------+
-|  _           | `GNOME Desktop <http://gnome.org>`_ and other `GTK+       |
-|              | <http://gtk.org>`_ based applications                     |
+|  _           | `GNOME Desktop <http://www.gnome.org>`_ and other `GTK+   |
+|              | <http://www.gtk.org>`_ based applications                 |
 +--------------+-----------------------------------------------------------+
-|  ~           | `LibreOffice <http://libreoffice.org>`_ and `Apache       |
-|              | OpenOffice <http://openoffice.org>`_                      |
+|  ~           | `LibreOffice <http://www.libreoffice.org>`_ and `Apache   |
+|              | OpenOffice <http://www.openoffice.org>`_                  |
 +--------------+-----------------------------------------------------------+
diff --git a/docs/commands/option_psyco.rst b/docs/commands/option_psyco.rst
deleted file mode 100644
index 0693ebc..0000000
--- a/docs/commands/option_psyco.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-
-.. _option_psyco:
-
---psyco=MODE
-************
-
-Psyco is an optimiser for Python programs.  It takes the sections that are run
-often or that could benefit from being compiled and compiles them into machine
-language.  This machine code is executed instead of the Python code.
-
-If you didn't understand any of that then simply understand that it makes you
-program run faster if it is installed.
-
-By default it is switched on, so you can safely ignore this option and benefit
-from psyco optimisations anyway.
-
-.. note:: psyco only works on i386 architectures.
-
-To install psyco, you can look for it in your distribution's packages, or
-obtain it here: http://psyco.sourceforge.net/
-
-.. _option_psyco#none:
-
-none
-====
-
-Switch psyco optimisation off.
-
-.. _option_psyco#full_default:
-
-full (default)
-==============
-
-This is the default option, even if no :opt:`--psyco` command line options is
-specified. It will try to optimise everything, so potentially it might consume
-more memory.
-
-.. _option_psyco#profile:
-
-profile
-=======
-
-This tries to selectively compile certain program parts, and therefore should
-consume less memory.
diff --git a/docs/commands/option_rewrite.rst b/docs/commands/option_rewrite.rst
index af635de..5666e81 100644
--- a/docs/commands/option_rewrite.rst
+++ b/docs/commands/option_rewrite.rst
@@ -80,8 +80,8 @@ chef
 
 .. versionadded:: 1.2
 
-Rewrites the source text using mock Swedish as popularised by the `Swedish Chef
-<https://en.wikipedia.org/wiki/Swedish_Chef>`_.
+Rewrites the source text using mock Swedish as popularised by the :wp:`Swedish
+Chef <Swedish_Chef>`.
 
 .. code-block:: po
 
diff --git a/docs/commands/php2po.rst b/docs/commands/php2po.rst
index 11d974f..477a569 100644
--- a/docs/commands/php2po.rst
+++ b/docs/commands/php2po.rst
@@ -39,8 +39,7 @@ Options (php2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -60,8 +59,8 @@ Options (po2php):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -70,45 +69,8 @@ Options (po2php):
 Formats Supported
 =================
 
-PHP files need to be organized into separate languages per file and in the
-following format:
-
-.. code-block:: php
-
-    $variable = 'string';
-    $another_variable = "another string";
-
-If $variable is an array it can be declared with the square bracket syntax:
-
-.. code-block:: php
-
-    $lang['item'] = 'string';
-    $lang['another_item'] = "another string";
-
-The converter also supports arrays in the form:
-
-.. code-block:: php
-
-    $variable = array(
-       name => 'value',
-       other => "other value",
-    )
-
-Finally, the converter also supports the define syntax:
-
-.. code-block:: php
-
-    define('item', 'string');
-    define("another_item", "another string");
-
-Gettext notations are also not supported, use the Gettext tools for those
-files.
-
-.. note:: Nested arrays are not supported:
-
-.. code-block:: php
-
-    $lang = array(array('key' => 'value')); #NOT SUPPORTED
+Check :doc:`PHP format </formats/php>` document to see to which extent the PHP
+format is supported.
 
 .. _php2po#examples:
 
diff --git a/docs/commands/po2tmx.rst b/docs/commands/po2tmx.rst
index 50df42b..87477df 100644
--- a/docs/commands/po2tmx.rst
+++ b/docs/commands/po2tmx.rst
@@ -6,8 +6,13 @@ po2tmx
 
 Convert :doc:`Gettext PO </formats/po>` files to a :doc:`/formats/tmx`
 translation memory file.  TMX is the Translation Memory eXchange format
-developed by `LISA <http://lisa.org/>`_ (Localization Industry Standards
-Association).
+developed by OSCAR.
+
+.. [*] OSCAR (Open Standards for Container/Content Allowing Re-use), a special
+   interest group of the now defunct LISA (Localization Industry Standards
+   Association). The Gala `LISA OSCAR Standards
+   <http://www.gala-global.org/lisa-oscar-standards>`_ page has more details on
+   the possble future for the standards.
 
 If you are interested in po2tmx, you might also be interested in
 :doc:`posegment` that can be used to perform some automated segmentation on
@@ -42,8 +47,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in tmx format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -lLANG, --language=LANG  set target language code (e.g. af-ZA) [required]
 --source-language=LANG   set source language code (default: en)
 
diff --git a/docs/commands/po2wordfast.rst b/docs/commands/po2wordfast.rst
index ae40f78..036bc98 100644
--- a/docs/commands/po2wordfast.rst
+++ b/docs/commands/po2wordfast.rst
@@ -6,8 +6,7 @@ po2wordfast
 
 Convert Gettext PO files to a :doc:`/formats/wordfast` translation memory file.
 
-`Wordfast <https://en.wikipedia.org/wiki/Wordfast>`_ is a popular Windows based
-computer-assisted translation tool.
+:wp:`Wordfast` is a popular Windows based computer-assisted translation tool.
 
 .. _po2wordfast#usage:
 
@@ -38,8 +37,7 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in tmx format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -lLANG, --language=LANG  set target language code (e.g. af-ZA) [required]
 --source-language=LANG   set source language code (default: en)
 
diff --git a/docs/commands/poclean.rst b/docs/commands/poclean.rst
index 3c32a98..2ccd020 100644
--- a/docs/commands/poclean.rst
+++ b/docs/commands/poclean.rst
@@ -37,8 +37,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 
 .. _poclean#examples:
 
diff --git a/docs/commands/pocompile.rst b/docs/commands/pocompile.rst
index 7dc2e2f..6f0507e 100644
--- a/docs/commands/pocompile.rst
+++ b/docs/commands/pocompile.rst
@@ -37,8 +37,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in xlf, po, pot formats
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in mo format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/commands/poconflicts.rst b/docs/commands/poconflicts.rst
index 0709a3c..bfd1810 100644
--- a/docs/commands/poconflicts.rst
+++ b/docs/commands/poconflicts.rst
@@ -46,8 +46,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -I, --ignore-case    ignore case distinctions
 -v, --invert         invert the conflicts thus extracting conflicting destination words
 --accelerator=ACCELERATORS
diff --git a/docs/commands/pocount.rst b/docs/commands/pocount.rst
index f30acd1..05950c9 100644
--- a/docs/commands/pocount.rst
+++ b/docs/commands/pocount.rst
@@ -35,13 +35,13 @@ Where:
 
 Options:
 
--h, --help      show this help message and exit
---incomplete    skip 100% translated files
---full          (default) statistics in full, verbose format
---csv           statistics in CSV format
---short         same as --short-strings
---short-strings statistics of strings in short format -- one line per file
---short-words   statistics of words in short format -- one line per file
+-h, --help       show this help message and exit
+--incomplete     skip 100% translated files
+--full           (default) statistics in full, verbose format
+--csv            statistics in CSV format
+--short          same as --short-strings
+--short-strings  statistics of strings in short format -- one line per file
+--short-words    statistics of words in short format -- one line per file
 
 .. _pocount#examples:
 
diff --git a/docs/commands/podebug.rst b/docs/commands/podebug.rst
index 800906c..3cc6a6a 100644
--- a/docs/commands/podebug.rst
+++ b/docs/commands/podebug.rst
@@ -4,8 +4,7 @@
 podebug
 *******
 
-Insert `pseudo translations
-<https://en.wikipedia.org/wiki/Pseudolocalization>`_ or debug markers into
+Insert :wp:`pseudo translations <Pseudolocalization>` or debug markers into
 target text in XLIFF, Gettex PO and other localization files.
 
 The pseudo translation or debug markers make it easy to reference and locate
@@ -56,8 +55,6 @@ Options:
                        exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT
                        write to OUTPUT in po, pot formats
---psyco=MODE           use psyco to speed up the operation, modes: :doc:`none,
-                       full, profile <option_psyco>`
 -P, --pot              output PO Templates (.pot) rather than PO files (.po)
 -fFORMAT, --format=FORMAT     specify format string
 --rewrite=STYLE        the translation rewrite style: :doc:`xxx, en, blank,
diff --git a/docs/commands/pofilter.rst b/docs/commands/pofilter.rst
index 4b23a8b..a6cfd5f 100644
--- a/docs/commands/pofilter.rst
+++ b/docs/commands/pofilter.rst
@@ -44,8 +44,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in pot, po, xlf, tmx formats
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot, xlf, tmx formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -l, --listfilters    list filters available
 --review             include elements marked for review (default)
 --noreview           exclude elements marked for review
diff --git a/docs/commands/pofilter_tests.rst b/docs/commands/pofilter_tests.rst
index 99c7d7d..2395b1f 100644
--- a/docs/commands/pofilter_tests.rst
+++ b/docs/commands/pofilter_tests.rst
@@ -43,7 +43,7 @@ you determine which to run first.
 
 * Critical -- can break a program
 
-  * :ref:`pofilter_tests#accelerators`, :ref:`pofilter_tests#escapes`,
+  * :ref:`pofilter_tests#escapes`,
     :ref:`pofilter_tests#newlines`, :ref:`pofilter_tests#nplurals`,
     :ref:`pofilter_tests#printf`, :ref:`pofilter_tests#tabs`,
     :ref:`pofilter_tests#variables`, :ref:`pofilter_tests#xmltags`,
@@ -51,7 +51,8 @@ you determine which to run first.
 
 * Functional -- may confuse the user
 
-  * :ref:`pofilter_tests#acronyms`, :ref:`pofilter_tests#blank`,
+  * :ref:`pofilter_tests#accelerators`,
+    :ref:`pofilter_tests#acronyms`, :ref:`pofilter_tests#blank`,
     :ref:`pofilter_tests#emails`, :ref:`pofilter_tests#filepaths`,
     :ref:`pofilter_tests#functions`, :ref:`pofilter_tests#gconf`,
     :ref:`pofilter_tests#kdecomments`, :ref:`pofilter_tests#long`,
@@ -88,8 +89,8 @@ Test Description
 accelerators
 ------------
 
-Checks whether :doc:`guide/translation/accelerators` are consistent between the
-two strings.
+Checks whether :ref:`accelerators <guide:accelerators>` are consistent between
+the two strings.
 
 Make sure you use the :opt:`--mozilla`, :opt:`--kde`, etc options so that
 pofilter knows which type of accelerator it is looking for.  The test will pick
@@ -126,17 +127,17 @@ brackets
 
 Checks that the number of brackets in both strings match.
 
-If ([{ or }]) appear in the original this will check that the same number
-appear in the translation.
+If ``([{`` or ``}])`` appear in the original this will check that the same
+number appear in the translation.
 
 .. _pofilter_tests#compendiumconflicts:
 
 compendiumconflicts
 -------------------
 
-Checks for Gettext compendium conflicts (#-#-#-#-#).
+Checks for Gettext compendium conflicts (``#-#-#-#-#``).
 
-When you use msgcat to create a PO compendium it will insert #-#-#-#-# into
+When you use msgcat to create a PO compendium it will insert ``#-#-#-#-#`` into
 entries that are not consistent.  If the compendium is used later in a message
 merge then these conflicts will appear in your translations.  This test quickly
 extracts those for correction.
@@ -178,9 +179,10 @@ doublequoting
 
 Checks whether doublequoting is consistent between the two strings.
 
-Checks on double quotes " to ensure that you have the same number in both the
-original and the translated string. This tests takes into account that several
-languages use different quoting characters, and will test for them instead.
+Checks on double quotes ``"`` to ensure that you have the same number in both
+the original and the translated string. This tests takes into account that
+several languages use different quoting characters, and will test for them
+instead.
 
 .. _pofilter_tests#doublespacing:
 
@@ -453,7 +455,7 @@ test can also manage variables-reordering using the ``%1$s`` syntax.  The
 variables' type and details following data are tested to ensure that they are
 strictly identical, but they may be reordered.
 
-.. seealso:: `printf Format String <https://en.wikipedia.org/wiki/Printf_format_string>`_
+.. seealso:: :wp:`printf Format String <Printf_format_string>`
 
 .. _pofilter_tests#puncspacing:
 
@@ -528,11 +530,11 @@ Checks for English style plural(s) for you to review.
 
 This test will extract any message that contains words with a final "(s)" in
 the source text.  You can then inspect the message, to check that the correct
-`plural form <http://qooxdoo.org/l10n/pluralforms>`_ has been used for your
-language.  In some languages, plurals are made by adding text at the beginning
-of words, making the English style messy.  In this case, they often revert to
-the plural form.  This test allows an editor to check that the plurals used are
-correct.  Be aware that this test may create a number of false positives.
+plural form has been used for your language.  In some languages, plurals are
+made by adding text at the beginning of words, making the English style messy.
+In this case, they often revert to the plural form.  This test allows an editor
+to check that the plurals used are correct.  Be aware that this test may create
+a number of false positives.
 
 For languages with no plural forms (only one noun form) this test will simply
 test that nothing like "(s)" was used in the translation.
@@ -544,11 +546,11 @@ singlequoting
 
 Checks whether singlequoting is consistent between the two strings.
 
-The same as doublequoting but checks for the ' character.  Because this is used
-in contractions like it's and in possessive forms like user's, this test can
-output spurious errors if your language doesn't use such forms.  If a quote
-appears at the end of a sentence in the translation, i.e. '[full-stop], this
-might not be detected properly by the check.
+The same as doublequoting but checks for the ``'`` character.  Because this is
+used in contractions like it's and in possessive forms like user's, this test
+can output spurious errors if your language doesn't use such forms.  If a quote
+appears at the end of a sentence in the translation, i.e. ``'.``, this might
+not be detected properly by the check.
 
 .. _pofilter_tests#spellcheck:
 
@@ -563,12 +565,11 @@ those to an exclusion list. The advantage of this exclusion is that many words
 that are specific to the application will not raise errors e.g. program names,
 brand names, function names.
 
-The checker works with `PyEnchant <http://pyenchant.sourceforge.net/>`_. You
+The checker works with `PyEnchant <http://pythonhosted.org/pyenchant/>`_. You
 need to have PyEnchant installed as well as a dictionary for your language (for
-example, one of the `Hunspell
-<http://wiki.services.openoffice.org/wiki/Dictionaries>`_ or `aspell
-<http://ftp.gnu.org/gnu/aspell/dict/>`_ dictionaries).  This test will only
-work if you have specified the :opt:`--language` option.
+example, one of the `Hunspell <https://wiki.openoffice.org/wiki/Dictionaries>`_
+or `aspell <http://ftp.gnu.org/gnu/aspell/dict/>`_ dictionaries).  This test
+will only work if you have specified the :opt:`--language` option.
 
 The pofilter error that is created, lists the misspelled word, plus
 suggestions returned from the spell checker.  That makes it easy for you to
@@ -688,7 +689,7 @@ files.
 xmltags
 -------
 
-Checks that :doc:`XML/HTML <guide/translation/html>` tags have not been
+Checks that :wiki:`XML/HTML <guide/translation/html>` tags have not been
 translated.
 
 This check finds the number of tags in the source string and checks that the
diff --git a/docs/commands/pogrep.rst b/docs/commands/pogrep.rst
index f598a85..543b5fb 100644
--- a/docs/commands/pogrep.rst
+++ b/docs/commands/pogrep.rst
@@ -37,14 +37,14 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po, pot, xlf formats (XLIFF since version 1.0)
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot, xlf formats (XLIFF since version 1.0)
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --search=SEARCHPARTS  searches the given parts (source, target, notes, locations)
 -I, --ignore-case    ignore case distinctions
 -e, --regexp         use regular expression matching
 -v, --invert-match   select non-matching lines
 --accelerator=ACCELERATORS
                       ignores the given :doc:`accelerator characters <option_accelerator>` when matching
+-k, --keep-translations
+                      always extract units with translations
 
 .. _pogrep#example:
 
diff --git a/docs/commands/pomerge.rst b/docs/commands/pomerge.rst
index 6de7a23..94ed5cc 100644
--- a/docs/commands/pomerge.rst
+++ b/docs/commands/pomerge.rst
@@ -52,8 +52,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in po, pot, xlf, tmx formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot, xlf, tmx formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --mergeblanks=MERGEBLANKS  whether to overwrite existing translations with blank translations (yes/no). Default is yes.
 --mergefuzzy=MERGEFUZZY  whether to overwrite existing translations with fuzzy translations (yes/no). Default is yes. (new in version 1.9)
 --mergecomments=MERGECOMMENTS  whether to merge comments as well as translations (yes/no). Default is yes.
diff --git a/docs/commands/porestructure.rst b/docs/commands/porestructure.rst
index 619e602..c533e4f 100644
--- a/docs/commands/porestructure.rst
+++ b/docs/commands/porestructure.rst
@@ -45,8 +45,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in po format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 
 .. _porestructure#examples:
 
diff --git a/docs/commands/posegment.rst b/docs/commands/posegment.rst
index 09fd24e..bef68fc 100644
--- a/docs/commands/posegment.rst
+++ b/docs/commands/posegment.rst
@@ -47,8 +47,6 @@ Options:
 -iINPUT, --input=INPUT   read from INPUT in pot format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -P, --pot             output PO Templates (.pot) rather than PO files (.po)
 -l LANG, --language=LANG
                       the target language code
diff --git a/docs/commands/poswap.rst b/docs/commands/poswap.rst
index badbd9f..0b884b9 100644
--- a/docs/commands/poswap.rst
+++ b/docs/commands/poswap.rst
@@ -49,8 +49,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --reverse  Do the inverse operation (converting back to a normal English based file). See the examples.
 
 .. _poswap#examples:
diff --git a/docs/commands/pot2po.rst b/docs/commands/pot2po.rst
index 89c88aa..9256264 100644
--- a/docs/commands/pot2po.rst
+++ b/docs/commands/pot2po.rst
@@ -39,8 +39,7 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in po, pot formats (old translations)
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --tm=TM              The file to use as translation memory when fuzzy matching
 -sMIN_SIMILARITY, --similarity=MIN_SIMILARITY   The minimum similarity for inclusion (default: 75%)
@@ -92,13 +91,9 @@ Performance
 ===========
 
 Fuzzy matches are usually of good quality. Installation of the
-`python-Levenshtein
-<https://sourceforge.net/project/showfiles.php?group_id=91920&package_id=260161>`_
-package will speed up fuzzy matching. Without this a Python based matcher is
-used which is considerably slower.
-
-Install psyco for additional speedup (it is used by most toolkit tools if it is
-installed.)
+`python-Levenshtein <https://pypi.python.org/pypi/python-Levenshtein>`_ package
+will speed up fuzzy matching. Without this a Python based matcher is used which
+is considerably slower.
 
 .. _pot2po#bugs:
 
diff --git a/docs/commands/poterminology.rst b/docs/commands/poterminology.rst
index c2143fb..9c17256 100644
--- a/docs/commands/poterminology.rst
+++ b/docs/commands/poterminology.rst
@@ -18,8 +18,7 @@ target language.
 The more separate PO files you use to generate terminology, the better your
 results will be, but poterminology can be used with just a single input file.
 
-Read more about `terminology extraction
-<http://en.wikipedia.org/wiki/Terminology_extraction>`_
+Read more about :wp:`terminology extraction <Terminology_extraction>`
 
 .. _poterminology#usage:
 
@@ -51,8 +50,6 @@ Options:
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -u UPDATEFILE, --update=UPDATEFILE  update terminology in UPDATEFILE
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -S STOPFILE, --stopword-list=STOPFILE  read stopword (term exclusion) list from STOPFILE (default site-packages/translate/share/stoplist-en)
 -F, --fold-titlecase  fold "Title Case" to lowercase (default)
 -C, --preserve-case   preserve all uppercase/lowercase
diff --git a/docs/commands/pretranslate.rst b/docs/commands/pretranslate.rst
index 9e598c7..101c163 100644
--- a/docs/commands/pretranslate.rst
+++ b/docs/commands/pretranslate.rst
@@ -43,8 +43,6 @@ Options:
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read old translations from TEMPLATE
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 --tm=TM              The file to use as translation memory when fuzzy matching
 -sMIN_SIMILARITY, --similarity=MIN_SIMILARITY   The minimum similarity for inclusion (default: 75%)
 --nofuzzymatching    Disable all fuzzy matching
@@ -87,9 +85,6 @@ Performance
 
 Fuzzy matches are usually of good quality. Installation of the
 `python-Levenshtein
-<https://sourceforge.net/project/showfiles.php?group_id=91920&package_id=260161>`_
+<https://pypi.python.org/pypi/python-Levenshtein>`_
 package will speed up fuzzy matching. Without this a Python based matcher is
 used which is considerably slower.
-
-Install psyco for additional speedup (it is used by most toolkit tools if it is
-installed.)
diff --git a/docs/commands/prop2po.rst b/docs/commands/prop2po.rst
index e932d44..23fb32a 100644
--- a/docs/commands/prop2po.rst
+++ b/docs/commands/prop2po.rst
@@ -55,8 +55,7 @@ Options (prop2po):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in properties format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --personality=TYPE    override the input file format: :doc:`flex, java, mozilla,
                       java-utf8, skype, gaia, strings <option_personality>`
@@ -80,12 +79,13 @@ Options (po2prop):
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in properties format
 -tTEMPLATE, --template=TEMPLATE  read from TEMPLATE in properties format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 --personality=TYPE    override the input file format: :doc:`flex, java, mozilla,
                       java-utf8, skype, gaia, strings <option_personality>`
                       (for .properties files, default: java)
 --encoding=ENCODING  override the encoding set by the personality (since 1.8.0)
+--removeuntranslated  remove key value from output if it is untranslated
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
@@ -165,7 +165,7 @@ Doing away with native2ascii
 ============================
 
 The `native2ascii
-<http://docs.oracle.com/javase/1.4.2/docs/tooldocs/windows/native2ascii.html>`_
+<http://docs.oracle.com/javase/7/docs/technotes/tools/windows/native2ascii.html>`_
 command is the traditional tool of property file localisers.  With prop2po
 there is no need to use this command or to ever work directly with the escaped
 Unicode.
diff --git a/docs/commands/rc2po.rst b/docs/commands/rc2po.rst
index 7529fec..91653c6 100644
--- a/docs/commands/rc2po.rst
+++ b/docs/commands/rc2po.rst
@@ -38,8 +38,6 @@ Options (rc2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in rc format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --charset=CHARSET    charset to use to decode the RC files (default:                        cp1252)
 --duplicates=DUPLICATESTYLE
@@ -60,11 +58,11 @@ Options (po2rc):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in rc format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in rc format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 --charset=CHARSET    charset to use to decode the RC files (default: utf-8)
 -l LANG, --lang=LANG  LANG entry
 --sublang=SUBLANG     SUBLANG entry (default: SUBLANG_DEFAULT)
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/commands/sub2po.rst b/docs/commands/sub2po.rst
index bb12b88..3f15288 100644
--- a/docs/commands/sub2po.rst
+++ b/docs/commands/sub2po.rst
@@ -44,8 +44,7 @@ Options (sub2po):
 -iINPUT, --input=INPUT    read from INPUT in .srt format
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -65,8 +64,8 @@ Options (po2sub):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in srt format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in txt format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/commands/symb2po.rst b/docs/commands/symb2po.rst
index dad73cf..0060216 100644
--- a/docs/commands/symb2po.rst
+++ b/docs/commands/symb2po.rst
@@ -46,8 +46,7 @@ Options (symb2po):
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in the Symbian translation format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot    output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -67,8 +66,7 @@ Options (po2symb):
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
 -t TEMPLATE, --template=TEMPLATE  read from TEMPLATE in the Symbian translation format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 .. _symb2po#examples:
 
diff --git a/docs/commands/tiki2po.rst b/docs/commands/tiki2po.rst
index 6645a2e..7a0865c 100644
--- a/docs/commands/tiki2po.rst
+++ b/docs/commands/tiki2po.rst
@@ -38,7 +38,8 @@ Options (tiki2po):
 -i INPUT, --input=INPUT      read from INPUT in php format
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---include-unused When converting, include strings in the "unused" section?
+-S, --timestamp       skip conversion if the output file has newer timestamp
+--include-unused      When converting, include strings in the "unused" section?
 
 Options (po2tiki):
 
@@ -52,6 +53,7 @@ Options (po2tiki):
 -i INPUT, --input=INPUT  read from INPUT in po, pot formats
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
+-S, --timestamp      skip conversion if the output file has newer timestamp
 
 .. _tiki2po#examples:
 
diff --git a/docs/commands/tmserver.rst b/docs/commands/tmserver.rst
index c55382b..bcafa6f 100644
--- a/docs/commands/tmserver.rst
+++ b/docs/commands/tmserver.rst
@@ -5,7 +5,10 @@ tmserver
 ********
 tmserver is a Translation Memory service that can be queried via HTTP using a
 simple REST like URL/http and data is exchanged between server and client
-encoded in JSON
+encoded in JSON.
+
+.. note:: If you are searching for an enterprise Translation Memory server then
+   rather use `amaGama <http://amagama.translatehouse.org/>`_.
 
 .. _tmserver#usage:
 
diff --git a/docs/commands/ts2po.rst b/docs/commands/ts2po.rst
index c5c2ccb..a2b1728 100644
--- a/docs/commands/ts2po.rst
+++ b/docs/commands/ts2po.rst
@@ -14,13 +14,13 @@ might wish to standardise on one localization tool.  ts2po allows you to
 standardise on the PO format and PO related tools.
 
 .. note:: `Virtaal <http://virtaal.org>`_ and `Pootle
-   <http://pootle.tramslatehouse.org>`_ can edit .ts files directly without the
+   <http://pootle.translatehouse.org>`_ can edit .ts files directly without the
    need for any conversion.
 
 .. warning:: po2ts uses our older .ts support.  Thus many of the newer features
    in .ts are not supported.  To support those features rather edit directly in
    `Virtaal <http://virtaal.org>`_ or `Pootle
-   <http://pootle.tramslatehouse.org>`_.
+   <http://pootle.translatehouse.org>`_.
 
 .. _ts2po#usage:
 
@@ -52,8 +52,7 @@ Options (ts2po):
 -iINPUT, --input=INPUT   read from INPUT in ts format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -73,8 +72,7 @@ Options (po2ts):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in ts format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in ts format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 
 .. _ts2po#examples:
 
diff --git a/docs/commands/txt2po.rst b/docs/commands/txt2po.rst
index 7687f5a..248f6e8 100644
--- a/docs/commands/txt2po.rst
+++ b/docs/commands/txt2po.rst
@@ -43,8 +43,7 @@ Options (txt2po):
 -iINPUT, --input=INPUT    read from INPUT in \*, txt formats
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --encoding=ENCODING    The encoding of the input file (default: UTF-8)
 --flavour=FLAVOUR      The flavour of text file: plain (default), dokuwiki, mediawiki
@@ -66,9 +65,9 @@ Options (po2txt):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT   write to OUTPUT in txt format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in txt format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -wWRAP, --wrap=WRAP  set number of columns to wrap text at
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 --encoding           encoding of the template file
diff --git a/docs/commands/web2py2po.rst b/docs/commands/web2py2po.rst
index 9b5fb96..d39c0f5 100644
--- a/docs/commands/web2py2po.rst
+++ b/docs/commands/web2py2po.rst
@@ -7,9 +7,9 @@ web2py2po
 
 Converts web2py translation files to PO files and vice versa.
 
-`Web2py <http://mdp.cti.depaul.edu>`_, formerly known as Gluon) is an
-open-source, Python-based web application framework by Massimo Di Pierro
-(inspired by Django and Rails).
+`Web2py <http://web2py.com/>`_, formerly known as Gluon) is an open-source,
+Python-based web application framework by Massimo Di Pierro (inspired by Django
+and Rails).
 
 Web2py uses an internal localization engine based on Python dictionaries, which
 is applied with the T() lookup function. Web2py provides a built-in translation
@@ -51,8 +51,7 @@ Options (web2py2po):
 -i INPUT, --input=INPUT      read from INPUT in php format
 -x EXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
                       text): :doc:`merge, msgctxt <option_duplicates>`
@@ -70,8 +69,8 @@ Options (po2web2py):
 -i INPUT, --input=INPUT  read from INPUT in po, pot formats
 -x EXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -o OUTPUT, --output=OUTPUT      write to OUTPUT in php format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
+--threshold=PERCENT  only convert files where the translation completion is above PERCENT
 --fuzzy              use translations marked fuzzy
 --nofuzzy            don't use translations marked fuzzy (default)
 
diff --git a/docs/commands/xliff2po.rst b/docs/commands/xliff2po.rst
index 29a2fc3..9a77ed1 100644
--- a/docs/commands/xliff2po.rst
+++ b/docs/commands/xliff2po.rst
@@ -7,7 +7,7 @@ xliff2po
 
 Converts XLIFF localization files to Gettext PO files.  XLIFF is the XML
 Localization Interchange File Format developed by `OASIS
-<http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_
+<https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_
 (Organization for the Advancement of Structured Information Standards) to allow
 translation work to be standardised no matter what the source format and to
 allow the work to be freely moved from tool to tool.
@@ -42,8 +42,7 @@ Options (xliff2po):
 -iINPUT, --input=INPUT   read from INPUT in xliff format
 -xEXCLUDE, --exclude=EXCLUDE  exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT     write to OUTPUT in po, pot formats
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp       skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 --duplicates=DUPLICATESTYLE
                       what to do with duplicate strings (identical source
@@ -63,8 +62,7 @@ Options (po2xliff):
 -xEXCLUDE, --exclude=EXCLUDE   exclude names matching EXCLUDE from input paths
 -oOUTPUT, --output=OUTPUT  write to OUTPUT in xliff format
 -tTEMPLATE, --template=TEMPLATE   read from TEMPLATE in xliff format
---psyco=MODE          use psyco to speed up the operation, modes: :doc:`none,
-                      full, profile <option_psyco>`
+-S, --timestamp      skip conversion if the output file has newer timestamp
 -P, --pot            output PO Templates (.pot) rather than PO files (.po)
 
 .. _xliff2po#examples:
diff --git a/docs/conf.py b/docs/conf.py
index c5a980d..12d597e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -61,9 +61,9 @@ copyright = u'2012, Translate.org.za'
 # built documents.
 #
 # The short X.Y version.
-version = '1.10'
+version = '1.11.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.0'
+release = '1.11.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -77,7 +77,7 @@ release = '1.10.0'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', '_themes/README.rst']
+exclude_patterns = ['_build', '_themes/README.rst', 'releases/README.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -116,7 +116,7 @@ class Mock(object):
         if name in ('__file__', '__path__'):
             return '/dev/null'
         elif name[0] == name[0].upper():
-            mockType = type(name, (), {})
+            mockType = type(name, (), {'fixtag': None})
             mockType.__module__ = __name__
             return mockType
         else:
@@ -124,14 +124,16 @@ class Mock(object):
 
 MOCK_MODULES = [
     'aeidon',
+    'aeidon.encodings',
+    'aeidon.util',
+    'aeidon.files',
     'BeautifulSoup',
-    'gaupol.subtitle',
     'glib',
     'gobject',
     'gtk',
     'iniparse',
     'lucene',
-    #'PyLucene',
+    'PyLucene',
     'vobject',
     'xapian',
     'xml',
@@ -142,7 +144,9 @@ MOCK_MODULES = [
 for mod_name in MOCK_MODULES:
     sys.modules[mod_name] = Mock()
 
+# Needed for _get_pylucene_version() used by translate.search.indexing.__init__
 sys.modules['lucene'].VERSION = "2.3.0"
+sys.modules['PyLucene'].VERSION = "2.2.0"
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -315,8 +319,11 @@ coverage_write_headline = False
 
 intersphinx_mapping = {
     'python': ('http://docs.python.org/2.7', None),
+    'pytest': ('http://pytest.org/latest/', None),
     'django': ('http://django.readthedocs.org/en/latest/', None),
-    'pootle': ('http://pootle.readthedocs.org/en/latest/', None),
+    'pootle': ('http://docs.translatehouse.org/projects/pootle/en/latest/', None),
+    'virtaal': ('http://docs.translatehouse.org/projects/virtaal/en/latest/', None),
+    'guide': ('http://docs.translatehouse.org/projects/localization-guide/en/latest/', None),
 }
 
 
@@ -327,4 +334,14 @@ extlinks = {
     'bug': ('http://bugs.locamotion.org/show_bug.cgi?id=%s',
             'bug '),
     'man': ('http://linux.die.net/man/1/%s', ''),
+    'wiki': ('http://translate.sourceforge.net/wiki/%s', ''),
+    'wp': ('http://en.wikipedia.org/wiki/%s', ''),
 }
+
+# -- Options for Linkcheck -------------------------------------------------
+
+# Add regex's here for links that should be ignored.
+linkcheck_ignore = [
+    'http://your_server.com/filename.html',  # Example URL
+    '.*localhost.*',
+]
diff --git a/docs/contents.rst.inc b/docs/contents.rst.inc
index 1ee1d4a..99c4cf7 100644
--- a/docs/contents.rst.inc
+++ b/docs/contents.rst.inc
@@ -17,16 +17,32 @@ Translate Toolkit.
 Developer's Guide
 -----------------
 
-If you are a developer and are willing to use the Translate Toolkit for
+If you are a developer interested in using the Translate Toolkit for
 building new tools, make sure to read through this part.
 
 .. toctree::
    :maxdepth: 1
 
-   styleguide
-   development/building
-   development/contributing
-   development/developers
+   developers/styleguide
+   developers/building
+   developers/testing
+   developers/contributing
+   developers/developers
+   developers/releasing
+
+
+Additional Notes
+----------------
+
+Changelog and legal information are included here.
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog
+   releases/index
+   history
+   license
 
 
 API Reference
@@ -41,15 +57,3 @@ localization tools.
 
    api/index
 
-
-Additional Notes
-----------------
-
-Changelog and legal information are included here.
-
-.. toctree::
-   :maxdepth: 1
-
-   changelog
-   history
-   license
diff --git a/docs/development/building.rst b/docs/developers/building.rst
similarity index 93%
rename from docs/development/building.rst
rename to docs/developers/building.rst
index 141c484..1014435 100644
--- a/docs/development/building.rst
+++ b/docs/developers/building.rst
@@ -31,7 +31,7 @@ Building Python packages with C extensions under Windows
 
 In order to build modules which have C extensions, you will need either the
 Visual Studio C++ compiler or `MinGW
-<http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=240780>`_.
+<http://sourceforge.net/projects/mingw/files/MSYS/Extension/>`_.
 
 Make sure that your Visual Studio C++ or MinGW program path is part of your
 system's program path, since the Python build system requires this.
diff --git a/docs/development/contributing.rst b/docs/developers/contributing.rst
similarity index 91%
rename from docs/development/contributing.rst
rename to docs/developers/contributing.rst
index 5c22c52..d99766b 100644
--- a/docs/development/contributing.rst
+++ b/docs/developers/contributing.rst
@@ -37,7 +37,7 @@ Compile and install the software to see if we have any platform issues::
 
 Check for any files that are missing, tools that were not installed, etc.
 
-:ref:`Run unit tests <developers/testing_guidelines#running tests>` to see if
+:wiki:`Run unit tests <developers/testing_guidelines#running_tests>` to see if
 there are any issues.  Please report any failures.
 
 Finally, simply work with the software.  Checking all your current usage
@@ -48,7 +48,7 @@ patterns and report problems.
 Debugging
 =========
 
-- Make sure your familiar with the :doc:`bug reporting guidelines
+- Make sure your familiar with the :wiki:`bug reporting guidelines
   <developers/reporting_bugs>`.
 - Create a login for yourself at http://bugs.locamotion.org
 - Then choose a bug
@@ -92,9 +92,9 @@ Here are some ideas to get you going:
   </formats/conformance>`
 
 You will definitely need to be on the `Development
-<http://lists.sourceforge.net/lists/listinfo/translate-devel>`_ and probably on
-the `Subversion checkin
-<http://lists.sourceforge.net/lists/listinfo/translate-cvs>`_ lists.
+<https://lists.sourceforge.net/lists/listinfo/translate-devel>`_ and probably
+on the `Subversion checkin
+<https://lists.sourceforge.net/lists/listinfo/translate-cvs>`_ lists.
 
 Now is the time to familiarise yourself with the :doc:`developers guide
 <developers>`.
diff --git a/docs/development/developers.rst b/docs/developers/developers.rst
similarity index 88%
rename from docs/development/developers.rst
rename to docs/developers/developers.rst
index 224c035..1da6917 100644
--- a/docs/development/developers.rst
+++ b/docs/developers/developers.rst
@@ -56,9 +56,39 @@ Bugzilla
 Communication
 -------------
 
-* IRC channel -- irc://irc.freenode.net/#pootle Developers mailing list --
-* https://lists.sourceforge.net/lists/listinfo/translate-devel Commits to
-* version control -- https://lists.sourceforge.net/lists/listinfo/translate-cvs
+* `IRC channel <irc://irc.freenode.net/#pootle>`_
+* `Developers mailing list <https://lists.sourceforge.net/lists/listinfo/translate-devel>`_
+* `Commits to version control <https://lists.sourceforge.net/lists/listinfo/translate-cvs>`_
+
+.. _developers#working_with_bugzilla:
+
+Working with Bugzilla
+=====================
+When you close bugs ensure that you give a description and git hash for the
+fix.  This ensures that the reporter or code reviewer can see your work and has
+an easy method of finding your fix.  This is made easier by GitHub's Bugzilla
+integration.
+
+Automated Bugzilla update from commits
+--------------------------------------
+
+Github will post comments on Bugzilla bugs when the commit messages make
+references to the bug by its bug number.
+
+- Bugs are recognised by the following format (which are case-insensitive)::
+
+    Bug 123
+
+- Multiple bugs can be specified by separating them with a comma, ampersand,
+  plus or "and"::
+
+    Bug 123, 124 and 125
+
+- Commits to all branches will be processed.
+- If there is a "fix", "close", or "address" before the bug then that bug is
+  closed. ::
+
+    Fix bug 123
 
 .. _developers#source_code_map:
 
@@ -94,10 +124,6 @@ As root
 
 The various setup options are yours to explore
 
-To run / test things without installing, see the :doc:`instructions for Pootle
-<pootle:no_install>`. Those instructions sets your environment for both Pootle
-and the toolkit
-
 .. _developers#general_overview_of_the_programs:
 
 General overview of the programs
@@ -217,6 +243,7 @@ defined:
   e.g. PO message, CSV records, DTD elements
 * XXfile -- handles the document or file level of the format.  Eg a PO file, a
   CSV file a DTD file
+
   * fromlines -- read in a file and initialise the various elements
   * tolines -- convert the elements stored in XXelements and portions in XXfile
     to a raw file in that format
diff --git a/docs/developers/releasing.rst b/docs/developers/releasing.rst
new file mode 100644
index 0000000..f8060b4
--- /dev/null
+++ b/docs/developers/releasing.rst
@@ -0,0 +1,272 @@
+==================================
+Making a Translate Toolkit Release
+==================================
+
+Summary
+=======
+#. Git clone git at github.com:translate/translate.git translate-release
+#. Create release notes
+#. Up version number
+#. make build
+#. Test install and other tests
+#. Tag the release
+#. Publish on PyPI
+#. Upload to Sourceforge
+#. Release documentation
+#. Update translate website
+#. Unstage sourceforge
+#. Announce to the world
+#. Cleanup
+
+Other possible steps
+--------------------
+We need to check and document these if needed:
+
+- Build docs: we need to check if e need to build the docs for the release
+- Change URLs to point to the correct docs: do we want to change URLs to point
+  to the $version docs rather then 'latest'
+- Building on Windows, building for other Linux distros. We have produced 
+- Communicating to upstream packagers
+
+
+Detailed instructions
+=====================
+
+Get a clean checkout
+--------------------
+We work from a clean checkout to esnure that everything you are adding to the
+build is what is in VC and doesn't contain any of your uncommitted changes.  It
+also ensure that someone else could relicate your process. ::
+
+    git clone git at github.com:translate/translate.git translate-release
+
+Create release notes
+--------------------
+The release notes will be used in these places:
+
+- Toolkit website - `download page
+  <http://toolkit.translatehouse.org/download.html>`_ (used in gh-pages)
+- Sourceforge download - README.rst (used to give user info)
+- Email announcements - text version
+
+We create our release notes in reStructured Text, since we use that elsewhere
+and since it can be rendered well in some of our key sites.
+
+First we need to create a log of changes in the Translate Toolkit, which is
+done generically like this::
+
+    git log $version-1..HEAD > docs/release/$version.rst
+
+Or a more specific example::
+
+    git log 1.10.0..HEAD > docs/releases/1.10.0.rst
+
+Edit this file.  You can use the commits as a guide to build up the release
+notes.  You should remove all log messages before the release.
+
+.. note:: Since the release notes will be used in places that allow linking we
+   use links within the notes.  These should link back to products websites
+   (`Virtaal <http://virtaal.org>`_, `Pootle
+   <http://pootle.translatehouse.org>`_, etc), references to `Translate
+   <http://translatehouse.org>`_ and possibly bug numbers, etc.
+
+Read for grammar and spelling errors.
+
+.. note:: When writing the notes please remember:
+
+   #. The voice is active. 'Translate has released a new version of the
+      toolkit', not 'A new version of the toolkit was release by Translate'.
+   #. The connection to the users is human not distant.
+   #. We speak in familiar terms e.g. "I know you've been waiting for this
+      release" instead of formal.
+
+We create a list of contributors using this command::
+
+   git log 1.10.0..HEAD --format='%aN, ' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn | cut -d\  -f2-
+
+
+Up version numbers
+------------------
+Update the version number in:
+
+- ``translate/__version__.py``
+- ``docs/conf.py```
+
+In ``__version__.py``, bump the build number if anybody used the toolkit with
+the previous number, and there have been any changes to code touching stats or
+quality checks.  An increased build number will force a toolkit user, like
+Pootle, to regenerate the stats and checks.
+
+For ``conf.py`` change ``version`` and ``release``
+
+.. note:: FIXME - We might want to consolidate the version and release info so
+   that we can update it in one place.
+
+The version string should follow the pattern::
+
+    $MAJOR-$MINOR-$MICRO[-$EXTRA]
+
+E.g. ::
+
+    1.10.0
+    0.9.1-rc1 
+
+``$EXTRA`` is optional but all the three others are required.  The first
+release of a ``$MINOR`` version will always have a ``$MICRO`` of ``.0``. So
+``1.10.0`` and never just ``1.10``.
+
+
+Build the package
+-----------------
+Building is the first step to testing that things work.  From your clean
+checkout run::
+
+    make build
+
+This will create a tarball in ``dist/`` which you can use for further testing.
+
+.. note:: We use a clean checkout just to make sure that no inadvertant changes
+   make it into the release.
+
+
+Test install and other tests
+----------------------------
+The easiest way to test is in a virtualenv.  You can install the new toolkit
+using::
+
+    pip install path/to/dist/translate-toolkit-$version.tar.bz2
+
+This will allow you test installation of the software.
+
+You can then proceed with other tests such as checking
+
+#. Documentation is available
+#. Converters and scripts are installed and run correctly
+#. Meta information about the package is correct. See pypy section of reviewing
+   meta data.
+
+
+Tag the release
+---------------
+You should only tag once you are happy with your release as there are some
+things that we can't undo. ::
+
+    git tag -a 1.10.0 -m "Tag version 1.10.0"
+    git push --tags
+
+
+Publish on PyPI
+---------------
+Publish the package on the `Python Package Index
+<https://pypi.python.org/pypi>`_ (PyPI)
+
+- `Submitting Packages to the Package Index
+  <http://wiki.python.org/moin/CheeseShopTutorial#Submitting_Packages_to_the_Package_Index>`_
+
+.. note:: You need a username and password on https://pypi.python.org and have
+   rights to the project before you can proceed with this step.
+
+   These can be stored in ``$HOME/.pypirc`` and will contain your username and
+   password. A first run of ``./setup.py register`` will create such a file.
+   It will also actually publish the meta-data so only do it when you are
+   actually ready.
+
+Review the meta data. This is stored in ``setup.py``, use ``./setup.py --help``
+to se some options to display meta-data. The actual descriptions are taken from
+``translate/__init__.py``.
+
+To test before publishing run::
+
+    make test-publish-pypi
+
+Then to actually publish::
+
+    make publish-pypi
+
+
+Copy files to sourceforge
+-------------------------
+Publishing files to the Translate Sourceforge project.
+
+.. note:: You need to have release permissions on sourceforge to perform this
+   step.
+
+- http://sourceforge.net/projects/translate/files/Translate%20Toolkit/
+
+You will need:
+
+- Tarball of the release
+- Release notes in reStructured Text
+
+#. Create a new folder in the `Translate Toolkit
+   <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/>`_
+   release folder using the 'Add Folder' button.  The folder must have the same
+   name as the release version e.g.  ``1.10.0-rc1``.  Mark this as being for
+   staging for the moment.
+#. ``make publish-sourceforge`` will give you the command to upload your
+   tarball and ``README.rst``.
+
+   #. Upload tarball for release.
+   #. Upload release notes as ``README.rst``.
+   #. Click on the info icon for ``README.rst`` and tick "Exclude Stats" to
+      exlude the README from stats counting.
+
+#. Check that the README.rst for the parent ``Translate Toolkit`` folder is
+   still appropriate, this is the text from ``translate/__info__.py``.
+#. Check all links for ``README.rst`` files, new release and parent.
+
+
+Release documentation
+---------------------
+We need a tagged release before we can do this.  The docs are published on Read
+The Docs.
+
+- https://readthedocs.org/dashboard/translate-toolkit/versions/
+
+Use the admin pages to flag a version that should be published
+
+.. note:: FIXME we might need to do this before publishing so that we can
+   update doc references to point to the tagged version as apposed to the
+   latest version.
+
+
+Update translate website
+------------------------
+We use github pages for the website. First we need to checkout the pages::
+
+    git checkout gh-pages
+
+#. In ``_posts/`` add a new release posting.  This is in Markdown format (for
+   now), so we need to change the release notes .rst to .md, which mostly means
+   changing URL links from ```xxx <link>`_`` to ``[xxx](link)``.
+#. Change $version as needed. See ``download.html``, ``_config.yml`` and
+   ``egrep -r $old_release *``
+#. :command:`git commit` and :command:`git push` - changes are quite quick so
+   easy to review.
+
+
+Unstage on sourceforge
+----------------------
+If you have created a staged release folder, then unstage it now.
+
+
+Announce to the world
+---------------------
+Let people know that there is a new version:
+
+#. Announce on mailing lists:
+   Send the announcement to the translate-announce mailing lists on
+   translate-announce at lists.sourceforge.net
+#. Adjust the #pootle channel notice. Use ``/topic`` to change the topic.
+#. Email important users
+#. Tweet about it
+
+
+Cleanup
+-------
+Some possible cleanup tasks:
+
+- Remove any RC builds from the sourceforge download pages (maybe?).
+- Commit any release notes and such (or maybe do that before tagging).
+- Remove your translate-release checkout.
+- Update and fix these release notes.
diff --git a/docs/developers/styleguide.rst b/docs/developers/styleguide.rst
new file mode 100644
index 0000000..3fb20b3
--- /dev/null
+++ b/docs/developers/styleguide.rst
@@ -0,0 +1,630 @@
+.. _styleguide:
+
+Translate Styleguide
+====================
+
+The Translate styleguide is the styleguide for all Translate projects,
+including Translate Toolkit, Pootle, Virtaal and others.  Patches are required
+to follow these guidelines.
+
+This Styleguide follows :pep:`8` with some clarifications. It is based almost
+verbatim on the `Flask Styleguide`_.
+
+
+.. _styleguide-general:
+
+General
+-------
+
+Indentation
+^^^^^^^^^^^
+
+4 real spaces, no tabs. Exceptions: modules that have been copied into the
+source that don't follow this guideline.
+
+
+Maximum line length
+^^^^^^^^^^^^^^^^^^^
+
+79 characters with a soft limit for 84 if absolutely necessary. Try to avoid
+too nested code by cleverly placing `break`, `continue` and `return`
+statements.
+
+
+Continuing long statements
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To continue a statement you can use backslashes (preceeded by a space) in which
+case you should align the next line with the last dot or equal sign, or indent
+four spaces:
+
+.. code-block:: python
+
+    MyModel.query.filter(MyModel.scalar > 120) \
+                 .order_by(MyModel.name.desc()) \
+                 .limit(10)
+
+    my_long_assignment = MyModel.query.filter(MyModel.scalar > 120) \
+                         .order_by(MyModel.name.desc()) \
+                         .limit(10)
+
+    this_is_a_very_long(function_call, 'with many parameters') \
+        .that_returns_an_object_with_an_attribute
+
+
+If you break in a statement with parentheses or braces, align to the braces:
+
+.. code-block:: python
+
+    this_is_a_very_long(function_call, 'with many parameters',
+                        23, 42, 'and even more')
+
+
+If you need to break long strings, on function calls or when assigning to
+variables, try to use implicit string continuation:
+
+.. code-block:: python
+
+    this_holds_a_very_long_string("Very long string with a lot of characters "
+                                  "and words on it, so many that it is "
+                                  "necessary to break it in several lines to "
+                                  "improve readability.")
+    long_string_var = ("Very long string with a lot of characters and words on "
+                       "it, so many that it is necessary to break it in "
+                       "several lines to improve readability.")
+
+
+For lists or tuples with many items, break immediately after the opening brace:
+
+.. code-block:: python
+
+    items = [
+        'this is the first', 'set of items', 'with more items',
+        'to come in this line', 'like this'
+    ]
+
+
+Blank lines
+^^^^^^^^^^^
+
+Top level functions and classes are separated by two lines, everything else
+by one. Do not use too many blank lines to separate logical segments in code.
+Example:
+
+.. code-block:: python
+
+    def hello(name):
+        print 'Hello %s!' % name
+
+
+    def goodbye(name):
+        print 'See you %s.' % name
+
+
+    class MyClass(object):
+        """This is a simple docstring"""
+
+        def __init__(self, name):
+            self.name = name
+
+        @property
+        def annoying_name(self):
+            return self.name.upper() + '!!!!111'
+
+
+.. _styleguide-imports:
+
+Imports
+^^^^^^^
+
+Like in :pep:`8`, but:
+
+- Imports should be grouped in the following order:
+
+  1) __future__ library imports
+  2) Python standard library imports
+  3) Third party libraries imports
+  4) Translate Toolkit imports
+  5) Current package imports, using explicit relative imports (See `PEP 328
+     <http://www.python.org/dev/peps/pep-0328/#guido-s-decision>`_)
+
+- A blank line must be present between each group of imports (like in PEP8).
+- Imports on each group must be arranged alphabetically by module name:
+
+  - Shortest module names must be before longer ones:
+    ``from django.db import ...`` before ``from django.db.models import ...``.
+
+- ``import ...`` calls must precede ``from ... import`` ones on each group:
+
+  - On each of these subgroups the entries should be alphabetically arranged.
+  - No blank lines between subgroups.
+
+- On ``from ... import``
+
+  - Use a ``CONSTANT``, ``Class``, ``function`` order, where the constants,
+    classes and functions are in alphabetical order inside of its respective
+    groups.
+  - If the import line exceeds the 80 chars, then split it using parentheses to
+    continue the import on the next line (aligning the imported items with the
+    opening parenthesis).
+
+.. code-block:: python
+
+    from __future__ import absolute_import
+
+    import re
+    import sys.path as sys_path
+    import time
+    from datetime import timedelta
+    from os import path
+
+    from lxml.html import fromstring
+
+    from translate.filters import checks
+    from translate.storage import versioncontrol
+    from translate.storage.aresource import (EOF, WHITESPACE, AndroidFile,
+                                             AndroidUnit, android_decode,
+                                             android_encode)
+
+    from . import php2po
+
+
+Properties
+^^^^^^^^^^
+
+- Never use ``lambda`` functions:
+
+  .. code-block:: python
+
+    # Good.
+    @property
+    def stores(self):
+      return self.child.stores
+
+
+    # Bad.
+    stores = property(lambda self: self.child.stores)
+
+
+- Try to use ``@property`` instead of ``get_*`` or ``is_*`` methods that don't
+  require passing any parameter:
+
+  .. code-block:: python
+
+    # Good.
+    @property
+    def terminology(self):
+      ...
+
+    @property
+    def is_monolingual(self):
+      ...
+
+
+    # Also good.
+    def get_stores_for_language(self, language):
+      ...
+
+
+    # Bad.
+    def get_terminology(self):
+      ...
+
+    def is_monolingual(self):
+      ...
+
+
+- Always use ``@property`` instead of ``property(...)``, even for properties
+  that also have a setter or a deleter:
+
+  .. code-block:: python
+
+    # Good.
+    @property
+    def units(self):
+      ...
+
+
+    # Also good.
+    @property
+    def x(self):
+      """I'm the 'x' property."""
+      return self._x
+
+    @x.setter
+    def x(self, value):  # Note: Method must be named 'x' too.
+      self._x = value
+
+    @x.deleter
+    def x(self):  # Note: Method must be named 'x' too.
+      del self._x
+
+
+    # Bad.
+    def _get_units(self):
+      ...
+    units = property(_get_units)
+
+
+    # Also bad.
+    def getx(self):
+      return self._x
+    def setx(self, value):
+      self._x = value
+    def delx(self):
+      del self._x
+    x = property(getx, setx, delx, "I'm the 'x' property.")
+
+
+Expressions and Statements
+--------------------------
+
+General whitespace rules
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+- No whitespace for unary operators that are not words (e.g.: ``-``, ``~``
+  etc.) as well on the inner side of parentheses.
+- Whitespace is placed between binary operators.
+
+.. code-block:: python
+
+    # Good.
+    exp = -1.05
+    value = (item_value / item_count) * offset / exp
+    value = my_list[index]
+    value = my_dict['key']
+
+
+    # Bad.
+    exp = - 1.05
+    value = ( item_value / item_count ) * offset / exp
+    value = (item_value/item_count)*offset/exp
+    value=( item_value/item_count ) * offset/exp
+    value = my_list[ index ]
+    value = my_dict ['key']
+
+
+Slice notation
+^^^^^^^^^^^^^^
+
+While :pep:`8` calls for spaces around operators ``a = b + c`` this results in
+flags when you use ``a[b+1:c-1]`` but would allow the rather unreadable
+``a[b + 1:c - 1]`` to pass. :pep:`8` is rather quiet on slice notation.
+
+- Don't use spaces with simple variables or numbers
+- Use brackets for expressions with spaces between binary operators
+
+  .. code-block:: python
+
+    # Good.
+    a[1:2]
+    a[start:end]
+    a[(start - 1):(end + var + 2)]  # Brackets help group things and don't hide the slice
+    a[-1:(end + 1)]
+
+
+    # Bad.
+    a[start: end]  # No spaces around :
+    a[start-1:end+var+2]  # Insanely hard to read, especially when your expressions are more complex
+    a[start - 1:end + 2]  # You lose sight of the fact that it is a slice
+    a[- 1:end]  # -1 is unary, no space
+
+
+.. note::
+
+   String slice formatting is still under discussion.
+
+Comparisons
+^^^^^^^^^^^
+
+- Against arbitrary types: ``==`` and ``!=``
+- Against singletons with ``is`` and ``is not`` (e.g.: ``foo is not None``)
+- Never compare something with `True` or `False` (for example never do ``foo ==
+  False``, do ``not foo`` instead)
+
+
+Negated containment checks
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Use ``foo not in bar`` instead of ``not foo in bar``
+
+
+Instance checks
+^^^^^^^^^^^^^^^
+
+- ``isinstance(a, C)`` instead of ``type(A) is C``, but try to avoid instance
+  checks in general.  Check for features.
+
+
+If statements
+^^^^^^^^^^^^^
+
+- Use ``()`` brackets around complex if statements to allow easy wrapping,
+  don't use backslash to wrap an if statement.
+- Wrap between ``and``, ``or``, etc.
+- Keep ``not`` with the expression
+- Use ``()`` alignment between expressions
+- Use extra ``()`` to eliminate ambiguity, don't rely on an understanding of
+  Python operator precedence rules.
+
+  .. code-block:: python
+
+    # Good.
+    if length >= (upper + 2):
+        ...
+
+    if (length >= 25 and
+        string != "Something" and
+        not careful):
+        do_something()
+
+
+    # Bad.
+    if length >= upper + 2:
+        ...
+
+    if (length...
+        and string !=...
+
+
+Naming Conventions
+------------------
+
+.. note::
+
+   This has not been implemented or discussed.  The Translate code 
+   is not at all consistent with these conventions.
+
+
+- Class names: ``CamelCase``, with acronyms kept uppercase (``HTTPWriter`` and
+  not ``HttpWriter``)
+- Variable names: ``lowercase_with_underscores``
+- Method and function names: ``lowercase_with_underscores``
+- Constants: ``UPPERCASE_WITH_UNDERSCORES``
+- precompiled regular expressions: ``name_re``
+
+Protected members are prefixed with a single underscore.  Double underscores
+are reserved for mixin classes.
+
+To prevent name clashes with keywords, one trailing underscore may be appended.
+Clashes with builtins are allowed and **must not** be resolved by appending an
+underline to the name.  If your code needs to access a shadowed builtin, rebind
+the builtin to a different name instead.  Consider using a different name to
+avoid having to deal with either type of name clash, but don't complicate names
+with prefixes or suffixes.
+
+
+Function and method arguments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Class methods: ``cls`` as first parameter
+- Instance methods: ``self`` as first parameter
+
+
+.. _styleguide-docs:
+
+Documentation
+=============
+
+We use Sphinx_ to generate our API and user documentation. Read the
+`reStructuredText primer`_ and `Sphinx documentation`_ as needed.
+
+
+Special roles
+-------------
+
+We introduce a number of special roles for documentation:
+
+* ``:bug:`` -- links to a bug in Translate's Bugzilla.
+
+  * ``:bug:`123``` gives: :bug:`123`
+  * ``:bug:`broken <123>``` gives: :bug:`broken <123>`
+
+* ``:opt:`` -- mark command options and command values.
+
+  * ``:opt:`-P``` gives :opt:`-P`
+  * ``:opt:`--progress=dots``` gives :opt:`--progress=dots`
+  * ``:opt:`dots``` gives :opt:`dots`
+
+* ``:man:`` -- link to a Linux man page.
+
+  * ``:man:`msgfmt``` gives :man:`msgfmt`
+
+
+Code and command line highlighting
+----------------------------------
+
+All code examples and format snippets should be highlighted to make them easier
+to read.  By default Sphinx uses Python highlighting of code snippets (but it
+doesn't always work).  You will want to change that in these situations:
+
+.. highlight:: rest
+
+* The examples are not Python e.g. talking about INI file parsing.  In which
+  case set the file level highlighting using::
+
+     .. highlight:: ini
+
+* There are multiple different code examples in the document, then use::
+
+    .. code-block:: ruby
+
+  before each code block.
+
+* Python code highlighting isn't working, then force Python highlighting using::
+
+    .. code-block:: python
+
+.. note:: Generally we prefer explicit markup as this makes it easier for those
+   following you to know what you intended.  So use ``.. code-block:: python``
+   even though in some cases this is not required.
+
+With bash *command line examples*, to improve readability use::
+
+    .. code-block:: bash
+
+Add ``$`` command prompt markers and ``#`` comments as required, as shown in
+this example:
+
+.. code-block:: bash
+
+   $ cd docs
+   $ make html  # Build all Sphinx documentation
+   $ make linkcheck  # Report broken links
+
+
+.. highlight:: python
+
+
+User documentation
+------------------
+
+This is documentation found in ``docs/`` and that is published on Read the
+Docs. The target is the end user so our primary objective is to make accesible,
+readable and beautiful documents for them.
+
+
+Docstrings
+----------
+
+Docstring conventions:
+  All docstrings are formatted with reStructuredText as understood by
+  Sphinx.  Depending on the number of lines in the docstring, they are
+  laid out differently.  If it's just one line, the closing triple
+  quote is on the same line as the opening, otherwise the text is on
+  the same line as the opening quote and the triple quote that closes
+  the string on its own line:
+
+  .. code-block:: python
+
+    def foo():
+        """This is a simple docstring."""
+
+
+    def bar():
+        """This is a longer docstring with so much information in there
+        that it spans three lines.  In this case the closing triple quote
+        is on its own line.
+        """
+
+
+Please read :pep:`257` (Docstring Conventions) for a general overview,
+the important parts though are:
+
+- A docstring should have a brief one-line summary, ending with a period. Use
+  ``Do this``, ``Return that`` rather than ``Does ...``, ``Returns ...``.
+- If there are more details there should be a blank line between the one-line
+  summary and the rest of the text.  Use paragraphs and formatting as needed.
+- Use `reST field lists`_ to describe the input parameters and/or return types
+  as the last part of the docstring.
+- Use proper capitalisation and punctuation.
+- Don't restate things that would appear in parameter descriptions.
+
+.. code-block:: python
+
+    def addunit(self, unit):
+        """Append the given unit to the object's list of units.
+
+        This method should always be used rather than trying to modify the
+        list manually.
+
+        :type unit: TranslationUnit
+        :param unit: Any object that inherits from :class:`TranslationUnit`.
+        """
+        self.units.append(unit)
+
+
+Parameter documentation:
+  Document parameters using `reST field lists`_ as follows:
+
+  .. code-block:: python
+
+    def foo(bar):
+        """Simple docstring.
+
+        :param bar: Something
+        :type bar: Some type
+        :return: Returns something
+        :rtype: Return type 
+        """
+
+
+Cross referencing code:
+   When talking about other objects, methods, functions and variables
+   it is good practice to cross-reference them with Sphinx's `Python
+   cross-referencing`_.
+
+Other directives:
+   Use `paragraph-level markup`_ when needed.
+
+.. note::
+
+   We still need to gather the useful ones that we want you to use and how to use
+   them.  E.g. how to talk about a parameter in the docstring.  How to reference
+   classes in the module.  How to reference other modules, etc.
+
+
+Module header:
+  The module header consists of an utf-8 encoding declaration, copyright
+  attribution, license block and a standard docstring:
+
+  .. code-block:: python
+
+    # -*- coding: utf-8 -*-
+    #
+    ... LICENSE BLOCK...
+
+    """A brief description"""
+
+..    """
+        package.module
+        ~~~~~~~~~~~~~~
+
+..        A brief description goes here.
+
+..        :copyright: (c) YEAR by AUTHOR.
+        :license: LICENSE_NAME, see LICENSE_FILE for more details.
+    """
+
+
+Comments
+--------
+
+General:
+  - The ``#`` symbol (pound or hash) is used to start comments.
+  - A space must follow the ``#`` between any written text.
+  - Line length must be observed.
+  - Inline comments are preceded by two spaces.
+  - Write sentences correctly: proper capitalisation and punctuation.
+
+  .. code-block:: python
+
+    # Good comment with space before and full sentence.
+    statement  # Good comment with two spaces
+
+
+    #Bad comment no space before
+    statement # Bad comment, needs two spaces
+
+
+Docstring comments:
+  Rules for comments are similar to docstrings.  Both are formatted with
+  reStructuredText.  If a comment is used to document an attribute, put a
+  colon after the opening pound sign (``#``):
+
+  .. code-block:: python
+
+    class User(object):
+        #: the name of the user as unicode string
+        name = Column(String)
+        #: the sha1 hash of the password + inline salt
+        pw_hash = Column(String)
+
+
+.. _Flask Styleguide: http://flask.pocoo.org/docs/styleguide/
+.. _reST field lists: http://sphinx-doc.org/domains.html#info-field-lists
+.. _Python cross-referencing: http://sphinx-doc.org/domains.html#cross-referencing-python-objects
+.. _Sphinx: http://sphinx-doc.org/
+.. _reStructuredText primer: http://sphinx-doc.org/rest.html
+.. _Sphinx documentation: http://sphinx-doc.org/contents.html
+.. _paragraph-level markup: http://sphinx-doc.org/markup/para.html#paragraph-level-markup
diff --git a/docs/developers/testing.rst b/docs/developers/testing.rst
new file mode 100644
index 0000000..ce7a5d8
--- /dev/null
+++ b/docs/developers/testing.rst
@@ -0,0 +1,142 @@
+.. _testing:
+
+Testing
+=======
+
+Our aim is that all new functionality is adequately tested. Adding tests for
+existing functionality is highly recommended before any major reimplementation
+(refactoring, etcetera).
+
+We use `py.test`_ for (unit) testing. You need at least pytest >= 1.0.0, but
+pytest >= 2.1 is strongly recommended.
+
+To run tests in the current directory and its subdirectories:
+
+.. code-block:: bash
+
+    $ py.test  # runs all tests
+    $ py.test storage/test_dtd.py  # runs just a single test module
+
+We use several py.test features to simplify testing, and to suppress errors in
+circumstances where the tests cannot possibly succeed (limitations of
+tests and missing dependencies).
+
+
+Skipping tests
+--------------
+
+Pytest allows tests, test classes, and modules to be skipped or marked as
+"expected to fail" (xfail).
+Generally you should *skip* only if the test cannot run at all (throws uncaught
+exception); otherwise *xfail* is preferred as it provides more test coverage.
+
+importorskip
+^^^^^^^^^^^^
+
+.. the ~ in this :func: reference suppresses all but the last component
+
+Use the builtin :func:`~pytest:_pytest.runner.importorskip` function
+to skip a test module if a dependency cannot be imported:
+
+.. code-block:: python
+
+    from pytest import importorskip
+    importorskip("vobject")
+
+If *vobject* can be imported, it will be; otherwise it raises an exception
+that causes pytest to skip the entire module rather than failing.
+
+skipif
+^^^^^^
+
+Use the ``skipif`` decorator to :ref:`mark tests to be skipped <pytest:skipif>`
+unless certain criteria are met.  The following skips a test if the version of
+*mymodule* is too old:
+
+.. code-block:: python
+
+    import mymodule
+
+    @pytest.mark.skipif("mymodule.__version__ < '1.2'")
+    def test_function():
+        ...
+
+In Python 2.6 and later, you can apply this decorator to classes as well as
+functions and methods.
+
+It is also possible to skip an entire test module by creating a ``pytestmark``
+static variable in the module:
+
+.. code-block:: python
+
+    # mark entire module as skipped for py.test if no indexer available
+    pytestmark = pytest.mark.skipif("noindexer")
+
+xfail
+^^^^^
+
+Use the ``xfail`` decorator to :ref:`mark tests as expected to fail
+<pytest:xfail>`. This allows you to do the following:
+
+* Build tests for functionality that we haven't implemented yet
+* Mark tests that will fail on certain platforms or Python versions
+* Mark tests that we should fix but haven't got round to fixing yet
+
+The simplest form is the following:
+
+.. code-block:: python
+
+    from pytest import pytest.mark
+    
+    @mark.xfail
+    def test_function():
+        ...
+
+You can also pass parameters to the decorator to mark expected failure only
+under some condition (like *skipif*), to document the reason failure is
+expected, or to actually skip the test:
+
+.. code-block:: python
+
+    @mark.xfail("sys.version_info >= (3,0)")  # only expect failure for Python 3
+    @mark.xfail(..., reason="Not implemented")  # provide a reason for the xfail
+    @mark.xfail(..., run=False)  # skip the test but still regard it as xfailed
+
+
+Testing for Warnings
+--------------------
+
+deprecated_call
+^^^^^^^^^^^^^^^
+
+The builtin :func:`~pytest:pytest.deprecated_call` function checks that a
+function that we run raises a DeprecationWarning:
+
+.. code-block:: python
+
+    from pytest import deprecated_call
+ 
+    def test_something():
+        deprecated_call(function_to_run, arguments_for_function)
+
+recwarn
+^^^^^^^
+
+The |recwarn plugin|_ allows us to test for other warnings. Note that
+``recwarn`` is a funcargs plugin, which means that you need it in your test
+function parameters:
+
+.. code-block:: python
+
+    def test_example(recwarn):
+        # do something
+        w = recwarn.pop()
+        # w.{message,category,filename,lineno}
+        assert 'something' in str(w.message)
+
+
+.. _py.test: http://pytest.org/
+
+.. _recwarn plugin: http://pytest.org/latest/recwarn.html
+.. |recwarn plugin| replace:: *recwarn plugin*
+.. we use |recwarn plugin| here and in ref above for italics like :ref:
diff --git a/docs/formats/android.rst b/docs/formats/android.rst
new file mode 100644
index 0000000..24a21ad
--- /dev/null
+++ b/docs/formats/android.rst
@@ -0,0 +1,24 @@
+.. _android:
+
+Android string resources
+************************
+
+:wp:`Android <Android_%28operating_system%29>` programs make use of localisable
+string resources.
+
+.. note:: The toolkit supports this format, but still doesn't provide any
+   converter.
+
+
+.. _android#references:
+
+References
+==========
+
+* Android `Resource files reference
+  <http://developer.android.com/guide/topics/resources/resources-i18n.html>`_
+* Android `String resources reference
+  <http://developer.android.com/guide/topics/resources/available-resources.html#stringresources>`_
+* `Localizing Android Applications <http://www.linux-mag.com/id/7794>`_ tutorial
+* Reference for `translatable attribute
+  <http://tools.android.com/recent/non-translatablestrings>`_
diff --git a/docs/formats/base_classes.rst b/docs/formats/base_classes.rst
index af01f59..169f5d2 100644
--- a/docs/formats/base_classes.rst
+++ b/docs/formats/base_classes.rst
@@ -3,8 +3,9 @@
 
 Base classes
 ************
-NOTE: This page is mostly useful for :doc:`developers` as it describes some
-programming detail of the :doc:`toolkit <index>`.
+NOTE: This page is mostly useful for :doc:`developers
+</developers/developers>` as it describes some programming detail of the
+:doc:`toolkit <index>`.
 
 For the implementation of the different storage classes that the toolkit
 supports, we want to define a set of base classes to form a common API for all
@@ -37,7 +38,7 @@ Other possibilities:
 * Support for variable number of languages in the format. Examples: .txt and
   .properties support one language, PO supports two, :doc:`tmx` supports many.
 * Support for "multifiles", in other words a file that contain other entities
-  that corresponds to files in other formats. Examples: ZIP, XPI and
+  that corresponds to files in other formats. Examples: ZIP and
   :doc:`xliff`. In reality this is only used by some of the converters. This
   isn't present in the base class yet.
 
@@ -118,7 +119,7 @@ Multifile
 This abstraction is only used by a few converters.
 
 This class represents a storage format that contains other files or file like
-objects. Examples include ZIP, XPI and XLIFF, and OpenOffice SDF files. It must
+objects. Examples include ZIP, XLIFF, and OpenOffice SDF files. It must
 give access to the contained files, and possibly give access to the translation
 units contained in those files, as if they are contained natively.
 
diff --git a/docs/formats/catkeys.rst b/docs/formats/catkeys.rst
index f3ae05a..71ab8b0 100644
--- a/docs/formats/catkeys.rst
+++ b/docs/formats/catkeys.rst
@@ -17,4 +17,4 @@ Links
 * `Some notes about the format
   <http://www.haiku-os.org/blog/pulkomandy/2009-09-24_haiku_locale_kit_translator_handbook>`_
 * `Some example files
-  <http://dev.haiku-os.org/browser/haiku/trunk/data/catalogs/>`_
+  <http://cgit.haiku-os.org/haiku/tree/data/catalogs/>`_
diff --git a/docs/formats/csv.rst b/docs/formats/csv.rst
index 9a587b5..504a681 100644
--- a/docs/formats/csv.rst
+++ b/docs/formats/csv.rst
@@ -6,8 +6,8 @@ CSV
 CSV (Comma Separated Values) is a simple file format for general data
 interchange. It can be used in the toolkit for simple data interchange, and can
 be edited with most spreadsheet programs. There is no formal specification for
-the CSV file format, but more information can be acquired from `Comma-Separated
-Values <https://en.wikipedia.org/wiki/Comma-separated_values>`_
+the CSV file format, but more information can be acquired from
+:wp:`Comma-Separated Values <Comma-separated_values>`
 
 .. _csv#conformance:
 
diff --git a/docs/formats/html.rst b/docs/formats/html.rst
index a123cc4..321c892 100644
--- a/docs/formats/html.rst
+++ b/docs/formats/html.rst
@@ -15,7 +15,7 @@ Conformance
 ===========
 
 * Can identify almost all tags and attributes that are localisable.
-* Does not convert HTML entities (e.g. ©) to normal strings
+* Does not convert HTML entities (e.g. ``©``) to normal strings
 * It does not handle inline elements well and will drop them, so complicated
   HTML might not make it through the filter
 
diff --git a/docs/formats/ical.rst b/docs/formats/ical.rst
index 3023690..5a9cb02 100644
--- a/docs/formats/ical.rst
+++ b/docs/formats/ical.rst
@@ -5,8 +5,8 @@
 iCalendar
 *********
 
-Support for `iCalendar <https://en.wikipedia.org/wiki/ICalendar>`_ (\*.ics)
-files.  This allows calendars to be localised.
+Support for :wp:`iCalendar <ICalendar>` (\*.ics) files.  This allows calendars
+to be localised.
 
 The format extracts certain properties from VEVENT objects.  The properties are
 limited to textual entries that would need to be localised, it does not include
@@ -25,9 +25,9 @@ Resources
 * `VObject <http://vobject.skyhouseconsulting.com/>`_ -- the python library
   used to read the iCal file.
 * `iCalender validator <http://severinghaus.org/projects/icv/>`_
-* `iCalendar <https://en.wikipedia.org/wiki/ICalendar>`_
+* :wp:`iCalendar <ICalendar>`
 * `Components and their properties
-  <http://upload.wikimedia.org/wikipedia/en/c/c0/ICalendarSpecification.png>`_
+  <https://upload.wikimedia.org/wikipedia/commons/c/c0/ICalendarSpecification.png>`_
 
 .. _ical#conformance:
 
diff --git a/docs/formats/index.rst b/docs/formats/index.rst
index 2c226c1..ac9d566 100644
--- a/docs/formats/index.rst
+++ b/docs/formats/index.rst
@@ -43,6 +43,7 @@ Other translation formats
    strings
    flex
    catkeys
+   android
 
 * :doc:`csv`
 * :doc:`ini` (including Inno Setup .isl dialect)
@@ -56,6 +57,7 @@ Other translation formats
 * Mac OSX :doc:`strings` files (also used on the iPhone) (from version 1.8)
 * Adobe :doc:`flex` files (from version 1.8)
 * Haiku :doc:`catkeys` (from version 1.8)
+* :doc:`android` (supports storage, not conversion)
 
 .. _formats#translation_memory_formats:
 
@@ -103,6 +105,7 @@ Formats of translatable documents
 
    html
    ical
+   json
    odf
    text
    wiki
@@ -110,12 +113,10 @@ Formats of translatable documents
 
 * :doc:`html`
 * :doc:`ical`
-* `JSON <https://en.wikipedia.org/wiki/JSON>`_ (from v1.9.0)
-* `OpenDocument <https://en.wikipedia.org/wiki/OpenDocument>`_ -- all ODF file
-  types
+* :doc:`json`
+* :wp:`OpenDocument` -- all ODF file types
 * :doc:`Text <text>` -- plain text with blocks separated by whitespace
-* :doc:`Wiki <wiki>` -- `DokuWiki <https://en.wikipedia.org/wiki/DokuWiki>`_
-  and `MediaWiki <https://en.wikipedia.org/wiki/MediaWiki>`_ supported
+* :doc:`Wiki <wiki>` -- :wp:`DokuWiki` and :wp:`MediaWiki` supported
 * :doc:`subtitles` -- various formats (v1.4)
 
 .. _formats#machine_readable_formats:
@@ -163,7 +164,7 @@ Formats that we would like to support but don't currently support:
 
   * `AppleGlot <ftp://ftp.apple.com/developer/tool_chest/localization_tools/appleglot/appleglot_3.2_usersguide.pdf>`_
   * .plist -- see :bug:`633` and `plistlib
-    <http://docs.python.org/library/plistlib.html>`_ for Python
+    <http://docs.python.org/2/library/plistlib.html>`_ for Python
 
 * Adobe:
 
@@ -178,36 +179,28 @@ Formats that we would like to support but don't currently support:
 * Microsoft
 
   * Word, Excel, etc (probably through usage of OpenOffice.org)
-  * `OOXML <https://en.wikipedia.org/wiki/OOXML>`_ (at least at the text level
-    we don't have to deal with much of the mess inside OOXML).  See also: `Open
-    XML SDK v1 <http://go.microsoft.com/fwlink/?LinkId=120908>`_
-  * `Rich Text Format <https://en.wikipedia.org/wiki/Rich_Text_Format>`_ (RTF)
-    see also `pyrtf-ng <http://code.google.com/p/pyrtf-ng/>`_
-  * `Open XML Paper Specification
-    <https://en.wikipedia.org/wiki/Open_XML_Paper_Specification>`_
+  * :wp:`OOXML` (at least at the text level we don't have to deal with much of
+    the mess inside OOXML).  See also: `Open XML SDK v1
+    <http://go.microsoft.com/fwlink/?LinkId=120908>`_
+  * :wp:`Rich Text Format <Rich_Text_Format>` (RTF) see also `pyrtf-ng
+    <http://code.google.com/p/pyrtf-ng/>`_
+  * :wp:`Open XML Paper Specification <Open_XML_Paper_Specification>`
   * .NET Resource files (.resx) -- :bug:`Bug 396 <396>`
 
 * XML related
 
   * Generic XML
-  * `DocBook <https://en.wikipedia.org/wiki/DocBook>`_ (can be handled by KDE's
-    :man:`xml2pot`)
+  * :wp:`DocBook` (can be handled by KDE's :man:`xml2pot`)
   * `SVG <http://www.w3.org/TR/SVG/>`_
-  * `Android <https://en.wikipedia.org/wiki/Android_%28operating_system%29>`_
-    `resource files
-    <http://code.google.com/android/devel/resources-i18n.html>`_ specifically
-    `string resources
-    <http://code.google.com/android/reference/available-resources.html#stringresources>`_
-    (`more background <http://www.linux-mag.com/id/7794>`_)
-
-* `DITA <https://en.wikipedia.org/wiki/Darwin_Information_Typing_Architecture>`_
-* `PDF <https://en.wikipedia.org/wiki/Portable_Document_Format>`_ see `spec
+
+* :wp:`DITA <Darwin_Information_Typing_Architecture>`
+* :wp:`PDF <Portable_Document_Format>` see `spec
   <http://www.adobe.com/devnet/pdf/pdf_reference.html>`_, `PDFedit
-  <http://pdfedit.petricek.net/en/index.html>`_
-* `LaTeX <https://en.wikipedia.org/wiki/LaTeX>`_ -- see `plasTeX
+  <http://pdfedit.cz/en/index.html>`_
+* :wp:`LaTeX` -- see `plasTeX
   <http://plastex.sourceforge.net/plastex/index.html>`_, a Python framework for
   processing LaTeX documents
-* `unoconv <http://dag.wieers.com/home-made/unoconv/>`_ -- Python bindings to
+* `unoconv <http://dag.wiee.rs/home-made/unoconv/>`_ -- Python bindings to
   OpenOffice.org UNO which could allow manipulation of all formats understood
   by OpenOffice.org.
 * Trados:
@@ -215,12 +208,15 @@ Formats that we would like to support but don't currently support:
   * TTX (`Reverse Engineered DTD
     <http://www.tracom.de/04/EN/techdoccenter/download/TRADOS_TTX-DTD.zip>`_,
     `other discussion
-    <http://blogs.sun.com/timf/entry/beds_mattresses_and_open_standards>`_)
+    <http://timsfoster.wordpress.com/2005/07/05/beds-mattresses-and-open-standards/>`_)
   * Multiterm XML `TSV to MiltiTerm conversion script
     <http://syntax.biz.pl/multiterm.html>`_ or `XLST
     <http://translationzone.eu/mtxml2txt.html>`_
   * .tmw
-  * .txt (You can interchange using TMX) `Format explanation <http://uk.dir.groups.yahoo.com/group/Tradosuser/message/2318?o=1&d=-1>`_ and `2 <http://translate.google.com/translate?js=y&prev=_t&hl=en&ie=UTF-8&layout=1&eotf=1&u=http%3A%2F%2Fwww.diemohrs.de%2Ftipps2_neu.html&sl=auto&tl=en>`_ with some `examples <http://slaci.komarom.net/roli/Trados/TRADOS%206.5.5.439%20Freelance%20+%20TRADOS%20MultiTerm%20iX%206.0.1.209/TRADOS%206.5.5.439%20Freelance/Program%20Files/TRADOS/T65_FL/Samples/T [...]
+  * .txt (You can interchange using TMX) `Format explanation
+    <http://translate.google.com/translate?js=y&prev=_t&hl=en&ie=UTF-8&layout=1&eotf=1&u=http%3A%2F%2Fwww.diemohrs.de%2Ftipps2_neu.html&sl=auto&tl=en>`_
+    with some `examples
+    <http://slaci.komarom.net/roli/Trados/TRADOS%206.5.5.439%20Freelance%20+%20TRADOS%20MultiTerm%20iX%206.0.1.209/TRADOS%206.5.5.439%20Freelance/Program%20Files/TRADOS/T65_FL/Samples/TW4Win/>`_.
 
 * Tcl: .msg files.  `Good documentation
   <http://www.google.com/codesearch?hl=en&q=show:XvsRBDCljVk:M2kzUbm70Ts:D5EHICz0aaQ&sa=N&ct=rd&cs_p=http://www.scilab.org/download/4.0/scilab-4.0-src.tar.gz&cs_f=scilab-4.0/tcl/scipadsources/msg_files/AddingTranslations.txt>`_
@@ -235,10 +231,10 @@ Formats that we would like to support but don't currently support:
     This is a custom XML format, another one!
 
 * catgets/`gencat
-  <http://www.opengroup.org/onlinepubs/009695399/utilities/gencat.html>`_:
+  <http://pubs.opengroup.org/onlinepubs/009695399/utilities/gencat.html>`_:
   precedes gettext, looking in man packages is the best information I could
   find.  Also `LSB requires it
-  <http://dev.linuxfoundation.org/navigator/browse/cmd_single.php?cmd=list-by-name&Cname=gencat>`_.
+  <http://www.linuxbase.org/navigator/browse/cmd_single.php?cmd=list-by-name&Cname=gencat>`_.
   There is some info about the source (msgfile) format on `GNU website
   <http://www.gnu.org/software/libc/manual/html_node/The-message-catalog-files.html#The-message-catalog-files>`_
 * :doc:`wml`
diff --git a/docs/formats/ini.rst b/docs/formats/ini.rst
index a03b347..3e3dda9 100644
--- a/docs/formats/ini.rst
+++ b/docs/formats/ini.rst
@@ -23,8 +23,8 @@ Dialects
 
 The format supports two dialects:
 
-* default: standard iniparse handling of INI files
-* inno: follows `Inno <http://www.innosetup.com/files/istrans/>`_ escaping
+- default: standard iniparse handling of INI files
+- inno: follows `Inno <http://www.innosetup.com/files/istrans/>`_ escaping
   conventions
 
 .. _ini#references:
@@ -34,5 +34,5 @@ References
 
 Further information is available on .ini files:
 
-* Wikipedia `INI file format <https://en.wikipedia.org/wiki/INI_file>`_ article
-* `Unofficial specification <http://www.cloanto.com/specs/ini.html>`_
+- Wikipedia :wp:`INI file format <INI_file>` article
+- `Unofficial specification <http://www.cloanto.com/specs/ini/>`_
diff --git a/docs/formats/json.rst b/docs/formats/json.rst
new file mode 100644
index 0000000..eb9a682
--- /dev/null
+++ b/docs/formats/json.rst
@@ -0,0 +1,32 @@
+JSON
+====
+
+.. versionadded:: 1.9.0
+
+:wp:`JSON` is a common format for web data interchange.
+
+Example:
+
+.. code-block:: json
+
+   {
+       "firstName": "John",
+       "lastName": "Smith",
+       "age": 25,
+       "address": {
+           "streetAddress": "21 2nd Street",
+           "city": "New York",
+           "state": "NY",
+           "postalCode": 10021
+       },
+       "phoneNumbers": [
+           {
+               "type": "home",
+               "number": "212 555-1234"
+           },
+           {
+               "type": "fax",
+               "number": "646 555-4567"
+           }
+       ]
+   }
diff --git a/docs/formats/l20n.rst b/docs/formats/l20n.rst
index 1d817eb..c5e71e0 100644
--- a/docs/formats/l20n.rst
+++ b/docs/formats/l20n.rst
@@ -17,7 +17,7 @@ Our tools are based on the idea of units. Each unit has an associated (source,
 target) pair, possibly containing more, like comments, state, etc. We prefer to
 build our richer tools against bilingual formats like :doc:`po`, :doc:`xliff`,
 :doc:`ts`, etc. and provide converters to these formats when we want to support
-:doc:`guide/monolingual` formats. Pootle also implements its own bilingual
+:wiki:`guide/monolingual` formats. Pootle also implements its own bilingual
 format in its database.
 
 l20n is based on the idea of entity soup, or object soup. Files are (at least
diff --git a/docs/formats/odf.rst b/docs/formats/odf.rst
index aba8942..32f923d 100644
--- a/docs/formats/odf.rst
+++ b/docs/formats/odf.rst
@@ -4,10 +4,9 @@
 
 OpenDocument Format
 *******************
-This page summarises the support for the `OpenDocument format
-<http://en.wikipedia.org/wiki/OpenDocument>`_ (ODF) in the Translate Toolkit.
-This currently involves only the :doc:`odf2xliff </commands/odf2xliff>` and
-xliff2odf converters.
+This page summarises the support for the :wp:`OpenDocument` format (ODF) in the
+Translate Toolkit.  This currently involves only the :doc:`odf2xliff
+</commands/odf2xliff>` and xliff2odf converters.
 
 The Translate Toolkit aims to support version 1.1 of the ODF standard, although
 it should work reasonably well with older or newer files to the extent that
@@ -23,5 +22,5 @@ released versions of the Translate Toolkit are not aware of their existence.
   <https://github.com/translate/translate/blob/master/translate/storage/odf_shared.py#L23>`_
 
 More complex tag uses are still needed to extract 100% correctly in some
-complex cases. For more information, see the list of :doc:`issues from testing
+complex cases. For more information, see the list of :wiki:`issues from testing
 <odf/testing>`.
diff --git a/docs/formats/php.rst b/docs/formats/php.rst
index 58983fc..5ead7c8 100644
--- a/docs/formats/php.rst
+++ b/docs/formats/php.rst
@@ -4,21 +4,10 @@
 PHP
 ***
 
-Many `PHP <https://en.wikipedia.org/wiki/PHP>`_ programs make use of a
-localisable string array.  The toolkit supports the full localisation of such
-files with :doc:`/commands/php2po` and po2php.
+Many :wp:`PHP` programs make use of a localisable string array.  The toolkit
+supports the full localisation of such files with :doc:`/commands/php2po` and
+po2php.
 
-.. _php#example:
-
-Example
-=======
-
-The localisable string arrays appear like this:
-
-.. code-block:: php
-
-    <?php
-    $string['name'] = 'value'
 
 .. _php#conformance:
 
@@ -27,50 +16,179 @@ Conformance
 
 Our format support allows:
 
-* PHP escaping (both for `single
+* `Single
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single>`_
   and `double
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double>`_
-  quoted strings)
-* Multiline entries
+  quoted strings (both for keys and values)
+
+  .. code-block:: php
+
+      <?php
+      $variable = 'string';
+      $messages["language"] = 'Language';
+      define('item', "another string");
+
+
 * PHP simple variable syntax
 
-.. code-block:: php
+  .. code-block:: php
 
-    $variable = 'string';
-    $another_variable = "another string";
+      <?php
+      $variable = 'string';
+      $another_variable = "another string";
 
-* Various layouts of the id
+
+* PHP square bracket array syntax
 
   .. code-block:: php
-  
-      $string['name'];
-      $string['name'] ;
-      $string[name];
-      $string[ 'name' ];
 
-* PHP array syntax for localisation (since > 1.6.0)
+      <?php
+      $messages['language'] = 'Language';
+      $messages['file'] = "File";
+      $messages["window"] = 'Window';
+      $messages["firewall"] = "Firewall";
+
+
+* PHP array syntax
+
+  .. versionadded:: 1.7.0
 
   .. code-block:: php
 
+      <?php
+      // Can be 'array', 'Array' or 'ARRAY'.
       $lang = array(
          'name' => 'value',
-         'name2' => 'value2',
+         'name2' => "value2",
+         "key1" => 'value3',
+         "key2" => "value4",
       );
 
+
 * PHP define syntax
 
-.. code-block:: php
+  .. versionadded:: 1.10.0
+
+  .. code-block:: php
+
+      <?php
+      define('item', 'string');
+      define('another_item', "another string");
+      define("key", 'and another string');
+      define("another_key", "yet another string");
+
+
+* Escape sequences (both for `single
+  <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single>`_
+  and `double
+  <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double>`_
+  quoted strings)
+
+  .. code-block:: php
+
+      <?php
+      $variable = 'He said: "I\'ll be back"';
+      $another_variable = "First line \n second line";
+      $key = "\tIndented string";
+
+
+* Multiline entries
+
+  .. code-block:: php
+
+      <?php
+      $lang = array(
+         'name' => 'value',
+         'info' => 'Some hosts disable automated mail sending
+	        on their servers. In this case the following features
+	        cannot be implemented.',
+         'name2' => 'value2',
+      );
+
+
+* Various layouts of the id
+
+  .. code-block:: php
+
+      <?php
+      $string['name'] = 'string';
+      $string[name] = 'string';
+      $string[ 'name' ] = 'string';
+
+
+* Comments
+
+  .. versionchanged:: 1.10.0
+
+  .. code-block:: php
+
+      <?php
+      # Hash one-line comment
+      $messages['language'] = 'Language';
+
+      // Double slash one-line comment
+      $messages['file'] = 'File';
+
+      /*
+         Multi-line
+         comment
+      */
+      $messages['help'] = 'Help';
 
-    define('item', 'string');
-    define("another_item", "another string");
 
 * Whitespace before end delimiter
 
+  .. versionadded:: 1.10.0
+
+  .. code-block:: php
+
+      <?php
+      $variable = 'string'     ;
+
+      $string['name'] = 'string'     ;
+
+      $lang = array(
+         'name' => 'value'           ,
+      );
+
+      define('item', 'string'    );
+
+
+* Nested arrays with any number of nesting levels
+
+  .. versionadded:: 1.11.0
+
   .. code-block:: php
 
-      $string['name']     ;
-      $string['name'] ;
+      <?php
+      $lang = array(
+         'name' => 'value',
+         'datetime' => array(
+            'TODAY' => 'Today',
+            'YESTERDAY'	=> 'Yesterday',
+            'AGO' => array(
+                0 => 'less than a minute ago',
+                2 => '%d minutes ago',
+                60 => '1 hour ago',
+            ),
+            'Converted' => 'Converted',
+            'LAST' => 'last',
+         ),
+      );
+
+* Whitespace in the array declaration
+
+  .. versionadded:: 1.11.0
+
+  .. code-block:: php
+
+      <?php
+      $variable = array    (
+         "one" => "this",
+         "two" => "that",
+      );
+
 
 .. _php#non-conformance:
 
@@ -79,8 +197,57 @@ Non-Conformance
 
 The following are not yet supported:
 
-* `herdoc
+* Keyless arrays:
+
+  .. code-block:: php
+
+      <?php
+      $days = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+
+      $messages['days_short'] = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
+
+
+* Nested arrays without key for a nested array:
+
+  .. code-block:: php
+
+      <?php
+      $lang = array(array("key" => "value"));
+
+
+* Array entries without ending comma:
+
+  .. code-block:: php
+
+      <?php
+      $variable = array(
+         "one" => "this",
+         "two" => "that"
+      );
+
+
+* String concatenation:
+
+  .. code-block:: php
+
+      <?php
+      $messages['welcome'] = 'Welcome ' . $name . '!';
+      $messages['greeting'] = 'Hi ' . $name;
+
+
+* Assignment in the same line a multiline comment ends:
+
+  .. code-block:: php
+
+      <?php
+      /*
+         Multi-line
+         comment
+      */ $messages['help'] = 'Help';
+
+
+* `Heredoc
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.heredoc>`_
-  and `nowdoc
+* `Nowdoc
   <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.nowdoc>`_
-  are not managed
+
diff --git a/docs/formats/po.rst b/docs/formats/po.rst
index 147caf2..3947db4 100644
--- a/docs/formats/po.rst
+++ b/docs/formats/po.rst
@@ -5,8 +5,8 @@ PO Files
 ********
 PO files use the file format of the Gettext tools.
 
-.. seealso:: `Gettext manual <http://www.gnu.org/software/gettext/>`_ and `KDE
-   style PO files <http://public.planetmirror.com/pub/kde/devel/gettext-kde/>`_
+.. seealso:: `Gettext manual <http://www.gnu.org/software/gettext/>`_
+
 
 .. _po#supported_features:
 
@@ -14,68 +14,67 @@ Supported Features
 ==================
 
 * Headers
-* Plural forms and plural form handling
-* Obsolete messages
-* Message Context (msgctxt)
 * Language header (since gettext version 0.17)
-* Previous message ID and context (#| msgid and #| msgctxt)
+* Plural forms and plural form handling
+* Message context
 
-.. _po#supported_comments:
+  .. code-block:: po
 
-Supported comments
-==================
+    msgctxt "noun"
+    msgid "View"
+    msgstr ""
 
-* normal comments
+* Normal comments
 
-.. code-block:: po
+  .. code-block:: po
 
     # this is another comment
 
-* automatic comments
+* Automatic comments
 
-.. code-block:: po
+  .. code-block:: po
 
     #. comment extracted from the source code
 
-* source location comments
+* Source location comments
 
-.. code-block:: po
+  .. code-block:: po
 
     #: sourcefile.xxx:35
 
-* typecomments
+* Typecomments
 
-.. code-block:: po
+  .. code-block:: po
 
     #, fuzzy
 
-* msgidcomments
+* Msgidcomments, also known as KDE style comments as they are used by KDE for
+  message disambiguation and comments to translators.
 
-.. code-block:: po
+  .. note:: Support for this is being phased out in favor of ``msgctxt``.
+
+  .. code-block:: po
 
     msgid "_: comment\n"
     "translation"
 
-Also know as KDE style comments as they are used by KDE for message
-disambiguation and comments to translators. (support for this is being phased
-out)
-
-* obsolete messages
+* Obsolete messages
 
-.. code-block:: po
+  .. code-block:: po
 
     #~ msgid "Blah"
     #~ msgstr "Bleeh"
 
-* previous msgid and msgctxt
+* Previous msgid
 
-.. code-block:: po
+  .. code-block:: po
 
     #| msgid "previous message"
 
-.. _po#unsupported_features:
+* Previous msgctxt
+
+  .. code-block:: po
+
+    #| msgctxt "previous context"
 
-Unsupported Features
-====================
 
-None
diff --git a/docs/formats/properties.rst b/docs/formats/properties.rst
index 77e9e8c..b4d2506 100644
--- a/docs/formats/properties.rst
+++ b/docs/formats/properties.rst
@@ -47,8 +47,8 @@ Examples
 References
 ==========
 
-* Java Properties Class `load method
-  <http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#load(java.io.InputStream)>`_
+- Java Properties Class's `load()
+  <http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Properties.html#load(java.io.InputStream)>`_
   describes the properties format.
-* http://java.sun.com/dtd/properties.dtd -- alternate XML based property
-  representation
+- http://www.oracle.com/webfolder/technetwork/jsc/dtd/properties.dtd --
+  alternate XML based property representation
diff --git a/docs/formats/quoting_and_escaping.rst b/docs/formats/quoting_and_escaping.rst
index d59f991..316fd22 100644
--- a/docs/formats/quoting_and_escaping.rst
+++ b/docs/formats/quoting_and_escaping.rst
@@ -22,7 +22,8 @@ Escaping is done with a backslash. An escaped double quote (``\"``) corresponds
 to a double quote in the original string. ``\n`` for newline, ``\t`` for tabs
 etc are used. Backslashes can be escaped to to give a native backslash.
 
-See also `escaping <guide/translation/escaping>`_ in the translation guide.
+See also :wiki:`escaping <guide/translation/escaping>` in the translation
+guide.
 
 Example:
 
diff --git a/docs/formats/rc.rst b/docs/formats/rc.rst
index b0631a1..e45e372 100644
--- a/docs/formats/rc.rst
+++ b/docs/formats/rc.rst
@@ -17,9 +17,9 @@ Conformance
 ===========
 
 The actual specification of .rc files is hard to come by.  The parser was built
-using `WINE <https://en.wikipedia.org/wiki/Wine_%28software%29>`_ .rc files as
-a reference.  This was done as WINE is a good target for .rc translations.  We
-are confident though that the extraction will prove robust for all .rc files.
+using :wp:`WINE <Wine_%28software%29>` .rc files as a reference.  This was done
+as WINE is a good target for .rc translations.  We are confident though that
+the extraction will prove robust for all .rc files.
 
 .. _rc#useful_resource:
 
diff --git a/docs/formats/strings.rst b/docs/formats/strings.rst
index d830a0d..cd91e69 100644
--- a/docs/formats/strings.rst
+++ b/docs/formats/strings.rst
@@ -17,8 +17,8 @@ References
 ==========
 
 * `Localising string resources
-  <http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html#//apple_ref/doc/uid/20000005-SW1>`_
-* `manual creation of .strings files
-  <http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html#//apple_ref/doc/uid/10000051i-CH6-SW10>`_
+  <https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html#//apple_ref/doc/uid/20000005-SW1>`_
+* `Manual creation of .strings files
+  <https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html#//apple_ref/doc/uid/10000051i-CH6-SW10>`_
 * `String format specifiers
-  <http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html>`_
+  <https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html>`_
diff --git a/docs/formats/subtitles.rst b/docs/formats/subtitles.rst
index 7562f6f..2952d5d 100644
--- a/docs/formats/subtitles.rst
+++ b/docs/formats/subtitles.rst
@@ -7,21 +7,21 @@ Subtitles
 .. versionadded:: 1.4
 
 The translation of subtitles are supported in the toolkit with the commands
-:doc:`suc2po </commands/sub2po>` and po2sub.
+:doc:`sub2po </commands/sub2po>` and po2sub.
 
 The following formats are supported for subtitles:
 
 * MicroDVD
 * MPL2
 * MPsub
-* `SubRip <https://en.wikipedia.org/wiki/SubRip>`_ (.srt)
-* `SubViewer <https://en.wikipedia.org/wiki/SubViewer>`_ 2.0 (.sub)
+* :wp:`SubRip` (.srt)
+* :wp:`SubViewer` 2.0 (.sub)
 * TMPlayer
 * Sub Station Alpha
 * Advanced Sub Station Alpha
 
-Both .sub and .srt are the main formats `supported by YouTube
-<http://help.youtube.com/support/youtube/bin/answer.py?answer=100077>`_
+YouTube supports `a number of formats
+<https://support.google.com/youtube/answer/2734698?hl=en&ref_topic=2734694>`_
 
 .. _subtitles#implementation_details:
 
diff --git a/docs/formats/tbx.rst b/docs/formats/tbx.rst
index f9820c9..e170a76 100644
--- a/docs/formats/tbx.rst
+++ b/docs/formats/tbx.rst
@@ -3,613 +3,72 @@
 
 TBX
 ***
-TBX is the LISA standard for terminology and term exchange.
+TBX is the `LISA OSCAR standard
+<http://www.gala-global.org/lisa-oscar-standards>`_ for terminology and term
+exchange.
 
 For information on more file formats, see :doc:`conformance`.
 
+
 .. _tbx#references:
 
 References
 ==========
 
-* `Standard home page <http://www.lisa.org/Term-Base-eXchange.32.0.html>`_
-* `Specification <http://www.lisa.org/TBX-Specification.33.0.html>`_
+* `Standard home page <http://www.gala-global.org/lisa-oscar-standards>`_
+* `Specification
+  <http://www.gala-global.org/oscarStandards/tbx/tbx_oscar.pdf>`_
 * `ISO 30042
   <http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=45797>`_
   -- TBX is an approved ISO standard
+* `Additional TBX resources <http://www.tbxconvert.gevterm.net/>`_
 
 You might also be interested in reading about `TBX-Basic
-<http://www.lisa.org/TBX-Basic.926.0.html>`_ -- a simpler, reduced version of
-TBX with most of the useful features included.
-
-.. _tbx#standard_conformance:
-
-Standard conformance
-====================
-
-.. _tbx#done:
-
-Done
-----
-* Basic file creation
-* Creating a bilingual list from CSV with :doc:`/commands/csv2tbx`
-* Using <tig> tags, not ntig
-
-.. _tbx#todo:
-
-Todo
-----
-* id attributes for termEntry tags
-* ntig, read and write
-* multiple languages
-* synonyms
-* cross references
-* abbreviations
-* definitions
-* context
-* parts of speech
-
-.. _tbx#implementation_notes_for_missing_features:
-
-Implementation notes for missing features
-=========================================
-
-Note here:
-
-* NLS -- South African National Language Services -- Multilingual Maths
-  Dictionary
-
-.. _tbx#synonyms:
-
-Synonyms
---------
-NLS: Extra listing
-
-TBX:
-
-.. code-block:: xml
-
-    <termNote type="termNote">synonym</termNote>
-
-according to this TBX documentation. In another place:
-
-.. code-block:: xml
-
-    <termNote type="termType">synonym</termNote>
-
-inside a <termGrp>, following <term>
-
-.. _tbx#definition:
-
-Definition
-----------
-NLS: term {definition/contextual information}
-
-TBX:
-
-.. code-block:: xml
-
-    <descripGrp>
-       <descrip type="definition">The longish definition of the term</descrip>
-    </descripGrp>
-
-inside langSet <descript> can probably be used directly under langSet
-
-.. _tbx#context:
+<http://www.gala-global.org/oscarStandards/tbx/tbx-basic.html>`_ -- a simpler,
+reduced version of TBX with most of the useful features included.
 
-Context
--------
-NLS: term {definition/contextual information} (see above)
+Additionally notes and examples about TBX are available in `Terminator TBX
+conformance notes
+<http://terminator.readthedocs.org/en/latest/tbx_conformance.html>`_ which might
+help understanding this format.
 
-TBX:
+Also you might want to use `TBXChecker
+<http://sourceforge.net/projects/tbxutil/>`_ in order to check that TBX files
+are valid. Check the `TBXChecker explanation
+<http://www.tbxconvert.gevterm.net/tbx_checker_explanation.html>`_.
 
-.. code-block:: xml
 
-    <descrip type="context">A usually somewhat longer contextual sentence.</descrip>
+.. _tbx#conformance:
 
-inside <ntig>
+Conformance
+===========
 
-.. _tbx#parts_of_speech:
+Translate Toolkit TBX format support allows:
 
-Parts of speech
----------------
-NLS: term v.  (or adj, or n.)
+* Basic TBX file creation
+* Creating a bilingual TBX from CSV using :doc:`/commands/csv2tbx`
+* Using ``<tig>`` tags only
 
-TBX:
 
-.. code-block:: xml
+.. _tbx#non-conformance:
 
-    <termNote type="partOfSpeech" >noun</termNote>
-
-following <term>
-
-.. _tbx#cross_reference:
-
-Cross reference
----------------
-NLS: alternate term -> real lemma
-
-TBX: <ref> TODO
-
-.. _tbx#abbreviations:
-
-Abbreviations
--------------
-NLS: same as alternate term: a.m. -> before noon
-
-TBX: TODO
-
-.. _tbx#tbx_cheat_sheet:
-
-TBX cheat sheet
+Non-Conformance
 ===============
 
-- source word in English
-- definition in English
-- translation of source word to XX
-- definition in XX
-- comment
-- syntactic group
-- one or more tags
-- a reference number
-
-.. code-block:: xml
-
-    <termEntry id="4324 (8)">
-        <note>tag1, tag2, tag3 (7) -
-    (Actually not clear what the best mapping to TBX is in this case.)</note>
-        <langSet xml:lang="en">
-            <tig>
-                <term>sound (1)</term>
-                <termNote type="partOfSpeech">noun (6)</termNote>
-            </tig>
-            <descripGrp>
-                <descrip type="definition">Something you can hear (2) -
-    definition with an associated external source)</descrip>
-                <xref type="xSource" target="http://www.something.org/?id=234">Glossmaster</xref>
-            </descripGrp>
-            <note>Any random note about the term. (5)
-    (Actually there are ways of storing pretty specific stuff in specific spaces,
-    but while it seems the comment could be a more verbose definition, examples,
-    usage notes or anything else, we'll use this generic way.)
-            </note>
-        </langSet>
-        <langSet xml:lang="af">
-            <tig>
-                <term>klank (3)</term>
-            </tig>
-            <descrip type="definition">Iets wat jy kan hoor (4) -
-    definition without an external source)</descrip>
-            <note>A note in the target language (5).</note>
-        </langSet>
-    </termEntry>
-
-Note that the <xref> tags are optional (as are just about everything except
-termEntry, langSet and tig). They allow to link to an external source. An
-internal source can also be specified, or the definition can be specified
-without a source as shown for the term "klank".
-
-.. _tbx#tbx_requirements_by_galician_translation_team_proxecto_trasno:
-
-TBX requirements by Galician translation team (Proxecto Trasno)
-***************************************************************
-
-Here you have a list of `TBX requirements
-<http://www.certima.net/glosima/?28-xustificacion-das-escollas-de>`_ needed by
-the `Galician translation team (Proxecto Trasno) <http://www.trasno.net>`_. Its
-translation to english is below. You can see a terminology management system
-software specification draft in
-http://translate.sourceforge.net/wiki/developers/terminology_management_system
-
-A very important feature is to allow the exporting using pretty printing (like
-in the first example below) since the exported glossaries should be able to be
-read both by humans and software.
-
-Before the example you can see a list priorizing the features from more
-interesting and needed to less interesting and needed.
-
-The chosen TBX tags are determined by the needs of our terminology management
-system (the galician translation team one). That terminology management system
-needs several glossaries, each glossary has several concepts, and each concept
-can have several definitions (only one definition per language in a given
-concept), and also can have several translations for each concept (several
-translations per language in a given concept). The concepts will also have
-associated some links to get more information (several links per language in a
-given concept). Also is needed to have defined several languages.
-
-Now we have a list of all the needed entities lets go with the list of
-attributes for each of that entities:
-
-Each glossary has a name and a description.
-
-Each concept has an unique id, a subject field (which is another concept in the
-same glossary), it can have several concepts that people may wish to see (lets
-call it related concepts), and it can also have a parent concept (broader
-concept).
-
-Each link has a type (image, Wikipedia page,...), the address of the link, and
-a tiny description.
-
-Each definition has a definition text.
-
-We want to save the ISO 639 code of each language.
-
-Each translation can have a translation text, it has an unique id, the part of
-speech, the grammatical genre (if applicable), the grammatical number (if
-applicable), a field that indicates if the translation is an abbreviation or an
-acronym, an explaining note, examples of use (created by the people that make
-the terminology), links to examples of real use (a corpus or translation
-database), a field that indicates if the translation is completed or if it is
-still incomplete (completion status), and we also need to save the translation
-administrative status (if it is a recommedend translation, a not recommended
-one, or if it is a forbidden translation) and the reason why the translation
-has the actual administrative status (a simple text string) that only applies
-when the administrative status is other than "recommended".
-
-Once listed the needs we proceeded with reading the TBX ISO 300042 standard in
-search of the elements that support these needs, and we found at least one tag
-(or attribute) for every need, except for only a few that doesn't have. We
-should comment that TBX stores the information grouping it by concepts, and
-within each concept part of the information is stored at the beginning of the
-concept and other part of that information (the language-dependant information)
-is splited between the different languages, and within every language section
-it is splited another time between the translations of that language. This way
-it has a three level structure: concept level, language level and translation
-level (also called term level).
-
-Next we list the needs and the tag chosen for that need, indicating the level
-in which the tag goes:
-
-* **Glossary name:** if we match glossary with TBX file, then the glossary name
-  is the TBX file title, the label <title>. It goes on the file header.
-
-* **Glossary description:** if we match glossary with TBX file then we can use
-  a <p> tag inside <sourceDesc> tag. It goes on the file header.
-
-* **Concept:** the <termEntry> tag from TBX standard represents a concept. This
-  tag encloses the concept level.
-
-* **Concept identifier:** the <termEntry> tag has an attribute named "id".
-
-* **Concept subject field:** the TBX standard defines the <descrip> tag with
-  "subjectField" in its "type" attribute to represent the concept subject field
-  (***<descrip type="subjectField">subject field name</descrip>***). Since
-  there is no way to refer to another concept we should use some of the
-  translations of the subject field concept (the concept that is the subject
-  field of the current concept) to put inside the subject field tag. It goes in
-  concept level. **The lack of a way in TBX standard to refer to another
-  concept within the same glossary as subject field to make self-contained
-  glossaries is a real lack or we haven't identified the way to do this using
-  TBX??**
-
-* **Related concepts:** the TBX standard suggest the use of the tag ***<ref
-  type="crossReference" target="cid­23">some text...</ref>*** where “cid­23” is
-  the value of the related concept id, and "some text..." is one of the related
-  concept translations (the first english recommended one, for example). It
-  goes on concept level.
-
-* **Broader concept:** TBX defines the use of the tag <descrip> with the value
-  "broaderConceptGeneric" in its "type" attribute and a text between its
-  opening and closing tags. Also it allows the use of the "target" attribute to
-  refer to the broader concept. It goes on concept level. Example ***<descrip
-  type="broaderConceptGeneric" target="cid­23">broader concept
-  name</descrip>***
-
-* **Link:** according to TBX standard the tag that defines external links to
-  outside the current file is the <xref> tag. This tag has the following
-  structure: ***<xref type="xGraphic" target="sports/cricket/bat.jpg">cricket
-  bat</xref>*** where "type" is the link type, "target" is the link address and
-  the text between the opening and closing tags is a short description. It goes
-  on language level.
-
-* **Link type:** the <xref> tag has an attribute named "type" that defines the
-  link type. This attribute can have the values "xGraphic" if it is an image,
-  "externalCrossReference" if it is a link to an external resource (for example
-  a link to Wikipedia). It can have other values, but for now they are
-  considered not important.
-
-* **Link address:** the <xref> tag has an attribute named "target" which is the
-  link address.
-
-* **Link description:** the link description can go between the opening and
-  closing tags
-
-* **Definition:** to save the definitions it should be used the <descrip> tag
-  with the value "definition" in its "type" attribute. It goes on the language
-  level. Example: ***<descrip type="definition">alternate name for a
-  person...</descrip>*** can be the definition for "nickname".
-
-* **Definition text:** the definition text goes between the opening and closing
-  <descrip> tags.
-
-* **Language:** in TBX the <langSet> tag represents a language, but no language
-  list is stored inside the TBX file. So if there is a <langSet> tag for a
-  given language somewhere inside the TBX file, then this particular language
-  is defined in that TBX file. Inside each concept only can exist one <langSet>
-  per language, but a given language can have a <langSet> in each <termEntry>.
-  It is essential that at least one <langSet> tag is present in every
-  <termEntry> tag. The <langSet> tag encloses the language level. It goes on
-  concept level.
-
-* **Language code:** the <langSet> tag has an attribute named "xml:lang" which
-  stores some ISO 639 code value. Example: ***<langSet xml:lang="gl">***
-
-* **Translation:** the TBX standard defines two different tags to enclose the
-  translation level: <tig> and <ntig>. The <tig> tag provides all the needed
-  functionalities, like also the <ntig> tag does, but the <ntig> also has a lot
-  of undesired and unnecessary functionalities that complicate the TBX file
-  structure in an unnecessary way making its size grow and making dificult to a
-  person read the file with a text editor. Besides the TBX-Basic standard only
-  uses the <tig> tag. So we decided to only use the <tig> tag.
-
-* **Translation text:** the translation text goes between the opening and
-  closing of the <term> tag that goes on the translation level (under the <tig>
-  tag). Example: ***<term>nickname</term>***
-
-* **Translation identifier:** the <tig> tag has an attribute named "id" in
-  which we put the identifier. Example: ***<tig id="tid­59">...</tig>***
-
-* **Part of speech:** for storing the part of speech TBX suggests the use of
-  the <termNote> tag indicating in the "type" attribute the value
-  "partOfSpeech". The TBX standard doesn't defines a part of speech values list
-  (like noun, verb...), but the TBX-Basic standard (a simplified subset of TBX)
-  defines a short list of part of speech values which we can reuse and that can
-  be completed if necessary. It goes on translation level. Example:
-  ***<termNote type="partOfSpeech">noun</termNote>***
-
-* **Grammatical gender:** TBX specifies that the grammatical gender should be
-  specified using the <termNote> tag indicating the value "grammaticalGender"
-  in the "type" attribute. Like in the previous point, TBX doesn't define a
-  gender list so we will have to use the defined in TBX-Basic. It goes on the
-  translation level. Example: ***<termNote
-  type="grammaticalGender">masculine</termNote>***
-
-* **Grammatical number:** TBX says that for saving the grammatical number it
-  should be used a <termNote> tag with the value "grammaticalNumber" in its
-  "type" attribute. For the grammatical number we are going to use the list
-  defined in TBX-Basic. The grammatical should only be put when not putting it
-  could lead to misunderstanding. It goes on the translation level. Example:
-  ***<termNote type="grammaticalNumber">plural</termNote>***
-
-* **Acronym:** to indicate that a translation is an acronym we can use the
-  <termNote> tag with the "termType" value on its attribute "type" and the text
-  "acronym" between its opening and closing tags. It goes on the translation
-  level. Example: ***<termNote type="termType">acronym</termNote>***
-
-* **Abbreviation:** Like in the previous point but putting now "abbreviation"
-  between the opening and the closing tags. It goes on the translation level.
-
-* **Translation explaining note:** for the notes TBX defines the use of the
-  <termNote> tag with the value "usageNote" on its "type" attribute with the
-  explanatory note text between its opening and closing tags. It goes on the
-  translation level. Example: ***<termNote type="usageNote">Don't abuse of that
-  translation...</termNote>***
-
-* **Example of use:** for the examples of use made ad hoc we are going to use
-  the <descrip> tag with the value "context" on its "type" attribute and the
-  example text between its opening and closing tags. It goes on the translation
-  level. We are not going to use <descrip type="sampleSentence"> since it
-  doesn't appear both in TBX and in TBX-Basic, and also we are not going to use
-  <descrip type="example"> since in it is not mandatory to include the
-  translation text in the example. Example: ***<descrip type="context">example
-  text</descrip>***
-
-* **Link to real use example:** it is used for references to corpus
-  (translations databases, like open-tran.eu). TBX says that such references
-  should be indicated using the <xref> tag with the value "corpusTrace" on its
-  "type" attribute. It goes on the translation level. Example: ***<xref
-  type="corpusTrace" target="http:*en.gl.open-tran.eu/suggest/window">Window on
-  open-tran.eu</xref>**//
-
-* **Completion status:** we are going to use the <termNote> tag with the value
-  "processStatus" in its "type" attribute and the text "provisionallyProcessed"
-  between its opening and closing tags to indicate that not all the translation
-  information is not approved or that some of that information are not included
-  on the system yet. In case being completed this tag shouldn't appear, despite
-  TBX defines the values "unprocessed" and "finalized". It goes on the
-  translation level. Example: ***<termNote
-  type="processStatus">provisionallyProcessed</termNote>***
-
-* **Administrative status:** to indicate the administrative status of the
-  translation we are going to do the way TBX specifies and not how TBX-Basic
-  does since we are using a superset of TBX-Basic. TBX specifies the use of the
-  <termNote> tag with the value "administrativeStatus" on its "type" attribute
-  and the text that indicates the status between its opening and closing tags.
-  TBX defines a list of several states but we are only going to use three of
-  them: "preferredTerm­admn­sts" to indicate that this is a recommended
-  translation, "admittedTerm­admn­sts" to indicate that it is a valid
-  translation but that be prefer not to use it since there is another one that
-  is recommended, and "deprecatedTerm­admn­sts" to indicate that this
-  translation is forbidden (for not being a valid translation for a given
-  language for some reasons: false friend,...). It goes on the translation
-  level. Example: ***<termNote
-  type="administrativeStatus">preferredTerm­admn­sts</termNote>***
-
-* **Administrative status reason:** TBX doesn't define any way to save the
-  reason why a translation has a given administrative status. Due to that we
-  decided to use the <note> tag for specifying the reason. Since this tag is
-  also used for saving notes we are considering to use the <termNoteGrp> to
-  group it together with the administrative status tag. Maybe some languages
-  are not going to use that, but in galician it is very very important. Note
-  that the reason is not specified if the administrative status is
-  "preferredTerm­admn­sts". It goes on the translation level. Example:
-  **galicism**
-
-Below you can see a diagram that shows the levels and the data that goes in
-each level. Click on the image to enlarge.
-
-.. image:: /_static/tbx_levels_structure.png
-
-.. _tbx#features_priorization:
-
-Features priorization
-=====================
-
-The upper ones are the most needed and interesting:
-
-* Definition
-* Several translations in the same language for the same concept
-* Part of speech
-* Grammatical gender
-* Grammatical number
-* Concept subject field
-* Pretty printing
-* Use of tig tag by default
-* Link to external resources (including its type, address and description)
-* Completion status
-* Administrative status
-* Administrative status reason
-* Translation explaining note
-* Translation identifier
-* Related concepts
-* Broader concept
-* Acronym
-* Abbreviation
-* Example of use
-* Link to real use example
-
-.. _tbx#example_for_galician_tbx_requirements:
-
-Example for galician TBX requirements
-=====================================
-
-.. code-block:: xml
-
-    <?xml version='1.0' encoding='UTF-8'?>
-    <!DOCTYPE martif SYSTEM 'TBXcoreStructV02.dtd'>
-    <martif type='TBX' xml:lang='en'>
-        <martifHeader>
-            <fileDesc>
-                <titleStmt>
-                    <title>Localization glossary</title>
-                </titleStmt>
-                <sourceDesc>
-                    <p>Test glossary with concepts from software localization...</p>
-                </sourceDesc>
-            </fileDesc>
-            <encodingDesc>
-                <p type='XCSURI'>http://www.lisa.org/fileadmin/standards/tbx/TBXXCSV02.xcs</p>
-            </encodingDesc>
-        </martifHeader>
-        <text>
-            <body>
-
-                <termEntry id="cid-23">
-                    <descrip type="subjectField">computer science</descrip><!-- enclosed text in english since it is the glossary 
-                    language (see martif opening tag) -->
-                    <ref type="crossReference" target="cid-12">microprocessor</ref><!-- enclosed text in english since it is the 
-                    glossary language (see martif opening tag) -->
-                    <ref type="crossReference" target="cid-16">keyboard</ref><!-- enclosed text in english since it is the glossary 
-                    language (see martif opening tag) -->
-                    <descrip type="broaderConceptGeneric" target="cid-7">hardware</descrip><!-- enclosed text in english since it is 
-                    the glossary language (see martif opening tag) -->
-
-                    <langSet xml:lang="en">
-                        <descrip type="definition">A computer is a programmable machine that receives input, stores and manipulates 
-    data, and provides output in a useful format.</descrip>
-                        <xref type="xGraphic" target="http://en.wikipedia.org/wiki/File:HPLaptopzv6000series.jpg">computer image</xref>
-                        <xref type="externalCrossReference" target="http://en.wikipedia.org/wiki/Computer">English Wikipedia computer page</xref>
-
-                        <tig id="tid-59">
-                            <term>computer</term>
-                        </tig>
-                        <tig>
-                            <term>PC</term>
-                            <termNote type="termType">acronym</termNote><!-- "PC" is an acronym of "Personal Computer" -->
-                            <termNote type="administrativeStatus">admittedTerm-admn-sts</termNote>
-                            <termNote type="usageNote">Do not abuse of using this translation.</termNote>
-                        </tig>
-                        <tig>
-                            <term>comp.</term>
-                            <termNote type="termType">abbreviation</termNote><!-- "comp." is an abbreviation of "computer" -->
-                            <termNote type="administrativeStatus">admittedTerm-admn-sts</termNote>
-                        </tig>
-                    </langSet>
-
-                    <langSet xml:lang="es">
-                        <descrip type="definition">Máquina  electrónica que recibe y procesa datos para convertirlos en información 
-    útil</descrip><!-- definition text in spanish -->
-
-                        <tig>
-                            <term>sistema</term>
-                            <termNote type="administrativeStatus">admittedTerm-admn-sts</termNote>
-                        </tig>
-                        <tig>
-                            <term>equipo</term>
-                            <termNote type="administrativeStatus">deprecatedTerm-admn-sts</termNote>
-                            <termNote type="processStatus">provisionallyProcessed</termNote>
-                        </tig>
-                        <tig>
-                            <term>ordenador</term>
-                            <termNote type="partOfSpeech">noun</termNote>
-                            <termNote type="grammaticalGender">masculine</termNote>
-                            <termNote type="grammaticalNumber">singular</termNote>
-                            <termNote type="administrativeStatus">preferredTerm-admn-sts</termNote>
-                            <descrip type="context">El ordenador personal ha supuesto la generalización de la informática.</descrip><!-- example phrase -->
-                            <xref type="corpusTrace" target="http://es.en.open-tran.eu/suggest/ordenador">ordenador en open-tran.eu</xref><!-- enclosed text in spanish -->
-                        </tig>
-                        <tig>
-                            <term>computador</term>
-                            <termNote type="administrativeStatus">deprecatedTerm-admn-sts</termNote>
-                        </tig>
-                        <tig>
-                            <term>computadora</term>
-                            <termNote type="administrativeStatus">deprecatedTerm-admn-sts</termNote>
-                        </tig>
-                    </langSet>
-
-                    <langSet xml:lang="fr">
-                        <descripGrp><!-- Using descripGrp tags for enclosing the definition and its source -->
-                            <descrip type="definition">Un ordinateur est une machine dotée d'une unité de traitement lui permettant 
-    d'exécuter des programmes enregistrés. C'est un ensemble de circuits électroniques permettant de manipuler des données sous forme 
-    binaire, ou bits. Cette machine permet de traiter automatiquement les données, ou informations, selon des séquences d'instructions 
-    prédéfinies appelées aussi programmes.
-                            Elle interagit avec l'environnement grâce à des périphériques comme le moniteur, le clavier, la souris, 
-    l'imprimante, le modem, le lecteur de CD (liste non-exhaustive). Les ordinateurs peuvent être classés selon plusieurs critères 
-    (domaine d'application, taille ou architecture).</descrip>
-                            <xref type="xSource" target="http://fr.wikipedia.org/wiki/Ordinateur">Wikipedia: ordinateur</xref>
-                        </descripGrp>
-
-                        <tig>
-                            <term>ordinateur</term>
-                        </tig>
-                    </langSet>
-                </termEntry>
-
-                <termEntry id="cid-27"><!-- Another concept -->
-                    <descrip type="subjectField">computer science</descrip>
-
-                    <langSet xml:lang="en">
-                        <descrip type="definition">A technical standard is an established norm or requirement. It is usually a formal 
-    document that establishes uniform engineering or technical criteria, methods, processes and practices. In contrast, a custom, 
-    convention, company product, corporate standard, etc. which becomes generally accepted and dominant is often called a de facto standard.</descrip>
-
-                        <tig>
-                            <term>standard</term>
-                            <termNote type="partOfSpeech">noun</termNote>
-                            <termNote type="administrativeStatus">preferredTerm-admn-sts</termNote>
-                        </tig>
-                    </langSet>
-
-                    <langSet xml:lang="gl">
-                        <descrip type="definition">Norma que mediante documentos técnicos fixa a especificación de determinado tema.</descrip>
-
-                        <tig>
-                            <term>estándar</term>
-                            <termNote type="administrativeStatus">preferredTerm-admn-sts</termNote>
-                        </tig>
-
-                        <tig>
-                            <term>standard</term>
-                            <termGrp><!-- Example of administrative status along with its reason -->
-                                <termNote type="administrativeStatus">deprecatedTerm­admn­sts</termNote>
-                                <note>Razón: anglicismo</note><!-- the translation of the enclosed text is: "Reason: anglicism" -->
-                            </termGrp>
-                        </tig>
-                    </langSet>
-                </termEntry>
-
-            </body>
-        </text>
-    </martif>
+The following are not yet supported:
+
+* ``id`` attribute for ``<termEntry>`` tags
+* Definitions
+* Multiple languages
+* Parts of speech
+* Multiple translations in the same language
+* Cross references
+* Context
+* Abbreviations
+* Synonyms
+* ``<ntig>`` tag, read and write
+
+Other features can be picked from the `Terminator TBX conformance notes
+<http://terminator.readthedocs.org/en/latest/tbx_conformance.html>`_ which also
+include examples and notes about the TBX format.
 
diff --git a/docs/formats/tmx.rst b/docs/formats/tmx.rst
index bba8019..b0a1049 100644
--- a/docs/formats/tmx.rst
+++ b/docs/formats/tmx.rst
@@ -3,19 +3,20 @@
 
 TMX
 ***
-TMX is the LISA standard for translation memories. See
-http://www.lisa.org/standards/tmx.
+TMX is the `LISA OSCAR standard
+<http://www.gala-global.org/lisa-oscar-standards>`_ for translation memories.
 
 .. _tmx#standard_conformance:
 
 Standard conformance
 ====================
 
-Summary: TMX version 1.4 conformance to Level 1, except that no markup is
-stripped.
+Summary: `TMX version 1.4
+<http://www.gala-global.org/oscarStandards/tmx/tmx14b.html>`_ conformance to
+Level 1, except that no markup is stripped.
 
 * All required header fields are supplied.
-* The adminlang field in the header is always English.
+* The ``adminlang`` field in the header is always English.
 * None of the optional header fields are supplied.
 * We assume that only two languages are used (source and single target
   language).
diff --git a/docs/formats/ts.rst b/docs/formats/ts.rst
index b91fc89..fa5d4ed 100644
--- a/docs/formats/ts.rst
+++ b/docs/formats/ts.rst
@@ -13,12 +13,12 @@ traditionally edited using Qt Linguist.
 References
 ==========
 
-The format is XML and seems to only have been documented properly in Qt 4.3
+The format is XML and seems to only have been documented properly since Qt 4.3
 
 * `Current DTD Specification
-  <http://doc.trolltech.com/4.5/linguist-ts-file-format.html>`_ for Qt 4.5,
+  <http://qt-project.org/doc/qt-5.0/qtlinguist/linguist-ts-file-format.html>`_ for Wt 5.0,
   older versions; `Qt 4.3
-  <http://doc.trolltech.com/4.3/linguist-ts-file-format.html>`_
+  <http://doc.qt.digia.com/4.3/linguist-ts-file-format.html>`_
 * http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt
 
 .. _ts#complete:
diff --git a/docs/formats/utx.rst b/docs/formats/utx.rst
index d79e95d..f22cda0 100644
--- a/docs/formats/utx.rst
+++ b/docs/formats/utx.rst
@@ -14,7 +14,8 @@ Resources
 =========
 
 * `UTX site <http://www.aamt.info/english/utx/index.htm>`_
-* `Specification <http://www.aamt.info/english/utx/utx-simple-1.00-specification-e.pdf>`_ (v1.0)
+* `Current Specification <http://www.aamt.info/english/utx/#Download>`_
+  (implementation is based on UTX 1.0 which is no longer available)
 
 .. _utx#conformance:
 
diff --git a/docs/formats/wiki.rst b/docs/formats/wiki.rst
index 9ea7319..3b0ea72 100644
--- a/docs/formats/wiki.rst
+++ b/docs/formats/wiki.rst
@@ -25,7 +25,7 @@ Supported Wiki Formats
 The following is a list of the wikis supported together with a list of the
 items that we can process:
 
-* `docuwiki <http://wiki.splitbrain.org/wiki:dokuwiki>`_ -- heading, bullet,
+* `dokuwiki <http://wiki.splitbrain.org/wiki:dokuwiki>`_ -- heading, bullet,
   numbered list
 * `MediaWiki <http://www.mediawiki.org/wiki/MediaWiki>`_ -- heading, bullet,
   numbered list
diff --git a/docs/formats/wml.rst b/docs/formats/wml.rst
index cbaadc5..2d18ef2 100644
--- a/docs/formats/wml.rst
+++ b/docs/formats/wml.rst
@@ -3,9 +3,8 @@
 
 Wireless Markup Language
 ************************
-This page documents the support for `WML
-<https://en.wikipedia.org/wiki/Wireless_Markup_Language>`_ and is used for
-planning our work on it.
+This page documents the support for :wp:`WML <Wireless_Markup_Language>` and is
+used for planning our work on it.
 
 This is implemented as a generic XML document type that is handled similarly to
-the way the :doc:`developers/projects/odf` project handles ODF documents.
+the way the :wiki:`developers/projects/odf` project handles ODF documents.
diff --git a/docs/formats/wordfast.rst b/docs/formats/wordfast.rst
index 55b4acd..a4e9cee 100644
--- a/docs/formats/wordfast.rst
+++ b/docs/formats/wordfast.rst
@@ -4,9 +4,8 @@
 Wordfast Translation Memory
 ***************************
 
-The Wordfast format, as used by the `Wordfast
-<https://en.wikipedia.org/wiki/Wordfast>`_ translation tool, is a simple tab
-delimited file.
+The Wordfast format, as used by the :wp:`Wordfast` translation tool, is a
+simple tab delimited file.
 
 The storage format can read and write Wordfast TM files.
 
diff --git a/docs/formats/xliff.rst b/docs/formats/xliff.rst
index 3e4e22c..7c9f31b 100644
--- a/docs/formats/xliff.rst
+++ b/docs/formats/xliff.rst
@@ -4,8 +4,16 @@
 XLIFF
 *****
 
-XLIFF is the OASIS standard for translation. See
-http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm.
+XLIFF[*] is the `OASIS <https://www.oasis-open.org/>`_ standard for translation.
+
+.. [*] XML Localization Interchange File Format
+
+References
+----------
+- `XLIFF Standard
+  <http://docs.oasis-open.org/xliff/xliff-core/xliff-core.html>`_
+- `OASIS XLIFF Technical Committee
+  <https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xliff>`_ website
 
 .. _xliff#flavours:
 
@@ -63,5 +71,5 @@ Done
 XLIFF and other tools
 =====================
 
-Here is a small report on the :doc:`guide/tools/xliff support by ms windows
-programs`.
+Here is a small report on :wiki:`XLIFF support by Windows programs
+<guide/tools/xliff_support_by_ms_windows_programs>`.
diff --git a/docs/guides/creating_mozilla_pot_files.rst b/docs/guides/creating_mozilla_pot_files.rst
index 3fe98b6..22e3d4c 100644
--- a/docs/guides/creating_mozilla_pot_files.rst
+++ b/docs/guides/creating_mozilla_pot_files.rst
@@ -4,10 +4,7 @@
 Creating Mozilla POT files
 **************************
 
-You can do this two ways:
-
-- Using Mozilla source (from CVS or Mercurial)
-- Using an en-US XPI file
+You can do this using Mozilla source from CVS or Mercurial
 
 .. _creating_mozilla_pot_files#using_mercurial:
 
@@ -16,10 +13,10 @@ Using Mercurial
 
 Since Firefox 3.1 and Thunderbird 3.0, Mozilla has switched to using Mercurial
 for version control. See the Mozilla's `L10n on Mercurial
-<https://developer.mozilla.org/en/l10n_on_mercurial>`_ page for instructions on
-how to checkout and update your Mozilla sources and l10n files.
+<https://developer.mozilla.org/docs/Localizing_with_Mercurial>`_ page for
+instructions on how to checkout and update your Mozilla sources and l10n files.
 
-You can use :ref:`get_moz_enUS.py <mozilla_l10n_scripts#get_moz_enus.py>` to
+You can use :ref:`get_moz_enUS.py <get_moz_enus.py>` to
 extract an en-US directory from the source tree:
 
 ::
@@ -68,14 +65,3 @@ POT files as follows::
 This will create the POT files in ``l10n/pot`` using the American English files
 from ``en-US``.  You now have a set of POT files that you can use for
 translation or updating your existing PO files.
-
-.. _creating_mozilla_pot_files#using_an_en-us_xpi_file:
-
-Using an en-US XPI file
-=======================
-
-Download an XPI file and run the following::
-
-  moz2po -P en-US.xpi pot
-
-You now have a set of POT files in ``pot``.
diff --git a/docs/guides/index.rst b/docs/guides/index.rst
index ea89bff..332d3c3 100644
--- a/docs/guides/index.rst
+++ b/docs/guides/index.rst
@@ -17,7 +17,6 @@ Use Cases
    running_the_tools_on_microsoft_windows
    cleanup_translator_comments
    creating_mozilla_pot_files
-   migrating_to_firefox
    document_translation
 
 * :doc:`Migrating an older version of your translations to the latest templates
@@ -35,6 +34,4 @@ Use Cases
 * Using ``phase`` for the complete translation roundtrip
 * :doc:`Cleanup translator comments <cleanup_translator_comments>`
 * :doc:`Creating Mozilla POT files <creating_mozilla_pot_files>`
-* :doc:`Migrating older Mozilla XPI based translations to Firefox
-  <migrating_to_firefox>`
 * :doc:`Document translation <document_translation>`
diff --git a/docs/guides/migrating_to_firefox.rst b/docs/guides/migrating_to_firefox.rst
deleted file mode 100644
index d4c52aa..0000000
--- a/docs/guides/migrating_to_firefox.rst
+++ /dev/null
@@ -1,169 +0,0 @@
-
-.. _migrating_to_firefox:
-.. _migrating_mozilla_translations_to_firefox:
-
-Migrating Mozilla Translations to Firefox
-*****************************************
-
-This quickstart shows you how to migrate your existing translations of the
-Mozilla suite to the Firefox web-browser.  The same instructions can be used to
-migrate Thunderbird§.
-
-Note: This guide assumes that you are or will be using PO files.
-
-FIXME this page needs to be rewriten now that Mozilla is using CSV.  The steps
-are more or less the same.  Look at :doc:`creating_mozilla_pot_files` which
-talks about creating POT file from CVS. Then the process is mostly the same
-except swap any reference to XPI to be the translations in Mozilla CVS.
-
-.. _migrating_to_firefox#quick_start:
-
-Quick Start
-===========
-
-#. :doc:`moz2po </commands/moz2po>` -t mozilla-1.7.3-langenus.xpi langXXYY.xpi xxYY-1.7.3
-#. :doc:`moz2po </commands/moz2po>` -P firefox-1.0-en-US.xpi templates-ff-1.0
-#. :doc:`/commands/pomigrate2` xxYY-1.7.3 xxYY-ff-1.0 templates-ff-1.0
-
-.. _migrating_to_firefox#detailed_description:
-
-Detailed Description
-====================
-
-.. _migrating_to_firefox#make_sure_your_mozilla_is_in_po_format:
-
-Make sure your Mozilla is in PO format
---------------------------------------
-
-If you are not currently using PO files to do your translations then you can
-migrate an existing XPI to PO format.
-
-.. _migrating_to_firefox#get_the_correct_en-us_xpi:
-
-Get the correct en-US xpi
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Firstly make sure you have an XPI for your language then download a Mozilla
-English (US) XPI for the same release::
-
-  ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.3/linux-xpi/langenus.xpi
-
-Change 1.7.3 to the release that you need.  Note: Linux and Windows
-langenus.xpi are the same so no need to worry about that.
-
-.. _migrating_to_firefox#create_mozilla_po_files_for_your_language:
-
-Create Mozilla PO files for your language
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Now create the Mozilla PO files for your language using your existing XPI and
-the en-US XPI.
-
-::
-
-    moz2po -t mozilla-1.7.3-langenus.xpi langXXYY.xpi xxYY-1.7.3
-
-Where:
-
-* mozilla-1.7.3-langenus.xpi is the langenus.xpi downloaded above
-* langXXYY.xpi is your existing translated XPI with the same version and the
-  en-US one downloaded.
-* xxYY-1.7.3 is an output directory for the PO files
-
-.. _migrating_to_firefox#create_firefox_pot_files:
-
-Create Firefox POT files
-------------------------
-
-You need to create a set of Firefox PO Template files that you will use as
-templates when you migrate your Mozilla translations.  Template files are
-simply blank PO files.
-
-.. _migrating_to_firefox#getting_the_en-us.xpi:
-
-Getting the en-US.xpi
-^^^^^^^^^^^^^^^^^^^^^
-
-Rumour has it that the en-US XPI files for Firefox are different for Windows
-and Linux.
-
-* Linux -- Firefox 1.0:
-  ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/linux-i686/xpi/en-US.xpi
-* Windows -- Firefox 1.0:
-  ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/win32/xpi/en-US.xpi
-
-.. _migrating_to_firefox#create_the_pot_files:
-
-Create the POT files
-^^^^^^^^^^^^^^^^^^^^
-
-::
-
-    moz2po -P firefox-1.0-en-US.xpi templates-ff-1.0
-
-Where:
-
-* *-P* specifies that you want to create POT files instead of PO files
-* *firefox-1.0-en-US.xpi* is an en-US.xpi for Firefox downloaded earlier
-* *templates-ff-1.0* is the new directory that will contain the POT files
-
-.. _migrating_to_firefox#migrate_the_mozilla_po_files_to_firefox:
-
-Migrate the Mozilla PO files to Firefox
----------------------------------------
-
-We will now take the existing Mozilla PO files and migrate them to Firefox.
-Note that this tool only works on Linux (or an operating environment with bash
-and the gettext tools).  If you need help ask at
-`translate-devel at lists.sourceforge.net
-<mailto:translate-devel at lists.sourceforge.net>`_.
-
-::
-
-  pomigrate2 xxYY-1.7.3 xxYY-ff-1.0 templates-ff-1.0
-
-Where:
-
-* *xxYY-1.7.3* contains your Mozilla PO files
-* *xxYY-ff-1.0* will contain your new Firefox files
-* *templates-ff-1.0* contains the Firefox template files
-
-.. _migrating_to_firefox#how_does_it_do_the_migration:
-
-How does it do the migration?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Things that are fully automated scare most people and justifiably so!  The
-migration will do the following:
-
-#. For each Firefox PO Template file
-
-   * If there is one in your Mozilla folder
-
-     * If there is only one file with that name
-
-       * copy it to the correct Firefox PO location
-
-     * Else
-
-       * combine all the copies you find and then copy them to the Firefox PO
-         location
-
-   * Else
-
-     * Initialise a blank PO file
-
-#. Create a compendium file of all Mozilla PO files
-#. Update all Firefox PO files optionally using the compendium
-
-The result is that all Firefox files are at least initialised.  Many of them
-are populated with conflicting entries clearly highlighted and ready for you to
-fix.
-
-.. _migrating_to_firefox#begin_translating:
-
-Begin translating
------------------
-
-Your PO files are ready.  Begin translating with any of your usual PO editing
-tools.
diff --git a/docs/guides/using_csv2po.rst b/docs/guides/using_csv2po.rst
index f4689b5..df6c606 100644
--- a/docs/guides/using_csv2po.rst
+++ b/docs/guides/using_csv2po.rst
@@ -135,7 +135,7 @@ You can, and should, keep your files as CSV files.  However, many translators
 are not the best wizzes at using their spreadsheet.  In this case many files
 will have been changed to XLS files.  To convert them by hand is tedious and
 error prone.  Rather make use of `xlHtml
-<http://freshmeat.net/projects/xlhtml/>`_ which can do all the work for you.
+<http://freecode.com/projects/xlhtml/>`_ which can do all the work for you.
 
 ::
 
diff --git a/docs/history.rst b/docs/history.rst
index 7cab5fd..3a53a0d 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -70,13 +70,14 @@ tool was created.
 WordForge project
 =================
 
-In 2006 with funding from the `Open Society Institute <http://www.soros.org/>`_
-(OSI) and `IDRC <http://www.idrc.ca/>`_ the toolkit was adapted to allow many
-core changes.  The first being to introduce the concept of a base class from
-which PO and XLIFF storage formats are derived.  This allowed tools to be
-adapted to allow output to XLIFF or PO files.  The tools themselves where
-adapted to allow them to work with the core formats XLIFF and PO as well as all
-base class derived formats.  Thus we can count XLIFF, PO, MO and other formats.
+In 2006 with funding from the `Open Society Institute
+<http://www.opensocietyfoundations.org/>`_ (OSI) and `IDRC
+<http://www.idrc.ca/>`_ the toolkit was adapted to allow many core changes.
+The first being to introduce the concept of a base class from which PO and
+XLIFF storage formats are derived.  This allowed tools to be adapted to allow
+output to XLIFF or PO files.  The tools themselves where adapted to allow them
+to work with the core formats XLIFF and PO as well as all base class derived
+formats.  Thus we can count XLIFF, PO, MO and other formats.
 
 Additional contributions during this phase where the adaptation of Pootle to
 use XLIFF as well as PO.  The creation of tools to manage translation memory
diff --git a/docs/installation.rst b/docs/installation.rst
index 444ca1d..d401a48 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -38,7 +38,7 @@ The dollowing advice only applies to manual installation from tar ball.
 Building
 ========
 
-For build instructions, see the :doc:`development/building` page.
+For build instructions, see the :doc:`developers/building` page.
 
 .. _installation#download:
 
diff --git a/docs/releases/1.10.0.rst b/docs/releases/1.10.0.rst
new file mode 100644
index 0000000..0713a1a
--- /dev/null
+++ b/docs/releases/1.10.0.rst
@@ -0,0 +1,118 @@
+.. These notes are used in:
+   1. Our email announcements
+   2. The Translate Tools download page at toolkit.translatehouse.org
+   3. Sourceforge download page in
+      http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.9.0/README.rst/download
+
+Translate Toolkit 1.10.0
+************************
+
+*Released on 12 March 2013*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes for the
+upcoming `Pootle <http://pootle.translatehouse.org/>`_ 2.5.0.
+
+It is just over a year since the last release so there are many improvements
+across the board.  A number of people contributed to this release and we've
+tried to credit them wherever possible (sorry if somehow we missed you).
+
+..
+  This is used for the email and other release notifications
+  Getting it and sharing it
+  =========================
+  * pip install translate-toolkit
+  * `Sourceforge download
+    <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.10.0/>`_
+  * Please share this URL http://toolkit.translatehouse.org/download.html if
+    you'd like to tweet or post about the release.
+
+
+Highlighted improvements
+========================
+* Android format support
+* Version control improvements
+* Source now on Github - all our code is now on github
+* Documentation - migrated all from our wiki into the code and Read The Docs
+* Continuous Integration using Travis
+
+
+Most important for Pootle
+-------------------------
+* Version control improvements
+* Categorize pofilter checks into critical, functional, cosmetic, etc
+
+
+Formats and Converters
+----------------------
+* Android format support [Michal Čihař]
+* Mozilla .lang, many improvements
+* PHP support for defintions, // comments and improved whitespace preservation
+* PO: X-Merge-On header to explicitly demand a conversion strategy instead of
+  guessing
+* .properties: BOMs in messages and C style comments [Roman Imankulov]
+* Mac OS String formatting improved [Roman Imankulov]
+
+
+Version Control improvements
+----------------------------
+* Interface for adding files to a repository & Implement .add() for all VCSs.
+* Caching of VC version info
+* Don't look for VCS if it's not available
+* Stop looking for VCS at a given parent
+* Subversion VC tests
+* Alway pass -m to 'commit' in Subversion to prevent blocking
+
+
+Checks
+------
+* New OpenOffice variables style used in extensions
+* Check for self-closing tags in the xmltags test [Seb M].
+* GConf test fixes
+* Terminology checker type for future terminology features
+* Categorize pofilter checks into critical, functional, cosmetic, etc
+* Added support for Objective-C %@ printf specifiers
+
+
+Language specific fixes
+-----------------------
+* Correct plurals: Scottish Gaelic (gd), Irish
+* Plural rules: Fulah, Brazilian Portuguese
+* Punctuation rules and tests to ignore for: Burmese, Urdu, Afrikaans, Wolof
+
+
+Documentation
+-------------
+* Moved to Git and we are now using reStructured Text and Sphinx
+* Published in Read The Docs (RTD).
+* Old wiki migrated to RTD.
+* New clean theme for documentation and website
+* API and code epydoc moved to reStructured Text.
+* Translate code Style Guide written
+
+
+Mozilla tooling fixes
+---------------------
+* Mozilla specific test for dialog size settings
+* Gaia properties dialect and plural handling
+* Fixes and imporovement to the Firefox build scripts
+* Improved accesskey detection
+* Improved DTD escaping for &quote, %, etc
+* Improvement of DTD to align with Base classes
+* Support new {{xx}} variable style introduced in PDF viewer
+
+
+...and refactoring, PEP8, test coverage and of course many many bugfixes.
+
+
+Contributors
+------------
+This release was made possible by the following people:
+
+Dwayne Bailey, Friedel Wolff, Leandro Regueiro, Julen Ruiz Aizpuru,
+Michal Čihař, Roman Imankulov, Alexander Dupuy, Frank Tetzel,
+Luiz Fernando Ranghetti, Laurette Pretorius, Jiro Matsuzawa, Henrik Saari,
+Luca De Petrillo, Khaled Hosny, Dave Dash & Chris Oelmueller.
+
+And to all our bug finder, testers and `localisers
+<http://pootle.locamotion.org/projects/pootle/>`_, a Very BIG Thank You.
diff --git a/docs/releases/1.11.0-rc1.rst b/docs/releases/1.11.0-rc1.rst
new file mode 100644
index 0000000..87378da
--- /dev/null
+++ b/docs/releases/1.11.0-rc1.rst
@@ -0,0 +1,140 @@
+.. These notes are used in:
+   1. Our email announcements
+   2. The Translate Tools download page at toolkit.translatehouse.org
+   3. Sourceforge download page in
+      http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/README.rst/download
+
+Translate Toolkit 1.11.0-rc1
+****************************
+
+*Released on 28 November 2013*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes and
+optimizations for the upcoming `Pootle <http://pootle.translatehouse.org/>`_
+2.5.1 and `Virtaal <http://virtaal.translatehouse.org>`_ releases.
+
+It is just over a eight months since the last release and there are many
+improvements across the board.  A number of people contributed to this release
+and we've tried to credit them wherever possible (sorry if somehow we missed
+you).
+
+..
+  This is used for the email and other release notifications
+  Getting it and sharing it
+  =========================
+  * pip install translate-toolkit
+  * `Sourceforge download
+    <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/>`_
+  * Please share this URL http://toolkit.translatehouse.org/download.html if
+    you'd like to tweet or post about the release.
+
+Highlighted improvements
+========================
+
+Major changes
+-------------
+- The PO format now matches Gettext more closely
+- PHP format adds a number of new features
+- Support for Python 2.5 has been dropped
+
+Formats and Converters
+----------------------
+- Gettext PO:
+
+  - cPO now handles fuzzy obsolete messages correctly
+  - Line wrapping improvement allow PO files to more closely match Gettext
+  - Optimization to increase performance
+
+- PHP:
+
+  - Warn about duplicate entries
+  - Allow blank spaces in array declaration (:bug:`2646`)
+  - Support nested arrays (:bug:`2240`)
+
+- XLIFF:
+
+  - Correctly parse XLIFF 1.2
+
+- Properties
+  
+  - Blank source text is now always translated
+  - Fuzzy units are discarded with --remove-untranslated
+  - prop2po no longer drops entries that are translated the same as the source
+
+- TMX:
+
+  - po2tmx support comments
+
+- Android:
+
+  - Detect untranslatable resource strings
+  - Various format improvements
+
+- New conversion options:
+
+  - :option:`--timestamp` -- skip conversion if the output file has a newer
+    timestamp (Makefile-alike)
+  - :option:`--threshold` -- in po2* converters this allows you to specify a
+    percentage complete threshold.  If the PO files passes this theshold then
+    the file is output (:bug:`2998`)
+  - :option:`--removeuntranslated` -- Extend this option to po2dtd and thus
+    po2moz -- don't output untranslated text (:bug:`1718`)
+
+Language specific fixes
+-----------------------
+- The toolkit now supports: Sakha, N'ko, Turkish, improvements for Bengali &
+  Hindi
+- Pootle special characters are now stored on Toolkit and available for other
+  tools to use
+- Rules for language ``ab`` are now available for language ``ab_CD``
+
+Checks
+------
+- Spelling test improvements including speed and optimization
+- Reduce false positive for the filepath test in cases of self closing tags
+  e.g. ``<br />``
+- Lowered the accelerator check severity to reduce false positive impact
+
+Mozilla tooling fixes
+---------------------
+- Better decoding of some characters in DTD e.g » and &x0022 (")
+- .lang -- Improved support for untranslated entries
+- ``buildxpi``:
+
+  - Can now build multiple languages at once (:bug:`2999`)
+  - Set a max product version to allow the language pack to continue to work
+    once the browser version has moved out of Aurora channel
+
+- Dropped native XPI building support (untested and no longer used)
+- Add Mozilla plural formulas, in time we'll handle Mozilla plurals correctly
+
+General
+-------
+- Dropped support for Python 2.5 -- 2.5 has reached end-of-life
+- Dropped psyco support -- it is no longer maintained
+- Use logging throught instead of ``sys.stderr``
+- Lots of cleanups on docs: TBX, PHP, added Android and JSON docs
+- Use requirements files for documenting all requirements and make it easy to
+  install Translate Toolkit using ``pip``
+- Added some functional tests
+- Improve searching to find words with hyphens
+- Choose the closest repo in nested VCS
+- Test suite down to zero failing tests
+
+...and loads of internal changes to improve maintainability, remove unused
+imports, remove unused code and general code cleanups, some changes to ensure
+future Python 3 portability and of course many many bugfixes.
+
+
+Contributors
+------------
+This release was made possible by the following people:
+
+Dwayne Bailey, Leandro Regueiro, Alexander Dupuy, Friedel Wolff, Khaled Hosny,
+Michal Čihař, Jordi Mas, Stuart Prescott, Trung Ngo, Ronald Sterckx, Rail
+Aliev, Michael Schlenker, Martin-Zack Mekkaoui, Iskren Chernev, Luiz Fernando
+Ranghetti & Christian Hitz
+
+And to all our bug finders, testers and `localisers
+<http://pootle.locamotion.org/projects/pootle/>`_, a Very BIG Thank You.
diff --git a/docs/releases/1.11.0.rst b/docs/releases/1.11.0.rst
new file mode 100644
index 0000000..480c5b1
--- /dev/null
+++ b/docs/releases/1.11.0.rst
@@ -0,0 +1,148 @@
+.. These notes are used in:
+   1. Our email announcements
+   2. The Translate Tools download page at toolkit.translatehouse.org
+   3. Sourceforge download page in
+      http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/README.rst/download
+
+Translate Toolkit 1.11.0
+************************
+
+*Released on 22 January 2014*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes and
+optimizations for the upcoming `Pootle <http://pootle.translatehouse.org/>`_
+2.5.1 and `Virtaal <http://virtaal.translatehouse.org>`_ releases.
+
+It is just over a ten months since the last release and there are many
+improvements across the board.  A number of people contributed to this release
+and we've tried to credit them wherever possible (sorry if somehow we missed
+you).
+
+..
+  This is used for the email and other release notifications
+  Getting it and sharing it
+  =========================
+  * pip install translate-toolkit
+  * `Sourceforge download
+    <https://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.11.0-rc1/>`_
+  * Please share this URL http://toolkit.translatehouse.org/download.html if
+    you'd like to tweet or post about the release.
+
+Highlighted improvements
+========================
+
+1.11.0 vs 1.11.0-rc1
+--------------------
+Changes since 1.11.0 RC1:
+
+- Improve handling of escapes in wrapping
+- Handle a broken version of python-Levenshtein 
+- Output HTML source in po2html when a unit is fuzzy (:bug:`3145`)
+
+Major changes
+-------------
+- The PO format now matches Gettext more closely
+- PHP format adds a number of new features
+- Support for Python 2.5 has been dropped
+
+Formats and Converters
+----------------------
+- Gettext PO:
+
+  - cPO now handles fuzzy obsolete messages correctly
+  - Line wrapping improvement allow PO files to more closely match Gettext
+  - Optimization to increase performance
+
+- PHP:
+
+  - Warn about duplicate entries
+  - Allow blank spaces in array declaration (:bug:`2646`)
+  - Support nested arrays (:bug:`2240`)
+
+- XLIFF:
+
+  - Correctly parse XLIFF 1.2
+
+- Properties
+  
+  - Blank source text is now always translated
+  - Fuzzy units are discarded with --remove-untranslated
+  - prop2po no longer drops entries that are translated the same as the source
+
+- TMX:
+
+  - po2tmx support comments
+
+- Android:
+
+  - Detect untranslatable resource strings
+  - Various format improvements
+
+- New conversion options:
+
+  - :option:`--timestamp` -- skip conversion if the output file has a newer
+    timestamp (Makefile-alike)
+  - :option:`--threshold` -- in po2* converters this allows you to specify a
+    percentage complete threshold.  If the PO files passes this theshold then
+    the file is output (:bug:`2998`)
+  - :option:`--removeuntranslated` -- Extend this option to po2dtd and thus
+    po2moz -- don't output untranslated text (:bug:`1718`)
+
+Language specific fixes
+-----------------------
+- The toolkit now supports: Sakha, N'ko, Turkish, improvements for Bengali &
+  Hindi
+- Pootle special characters are now stored on Toolkit and available for other
+  tools to use
+- Rules for language ``ab`` are now available for language ``ab_CD``
+
+Checks
+------
+- Spelling test improvements including speed and optimization
+- Reduce false positive for the filepath test in cases of self closing tags
+  e.g. ``<br />``
+- Lowered the accelerator check severity to reduce false positive impact
+
+Mozilla tooling fixes
+---------------------
+- Better decoding of some characters in DTD e.g » and &x0022 (")
+- .lang -- Improved support for untranslated entries
+- ``buildxpi``:
+
+  - Can now build multiple languages at once (:bug:`2999`)
+  - Set a max product version to allow the language pack to continue to work
+    once the browser version has moved out of Aurora channel
+
+- Dropped native XPI building support (untested and no longer used)
+- Add Mozilla plural formulas, in time we'll handle Mozilla plurals correctly
+
+General
+-------
+- Dropped support for Python 2.5 -- 2.5 has reached end-of-life
+- Dropped psyco support -- it is no longer maintained
+- Use logging throught instead of ``sys.stderr``
+- Lots of cleanups on docs: TBX, PHP, added Android and JSON docs
+- Use requirements files for documenting all requirements and make it easy to
+  install Translate Toolkit using ``pip``
+- Added some functional tests
+- Improve searching to find words with hyphens
+- Choose the closest repo in nested VCS
+- Test suite down to zero failing tests
+
+...and loads of internal changes to improve maintainability, remove unused
+imports, remove unused code and general code cleanups, some changes to ensure
+future Python 3 portability and of course many many bugfixes.
+
+
+Contributors
+------------
+This release was made possible by the following people:
+
+Dwayne Bailey, Leandro Regueiro, Alexander Dupuy, Friedel Wolff, Khaled Hosny,
+Michal Čihař, Jordi Mas, Stuart Prescott, Trung Ngo, Ronald Sterckx, Rail
+Aliev, Michael Schlenker, Martin-Zack Mekkaoui, Iskren Chernev, Luiz Fernando
+Ranghetti & Christian Hitz
+
+And to all our bug finders, testers and `localisers
+<http://pootle.locamotion.org/projects/pootle/>`_, a Very BIG Thank You.
diff --git a/docs/releases/1.8.1.rst b/docs/releases/1.8.1.rst
new file mode 100644
index 0000000..d987e31
--- /dev/null
+++ b/docs/releases/1.8.1.rst
@@ -0,0 +1,74 @@
+Translate Toolkit 1.8.1
+***********************
+
+*Released on 19 Novermber 2010*
+
+Today the Translate team released version 1.8.1 of the Translate Toolkit.  The
+Translate Toolkit contains many useful tools for translation, management, and
+quality control. It is the technology platform for Pootle, Virtaal, and other
+software.
+
+This release contains many improvements and bug fixes. It is a recommended
+upgrade for users of Pootle and Virtaal. There were over 200 commits since
+version 1.8.0.
+
+This work was made possible by volunteers and our funders:
+ - ANLoc_, funded by IDRC
+
+
+Highlighted improvements
+========================
+
+File formats:
+
+- A rewrite and major improvement of the html format and html2po_ converter
+- New JSON format introduced
+- Support for `Universal Terminology Exchange (UTX)`_ format
+- Support for `Java properties`_ files encoded in UTF-8
+- Improvements to CSV_ format, and improved compatibility with Excel exports
+- Bug fixes to `Qt .ts`_
+- Support for XLIFF_'s state attributes (pocount_ now lists detailed state
+  statistics)
+- Minor bug fixes for PHP_ format
+
+Languages and quality checks:
+
+- Support for Persian quotations
+- Major performance improvements to quality checks
+
+Pootle will regenerate all statistics with the new Translate Toolkit installed.
+Read about the `quality checks`_.
+
+Other improvements:
+
+- Improvements to stability of Lucene text indexing (affecting Pootle)
+- Parameter for po2prop_ to ignore untranslated strings
+- Many improvements to pot2po_ including Qt ts support, improved handling of
+  extra XML namespaces in XLIFF, and performance improvements.
+
+Further resources:
+
+* `Full feature list`_
+* Download_
+* Bugs_
+
+
+Happy translating!
+
+The Translate team
+
+.. _ANLoc: http://africanlocalisation.net/
+.. _html2po: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/html2po.html
+.. _Universal Terminology Exchange (UTX): http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/utx.html
+.. _Java properties: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/properties.html
+.. _CSV: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/csv.html
+.. _Qt .ts: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/ts.html
+.. _XLIFF: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/xliff.html
+.. _pocount: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pocount.html
+.. _PHP: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/php.html
+.. _quality checks: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter_tests.html
+.. _po2prop: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/prop2po.html
+.. _pot2po: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pot2po.html
+.. _Full feature list: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/features.html
+.. _Download: http://sourceforge.net/projects/translate/files/Translate%20Toolkit/1.8.1/
+.. _Bugs: http://bugs.locamotion.org/
diff --git a/docs/releases/1.9.0.rst b/docs/releases/1.9.0.rst
new file mode 100644
index 0000000..39add52
--- /dev/null
+++ b/docs/releases/1.9.0.rst
@@ -0,0 +1,56 @@
+Translate Toolkit 1.9.0 Released
+********************************
+
+*Released on 12 April 2011*
+
+This release contains many improvements and bug fixes. While it contains many
+general improvements, it also specifically contains needed changes for the
+upcoming `Pootle <http://pootle.translatehouse.org>`_ 2.1.6 and `Virtaal
+<http://virtaal.translatehouse.org/>`_ 0.7.
+   
+   
+Highlighted improvements
+========================
+
+- Faster terminology matching
+- Several small optimisations to performance and memory use
+- More advanced state support (visible in `pocount
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pocount.html>`_
+  and `Virtaal <http://virtaal.translatehouse.org/>`_ 0.7)
+- Improved language detection models (+South African languages)
+- Improve handling of printf variable reordering [Jacques Beaurain]
+- Review of the wording of the messages of `pofilter
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter.html>`_
+  checks
+- Better sentence segmentation for some non-Latin languages
+- More supported formats for `podebug
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/podebug.html>`_
+- Extra options for `pomerge
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pomerge.html>`_,
+  `pogrep
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pogrep.html>`_
+  and po2oo/xliff2oo.
+
+The new `pogrep
+<http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pogrep.html>`_
+options made this `possible for GNOME
+<http://translate.org.za/blogs/friedel/en/content/better-lies-about-gnome-localisation>`_.
+
+
+Most relevant for Pootle
+------------------------
+- Support for Xapian 1.2 (:bug:`1766`) [Rimas Kudelis]
+- Work around some changes introduced in Django 1.2.5/1.3
+
+
+Format support
+--------------
+- Always use UNIX line endings for PO (even on Windows)
+- XLIFF and .ts files now shows "fuzzy" only the target present
+- Improved support for .ts comment as context (:bug:`1739`)
+- Support for Java properties in UTF-8 encoding
+- More natural string ordering in json converter
+- Improved handling of trailing spaces in Mozilla DTD files
+- Removed unused support for _old_ KDE plurals in pocount
+
+...and several small bugfixes
diff --git a/docs/releases/README.rst b/docs/releases/README.rst
new file mode 100644
index 0000000..77881ea
--- /dev/null
+++ b/docs/releases/README.rst
@@ -0,0 +1,29 @@
+.. This is the text from translate/__init__.py
+   It is used in:
+   1. http://sourceforge.net/projects/translate/files/Translate%20Toolkit/README.rst
+   2. https://pypi.python.org/pypi/translate-toolkit/
+
+Tools and API for translation and localization engineering
+==========================================================
+
+The `Translate Toolkit <http://toolkit.translatehouse.org/>`_ is created by
+localizers for localizers. It contains several utilities, as well as an API for
+building localization tools.
+
+Some of the **tools** include:
+
+- File format `converters
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/index.html#converters>`_
+- `Quality checking
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/index.html#quality-assurance>`_
+  tools
+- Tools for counting, grepping, terminology extraction, and pseudo-localization
+
+Apart from the code for the tools above, some features of the **API** include:
+
+- Support for multiple `file formats
+  <http://docs.translatehouse.org/projects/translate-toolkit/en/latest/formats/index.html>`_
+- Language information and language support code (including language detection)
+- Code for translation memory, terminology matching and indexed search
+- Several helper classes and functions for tools built on the Translate
+  Toolkit.
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
new file mode 100644
index 0000000..3be0bb4
--- /dev/null
+++ b/docs/releases/index.rst
@@ -0,0 +1,16 @@
+.. _release_notes:
+
+Release Notes
+*************
+
+The following are release notes used on PyPI, Sourceforge and mailing lists for
+Pootle releases.
+
+.. toctree::
+   :maxdepth: 1
+
+   1.11.0 <1.11.0>
+   1.11.0-rc1 <1.11.0-rc1>
+   1.10.0 <1.10.0>
+   1.9.0 <1.9.0>
+   1.8.1 <1.8.1>
diff --git a/docs/styleguide.rst b/docs/styleguide.rst
deleted file mode 100644
index 84ae330..0000000
--- a/docs/styleguide.rst
+++ /dev/null
@@ -1,370 +0,0 @@
-.. _styleguide:
-
-Translate Styleguide
-====================
-
-The Translate styleguide is the styleguide for all Translate projects,
-including Translate Toolkit, Pootle, Virtaal and others.  Patches are required
-to follow these guidelines.
-
-This Styleguide follows :pep:`8` with some clarifications. It is based almost
-verbatim on the `Flask Styleguide`_.
-
-.. _styleguide-general:
-
-General
--------
-
-Indentation:
-  4 real spaces, no tabs. Exceptions, modules that have copied into
-  the source that don't follow this guideline.
-
-Maximum line length:
-  79 characters with a soft limit for 84 if absolutely necessary.  Try
-  to avoid too nested code by cleverly placing `break`, `continue` and
-  `return` statements.
-
-Continuing long statements:
-  To continue a statement you can use backslashes (preceeded by a space)
-  in which case you should align the next line with the last dot or
-  equal sign, or indent four spaces::
-
-    MyModel.query.filter(MyModel.scalar > 120) \
-                 .order_by(MyModel.name.desc()) \
-                 .limit(10)
-
-    my_long_assignment = MyModel.query.filter(MyModel.scalar > 120) \
-                         .order_by(MyModel.name.desc()) \
-                         .limit(10)
-
-    this_is_a_very_long(function_call, 'with many parameters') \
-        .that_returns_an_object_with_an_attribute
-
-  If you break in a statement with parentheses or braces, align to the
-  braces::
-
-    this_is_a_very_long(function_call, 'with many parameters',
-                        23, 42, 'and even more')
-
-  For lists or tuples with many items, break immediately after the
-  opening brace::
-
-    items = [
-        'this is the first', 'set of items', 'with more items',
-        'to come in this line', 'like this'
-    ]
-
-Blank lines:
-  Top level functions and classes are separated by two lines, everything
-  else by one.  Do not use too many blank lines to separate logical
-  segments in code.  Example::
-
-    def hello(name):
-        print 'Hello %s!' % name
-
-
-    def goodbye(name):
-        print 'See you %s.' % name
-
-
-    class MyClass(object):
-        """This is a simple docstring"""
-
-        def __init__(self, name):
-            self.name = name
-
-        def get_annoying_name(self):
-            return self.name.upper() + '!!!!111'
-
-Expressions and Statements
---------------------------
-
-General whitespace rules:
-  - No whitespace for unary operators that are not words
-    (e.g.: ``-``, ``~`` etc.) as well on the inner side of parentheses.
-  - Whitespace is placed between binary operators.
-
-  Good::
-
-    exp = -1.05
-    value = (item_value / item_count) * offset / exp
-    value = my_list[index]
-    value = my_dict['key']
-
-  Bad::
-
-    exp = - 1.05
-    value = ( item_value / item_count ) * offset / exp
-    value = (item_value/item_count)*offset/exp
-    value=( item_value/item_count ) * offset/exp
-    value = my_list[ index ]
-    value = my_dict ['key']
-
-Slice notation:
-  While :pep:`8` calls for spaces around operators ``a = b + c`` this
-  results in flags when you use ``a[b+1:c-1]`` but would allow
-  the rather unreadable ``a[b + 1:c - 1]`` to pass. :pep:`8` is
-  rather quiet on slice notation.
-
-  - Don't use spaces with simple variables or numbers
-  - Use brackets for expressions with spaces between binary operators
-
-  Good::
-
-    a[1:2]
-    a[start:end]
-    a[(start - 1):(end + var + 2)]  # Brackets help group things and don't hide the slice
-    a[-1:(end + 1)]
-
-  Bad::
-
-    a[start: end]  # No spaces around :
-    a[start-1:end+var+2]  # Insanely hard to read, especially when your expressions are more complex
-    a[start - 1:end + 2]  # You lose sight of the fact that it is a slice
-    a[- 1:end]  # -1 is unary, no space
-
-
-.. note::
-
-   String slice formating is still under discussion.
-
-Comparisons:
-  - against arbitrary types: ``==`` and ``!=``
-  - against singletons with ``is`` and ``is not`` (eg: ``foo is not
-    None``)
-  - never compare something with `True` or `False` (for example never
-    do ``foo == False``, do ``not foo`` instead)
-
-Negated containment checks:
-  use ``foo not in bar`` instead of ``not foo in bar``
-
-Instance checks:
-  ``isinstance(a, C)`` instead of ``type(A) is C``, but try to avoid
-  instance checks in general.  Check for features.
-
-If statements:
-  - Use ``()`` brackets around complex if statements to allow easy wrapping,
-    don't use backslash to wrap an if statements.
-  - Wrap between ``and``, ``or``, etc.
-  - Keep ``not`` with the expression
-  - Use ``()`` alignment between expressions 
-  - Use extra ``()`` to eliminate abiguity, don't rely on an understanding of
-    Python operator precedent rules.
-
-  Good::
-
-    if length >= (upper + 2)
-
-    if (length >= 25 and
-        string != "Something" and
-        not careful):
-        do_something()
-
-  Bad::
-
-    if length >= upper + 2:
-
-    if (length...
-        and string !=...
-
-
-Naming Conventions
-------------------
-
-.. note::
-
-   This has not been implemented or discussed.  The Translate code 
-   is not at all consistent with these conventions.
-
-- Class names: ``CamelCase``, with acronyms kept uppercase (``HTTPWriter`` and
-  not ``HttpWriter``)
-- Variable names: ``lowercase_with_underscores``
-- Method and function names: ``lowercase_with_underscores``
-- Constants: ``UPPERCASE_WITH_UNDERSCORES``
-- precompiled regular expressions: ``name_re``
-
-Protected members are prefixed with a single underscore.  Double underscores
-are reserved for mixin classes.
-
-On classes with keywords, trailing underscores are appended.  Clashes with
-builtins are allowed and **must not** be resolved by appending an underline to
-the variable name.  If the function needs to access a shadowed builtin, rebind
-the builtin to a different name instead.
-
-Function and method arguments:
-  - class methods: ``cls`` as first parameter
-  - instance methods: ``self`` as first parameter
-  - lambdas for properties might have the first parameter replaced with ``x``
-    like in ``display_name = property(lambda x: x.real_name or x.username)``
-
-
-.. _styleguide-docs:
-
-Documentation
-=============
-
-We use Sphinx_ to generate our API and user documentation. Read the
-`reStructuredText primer`_ and `Sphinx documentation`_ as needed.
-
-Special roles
--------------
-
-We introduce a number of special roles for documentation:
-
-* ``:bug:`` -- links to a bug in Translate's Bugzilla.
-
-  * ``:bug:`123``` gives: :bug:`123`
-  * ``:bug:`broken <123>``` gives: :bug:`broken <123>`
-
-* ``:opt:`` -- mark command options and command values.
-
-  * ``:opt:`-P``` gives :opt:`-P`
-  * ``:opt:`--progress=dots``` gives :opt:`--proress=dots`
-  * ``:opt:`dots``` gives :opt:`dots`
-
-* ``:man:`` -- link to a Linux man page.
-
-  * ``:man:`msgfmt``` gives :man:msgfmt
-
-Docstrings
-----------
-
-Docstring conventions:
-  All docstrings are formatted with reStructuredText as understood by
-  Sphinx.  Depending on the number of lines in the docstring, they are
-  laid out differently.  If it's just one line, the closing triple
-  quote is on the same line as the opening, otherwise the text is on
-  the same line as the opening quote and the triple quote that closes
-  the string on its own line::
-
-    def foo():
-        """This is a simple docstring."""
-
-
-    def bar():
-        """This is a longer docstring with so much information in there
-        that it spans three lines.  In this case the closing triple quote
-        is on its own line.
-        """
-
-Please read :pep:`257` (Docstring Conventions) for a general overview,
-the important parts though are:
-
-- A docstring should have a brief one-line summary, ending with a period.
-- If there are more details there should be a blank line between the one-line
-  summary and the rest of the text.  Use pragraphs and formating as needed.
-- Use `reST field lists`_ to describe the input parameters and/or return types
-  as the last part of the docstring.
-- Use proper capitalisation and punctuation.
-- Don't restate things that would appear in parameter descriptions.
-
-::
-
-    def foo(bar):
-        """One line description.
-
-        Further explanations that might be needed.
-
-        :param bar: Parameter descriptions.
-        """
-
-::
-
-    def addunit(self, unit):
-        """Appends the given unit to the object's list of units.
-
-        This method should always be used rather than trying to modify the
-        list manually.
-
-        :type unit: TranslationUnit
-        :param unit: Any object that inherits from :class:`TranslationUnit`.
-        """
-        self.units.append(unit)
-
-Parameter documentation:
-  Document parameters using `reST field lists`_ as follows::
-
-    def foo(bar):
-        """Simple docstring
-
-        :param bar: Something
-        :type bar: Some type
-        :return: Returns something
-        :rtype: Return type 
-        """
-
-Cross refencing code:
-   When talking about other objects, methods, functions and variables
-   it is good practice to cross-reference them with Sphinx's `Python
-   cross-referencing`_.
-
-Other directives:
-   Use `paragraph-level markup`_ when needed.
-
-.. note::
-
-   We still Need to gather the useful ones that we want you to use and how to use
-   then.  E.g. how to talk about a paramter in the docstring.  How to reference
-   classes in the module.  How to reference other modules, etc.
-
-
-Module header:
-  The module header consists of an utf-8 encoding declaration, copyright
-  attribution, license block and a standard docstring::
-
-    # -*- coding: utf-8 -*-
-    #
-    ... LICENSE BLOCK...
-
-    """A brief description"""
-
-..    """
-        package.module
-        ~~~~~~~~~~~~~~
-
-..        A brief description goes here.
-
-..        :copyright: (c) YEAR by AUTHOR.
-        :license: LICENSE_NAME, see LICENSE_FILE for more details.
-    """
-
-
-Comments
---------
-
-General:
-  - The ``#`` symbol (pound or hash) is used to start comments.
-  - A space must follow the ``#`` between any written text.
-  - Line length must be observed.
-  - Inline comments are preceeded by two spaces.
-  - Write sentences correctly: proper capitalisation and punctuation.
-
-  Good::
-
-    # Good comment with space before and full sentence.
-    statement  # Good comment with two spaces
-
-  Bad::
-
-    #Bad comment no space before
-    statement # Bad comment, needs two spaces
-
-Docstring comments:
-  Rules for comments are similar to docstrings.  Both are formatted with
-  reStructuredText.  If a comment is used to document an attribute, put a
-  colon after the opening pound sign (``#``)::
-
-    class User(object):
-        #: the name of the user as unicode string
-        name = Column(String)
-        #: the sha1 hash of the password + inline salt
-        pw_hash = Column(String)
-
-
-.. _Flask Styleguide: http://flask.pocoo.org/docs/styleguide/
-.. _reST field lists: http://sphinx.pocoo.org/domains.html#info-field-lists
-.. _Python cross-referencing: http://sphinx.pocoo.org/domains.html#cross-referencing-python-objects
-.. _Sphinx: http://sphinx.pocoo.org/
-.. _reStructuredText primer: http://sphinx.pocoo.org/rest.html
-.. _Sphinx documentation: http://sphinx.pocoo.org/contents.html
-.. _paragraph-level markup: http://sphinx.pocoo.org/markup/para.html#paragraph-level-markup
diff --git a/min-required.txt b/min-required.txt
new file mode 100644
index 0000000..086ba72
--- /dev/null
+++ b/min-required.txt
@@ -0,0 +1,9 @@
+lxml==2.1.0  # >=1.3.4 should work
+python-Levenshtein==0.10.2
+# If Python 
+iniparse==0.3.1
+vobject==0.6.6
+BeautifulSoup==3.2
+#aeidon==0.14
+pytest==2.2
+Sphinx==1.1
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..87db021
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+distribute==0.6.45
+lxml==3.2.1
+python-Levenshtein==0.10.2
diff --git a/requirements/dev.txt b/requirements/dev.txt
new file mode 100644
index 0000000..d688ba8
--- /dev/null
+++ b/requirements/dev.txt
@@ -0,0 +1,4 @@
+-r optional.txt
+
+pytest>=2.2
+Sphinx>=1.1
diff --git a/requirements/optional.txt b/requirements/optional.txt
new file mode 100644
index 0000000..e61773e
--- /dev/null
+++ b/requirements/optional.txt
@@ -0,0 +1,19 @@
+-r recommended.txt
+
+##################
+# Format support #
+##################
+# ini2po
+iniparse>=0.3.1
+
+# ical2po
+vobject>=0.6.6
+
+# Trados TM
+BeautifulSoup>=3.2
+
+# sub2po
+#aeidon>=0.14
+
+# aeidon not available through pip/PyPI,
+# so recording this dependency here is pointless except as a comment
diff --git a/requirements/recommended.txt b/requirements/recommended.txt
new file mode 100644
index 0000000..db52402
--- /dev/null
+++ b/requirements/recommended.txt
@@ -0,0 +1,9 @@
+###############
+# Recommended #
+###############
+
+# lxml - for XML processing (XLIFF, TMX, TBX)
+lxml>=2.1.0  # >=1.3.4 should work
+
+# Faster matching in e.g. pot2po
+python-Levenshtein>=0.11.1
diff --git a/setup.py b/setup.py
index dcceab7..4956d96 100755
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,29 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2006-2013 Zuza Software Foundation
+#
+# This file is part of Translate.
+#
+# Translate is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Translate is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Translate; if not, see <http://www.gnu.org/licenses/>.
 
-from distutils.core import setup, Extension, Distribution, Command
 import distutils.sysconfig
-import sys
 import os
 import os.path
-from translate import __version__
-from translate import __doc__
+import site
+import sys
+from distutils.core import setup, Extension, Distribution, Command
+
 try:
     import py2exe
     build_exe = py2exe.build_exe.py2exe
@@ -21,6 +38,8 @@ try:
 except ImportError:
     cmdclass = {}
 
+from translate import __doc__, __version__
+
 
 # TODO: check out installing into a different path with --prefix/--home
 
@@ -29,11 +48,14 @@ join = os.path.join
 PRETTY_NAME = 'Translate Toolkit'
 translateversion = __version__.sver
 
-packagesdir = distutils.sysconfig.get_python_lib()
-sitepackages = packagesdir.replace(sys.prefix + os.sep, '')
+if sys.version_info >= (2, 6, 0) and site.ENABLE_USER_SITE:
+    sitepackages = site.USER_SITE
+else:
+    packagesdir = distutils.sysconfig.get_python_lib()
+    sitepackages = packagesdir.replace(sys.prefix + os.sep, '')
 
 infofiles = [(join(sitepackages, 'translate'),
-             [filename for filename in 'COPYING', 'README.rst'])]
+             [filename for filename in ('COPYING', 'README.rst')])]
 initfiles = [(join(sitepackages, 'translate'), [join('translate', '__init__.py')])]
 
 subpackages = [
@@ -99,6 +121,8 @@ translatebashscripts = [
     apply(join, ('tools', ) + script) for script in [
                   ('junitmsgfmt', ),
                   ('mozilla', 'build_firefox.sh'),
+                  ('mozilla', 'buildxpi.py'),
+                  ('mozilla', 'get_moz_enUS.py'),
                   ('pocommentclean', ),
                   ('pocompendium', ),
                   ('pomigrate2', ),
@@ -336,7 +360,7 @@ class TranslateDistribution(Distribution):
         ]
         version = attrs.get("version", translateversion)
         py2exeoptions["dist_dir"] = "translate-toolkit-%s" % version
-        py2exeoptions["includes"] = ["lxml", "lxml._elementpath", "psyco"]
+        py2exeoptions["includes"] = ["lxml", "lxml._elementpath"]
         options = {"py2exe": py2exeoptions}
         baseattrs['options'] = options
         if py2exe:
@@ -378,7 +402,7 @@ classifiers = [
   "Operating System :: OS Independent",
   "Operating System :: Microsoft :: Windows",
   "Operating System :: Unix"
-  ]
+]
 
 
 def dosetup(name, version, packages, datafiles, scripts, ext_modules=[]):
diff --git a/tools/mozilla/buildxpi.py b/tools/mozilla/buildxpi.py
new file mode 100755
index 0000000..6d7e3ab
--- /dev/null
+++ b/tools/mozilla/buildxpi.py
@@ -0,0 +1,284 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2008 Zuza Software Foundation
+#
+# This file is part of the Translate Toolkit.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+"""Create a XPI language pack from Mozilla sources and translated l10n files.
+This script has only been tested with Firefox 3.1 beta sources.
+
+(Basically the process described at
+https://developer.mozilla.org/en/Creating_a_Language_Pack)
+
+Example usage::
+
+    buildxpi.py -L /path/to/l10n -s /path/to/mozilla-central -o /path/to/xpi_output af ar
+
+- "/path/to/l10n" is the path to a the parent directory of the "af" and "ar"
+  directories containing the Afrikaans and Arabic translated files.
+- "/path/to/mozilla-central" is the path to the Firefox sources checked out
+  from Mercurial. Note that --mozproduct is not specified, because the default
+  is "browser". For Thunderbird (>=3.0) it should be "/path/to/comm-central"
+  and "--mozproduct mail" should be specified, although this is not yet
+  working.
+- "/path/to/xpi_output" is the path to the output directory.
+- "af ar" are the languages (Afrikaans and Arabic in this case) to build
+  language packs for.
+
+NOTE: The .mozconfig in Firefox source directory gets backed up,
+overwritten and replaced.
+"""
+
+import logging
+import os
+import re
+from glob       import glob
+from shutil     import move, rmtree
+from subprocess import Popen, PIPE, CalledProcessError
+from tempfile   import mkdtemp
+
+logger = logging.getLogger(__name__)
+
+
+class RunProcessError(CalledProcessError):
+    """Subclass of CalledProcessError exception with custom message strings
+    """
+    _default_message = "Command '%s' returned exit status %d"
+
+    def __init__(self, message=None, **kwargs):
+        """Use and strip string message='' from kwargs"""
+        self._message = message or self._default_message
+        super(RunProcessError, self).__init__(**kwargs)
+
+    def __str__(self):
+        """Format exception message string (avoiding TypeErrors)"""
+        output = ''
+        message = self._message
+        if message.count('%') != 2:
+            output += message + '\n'
+            message = self._default_message
+            
+        output += message % (self.cmd, self.returncode)
+        return output
+
+def run(cmd, expected_status=0, fail_msg=None, stdout=-1, stderr=-1):
+    """Run a command
+    """
+    # Default is to capture (and log) std{out,error} unless run as script
+    if __name__ == '__main__' or logger.getEffectiveLevel() == logging.DEBUG:
+        std = None
+    else:
+        std = PIPE
+
+    if stdout == -1:
+        stdout = std
+    if stderr == -1:
+        stderr = std
+
+    cmdstring = isinstance(str, basestring) and cmd or ' '.join(cmd)
+    logger.debug('>>> %s $ %s', os.getcwd(), cmdstring)
+    p = Popen(cmd, stdout=stdout, stderr=stderr)
+    (output, error) = p.communicate()
+    cmd_status = p.wait()
+
+    if stdout == PIPE:
+        if cmd_status != expected_status:
+            logger.info('%s', output)
+    elif stderr == PIPE:
+        logger.warning('%s', error)
+
+    if cmd_status != expected_status:
+        raise RunProcessError(returncode=cmd_status, cmd=cmdstring,
+                              message=fail_msg)
+    return cmd_status
+
+
+def build_xpi(l10nbase, srcdir, outputdir, langs, product, delete_dest=False,
+              soft_max_version=False):
+    MOZCONFIG = os.path.join(srcdir, '.mozconfig')
+    # Backup existing .mozconfig if it exists
+    backup_name = ''
+    if os.path.exists(MOZCONFIG):
+        backup_name = MOZCONFIG + '.tmp'
+        os.rename(MOZCONFIG, backup_name)
+
+    # Create a temporary directory for building
+    builddir = mkdtemp('', 'buildxpi')
+
+    # Per the original instructions, it should be possible to configure the
+    # Mozilla build so that it doesn't require compiler toolchains or
+    # development include/library files - however it is currently broken for
+    # Aurora 22-23; # see https://bugzilla.mozilla.org/show_bug.cgi?id=862770
+    # in case it has been fixed and you can put back:
+    #ac_add_options --disable-compile-environment
+
+    try:
+        # Create new .mozconfig
+        content = """
+ac_add_options --disable-gstreamer
+ac_add_options --disable-ogg
+ac_add_options --disable-opus
+ac_add_options --disable-webrtc
+ac_add_options --disable-wave
+ac_add_options --disable-webm
+ac_add_options --disable-libjpeg-turbo
+mk_add_options MOZ_OBJDIR=%(builddir)s
+ac_add_options --with-l10n-base=%(l10nbase)s
+ac_add_options --enable-application=%(product)s
+""" % \
+            {
+                'builddir': builddir,
+                'l10nbase': l10nbase,
+                'product': product
+            }
+
+        mozconf = open(MOZCONFIG, 'w').write(content)
+
+	# Try to make sure that "environment shell" is defined
+        # (python/mach/mach/mixin/process.py)
+        if not any (var in os.environ
+                    for var in ('SHELL', 'MOZILLABUILD', 'COMSPEC')):
+            os.environ['SHELL'] = '/bin/sh'
+
+        # Start building process.
+        # See https://developer.mozilla.org/en/Creating_a_Language_Pack for
+        # more details.
+        olddir = os.getcwd()
+        os.chdir(srcdir)
+        run(['make', '-f', 'client.mk', 'configure'],
+            fail_msg="Build environment error - "
+                     "check logs, fix errors, and try again")
+
+        os.chdir(builddir)
+        run(['make', '-C', 'config'],
+            fail_msg="Unable to successfully configure build for XPI!")
+
+	moz_app_version=[]
+	if soft_max_version:
+	    version = open(os.path.join(srcdir, product, 'config', 'version.txt')).read().strip()
+	    version = re.sub(r'(^[0-9]*\.[0-9]*).*', r'\1.*', version)
+	    moz_app_version = ['MOZ_APP_MAXVERSION=%s' % version]
+        run(['make', '-C', os.path.join(product, 'locales')] +
+            ['langpack-%s' % lang for lang in langs] + moz_app_version,
+            fail_msg="Unable to successfully build XPI!")
+
+        destfiles = []
+        for lang in langs:
+            xpiglob = glob(
+                os.path.join(
+                    builddir,
+                    product == 'mail' and 'mozilla' or '',
+                    'dist',
+                    '*',
+                    'xpi',
+                    '*.%s.langpack.xpi' % lang
+                )
+            )[0]
+            filename = os.path.split(xpiglob)[1]
+            destfile = os.path.join(outputdir, filename)
+            destfiles.append(destfile)
+            if delete_dest:
+                if os.path.isfile(destfile):
+                    os.unlink(destfile)
+            move(xpiglob, outputdir)
+
+    finally:
+        os.chdir(olddir)
+        # Clean-up
+        rmtree(builddir)
+        if backup_name:
+            os.remove(MOZCONFIG)
+            os.rename(backup_name, MOZCONFIG)
+
+    return destfiles
+
+
+def create_option_parser():
+    from optparse import OptionParser
+    usage = 'Usage: buildxpi.py [<options>] <lang> [<lang2> ...]'
+    p = OptionParser(usage=usage)
+
+    p.add_option(
+        '-L', '--l10n-base',
+        dest='l10nbase',
+        default='l10n',
+        help='The directory containing the <lang> subdirectory.'
+    )
+    p.add_option(
+        '-o', '--output-dir',
+        dest='outputdir',
+        default='.',
+        help='The directory to copy the built XPI to (default: current directory).'
+    )
+    p.add_option(
+        '-p', '--mozproduct',
+        dest='mozproduct',
+        default='browser',
+        help='The Mozilla product name (default: "browser").'
+    )
+    p.add_option(
+        '-s', '--src',
+        dest='srcdir',
+        default='mozilla',
+        help='The directory containing the Mozilla l10n sources.'
+    )
+    p.add_option(
+        '-d', '--delete-dest',
+        dest='delete_dest',
+        action='store_true',
+        default=False,
+        help='Delete output XPI if it already exists.'
+    )
+
+    p.add_option(
+        '-v', '--verbose',
+        dest='verbose',
+        action='store_true',
+        default=False,
+        help='Be more noisy'
+    )
+
+    p.add_option(
+        '', '--soft-max-version',
+        dest='soft_max_version',
+        action='store_true',
+        default=False,
+	help='Override a fixed max version with one to cover the whole cycle '
+	     'e.g. 24.0a1 becomes 24.0.*'
+    )
+
+    return p
+
+if __name__ == '__main__':
+    options, args = create_option_parser().parse_args()
+
+    if len(args) < 1:
+        from argparse import ArgumentError
+        raise ArgumentError(None, 'You need to specify at least a language!')
+
+    if options.verbose:
+        logging.basicConfig(level=logging.DEBUG)
+
+    build_xpi(
+        l10nbase=os.path.abspath(options.l10nbase),
+        srcdir=os.path.abspath(options.srcdir),
+        outputdir=os.path.abspath(options.outputdir),
+        langs=args,
+        product=options.mozproduct,
+        delete_dest=options.delete_dest,
+        soft_max_version=options.soft_max_version
+    )
diff --git a/tools/mozilla/get_moz_enUS.py b/tools/mozilla/get_moz_enUS.py
new file mode 100755
index 0000000..ec30cb3
--- /dev/null
+++ b/tools/mozilla/get_moz_enUS.py
@@ -0,0 +1,145 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2008 Zuza Software Foundation
+#
+# This file is part of Virtaal.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+import shutil
+from ConfigParser import ConfigParser, NoSectionError
+
+
+srccheckout = "mozilla"
+l10ncheckout = "l10n"
+product = "browser"
+verbose = False
+
+
+def path_neutral(path):
+    """Convert a path specified using Unix path seperator into a
+    platform path"""
+    newpath = ""
+    for seg in path.split("/"):
+        if not seg:
+            newpath = os.sep
+        newpath = os.path.join(newpath, seg)
+    return newpath
+
+
+def process_l10n_ini(inifile):
+    """Read a Mozilla l10n.ini file and process it to find the localisation
+    files needed by a project"""
+
+    l10n = ConfigParser()
+    l10n.readfp(open(path_neutral(inifile)))
+    l10n_ini_path = os.path.dirname(inifile)
+
+    for dir in l10n.get('compare', 'dirs').split():
+        frompath = os.path.join(l10n_ini_path, l10n.get('general', 'depth'),
+                                dir, 'locales', 'en-US')
+        topath = os.path.join(l10ncheckout, 'en-US', dir)
+        if not os.path.exists(frompath):
+            if verbose:
+                print "[Missing source]: %s" % frompath
+            continue
+        if os.path.exists(topath):
+            if verbose:
+                print "[Existing target]: %s" % topath
+            continue
+        if verbose:
+            print '%s -> %s' % (frompath, topath)
+        try:
+            shutil.copytree(frompath, topath)
+        except OSError as e:
+            print e
+
+    try:
+        for include in l10n.options('includes'):
+            include_ini = os.path.join(
+                l10n_ini_path, l10n.get('general', 'depth'),
+                l10n.get('includes', include)
+            )
+            if os.path.isfile(include_ini):
+                process_l10n_ini(include_ini)
+    except TypeError:
+        pass
+    except NoSectionError:
+        pass
+
+
+def create_option_parser():
+    from optparse import OptionParser
+    p = OptionParser()
+
+    p.add_option(
+        '-s', '--src',
+        dest='srcdir',
+        default='mozilla',
+        help='The directory containing the Mozilla l10n sources.'
+    )
+    p.add_option(
+        '-d', '--dest',
+        dest='destdir',
+        default='l10n',
+        help='The destination directory to copy the en-US locale files to.'
+    )
+    p.add_option(
+        '-p', '--mozproduct',
+        dest='mozproduct',
+        default='browser',
+        help='The Mozilla product name.'
+    )
+    p.add_option(
+        '--delete-dest',
+        dest='deletedest',
+        default=False,
+        action='store_true',
+        help='Delete the destination directory (if it exists).'
+    )
+
+    p.add_option(
+        '-v', '--verbose',
+        dest='verbose',
+        action='store_true',
+        default=False,
+        help='Be more noisy'
+    )
+
+    return p
+
+if __name__ == '__main__':
+    options, args = create_option_parser().parse_args()
+    srccheckout = options.srcdir
+    l10ncheckout = options.destdir
+    product = options.mozproduct
+    verbose = options.verbose
+
+    enUS_dir = os.path.join(l10ncheckout, 'en-US')
+    if options.deletedest and os.path.exists(enUS_dir):
+        shutil.rmtree(enUS_dir)
+    if not os.path.exists(enUS_dir):
+        os.makedirs(enUS_dir)
+
+    if verbose:
+        print "%s -s %s -d %s -p %s -v %s" % \
+              (__file__, srccheckout, l10ncheckout, product,
+               options.deletedest and '--delete-dest' or '')
+    product_ini = os.path.join(srccheckout, product, 'locales', 'l10n.ini')
+    if not os.path.isfile(product_ini):
+        # Done for Fennec
+        product_ini = os.path.join(srccheckout, 'locales', 'l10n.ini')
+    process_l10n_ini(product_ini)
diff --git a/tools/pocommentclean b/tools/pocommentclean
index d4316f7..e75e7cc 100755
--- a/tools/pocommentclean
+++ b/tools/pocommentclean
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with translate; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 # pocommentclean - delete all translator comments from a PO file
diff --git a/tools/pocompendium b/tools/pocompendium
index 489f692..cdeac4b 100755
--- a/tools/pocompendium
+++ b/tools/pocompendium
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with translate; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 # Creates a PO Compendium ie a merge of all PO files in a given directory and
diff --git a/tools/pomigrate2 b/tools/pomigrate2
index e351011..66e24af 100755
--- a/tools/pomigrate2
+++ b/tools/pomigrate2
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with translate; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 # pomigrate2 - migrates PO files from an old version using new POT files.
diff --git a/tools/popuretext b/tools/popuretext
index fab7d26..5a33deb 100755
--- a/tools/popuretext
+++ b/tools/popuretext
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with translate; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 # popuretext - extracts all the source text from a directory of PO or POT files, removes
diff --git a/tools/poreencode b/tools/poreencode
index 9e75a50..4854a41 100755
--- a/tools/poreencode
+++ b/tools/poreencode
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with translate; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 # poreencode - will traverse a PO directory and reencode all files to the
diff --git a/tools/posplit b/tools/posplit
index fe86590..f705ac3 100755
--- a/tools/posplit
+++ b/tools/posplit
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with translate; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 # posplit - takes any po file, usually a compendium PO file,
diff --git a/translate/__version__.py b/translate/__version__.py
index 9b31e6d..4583916 100644
--- a/translate/__version__.py
+++ b/translate/__version__.py
@@ -20,6 +20,16 @@
 
 """This file contains the version of the Translate Toolkit."""
 
-build = 12016
-sver = "1.10.0"
-ver = (1, 10, 0)
+build = 12017
+"""The build number is used by external used of the Translate Toolkit to
+trigger refreshes.  Thus increase the build number whenever changes are made to
+code touching stats or quality checks.  An increased build number will force a
+toolkit user, like Pootle, to regenerate it's stored stats and check
+results."""
+
+sver = "1.11.0"
+"""Human readable version number. Used for version number display."""
+
+ver = (1, 11, 0)
+"""Machine readable version number. Used by tools that need to adjust code
+paths based on a Translate Toolkit release number."""
diff --git a/translate/convert/convert.py b/translate/convert/convert.py
index 7de59c9..fd87c46 100644
--- a/translate/convert/convert.py
+++ b/translate/convert/convert.py
@@ -42,6 +42,7 @@ class ConvertOptionParser(optrecurse.RecursiveOptionParser, object):
                                                   allowmissingtemplate=allowmissingtemplate,
                                                   description=description)
         self.usepots = usepots
+        self.settimestampoption()
         self.setpotoption()
         self.set_usage()
 
@@ -59,6 +60,15 @@ class ConvertOptionParser(optrecurse.RecursiveOptionParser, object):
                         action="store_false", default=default, help=nofuzzyhelp)
         self.passthrough.append("includefuzzy")
 
+    def add_threshold_option(self, default=None):
+        """Adds an option to output only stores where translation percentage
+        exceeds the threshold.
+        """
+        self.add_option("", "--threshold", dest="outputthreshold", default=default,
+                        metavar="PERCENT", type="int",
+                        help="only convert files where the translation completion is above PERCENT")
+        self.passthrough.append("outputthreshold")
+
     def add_duplicates_option(self, default="msgctxt"):
         """Adds an option to say what to do with duplicate strings."""
         self.add_option(
@@ -134,6 +144,15 @@ class ConvertOptionParser(optrecurse.RecursiveOptionParser, object):
             )
             self.define_option(potoption)
 
+    def settimestampoption(self):
+        """Sets ``-S``/``--timestamp`` option."""
+        timestampopt = optparse.Option(
+            "-S", "--timestamp",
+            action="store_true", dest="timestamp", default=False,
+            help="skip conversion if the output file has newer timestamp"
+        )
+        self.define_option(timestampopt)
+
     def verifyoptions(self, options):
         """Verifies that the options are valid (required options are
         present, etc)."""
@@ -144,13 +163,21 @@ class ConvertOptionParser(optrecurse.RecursiveOptionParser, object):
         (options, args) = self.parse_args(argv)
         options.inputformats = self.filterinputformats(options)
         options.outputoptions = self.filteroutputoptions(options)
-        self.usepsyco(options)
         try:
             self.verifyoptions(options)
         except Exception, e:
             self.error(str(e))
         self.recursiveprocess(options)
 
+    def processfile(self, fileprocessor, options, fullinputpath,
+                    fulloutputpath, fulltemplatepath):
+        if options.timestamp and _output_is_newer(fullinputpath, fulloutputpath):
+            return False
+
+        return super(ConvertOptionParser,
+                    self).processfile(fileprocessor, options,
+                                      fullinputpath, fulloutputpath,
+                                      fulltemplatepath)
 
 def copyinput(inputfile, outputfile, templatefile, **kwargs):
     """Copies the input file to the output file."""
@@ -400,6 +427,9 @@ class ArchiveConvertOptionParser(ConvertOptionParser):
     def processfile(self, fileprocessor, options, fullinputpath,
                     fulloutputpath, fulltemplatepath):
         """Run an invidividual conversion."""
+        if options.timestamp and _output_is_newer(fullinputpath, fulloutputpath):
+            return False
+
         if self.isarchive(options.output, 'output'):
             inputfile = self.openinputfile(options, fullinputpath)
             # TODO: handle writing back to same archive as input/template
@@ -422,6 +452,40 @@ class ArchiveConvertOptionParser(ConvertOptionParser):
                                           fullinputpath, fulloutputpath,
                                           fulltemplatepath)
 
+def _output_is_newer(input_path, output_path):
+    """Check if input_path was not modified since output_path was generated,
+    used to avoid needless regeneration of output.
+    """
+    if not input_path or not output_path:
+        return False
+
+    if not os.path.exists(input_path) or not os.path.exists(output_path):
+        return False
+
+    input_mtime = os.path.getmtime(input_path)
+    output_mtime = os.path.getmtime(output_path)
+
+    return output_mtime > input_mtime
+
+def should_output_store(store, threshold):
+    """Check if the percent of translated source words more than or equal to
+    the given threshold.
+    """
+
+    if not threshold:
+        return True
+
+    from translate.storage import statsdb
+
+    units = filter(lambda unit: unit.istranslatable(), store.units)
+    translated = filter(lambda unit: unit.istranslated(), units)
+    wordcounts = dict(map(lambda unit: (unit, statsdb.wordsinunit(unit)), units))
+    sourcewords = lambda elementlist: sum(map(lambda unit: wordcounts[unit][0], elementlist))
+    tranlated_count = sourcewords(translated)
+    total_count = sourcewords(units)
+    percent = tranlated_count * 100 / total_count
+
+    return percent >= threshold
 
 def main(argv=None):
     parser = ArchiveConvertOptionParser({}, description=__doc__)
diff --git a/translate/convert/csv2po.py b/translate/convert/csv2po.py
index 0ecab41..0a0e15a 100644
--- a/translate/convert/csv2po.py
+++ b/translate/convert/csv2po.py
@@ -25,10 +25,12 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 
 from translate.storage import po
 from translate.storage import csvl10n
 
+logger = logging.getLogger(__name__)
 
 def replacestrings(source, *pairs):
     """Use ``pairs`` of ``(original, replacement)`` to replace text found in
@@ -121,18 +123,27 @@ class csv2po:
             thepolist = self.simpleindex[simplify(csvunit.source)]
             if len(thepolist) > 1:
                 csvfilename = getattr(self.csvfile, "filename", "(unknown)")
-                matches = "\n  ".join(["possible match: " + pounit.source for pounit in thepolist])
-                print >> sys.stderr, "%s - csv entry not found in pofile, multiple matches found:\n  location\t%s\n  original\t%s\n  translation\t%s\n  %s" % \
-                                     (csvfilename, csvunit.location,
-                                      csvunit.source, csvunit.target, matches)
+                matches = "\n  ".join(["possible match: " +
+                                       pounit.source for pounit in thepolist])
+                logger.warning("%s - csv entry not unique in pofile, "
+                               "multiple matches found:\n"
+                               "  location\t%s\n"
+                               "  original\t%s\n"
+                               "  translation\t%s\n"
+                               "  %s",
+                               csvfilename, csvunit.location,
+                               csvunit.source, csvunit.target, matches)
                 self.unmatched += 1
                 return
             pounit = thepolist[0]
         else:
             csvfilename = getattr(self.csvfile, "filename", "(unknown)")
-            print >> sys.stderr, "%s - csv entry not found in pofile:\n  location\t%s\n  original\t%s\n  translation\t%s" % \
-                                 (csvfilename, csvunit.location,
-                                  csvunit.source, csvunit.target)
+            logger.warning("%s - csv entry not found in pofile:\n"
+                           "  location\t%s\n"
+                           "  original\t%s\n"
+                           "  translation\t%s",
+                           csvfilename, csvunit.location,
+                           csvunit.source, csvunit.target)
             self.unmatched += 1
             return
         if pounit.hasplural():
@@ -148,8 +159,8 @@ class csv2po:
             elif simplify(csvunit.source) == simplify(pluralid):
                 pounit.msgstr[1] = csvunit.target
             else:
-                print >> sys.stderr, "couldn't work out singular or plural: %r, %r, %r" % \
-                    (csvunit.source, singularid, pluralid)
+                logger.warning("couldn't work out singular/plural: %r, %r, %r", 
+                               csvunit.source, singularid, pluralid)
                 self.unmatched += 1
                 return
         else:
diff --git a/translate/convert/ical2po.py b/translate/convert/ical2po.py
index e964ef3..7a674f4 100644
--- a/translate/convert/ical2po.py
+++ b/translate/convert/ical2po.py
@@ -25,10 +25,12 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 
 from translate.storage import po
 from translate.storage import ical
 
+logger = logging.getLogger(__name__)
 
 class ical2po:
     """convert a iCal file to a .po file for handling the translation..."""
@@ -67,7 +69,8 @@ class ical2po:
                     origpo.target = translatedpo.source
                 output_store.addunit(origpo)
             elif translatedpo is not None:
-                print >> sys.stderr, "error converting original iCal definition %s" % origpo.name
+                logger.error("error converting original iCal definition %s",
+                             origpo.name)
         output_store.removeduplicates(duplicatestyle)
         return output_store
 
diff --git a/translate/convert/ini2po.py b/translate/convert/ini2po.py
index 8f3414e..aa039c2 100644
--- a/translate/convert/ini2po.py
+++ b/translate/convert/ini2po.py
@@ -25,9 +25,11 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 
 from translate.storage import po
 
+logger = logging.getLogger(__name__)
 
 class ini2po:
     """convert a .ini file to a .po file for handling the translation..."""
@@ -67,7 +69,8 @@ class ini2po:
                     origpo.target = translatedpo.source
                 output_store.addunit(origpo)
             elif translatedpo is not None:
-                print >> sys.stderr, "error converting original ini definition %s" % origpo.name
+                logger.error("error converting original ini definition %s",
+                             origpo.name)
         output_store.removeduplicates(duplicatestyle)
         return output_store
 
diff --git a/translate/convert/json2po.py b/translate/convert/json2po.py
index e495e54..d300d2c 100644
--- a/translate/convert/json2po.py
+++ b/translate/convert/json2po.py
@@ -25,9 +25,11 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 
 from translate.storage import po
 
+logger = logging.getLogger(__name__)
 
 class json2po:
     """Convert a JSON file to a PO file"""
@@ -70,7 +72,8 @@ class json2po:
                     origpo.target = translatedpo.source
                 output_store.addunit(origpo)
             elif translatedpo is not None:
-                print >> sys.stderr, "Error converting original JSON definition %s" % origpo.name
+                logger.error("error converting original JSON definition %s",
+                             origpo.name)
         output_store.removeduplicates(duplicatestyle)
         return output_store
 
diff --git a/translate/convert/moz2po.py b/translate/convert/moz2po.py
index 8c3e66b..456b9d4 100644
--- a/translate/convert/moz2po.py
+++ b/translate/convert/moz2po.py
@@ -28,7 +28,6 @@ from translate.convert import dtd2po
 from translate.convert import prop2po
 from translate.convert import mozfunny2prop
 from translate.convert import mozlang2po
-from translate.storage import xpi
 from translate.convert import convert
 
 
@@ -56,10 +55,9 @@ def main(argv=None):
         formats[(replaceformat, replaceformat)] = (replaceformat,
                                                    replacer.searchreplaceinput)
         formats[replaceformat] = (replaceformat, replacer.searchreplaceinput)
-    parser = convert.ArchiveConvertOptionParser(formats, usetemplates=True,
-                                                usepots=True,
-                                                description=__doc__,
-                                                archiveformats={"xpi": xpi.XpiFile})
+    parser = convert.ConvertOptionParser(formats, usetemplates=True,
+                                         usepots=True,
+                                         description=__doc__)
     parser.add_duplicates_option()
     parser.passthrough.append("pot")
     parser.run(argv)
diff --git a/translate/convert/oo2po.py b/translate/convert/oo2po.py
index 03d6d22..0c87889 100644
--- a/translate/convert/oo2po.py
+++ b/translate/convert/oo2po.py
@@ -25,7 +25,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
-import sys
+import logging
 from urllib import urlencode
 
 from translate.storage import po
@@ -33,6 +33,7 @@ from translate.storage import oo
 
 # TODO: support using one GSI file as template, another as input (for when English is in one and translation in another)
 
+logger = logging.getLogger(__name__)
 
 class oo2po:
 
@@ -63,7 +64,8 @@ class oo2po:
         if self.sourcelanguage in theoo.languages:
             part1 = theoo.languages[self.sourcelanguage]
         else:
-            print >> sys.stderr, "/".join(theoo.lines[0].getkey()), "language not found: %s" % (self.sourcelanguage)
+            logger.error("/".join(theoo.lines[0].getkey()) +
+                         "language not found: %s", self.sourcelanguage)
             return []
         if self.blankmsgstr:
             # use a blank part2
@@ -139,9 +141,15 @@ def convertoo(inputfile, outputfile, templates, pot=False, sourcelanguage=None,
         else:
             sourcelanguage = "en-US"
     if not sourcelanguage in inputstore.languages:
-        print >> sys.stderr, "Warning: sourcelanguage '%s' not found in inputfile '%s' (contains %s)" % (sourcelanguage, inputfilename, ", ".join(inputstore.languages))
+        logger.warning("sourcelanguage '%s' not found in inputfile '%s' "
+                       "(contains %s)",
+                       sourcelanguage, inputfilename,
+                       ", ".join(inputstore.languages))
     if targetlanguage and targetlanguage not in inputstore.languages:
-        print >> sys.stderr, "Warning: targetlanguage '%s' not found in inputfile '%s' (contains %s)" % (targetlanguage, inputfilename, ", ".join(inputstore.languages))
+        logger.warning("targetlanguage '%s' not found in inputfile '%s' "
+                       "(contains %s)",
+                       targetlanguage, inputfilename,
+                       ", ".join(inputstore.languages))
     convertor = oo2po(sourcelanguage, targetlanguage, blankmsgstr=pot, long_keys=multifilestyle != "single")
     outputstore = convertor.convertstore(inputstore, duplicatestyle)
     if outputstore.isempty():
diff --git a/translate/convert/oo2xliff.py b/translate/convert/oo2xliff.py
index 880c2f0..4846273 100644
--- a/translate/convert/oo2xliff.py
+++ b/translate/convert/oo2xliff.py
@@ -26,6 +26,7 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 from urllib import urlencode
 
 from translate.storage import xliff
@@ -33,6 +34,7 @@ from translate.storage import oo
 
 # TODO: support using one GSI file as template, another as input (for when English is in one and translation in another)
 
+logger = logging.getLogger(__name__)
 
 class oo2xliff:
 
@@ -67,7 +69,8 @@ class oo2xliff:
         if self.sourcelanguage in theoo.languages:
             part1 = theoo.languages[self.sourcelanguage]
         else:
-            print >> sys.stderr, "/".join(theoo.lines[0].getkey()), "language not found: %s" % (self.sourcelanguage)
+            logging.error("/".join(theoo.lines[0].getkey()) +
+                          "language not found: %s", self.sourcelanguage)
             return []
         if self.blankmsgstr:
             # use a blank part2
@@ -134,10 +137,18 @@ def convertoo(inputfile, outputfile, templates, pot=False, sourcelanguage=None,
         else:
             sourcelanguage = "en-US"
     if not sourcelanguage in inputstore.languages:
-        print >> sys.stderr, "Warning: sourcelanguage '%s' not found in inputfile '%s' (contains %s)" % (sourcelanguage, inputfilename, ", ".join(inputstore.languages))
-    if not pot and targetlanguage and targetlanguage not in inputstore.languages:
-        print >> sys.stderr, "Warning: targetlanguage '%s' not found in inputfile '%s' (contains %s)" % (targetlanguage, inputfilename, ", ".join(inputstore.languages))
-    convertor = oo2xliff(sourcelanguage, targetlanguage, blankmsgstr=pot, long_keys=(multifilestyle != "single"))
+        logger.warning("sourcelanguage '%s' not found in inputfile '%s' "
+                       "(contains %s)",
+                       sourcelanguage, inputfilename,
+                       ", ".join(inputstore.languages))
+    if not pot and (targetlanguage and
+                    targetlanguage not in inputstore.languages):
+        logger.warning("targetlanguage '%s' not found in inputfile '%s' "
+                       "(contains %s)",
+                       targetlanguage, inputfilename,
+                       ", ".join(inputstore.languages))
+    convertor = oo2xliff(sourcelanguage, targetlanguage, blankmsgstr=pot,
+                         long_keys=(multifilestyle != "single"))
     outputstore = convertor.convertstore(inputstore, duplicatestyle)
     if outputstore.isempty():
         return 0
diff --git a/translate/convert/php2po.py b/translate/convert/php2po.py
index 120415a..9c056c7 100644
--- a/translate/convert/php2po.py
+++ b/translate/convert/php2po.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2002-2006 Zuza Software Foundation
+# Copyright 2002-2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -25,19 +25,24 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 
-from translate.storage import po
-from translate.storage import php
+from translate.convert import convert
+from translate.storage import php, po
+
+
+logger = logging.getLogger(__name__)
 
 
 class php2po:
-    """convert a .php file to a .po file for handling the translation..."""
+    """Convert a .php file to a .po file for handling the translation."""
 
     def convertstore(self, inputstore, duplicatestyle="msgctxt"):
-        """converts a .php file to a .po file..."""
+        """Convert a .php file to a .po file."""
         outputstore = po.pofile()
         outputheader = outputstore.header()
-        outputheader.addnote("extracted from %s" % inputstore.filename, "developer")
+        outputheader.addnote("extracted from %s" % inputstore.filename,
+                             "developer")
 
         for inputunit in inputstore.units:
             outputunit = self.convertunit(inputunit, "developer")
@@ -46,35 +51,41 @@ class php2po:
         outputstore.removeduplicates(duplicatestyle)
         return outputstore
 
-    def mergestore(self, templatestore, inputstore, blankmsgstr=False, duplicatestyle="msgctxt"):
-        """converts two .php files to a .po file..."""
+    def mergestore(self, templatestore, inputstore, blankmsgstr=False,
+                   duplicatestyle="msgctxt"):
+        """Convert two .php files to a .po file."""
         outputstore = po.pofile()
         outputheader = outputstore.header()
-        outputheader.addnote("extracted from %s, %s" % (templatestore.filename, inputstore.filename), "developer")
+        outputheader.addnote("extracted from %s, %s" % (templatestore.filename,
+                                                        inputstore.filename),
+                             "developer")
 
         inputstore.makeindex()
-        # loop through the original file, looking at units one by one
+        # Loop through the original file, looking at units one by one.
         for templateunit in templatestore.units:
             outputunit = self.convertunit(templateunit, "developer")
-            # try and find a translation of the same name...
+            # Try and find a translation of the same name.
             if templateunit.name in inputstore.locationindex:
                 translatedinputunit = inputstore.locationindex[templateunit.name]
-                # Need to check that this comment is not a copy of the developer comments
-                translatedoutputunit = self.convertunit(translatedinputunit, "translator")
+                # Need to check that this comment is not a copy of the
+                # developer comments.
+                translatedoutputunit = self.convertunit(translatedinputunit,
+                                                        "translator")
             else:
                 translatedoutputunit = None
-            # if we have a valid po unit, get the translation and add it...
+            # If we have a valid po unit, get the translation and add it.
             if outputunit is not None:
                 if translatedoutputunit is not None and not blankmsgstr:
                     outputunit.target = translatedoutputunit.source
                 outputstore.addunit(outputunit)
             elif translatedoutputunit is not None:
-                print >> sys.stderr, "error converting original properties definition %s" % templateunit.name
+                logger("error converting original properties definition %s",
+                       templateunit.name)
         outputstore.removeduplicates(duplicatestyle)
         return outputstore
 
     def convertunit(self, inputunit, origin):
-        """Converts a .php unit to a .po unit"""
+        """Convert a .php unit to a .po unit."""
         outputunit = po.pounit(encoding="UTF-8")
         outputunit.addnote(inputunit.getnotes(origin), origin)
         outputunit.addlocation("".join(inputunit.getlocations()))
@@ -83,15 +94,19 @@ class php2po:
         return outputunit
 
 
-def convertphp(inputfile, outputfile, templatefile, pot=False, duplicatestyle="msgctxt"):
-    """reads in inputfile using php, converts using php2po, writes to outputfile"""
+def convertphp(inputfile, outputfile, templatefile, pot=False,
+               duplicatestyle="msgctxt"):
+    """Read inputfile using php, convert using php2po, write to outputfile."""
     inputstore = php.phpfile(inputfile)
     convertor = php2po()
     if templatefile is None:
-        outputstore = convertor.convertstore(inputstore, duplicatestyle=duplicatestyle)
+        outputstore = convertor.convertstore(inputstore,
+                                             duplicatestyle=duplicatestyle)
     else:
         templatestore = php.phpfile(templatefile)
-        outputstore = convertor.mergestore(templatestore, inputstore, blankmsgstr=pot, duplicatestyle=duplicatestyle)
+        outputstore = convertor.mergestore(templatestore, inputstore,
+                                           blankmsgstr=pot,
+                                           duplicatestyle=duplicatestyle)
     if outputstore.isempty():
         return 0
     outputfile.write(str(outputstore))
@@ -99,12 +114,12 @@ def convertphp(inputfile, outputfile, templatefile, pot=False, duplicatestyle="m
 
 
 def main(argv=None):
-    from translate.convert import convert
     formats = {
             "php": ("po", convertphp), ("php", "php"): ("po", convertphp),
             "html": ("po", convertphp), ("html", "html"): ("po", convertphp),
     }
-    parser = convert.ConvertOptionParser(formats, usetemplates=True, usepots=True, description=__doc__)
+    parser = convert.ConvertOptionParser(formats, usetemplates=True,
+                                         usepots=True, description=__doc__)
     parser.add_duplicates_option()
     parser.passthrough.append("pot")
     parser.run(argv)
diff --git a/translate/convert/po2dtd.py b/translate/convert/po2dtd.py
index 65fd781..04d0409 100644
--- a/translate/convert/po2dtd.py
+++ b/translate/convert/po2dtd.py
@@ -30,6 +30,7 @@ from translate.storage import dtd
 from translate.storage import po
 from translate.misc import quote
 from translate.convert import accesskey
+from translate.convert import convert
 
 
 def dtdwarning(message, category, filename, lineno, line=None):
@@ -74,34 +75,38 @@ def applytranslation(entity, dtdunit, inputunit, mixedentities):
 class redtd:
     """this is a convertor class that creates a new dtd based on a template using translations in a po"""
 
-    def __init__(self, dtdfile, android=False):
+    def __init__(self, dtdfile, android=False, remove_untranslated=False):
         self.dtdfile = dtdfile
         self.mixer = accesskey.UnitMixer(dtd.labelsuffixes, dtd.accesskeysuffixes)
         self.android = False
+        self.remove_untranslated = remove_untranslated
 
     def convertstore(self, inputstore, includefuzzy=False):
-        # translate the strings
         for inunit in inputstore.units:
-            # there may be more than one entity due to msguniq merge
-            if includefuzzy or not inunit.isfuzzy():
-                self.handleinunit(inunit)
+            self.handleinunit(inunit, includefuzzy)
         return self.dtdfile
 
-    def handleinunit(self, inunit):
+    def handleinunit(self, inunit, includefuzzy):
         entities = inunit.getlocations()
         mixedentities = self.mixer.match_entities(entities)
         for entity in entities:
             if entity in self.dtdfile.index:
                 # now we need to replace the definition of entity with msgstr
                 dtdunit = self.dtdfile.index[entity]  # find the dtd
-                applytranslation(entity, dtdunit, inunit, mixedentities)
+                if inunit.istranslated() or not bool(inunit.source):
+                    applytranslation(entity, dtdunit, inunit, mixedentities)
+                elif self.remove_untranslated and not (includefuzzy and inunit.isfuzzy()):
+                    dtdunit.entity = None
+                else:
+                    applytranslation(entity, dtdunit, inunit, mixedentities)
 
 
 class po2dtd:
     """this is a convertor class that creates a new dtd file based on a po file without a template"""
 
-    def __init__(self, android=False):
+    def __init__(self, android=False, remove_untranslated=False):
         self.android = android
+        self.remove_untranslated = remove_untranslated
 
     def convertcomments(self, inputunit, dtdunit):
         entities = inputunit.getlocations()
@@ -130,8 +135,10 @@ class po2dtd:
             dtdunit.comments.append(("locnote", locnote))
 
     def convertstrings(self, inputunit, dtdunit):
-        if inputunit.istranslated():
+        if inputunit.istranslated() or not bool(inputunit.source):
             unquoted = inputunit.target
+        elif self.remove_untranslated:
+            unquoted = None
         else:
             unquoted = inputunit.source
         dtdunit.source = dtd.removeinvalidamps(dtdunit.entity, unquoted)
@@ -146,16 +153,21 @@ class po2dtd:
         outputstore = dtd.dtdfile(android=self.android)
         self.currentgroups = []
         for inputunit in inputstore.units:
-            if includefuzzy or not inputunit.isfuzzy():
+            if ((includefuzzy or not inputunit.isfuzzy()) and
+                (inputunit.istranslated() or not self.remove_untranslated)):
                 dtdunit = self.convertunit(inputunit)
                 if dtdunit is not None:
                     outputstore.addunit(dtdunit)
         return outputstore
 
 
-def convertdtd(inputfile, outputfile, templatefile, includefuzzy=False):
+def convertdtd(inputfile, outputfile, templatefile, includefuzzy=False,
+               remove_untranslated=False, outputthreshold=None):
     inputstore = po.pofile(inputfile)
 
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     # Some of the DTD files used for Firefox Mobile are actually completely
     # different with different escaping and quoting rules. The best way to
     # identify them seems to be on their file path in the tree (based on code
@@ -169,10 +181,12 @@ def convertdtd(inputfile, outputfile, templatefile, includefuzzy=False):
             android_dtd = True
 
     if templatefile is None:
-        convertor = po2dtd(android=android_dtd)
+        convertor = po2dtd(android=android_dtd,
+                           remove_untranslated=remove_untranslated)
     else:
         templatestore = dtd.dtdfile(templatefile, android=android_dtd)
-        convertor = redtd(templatestore, android=android_dtd)
+        convertor = redtd(templatestore, android=android_dtd,
+                          remove_untranslated=remove_untranslated)
     outputstore = convertor.convertstore(inputstore, includefuzzy)
     outputfile.write(str(outputstore))
     return 1
@@ -180,10 +194,14 @@ def convertdtd(inputfile, outputfile, templatefile, includefuzzy=False):
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     formats = {"po": ("dtd", convertdtd), ("po", "dtd"): ("dtd", convertdtd)}
     parser = convert.ConvertOptionParser(formats, usetemplates=True, description=__doc__)
+    parser.add_option("", "--removeuntranslated", dest="remove_untranslated",
+            default=False, action="store_true",
+            help="remove untranslated strings from output")
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
+    parser.passthrough.append("remove_untranslated")
     parser.run(argv)
 
 
diff --git a/translate/convert/po2html.py b/translate/convert/po2html.py
index c66a6d9..ed42cc1 100644
--- a/translate/convert/po2html.py
+++ b/translate/convert/po2html.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.storage import html
 from translate.storage import po
 
@@ -40,7 +41,7 @@ class po2html:
         if self.includefuzzy or not unit.isfuzzy():
             return unit.target
         else:
-            return None
+            return unit.source
 
     def mergestore(self, inputstore, templatetext, includefuzzy):
         """converts a file to .po format"""
@@ -51,10 +52,15 @@ class po2html:
         return output_store.filesrc
 
 
-def converthtml(inputfile, outputfile, templatefile, includefuzzy=False):
+def converthtml(inputfile, outputfile, templatefile, includefuzzy=False,
+                outputthreshold=None):
     """reads in stdin using fromfileclass, converts using convertorclass,
     writes to stdout"""
     inputstore = po.pofile(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     convertor = po2html()
     if templatefile is None:
         raise ValueError("must have template file for HTML files")
@@ -67,7 +73,6 @@ def converthtml(inputfile, outputfile, templatefile, includefuzzy=False):
 
 
 def main(argv=None):
-    from translate.convert import convert
     from translate.misc import stdiotell
     import sys
     sys.stdout = stdiotell.StdIOWrapper(sys.stdout)
@@ -78,6 +83,7 @@ def main(argv=None):
               }
     parser = convert.ConvertOptionParser(formats, usetemplates=True,
                                          description=__doc__)
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2ical.py b/translate/convert/po2ical.py
index 3b77328..e3edd3b 100644
--- a/translate/convert/po2ical.py
+++ b/translate/convert/po2ical.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.storage import factory
 from translate.storage import ical
 
@@ -51,8 +52,13 @@ class reical:
         return str(self.templatestore)
 
 
-def convertical(inputfile, outputfile, templatefile, includefuzzy=False):
+def convertical(inputfile, outputfile, templatefile, includefuzzy=False,
+                outputthreshold=None):
     inputstore = factory.getobject(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if templatefile is None:
         raise ValueError("must have template file for iCal files")
     else:
@@ -64,9 +70,9 @@ def convertical(inputfile, outputfile, templatefile, includefuzzy=False):
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     formats = {("po", "ics"): ("ics", convertical)}
     parser = convert.ConvertOptionParser(formats, usetemplates=True, description=__doc__)
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2ini.py b/translate/convert/po2ini.py
index ec9637c..3329d53 100644
--- a/translate/convert/po2ini.py
+++ b/translate/convert/po2ini.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.storage import factory
 
 
@@ -51,8 +52,13 @@ class reini:
         return str(self.templatestore)
 
 
-def convertini(inputfile, outputfile, templatefile, includefuzzy=False, dialect="default"):
+def convertini(inputfile, outputfile, templatefile, includefuzzy=False, dialect="default",
+               outputthreshold=None):
     inputstore = factory.getobject(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if templatefile is None:
         raise ValueError("must have template file for ini files")
     else:
@@ -62,18 +68,20 @@ def convertini(inputfile, outputfile, templatefile, includefuzzy=False, dialect=
     return 1
 
 
-def convertisl(inputfile, outputfile, templatefile, includefuzzy=False, dialect="inno"):
-    convertini(inputfile, outputfile, templatefile, includefuzzy, dialect)
+def convertisl(inputfile, outputfile, templatefile, includefuzzy=False, dialect="inno",
+               outputthreshold=None):
+    convertini(inputfile, outputfile, templatefile, includefuzzy, dialect,
+               outputthreshold=outputthreshold)
 
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     formats = {
                ("po", "ini"): ("ini", convertini),
                ("po", "isl"): ("isl", convertisl),
               }
     parser = convert.ConvertOptionParser(formats, usetemplates=True, description=__doc__)
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2json.py b/translate/convert/po2json.py
index e988ff6..11e855e 100644
--- a/translate/convert/po2json.py
+++ b/translate/convert/po2json.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.storage import factory
 
 
@@ -50,8 +51,13 @@ class rejson:
         return str(self.templatestore)
 
 
-def convertjson(inputfile, outputfile, templatefile, includefuzzy=False):
+def convertjson(inputfile, outputfile, templatefile, includefuzzy=False,
+                outputthreshold=None):
     inputstore = factory.getobject(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if templatefile is None:
         raise ValueError("Must have template file for JSON files")
     else:
@@ -63,12 +69,12 @@ def convertjson(inputfile, outputfile, templatefile, includefuzzy=False):
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     formats = {
                ("po", "json"): ("json", convertjson),
               }
     parser = convert.ConvertOptionParser(formats, usetemplates=True,
                                          description=__doc__)
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2moz.py b/translate/convert/po2moz.py
index ad56ab4..3e2ea43 100644
--- a/translate/convert/po2moz.py
+++ b/translate/convert/po2moz.py
@@ -30,49 +30,15 @@ from translate.convert import po2dtd
 from translate.convert import po2prop
 from translate.convert import po2mozlang
 from translate.convert import prop2mozfunny
-from translate.storage import xpi
 from translate.convert import convert
 
 
-class MozConvertOptionParser(convert.ArchiveConvertOptionParser):
+class MozConvertOptionParser(convert.ConvertOptionParser):
 
     def __init__(self, formats, usetemplates=False, usepots=False,
                  description=None):
-        convert.ArchiveConvertOptionParser.__init__(self, formats, usetemplates, usepots,
-                                                    description=description,
-                                                    archiveformats={"xpi": xpi.XpiFile})
-
-    def initoutputarchive(self, options):
-        """creates an outputarchive if required"""
-        if options.output and self.isarchive(options.output, 'output'):
-            newlang = None
-            newregion = None
-            if options.locale is not None:
-                if options.locale.count("-") > 1:
-                    raise ValueError("Invalid locale: %s - should be of the form xx-YY" % options.locale)
-                elif "-" in options.locale:
-                    newlang, newregion = options.locale.split("-")
-                else:
-                    newlang, newregion = options.locale, ""
-            if options.clonexpi is not None:
-                originalxpi = xpi.XpiFile(options.clonexpi, "r")
-                options.outputarchive = originalxpi.clone(options.output, "w",
-                                                          newlang=newlang,
-                                                          newregion=newregion)
-            elif self.isarchive(options.template, 'template'):
-                options.outputarchive = options.templatearchive.clone(options.output, "a",
-                                                                      newlang=newlang,
-                                                                      newregion=newregion)
-            else:
-                if os.path.exists(options.output):
-                    options.outputarchive = xpi.XpiFile(options.output, "a",
-                                                        locale=newlang,
-                                                        region=newregion)
-                else:
-                    # FIXME: this is unlikely to work because it has no jar files
-                    options.outputarchive = xpi.XpiFile(options.output, "w",
-                                                        locale=newlang,
-                                                        region=newregion)
+        convert.ConvertOptionParser.__init__(self, formats, usetemplates, usepots,
+                                             description=description)
 
     def splitinputext(self, inputpath):
         """splits a inputpath into name and extension"""
@@ -89,10 +55,6 @@ class MozConvertOptionParser(convert.ArchiveConvertOptionParser):
         """recurse through directories and convert files"""
         self.replacer.replacestring = options.locale
         result = super(MozConvertOptionParser, self).recursiveprocess(options)
-        if self.isarchive(options.output, 'output'):
-            if options.progress in ('console', 'verbose'):
-                print "writing xpi file..."
-            options.outputarchive.close()
         return result
 
 
@@ -120,9 +82,12 @@ def main(argv=None):
     parser.add_option("-l", "--locale", dest="locale", default=None,
         help="set output locale (required as this sets the directory names)",
         metavar="LOCALE")
-    parser.add_option("", "--clonexpi", dest="clonexpi", default=None,
-        help="clone xpi structure from the given xpi file")
+    parser.add_option("", "--removeuntranslated", dest="remove_untranslated",
+            default=False, action="store_true",
+            help="remove untranslated strings from output")
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
+    parser.passthrough.append("remove_untranslated")
     parser.replacer = replacer
     parser.run(argv)
 
diff --git a/translate/convert/po2mozlang.py b/translate/convert/po2mozlang.py
index 28842cf..3d355e7 100644
--- a/translate/convert/po2mozlang.py
+++ b/translate/convert/po2mozlang.py
@@ -24,6 +24,7 @@
 """Convert Gettext PO localization files to Mozilla .lang files.
 """
 
+from translate.convert import convert
 from translate.storage import mozilla_lang as lang
 from translate.storage import po
 
@@ -52,10 +53,15 @@ class po2lang:
         return thetargetfile
 
 
-def convertlang(inputfile, outputfile, templates, includefuzzy=False, mark_active=True):
+def convertlang(inputfile, outputfile, templates, includefuzzy=False, mark_active=True,
+                outputthreshold=None, remove_untranslated=None):
     """reads in stdin using fromfileclass, converts using convertorclass,
     writes to stdout"""
     inputstore = po.pofile(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if inputstore.isempty():
         return 0
     convertor = po2lang(mark_active=mark_active)
@@ -71,7 +77,6 @@ formats = {
 
 
 def main(argv=None):
-    from translate.convert import convert
     from translate.misc import stdiotell
     import sys
     sys.stdout = stdiotell.StdIOWrapper(sys.stdout)
@@ -79,6 +84,7 @@ def main(argv=None):
                                            description=__doc__)
     parser.add_option("", "--mark-active", dest="mark_active", default=False,
             action="store_true", help="mark the file as active")
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.passthrough.append("mark_active")
     parser.run(argv)
diff --git a/translate/convert/po2oo.py b/translate/convert/po2oo.py
index 5f9bb6c..8fc1dd0 100644
--- a/translate/convert/po2oo.py
+++ b/translate/convert/po2oo.py
@@ -27,13 +27,16 @@ for examples and usage instructions.
 import os
 import sys
 import time
+import logging
 
+from translate.convert import convert
 from translate.storage import oo
 from translate.storage import factory
 from translate.filters import pofilter
 from translate.filters import checks
 from translate.filters import autocorrect
 
+logger = logging.getLogger(__name__)
 
 class reoo:
 
@@ -87,14 +90,15 @@ class reoo:
                 theoo = self.index[key]  # find the oo
                 self.applytranslation(key, subkey, theoo, unit)
             else:
-                print >> sys.stderr, "couldn't find key %s from po in %d keys" % (key, len(self.index))
+                logger.warning("couldn't find key %s from po in %d keys",
+                               key, len(self.index))
                 try:
                     sourceunitlines = str(unit)
                     if isinstance(sourceunitlines, unicode):
                         sourceunitlines = sourceunitlines.encode("utf-8")
-                    print >> sys.stderr, sourceunitlines
+                    logger.warning(sourceunitlines)
                 except:
-                    print >> sys.stderr, "error outputting source unit %r" % (str(unit),)
+                    logger.warning("error outputting source unit %r", str(unit))
 
     def applytranslation(self, key, subkey, theoo, unit):
         """applies the translation from the source unit to the oo unit"""
@@ -160,10 +164,12 @@ class oocheckfilter(pofilter.pocheckfilter):
                 for filtername, filtermessage in filterresult.iteritems():
                     location = unit.getlocations()[0].encode('utf-8')
                     if filtername in self.options.error:
-                        print >> sys.stderr, "Error at %s::%s: %s" % (filename, location, filtermessage)
+                        logger.error("Error at %s::%s: %s",
+                                     filename, location, filtermessage)
                         return not filteraction in ["exclude-all", "exclude-serious"]
                     if filtername in self.options.warning or self.options.alwayswarn:
-                        print >> sys.stderr, "Warning at %s::%s: %s" % (filename, location, filtermessage)
+                        logger.warning("Warning at %s::%s: %s",
+                                       filename, location, filtermessage)
                         return not filteraction in ["exclude-all"]
         return True
 
@@ -188,8 +194,13 @@ filter = oocheckfilter(options, [checks.OpenOfficeChecker, checks.StandardUnitCh
 
 def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None,
               targetlanguage=None, timestamp=None, includefuzzy=False,
-              multifilestyle="single", skip_source=False, filteraction=None):
+              multifilestyle="single", skip_source=False, filteraction=None,
+              outputthreshold=None):
     inputstore = factory.getobject(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     inputstore.filename = getattr(inputfile, 'name', '')
     if not targetlanguage:
         raise ValueError("You must specify the target language")
@@ -213,7 +224,6 @@ def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None,
 
 
 def main(argv=None):
-    from translate.convert import convert
     formats = {
                 ("po", "oo"): ("oo", convertoo),
                 ("xlf", "oo"): ("oo", convertoo),
@@ -244,6 +254,7 @@ def main(argv=None):
                       help="don't output the source language, but fallback to it where needed")
     parser.add_option("", "--filteraction", dest="filteraction", default="none", metavar="ACTION",
                       help="action on pofilter failure: none (default), warn, exclude-serious, exclude-all")
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.add_multifile_option()
     parser.passthrough.append("sourcelanguage")
diff --git a/translate/convert/po2php.py b/translate/convert/po2php.py
index 42c03e5..56898be 100644
--- a/translate/convert/po2php.py
+++ b/translate/convert/po2php.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.misc import quote
 from translate.storage import po
 from translate.storage import php
@@ -140,8 +141,13 @@ class rephp:
         return returnline
 
 
-def convertphp(inputfile, outputfile, templatefile, includefuzzy=False):
+def convertphp(inputfile, outputfile, templatefile, includefuzzy=False,
+               outputthreshold=None):
     inputstore = po.pofile(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if templatefile is None:
         raise ValueError("must have template file for php files")
         # convertor = po2php()
@@ -154,13 +160,13 @@ def convertphp(inputfile, outputfile, templatefile, includefuzzy=False):
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     formats = {
             ("po", "php"): ("php", convertphp),
             ("po", "html"): ("html", convertphp),
     }
     parser = convert.ConvertOptionParser(formats, usetemplates=True,
                                          description=__doc__)
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2prop.py b/translate/convert/po2prop.py
index 9eb7c71..55b1e80 100644
--- a/translate/convert/po2prop.py
+++ b/translate/convert/po2prop.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.misc import quote
 from translate.storage import po
 from translate.storage import properties
@@ -115,9 +116,7 @@ class reprop:
                 delimiter = prespace + delimiter_char + postspace
             if key in self.inputstore.locationindex:
                 unit = self.inputstore.locationindex[key]
-                if self.remove_untranslated and (unit.source == unit.target or
-                                                 unit.isfuzzy() or
-                                                 len(unit.target) == 0):
+                if not unit.istranslated() and bool(unit.source) and self.remove_untranslated:
                     returnline = u""
                 else:
                     if unit.isfuzzy() and not self.includefuzzy or len(unit.target) == 0:
@@ -145,26 +144,33 @@ class reprop:
 
 
 def convertstrings(inputfile, outputfile, templatefile, personality="strings",
-                   includefuzzy=False, encoding=None,
+                   includefuzzy=False, encoding=None, outputthreshold=None,
                    remove_untranslated=False):
     """.strings specific convertor function"""
     return convertprop(inputfile, outputfile, templatefile,
                        personality="strings", includefuzzy=includefuzzy,
-                       encoding=encoding,
+                       encoding=encoding, outputthreshold=outputthreshold,
                        remove_untranslated=remove_untranslated)
 
 
 def convertmozillaprop(inputfile, outputfile, templatefile,
-                       includefuzzy=False, remove_untranslated=False):
+                       includefuzzy=False, remove_untranslated=False,
+                       outputthreshold=None):
     """Mozilla specific convertor function"""
     return convertprop(inputfile, outputfile, templatefile,
                        personality="mozilla", includefuzzy=includefuzzy,
-                       remove_untranslated=remove_untranslated)
+                       remove_untranslated=remove_untranslated,
+                       outputthreshold=outputthreshold)
 
 
 def convertprop(inputfile, outputfile, templatefile, personality="java",
-                includefuzzy=False, encoding=None, remove_untranslated=False):
+                includefuzzy=False, encoding=None, remove_untranslated=False,
+                outputthreshold=None):
     inputstore = po.pofile(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if templatefile is None:
         raise ValueError("must have template file for properties files")
         # convertor = po2prop()
@@ -184,7 +190,6 @@ formats = {
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     parser = convert.ConvertOptionParser(formats, usetemplates=True,
                                          description=__doc__)
     parser.add_option("", "--personality", dest="personality",
@@ -200,6 +205,7 @@ def main(argv=None):
     parser.add_option("", "--removeuntranslated", dest="remove_untranslated",
             default=False, action="store_true",
             help="remove key value from output if it is untranslated")
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.passthrough.append("personality")
     parser.passthrough.append("encoding")
diff --git a/translate/convert/po2rc.py b/translate/convert/po2rc.py
index bf6b641..e66256b 100644
--- a/translate/convert/po2rc.py
+++ b/translate/convert/po2rc.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.storage import po
 from translate.storage import rc
 
@@ -77,8 +78,12 @@ class rerc:
 
 
 def convertrc(inputfile, outputfile, templatefile, includefuzzy=False,
-              charset=None, lang=None, sublang=None):
+              charset=None, lang=None, sublang=None, outputthreshold=None):
     inputstore = po.pofile(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if not lang:
         raise ValueError("must specify a target language")
     if templatefile is None:
@@ -93,7 +98,6 @@ def convertrc(inputfile, outputfile, templatefile, includefuzzy=False,
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     formats = {("po", "rc"): ("rc", convertrc)}
     parser = convert.ConvertOptionParser(formats, usetemplates=True,
                                          description=__doc__)
@@ -109,6 +113,7 @@ def main(argv=None):
     parser.passthrough.append("charset")
     parser.passthrough.append("lang")
     parser.passthrough.append("sublang")
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2sub.py b/translate/convert/po2sub.py
index e2c486b..3f800a7 100644
--- a/translate/convert/po2sub.py
+++ b/translate/convert/po2sub.py
@@ -24,6 +24,7 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+from translate.convert import convert
 from translate.storage import factory
 
 
@@ -51,8 +52,13 @@ class resub:
         return str(self.templatestore)
 
 
-def convertsub(inputfile, outputfile, templatefile, includefuzzy=False):
+def convertsub(inputfile, outputfile, templatefile, includefuzzy=False,
+               outputthreshold=None):
     inputstore = factory.getobject(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     if templatefile is None:
         raise ValueError("must have template file for subtitle files")
     else:
@@ -64,7 +70,6 @@ def convertsub(inputfile, outputfile, templatefile, includefuzzy=False):
 
 def main(argv=None):
     # handle command line options
-    from translate.convert import convert
     formats = {
          ("po", "srt"): ("srt", convertsub),
          ("po", "sub"): ("sub", convertsub),
@@ -73,6 +78,7 @@ def main(argv=None):
     }
     parser = convert.ConvertOptionParser(formats, usetemplates=True,
                                          description=__doc__)
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2tmx b/translate/convert/po2tmx
index 44fb5a9..dbc9514 100755
--- a/translate/convert/po2tmx
+++ b/translate/convert/po2tmx
@@ -18,8 +18,8 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 
-"""Converts Gettext .po files to Qt .ts localization files
-You can convert from .ts to .po using po2ts"""
+"""Converts Gettext .po files to TMX (Translation Memory eXchange) localization
+files"""
 
 from translate.convert import po2tmx
 
diff --git a/translate/convert/po2tmx.py b/translate/convert/po2tmx.py
index baa7e02..d621164 100644
--- a/translate/convert/po2tmx.py
+++ b/translate/convert/po2tmx.py
@@ -34,20 +34,16 @@ from translate.misc import wStringIO
 
 class po2tmx:
 
-    def convertfile(self, inputfile, sourcelanguage='en', targetlanguage=None):
-        """converts a .po file to TMX file"""
-        # TODO: This seems to not be used... remove it
-        inputstore = inputfile
-        for inunit in inputstore.units:
-            if inunit.isheader() or inunit.isblank() or not inunit.istranslated() or inunit.isfuzzy():
-                continue
-            source = inunit.source
-            translation = inunit.target
-            # TODO place source location in comments
-            tmxfile.addtranslation(source, sourcelanguage, translation, targetlanguage)
-        return str(tmxfile)
+    def cleancomments(self, comments):
+        """Removes the comment marks from the PO strings."""
+        for index, comment in enumerate(comments):
+            if comment.startswith("#"):
+                comments[index] = comment[1:].rstrip()
+
+        return ''.join(comments)
 
-    def convertfiles(self, inputfile, tmxfile, sourcelanguage='en', targetlanguage=None):
+    def convertfiles(self, inputfile, tmxfile, sourcelanguage='en',
+                     targetlanguage=None, comment=None):
         """converts a .po file (possibly many) to TMX file"""
         inputstore = po.pofile(inputfile)
         for inunit in inputstore.units:
@@ -55,14 +51,23 @@ class po2tmx:
                 continue
             source = inunit.source
             translation = inunit.target
-            # TODO place source location in comments
-            tmxfile.addtranslation(source, sourcelanguage, translation, targetlanguage)
+
+            commenttext = {
+                'source': self.cleancomments(inunit.sourcecomments),
+                'type': self.cleancomments(inunit.typecomments),
+                'others': self.cleancomments(inunit.othercomments),
+            }.get(comment, None)
+
+            tmxfile.addtranslation(source, sourcelanguage, translation,
+                                   targetlanguage, commenttext)
 
 
-def convertpo(inputfile, outputfile, templatefile, sourcelanguage='en', targetlanguage=None):
+def convertpo(inputfile, outputfile, templatefile, sourcelanguage='en',
+              targetlanguage=None, comment=None):
     """reads in stdin using fromfileclass, converts using convertorclass, writes to stdout"""
     convertor = po2tmx()
-    convertor.convertfiles(inputfile, outputfile.tmxfile, sourcelanguage, targetlanguage)
+    convertor.convertfiles(inputfile, outputfile.tmxfile, sourcelanguage,
+                           targetlanguage, comment)
     return 1
 
 
@@ -113,8 +118,14 @@ def main(argv=None):
             help="set target language code (e.g. af-ZA) [required]", metavar="LANG")
     parser.add_option("", "--source-language", dest="sourcelanguage", default='en',
             help="set source language code (default: en)", metavar="LANG")
+    comments = ['source', 'type', 'others', 'none']
+    comments_help = ("set default comment import: none, source, type or "
+                     "others (default: none)")
+    parser.add_option("", "--comments", dest="comment", default="none",
+                      type="choice", choices=comments, help=comments_help)
     parser.passthrough.append("sourcelanguage")
     parser.passthrough.append("targetlanguage")
+    parser.passthrough.append("comment")
     parser.run(argv)
 
 
diff --git a/translate/convert/po2txt.py b/translate/convert/po2txt.py
index 2500695..0a18887 100644
--- a/translate/convert/po2txt.py
+++ b/translate/convert/po2txt.py
@@ -29,6 +29,7 @@ try:
 except ImportError:
     textwrap = None
 
+from translate.convert import convert
 from translate.storage import factory
 
 
@@ -72,9 +73,14 @@ class po2txt:
         return txtresult
 
 
-def converttxt(inputfile, outputfile, templatefile, wrap=None, includefuzzy=False, encoding='utf-8'):
+def converttxt(inputfile, outputfile, templatefile, wrap=None, includefuzzy=False, encoding='utf-8',
+               outputthreshold=None):
     """reads in stdin using fromfileclass, converts using convertorclass, writes to stdout"""
     inputstore = factory.getobject(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     convertor = po2txt(wrap=wrap)
     if templatefile is None:
         outputstring = convertor.convertstore(inputstore, includefuzzy)
@@ -86,7 +92,6 @@ def converttxt(inputfile, outputfile, templatefile, wrap=None, includefuzzy=Fals
 
 
 def main(argv=None):
-    from translate.convert import convert
     from translate.misc import stdiotell
     import sys
     sys.stdout = stdiotell.StdIOWrapper(sys.stdout)
@@ -99,6 +104,7 @@ def main(argv=None):
         parser.add_option("-w", "--wrap", dest="wrap", default=None, type="int",
                 help="set number of columns to wrap text at", metavar="WRAP")
         parser.passthrough.append("wrap")
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/po2web2py.py b/translate/convert/po2web2py.py
index fa1b696..fb7fd68 100644
--- a/translate/convert/po2web2py.py
+++ b/translate/convert/po2web2py.py
@@ -22,7 +22,7 @@
 
 """Convert GNU/gettext PO files to web2py translation dictionaries (.py).
 
-See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/py2web2po.html
+See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/web2py2po.html
 for examples and usage instructions.
 """
 
@@ -57,8 +57,13 @@ class po2pydict:
         return str_obj
 
 
-def convertpy(inputfile, outputfile, templatefile=None, includefuzzy=False):
+def convertpy(inputfile, outputfile, templatefile=None, includefuzzy=False,
+              outputthreshold=None):
     inputstore = factory.getobject(inputfile)
+
+    if not convert.should_output_store(inputstore, outputthreshold):
+        return False
+
     convertor = po2pydict()
     outputstring = convertor.convertstore(inputstore, includefuzzy)
     outputfile.write(outputstring.read())
@@ -66,12 +71,12 @@ def convertpy(inputfile, outputfile, templatefile=None, includefuzzy=False):
 
 
 def main(argv=None):
-    from translate.convert import convert
     from translate.misc import stdiotell
     import sys
     sys.stdout = stdiotell.StdIOWrapper(sys.stdout)
     formats = {("po", "py"): ("py", convertpy), ("po"): ("py", convertpy)}
     parser = convert.ConvertOptionParser(formats, usetemplates=False, description=__doc__)
+    parser.add_threshold_option()
     parser.add_fuzzy_option()
     parser.run(argv)
 
diff --git a/translate/convert/prop2mozfunny.py b/translate/convert/prop2mozfunny.py
index def4e38..f6f2a74 100644
--- a/translate/convert/prop2mozfunny.py
+++ b/translate/convert/prop2mozfunny.py
@@ -92,7 +92,8 @@ def prop2funny(src, itencoding="cp1252"):
             yield line.decode("utf-8").encode(itencoding) + "\n"
 
 
-def po2inc(inputfile, outputfile, templatefile, encoding=None, includefuzzy=False):
+def po2inc(inputfile, outputfile, templatefile, encoding=None, includefuzzy=False,
+           remove_untranslated=False, outputthreshold=None):
     """wraps po2prop but converts outputfile to properties first"""
     outputpropfile = StringIO()
     if templatefile is not None:
@@ -101,7 +102,11 @@ def po2inc(inputfile, outputfile, templatefile, encoding=None, includefuzzy=Fals
         templatepropfile = StringIO("".join(templateproplines))
     else:
         templatepropfile = None
-    result = po2prop.convertmozillaprop(inputfile, outputpropfile, templatepropfile, includefuzzy=includefuzzy)
+    result = po2prop.convertmozillaprop(inputfile, outputpropfile,
+                                        templatepropfile,
+                                        includefuzzy=includefuzzy,
+                                        remove_untranslated=remove_untranslated,
+                                        outputthreshold=outputthreshold)
     if result:
         outputpropfile.seek(0)
         pf = properties.propfile(outputpropfile, personality="mozilla")
@@ -110,7 +115,8 @@ def po2inc(inputfile, outputfile, templatefile, encoding=None, includefuzzy=Fals
     return result
 
 
-def po2it(inputfile, outputfile, templatefile, encoding="cp1252", includefuzzy=False):
+def po2it(inputfile, outputfile, templatefile, encoding="cp1252", includefuzzy=False,
+          remove_untranslated=False, outputthreshold=None):
     """wraps po2prop but converts outputfile to properties first"""
     outputpropfile = StringIO()
     if templatefile is not None:
@@ -119,7 +125,11 @@ def po2it(inputfile, outputfile, templatefile, encoding="cp1252", includefuzzy=F
         templatepropfile = StringIO("".join(templateproplines))
     else:
         templatepropfile = None
-    result = po2prop.convertmozillaprop(inputfile, outputpropfile, templatepropfile, includefuzzy=includefuzzy)
+    result = po2prop.convertmozillaprop(inputfile, outputpropfile,
+                                        templatepropfile,
+                                        includefuzzy=includefuzzy,
+                                        remove_untranslated=remove_untranslated,
+                                        outputthreshold=outputthreshold)
     if result:
         outputpropfile.seek(0)
         pf = properties.propfile(outputpropfile, personality="mozilla")
@@ -130,9 +140,14 @@ def po2it(inputfile, outputfile, templatefile, encoding="cp1252", includefuzzy=F
     return result
 
 
-def po2ini(inputfile, outputfile, templatefile, encoding="UTF-8", includefuzzy=False):
+def po2ini(inputfile, outputfile, templatefile, encoding="UTF-8", includefuzzy=False,
+           remove_untranslated=False, outputthreshold=None):
     """wraps po2prop but converts outputfile to properties first using UTF-8 encoding"""
-    return po2it(inputfile=inputfile, outputfile=outputfile, templatefile=templatefile, encoding=encoding, includefuzzy=includefuzzy)
+    return po2it(inputfile=inputfile, outputfile=outputfile,
+                 templatefile=templatefile, encoding=encoding,
+                 includefuzzy=includefuzzy,
+                 remove_untranslated=remove_untranslated,
+                 outputthreshold=outputthreshold)
 
 
 def main(argv=None):
diff --git a/translate/convert/prop2po.py b/translate/convert/prop2po.py
index c79c71a..ed6028b 100644
--- a/translate/convert/prop2po.py
+++ b/translate/convert/prop2po.py
@@ -24,10 +24,13 @@ See: http://docs.translatehouse.org/projects/translate-toolkit/en/latest/command
 for examples and usage instructions.
 """
 
+import logging
 import sys
 
-from translate.storage import po
-from translate.storage import properties
+from translate.storage import po, properties
+
+
+logger = logging.getLogger(__name__)
 
 
 def _collapse(store, units):
@@ -139,7 +142,8 @@ class prop2po:
                 waitingcomments = []
                 thetargetfile.addunit(origpo)
             elif translatedpo is not None:
-                print >> sys.stderr, "error converting original properties definition %s" % origprop.name
+                logger.error("didn't convert original property definition '%s'",
+                             origprop.name)
         if self.personality == "gaia":
             thetargetfile = self.fold_gaia_plurals(thetargetfile)
         thetargetfile.removeduplicates(duplicatestyle)
@@ -186,8 +190,8 @@ class prop2po:
 
         # if everything went well, there should be nothing left in plurals
         if len(plurals) != 0:
-            print >> sys.stderr, "Not all plural units converted correctly:"
-            print >> sys.stderr, "\n".join(plurals.keys())
+            logger.warning("Not all plural units converted correctly:" +
+                           "\n".join(plurals.keys()))
         return new_store
 
     def convertunit(self, propunit, commenttype):
@@ -246,6 +250,7 @@ def convertprop(inputfile, outputfile, templatefile, personality="java",
     outputfile.write(str(outputstore))
     return 1
 
+
 formats = {
     "properties": ("po", convertprop),
     ("properties", "properties"): ("po", convertprop),
@@ -278,5 +283,6 @@ def main(argv=None):
     parser.passthrough.append("encoding")
     parser.run(argv)
 
+
 if __name__ == '__main__':
     main()
diff --git a/translate/convert/rc2po.py b/translate/convert/rc2po.py
index e363117..a468739 100644
--- a/translate/convert/rc2po.py
+++ b/translate/convert/rc2po.py
@@ -25,10 +25,12 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 
 from translate.storage import po
 from translate.storage import rc
 
+logger = logging.getLogger(__name__)
 
 class rc2po:
     """Convert a .rc file to a .po file for handling the translation."""
@@ -72,7 +74,8 @@ class rc2po:
                     origpo.target = translatedpo.source
                 output_store.addunit(origpo)
             elif translatedpo is not None:
-                print >> sys.stderr, "error converting original rc definition %s" % template_unit.name
+                logging.error("error converting original rc definition %s",
+                              template_unit.name)
         output_store.removeduplicates(duplicatestyle)
         return output_store
 
diff --git a/translate/convert/sub2po.py b/translate/convert/sub2po.py
index ac56367..2ecec19 100644
--- a/translate/convert/sub2po.py
+++ b/translate/convert/sub2po.py
@@ -25,9 +25,11 @@ for examples and usage instructions.
 """
 
 import sys
+import logging
 
 from translate.storage import po
 
+logger = logging.getLogger(__name__)
 
 def convert_store(input_store, duplicatestyle="msgctxt"):
     """converts a subtitle file to a .po file..."""
@@ -69,7 +71,8 @@ def merge_store(template_store, input_store, blankmsgstr=False,
                 origpo.target = translatedpo.source
             output_store.addunit(origpo)
         elif translatedpo is not None:
-            print >> sys.stderr, "error converting original subtitle definition %s" % origini.name
+            logger.error("error converting original subtitle definition %s",
+                         origini.name)
     output_store.removeduplicates(duplicatestyle)
     return output_store
 
diff --git a/translate/convert/test_convert.py b/translate/convert/test_convert.py
index 5b6db05..6bc4a1b 100644
--- a/translate/convert/test_convert.py
+++ b/translate/convert/test_convert.py
@@ -4,11 +4,7 @@
 import os
 import sys
 
-try:
-    import psyco
-except Exception:
-    psyco = None
-from py import test
+import pytest
 
 from translate.convert import convert
 
@@ -17,8 +13,6 @@ class TestConvertCommand:
     """Tests running actual commands on files"""
     convertmodule = convert
     defaultoptions = {"progress": "none"}
-    if psyco:
-        defaultoptions["psyco"] = "none"
 
     def setup_method(self, method):
         """creates a clean test directory for the given method"""
@@ -108,7 +102,7 @@ class TestConvertCommand:
         helpfile = self.open_testfile("help.txt", "w")
         sys.stdout = helpfile
         try:
-            test.raises(SystemExit, self.run_command, help=True)
+            pytest.raises(SystemExit, self.run_command, help=True)
         finally:
             sys.stdout = stdout
         helpfile.close()
@@ -130,9 +124,8 @@ class TestConvertCommand:
         options = self.help_check(options, "-h, --help")
         options = self.help_check(options, "--manpage")
         options = self.help_check(options, "--errorlevel=ERRORLEVEL")
-        if psyco:
-            options = self.help_check(options, "--psyco=MODE")
         options = self.help_check(options, "-i INPUT, --input=INPUT")
         options = self.help_check(options, "-x EXCLUDE, --exclude=EXCLUDE")
         options = self.help_check(options, "-o OUTPUT, --output=OUTPUT")
+        options = self.help_check(options, "-S, --timestamp")
         return options
diff --git a/translate/convert/test_dtd2po.py b/translate/convert/test_dtd2po.py
index 83f77ba..a47f56b 100644
--- a/translate/convert/test_dtd2po.py
+++ b/translate/convert/test_dtd2po.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import dtd2po
 from translate.convert import test_convert
diff --git a/translate/convert/test_html2po.py b/translate/convert/test_html2po.py
index daf9396..2d06049 100644
--- a/translate/convert/test_html2po.py
+++ b/translate/convert/test_html2po.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import html2po
 from translate.convert import po2html
diff --git a/translate/convert/test_mozlang2po.py b/translate/convert/test_mozlang2po.py
index 6d5c8de..ba818e4 100644
--- a/translate/convert/test_mozlang2po.py
+++ b/translate/convert/test_mozlang2po.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import mozlang2po
 from translate.convert import test_convert
diff --git a/translate/convert/test_po2dtd.py b/translate/convert/test_po2dtd.py
index 54610b0..13c9a55 100644
--- a/translate/convert/test_po2dtd.py
+++ b/translate/convert/test_po2dtd.py
@@ -3,8 +3,7 @@
 
 import warnings
 
-from py import test
-from py.test import mark
+import pytest
 
 from translate.convert import po2dtd
 from translate.convert import dtd2po
@@ -22,11 +21,11 @@ class TestPO2DTD:
     def teardown_method(self, method):
         warnings.resetwarnings()
 
-    def po2dtd(self, posource):
+    def po2dtd(self, posource, remove_untranslated=False):
         """helper that converts po source to dtd source without requiring files"""
         inputfile = wStringIO.StringIO(posource)
         inputpo = po.pofile(inputfile)
-        convertor = po2dtd.po2dtd()
+        convertor = po2dtd.po2dtd(remove_untranslated=remove_untranslated)
         outputdtd = convertor.convertstore(inputpo)
         return outputdtd
 
@@ -40,12 +39,13 @@ class TestPO2DTD:
         outputdtd = convertor.convertstore(inputpo)
         return outputdtd
 
-    def convertdtd(self, posource, dtdtemplate):
+    def convertdtd(self, posource, dtdtemplate, remove_untranslated=False):
         """helper to exercise the command line function"""
         inputfile = wStringIO.StringIO(posource)
         outputfile = wStringIO.StringIO()
         templatefile = wStringIO.StringIO(dtdtemplate)
-        assert po2dtd.convertdtd(inputfile, outputfile, templatefile)
+        assert po2dtd.convertdtd(inputfile, outputfile, templatefile,
+                                 remove_untranslated=remove_untranslated)
         return outputfile.getvalue()
 
     def roundtripsource(self, dtdsource):
@@ -109,7 +109,7 @@ class TestPO2DTD:
         simplepo = '''#: simple.label\n#: simple.accesskey\nmsgid "Simple &String"\nmsgstr "Dimpled Ring"\n'''
         simpledtd = '''<!ENTITY simple.label "Simple String">\n<!ENTITY simple.accesskey "S">'''
         warnings.simplefilter("error")
-        assert test.raises(Warning, self.merge2dtd, simpledtd, simplepo)
+        assert pytest.raises(Warning, self.merge2dtd, simpledtd, simplepo)
 
     def test_accesskeycase(self):
         """tests that access keys come out with the same case as the original, regardless"""
@@ -204,6 +204,98 @@ msgstr "&searchIntegration.engineName; &ileti aramasına izin ver"
         print newdtd
         assert newdtd == dtdexpected
 
+    def test_untranslated_with_template(self):
+        """test removing of untranslated entries in redtd"""
+        posource = '''#: simple.label
+msgid "Simple string"
+msgstr "Dimpled ring"
+
+#: simple.label2
+msgid "Simple string 2"
+msgstr ""
+
+#: simple.label3
+msgid "Simple string 3"
+msgstr "Simple string 3"
+
+#: simple.label4
+#, fuzzy
+msgid "Simple string 4"
+msgstr "simple string four"
+'''
+        dtdtemplate = '''<!ENTITY simple.label "Simple string">
+<!ENTITY simple.label2 "Simple string 2">
+<!ENTITY simple.label3 "Simple string 3">
+<!ENTITY simple.label4 "Simple string 4">
+'''
+        dtdexpected = '''<!ENTITY simple.label "Dimpled ring">
+
+<!ENTITY simple.label3 "Simple string 3">
+
+'''
+        newdtd = self.convertdtd(posource, dtdtemplate, remove_untranslated=True)
+        print newdtd
+        assert newdtd == dtdexpected
+
+    def test_untranslated_without_template(self):
+        """test removing of untranslated entries in po2dtd"""
+        posource = '''#: simple.label
+msgid "Simple string"
+msgstr "Dimpled ring"
+
+#: simple.label2
+msgid "Simple string 2"
+msgstr ""
+
+#: simple.label3
+msgid "Simple string 3"
+msgstr "Simple string 3"
+
+#: simple.label4
+#, fuzzy
+msgid "Simple string 4"
+msgstr "simple string four"
+'''
+        dtdexpected = '''<!ENTITY simple.label "Dimpled ring">
+<!ENTITY simple.label3 "Simple string 3">
+'''
+        newdtd = self.po2dtd(posource, remove_untranslated=True)
+        print newdtd
+        assert str(newdtd) == dtdexpected
+
+    def test_blank_source(self):
+        """test removing of untranslated entries where source is blank"""
+        posource = '''#: simple.label
+msgid "Simple string"
+msgstr "Dimpled ring"
+
+#: simple.label2
+msgid ""
+msgstr ""
+
+#: simple.label3
+msgid "Simple string 3"
+msgstr "Simple string 3"
+'''
+        dtdtemplate = '''<!ENTITY simple.label "Simple string">
+<!ENTITY simple.label2 "">
+<!ENTITY simple.label3 "Simple string 3">
+'''
+        dtdexpected_with_template = '''<!ENTITY simple.label "Dimpled ring">
+<!ENTITY simple.label2 "">
+<!ENTITY simple.label3 "Simple string 3">
+'''
+
+        dtdexpected_no_template = '''<!ENTITY simple.label "Dimpled ring">
+<!ENTITY simple.label3 "Simple string 3">
+'''
+        newdtd_with_template = self.convertdtd(posource, dtdtemplate, remove_untranslated=True)
+        print newdtd_with_template
+        assert newdtd_with_template == dtdexpected_with_template
+        newdtd_no_template = self.po2dtd(posource, remove_untranslated=True)
+        print newdtd_no_template
+        assert str(newdtd_no_template) == dtdexpected_no_template
+
     def test_newlines_escapes(self):
         """check that we can handle a \n in the PO file"""
         posource = '''#: simple.label\n#: simple.accesskey\nmsgid "A hard coded newline.\\n"\nmsgstr "Hart gekoeerde nuwe lyne\\n"\n'''
@@ -361,4 +453,6 @@ class TestPO2DTDCommand(test_convert.TestConvertCommand, TestPO2DTD):
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
         options = self.help_check(options, "--fuzzy")
+        options = self.help_check(options, "--threshold=PERCENT")
+        options = self.help_check(options, "--removeuntranslated")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2html.py b/translate/convert/test_po2html.py
index ecc135c..44ee712 100644
--- a/translate/convert/test_po2html.py
+++ b/translate/convert/test_po2html.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import po2html
 from translate.convert import test_convert
@@ -86,6 +86,19 @@ sin.
         htmlexpected = '<p>"ek is dom"</p>'
         assert htmlexpected in self.converthtml(posource, htmlsource)
 
+    def test_fuzzy_strings(self):
+        """Test that we use source when a string is fuzzy
+
+        This fixes :bug:`3145`
+        """
+        htmlsource = '<div>aaa</div>'
+        posource = '#: html:3\nmsgid "aaa"\nmsgstr "bbb"\n'
+        posource_fuzzy = '#: html:3\n#, fuzzy\nmsgid "aaa"\nmsgstr "bbb"\n'
+        htmlexpected = '<div>bbb</div>'
+        assert htmlexpected in self.converthtml(posource, htmlsource)
+        assert htmlexpected not in self.converthtml(posource_fuzzy, htmlsource)
+        assert htmlsource in self.converthtml(posource_fuzzy, htmlsource)
+
 
 class TestPO2HtmlCommand(test_convert.TestConvertCommand, TestPO2Html):
     """Tests running actual po2oo commands on files"""
@@ -95,5 +108,6 @@ class TestPO2HtmlCommand(test_convert.TestConvertCommand, TestPO2Html):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2ical.py b/translate/convert/test_po2ical.py
index 5d4843e..3db351d 100644
--- a/translate/convert/test_po2ical.py
+++ b/translate/convert/test_po2ical.py
@@ -73,5 +73,6 @@ class TestPO2IcalCommand(test_convert.TestConvertCommand, TestPO2Ical):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2ini.py b/translate/convert/test_po2ini.py
index da4eb39..50cd83a 100644
--- a/translate/convert/test_po2ini.py
+++ b/translate/convert/test_po2ini.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import importorskip
 
 from translate.convert import po2ini
 from translate.convert import test_convert
@@ -9,6 +9,9 @@ from translate.misc import wStringIO
 from translate.storage import po
 
 
+importorskip("iniparse")
+
+
 class TestPO2Ini:
 
     def po2ini(self, posource):
@@ -113,5 +116,6 @@ class TestPO2IniCommand(test_convert.TestConvertCommand, TestPO2Ini):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2moz.py b/translate/convert/test_po2moz.py
index 3892ae3..d0b84c0 100644
--- a/translate/convert/test_po2moz.py
+++ b/translate/convert/test_po2moz.py
@@ -18,6 +18,7 @@ class TestPO2MozCommand(test_convert.TestConvertCommand, TestPO2Moz):
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
         options = self.help_check(options, "-l LOCALE, --locale=LOCALE")
-        options = self.help_check(options, "--clonexpi=CLONEXPI")
+        options = self.help_check(options, "--removeuntranslated")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2mozlang.py b/translate/convert/test_po2mozlang.py
index a488784..435a63a 100644
--- a/translate/convert/test_po2mozlang.py
+++ b/translate/convert/test_po2mozlang.py
@@ -59,6 +59,7 @@ class TestPO2LangCommand(test_convert.TestConvertCommand, TestPO2Lang):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--mark-active")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2oo.py b/translate/convert/test_po2oo.py
index 5aa7d4c..88e51cd 100644
--- a/translate/convert/test_po2oo.py
+++ b/translate/convert/test_po2oo.py
@@ -3,7 +3,7 @@
 import os
 import warnings
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import po2oo
 from translate.convert import oo2po
@@ -171,6 +171,7 @@ class TestPO2OOCommand(test_convert.TestConvertCommand, TestPO2OO):
         options = self.help_check(options, "--nonrecursivetemplate")
         options = self.help_check(options, "--filteraction")
         options = self.help_check(options, "--skipsource")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy")
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
diff --git a/translate/convert/test_po2php.py b/translate/convert/test_po2php.py
index 85dd9bc..3442014 100644
--- a/translate/convert/test_po2php.py
+++ b/translate/convert/test_po2php.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import po2php
 from translate.convert import test_convert
@@ -163,5 +163,6 @@ class TestPO2PhpCommand(test_convert.TestConvertCommand, TestPO2Php):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2prop.py b/translate/convert/test_po2prop.py
index 1210232..4d89a90 100644
--- a/translate/convert/test_po2prop.py
+++ b/translate/convert/test_po2prop.py
@@ -179,6 +179,52 @@ msgstr "translated"
         # FIXME ideally we should drop the comment as well as the unit
         assert propfile == '# A comment\n'  # We drop the key
 
+    def test_merging_untranslated_unchanged(self):
+        """check removing untranslated entries but keeping unchanged ones"""
+        posource = '''#: prop
+msgid "value"
+msgstr ""
+
+#: prop2
+msgid "value2"
+msgstr "value2"
+'''
+        proptemplate = '''prop=value
+prop2=value2
+'''
+
+        propexpected = '''prop2=value2\n'''
+        propfile = self.merge2prop(proptemplate, posource, remove_untranslated=True)
+        print propfile
+        assert propfile == propexpected
+
+    def test_merging_blank(self):
+        """We always merge in a blank translation for a blank source"""
+        posource = '''#: prop
+msgctxt "prop"
+msgid ""
+msgstr "value"
+
+#: prop2
+msgctxt "prop2"
+msgid ""
+msgstr ""
+'''
+        proptemplate = '''prop=
+prop2=
+'''
+
+        propexpected = '''prop=value
+prop2=
+'''
+
+        propfile = self.merge2prop(proptemplate, posource, remove_untranslated=False)
+        print propfile
+        assert propfile == propexpected
+        propfile = self.merge2prop(proptemplate, posource, remove_untranslated=True)
+        print propfile
+        assert propfile == propexpected
+
     def test_gaia_plurals(self):
         """Test back conversion of gaia plural units."""
         proptemplate = '''
@@ -229,6 +275,7 @@ class TestPO2PropCommand(test_convert.TestConvertCommand, TestPO2Prop):
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
         options = self.help_check(options, "--fuzzy")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--personality=TYPE")
         options = self.help_check(options, "--encoding=ENCODING")
         options = self.help_check(options, "--removeuntranslated")
diff --git a/translate/convert/test_po2sub.py b/translate/convert/test_po2sub.py
index 9c30a09..56b4bea 100644
--- a/translate/convert/test_po2sub.py
+++ b/translate/convert/test_po2sub.py
@@ -1,12 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from pytest import importorskip
+
 from translate.convert import po2sub
 from translate.convert import test_convert
 from translate.misc import wStringIO
 from translate.storage import po
 
 
+# Technically subtitles can also use an older gaupol
+importorskip("aeidon")
+
+
 class TestPO2Sub:
 
     def po2sub(self, posource):
@@ -69,5 +75,6 @@ class TestPO2SubCommand(test_convert.TestConvertCommand, TestPO2Sub):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy", last=True)
diff --git a/translate/convert/test_po2tmx.py b/translate/convert/test_po2tmx.py
index 5d39b83..9ac27b4 100644
--- a/translate/convert/test_po2tmx.py
+++ b/translate/convert/test_po2tmx.py
@@ -10,12 +10,15 @@ from translate.misc.xml_helpers import XML_NS
 
 class TestPO2TMX:
 
-    def po2tmx(self, posource, sourcelanguage='en', targetlanguage='af'):
+    def po2tmx(self, posource, sourcelanguage='en', targetlanguage='af',
+               comment=None):
         """helper that converts po source to tmx source without requiring files"""
         inputfile = wStringIO.StringIO(posource)
         outputfile = wStringIO.StringIO()
         outputfile.tmxfile = tmx.tmxfile(inputfile=None, sourcelanguage=sourcelanguage)
-        po2tmx.convertpo(inputfile, outputfile, templatefile=None, sourcelanguage=sourcelanguage, targetlanguage=targetlanguage)
+        po2tmx.convertpo(inputfile, outputfile, templatefile=None,
+                         sourcelanguage=sourcelanguage,
+                         targetlanguage=targetlanguage, comment=comment)
         return outputfile.tmxfile
 
     def test_basic(self):
@@ -141,6 +144,49 @@ msgstr "Bézier-kurwe"
         print str(tmx)
         assert tmx.translate(u"Bézier curve") == u"Bézier-kurwe"
 
+    def test_nonecomments(self):
+        """Tests that none comments are imported."""
+        minipo = r'''#My comment rules
+msgid "Bézier curve"
+msgstr "Bézier-kurwe"
+'''
+        tmx = self.po2tmx(minipo)
+        print str(tmx)
+        unit = tmx.findunits(u"Bézier curve")
+        assert len(unit[0].getnotes()) == 0
+
+    def test_otherscomments(self):
+        """Tests that others comments are imported."""
+        minipo = r'''#My comment rules
+msgid "Bézier curve"
+msgstr "Bézier-kurwe"
+'''
+        tmx = self.po2tmx(minipo, comment='others')
+        print str(tmx)
+        unit = tmx.findunits(u"Bézier curve")
+        assert unit[0].getnotes() == u"My comment rules"
+
+    def test_sourcecomments(self):
+        """Tests that source comments are imported."""
+        minipo = r'''#: ../PuzzleFourSided.h:45
+msgid "Bézier curve"
+msgstr "Bézier-kurwe"
+'''
+        tmx = self.po2tmx(minipo, comment='source')
+        print str(tmx)
+        unit = tmx.findunits(u"Bézier curve")
+        assert unit[0].getnotes() == u": ../PuzzleFourSided.h:45"
+
+    def test_typecomments(self):
+        """Tests that others comments are imported."""
+        minipo = r'''#, csharp-format
+msgid "Bézier curve"
+msgstr "Bézier-kurwe"
+'''
+        tmx = self.po2tmx(minipo, comment='type')
+        print str(tmx)
+        unit = tmx.findunits(u"Bézier curve")
+        assert unit[0].getnotes() == u", csharp-format"
 
 class TestPO2TMXCommand(test_convert.TestConvertCommand, TestPO2TMX):
     """Tests running actual po2tmx commands on files"""
@@ -150,4 +196,5 @@ class TestPO2TMXCommand(test_convert.TestConvertCommand, TestPO2TMX):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-l LANG, --language=LANG")
-        options = self.help_check(options, "--source-language=LANG", last=True)
+        options = self.help_check(options, "--source-language=LANG")
+        options = self.help_check(options, "--comments", last=True)
diff --git a/translate/convert/test_po2txt.py b/translate/convert/test_po2txt.py
index 59116ef..74134e6 100644
--- a/translate/convert/test_po2txt.py
+++ b/translate/convert/test_po2txt.py
@@ -57,6 +57,7 @@ class TestPO2TxtCommand(test_convert.TestConvertCommand, TestPO2Txt):
         """tests getting help"""
         options = test_convert.TestConvertCommand.test_help(self)
         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
+        options = self.help_check(options, "--threshold=PERCENT")
         options = self.help_check(options, "--fuzzy")
         options = self.help_check(options, "--nofuzzy")
         options = self.help_check(options, "--encoding")
diff --git a/translate/convert/test_pot2po.py b/translate/convert/test_pot2po.py
index b4b2bec..5cea190 100644
--- a/translate/convert/test_pot2po.py
+++ b/translate/convert/test_pot2po.py
@@ -3,7 +3,7 @@
 
 import warnings
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import pot2po
 from translate.convert import test_convert
diff --git a/translate/convert/test_prop2po.py b/translate/convert/test_prop2po.py
index 88e6700..34e0dc8 100644
--- a/translate/convert/test_prop2po.py
+++ b/translate/convert/test_prop2po.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark
 
 from translate.convert import prop2po
 from translate.convert import test_convert
diff --git a/translate/convert/test_xliff2po.py b/translate/convert/test_xliff2po.py
index c35e144..7420526 100644
--- a/translate/convert/test_xliff2po.py
+++ b/translate/convert/test_xliff2po.py
@@ -1,11 +1,18 @@
 #!/usr/bin/env python
 
+from translate.convert import po2xliff
+from translate.convert import test_convert
 from translate.convert import xliff2po
 from translate.misc import wStringIO
+from translate.misc import wStringIO
+from translate.storage import po
+from translate.storage import xliff
+from translate.storage.poheader import poheader
 from translate.storage.test_base import headerless_len, first_translatable
 
 
 class TestXLIFF2PO:
+    target_filetype = po.pofile
     xliffskeleton = '''<?xml version="1.0" ?>
 <xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1">
   <file original="filename.po" source-language="en-US" datatype="po">
@@ -209,8 +216,9 @@ garbage</note>
         assert potext.index('msgstr[1] "iinkomo"')
 
 
-class TestBasicXLIFF2PO(TestXLIFF2PO):
+class TestBasicXLIFF2PO(test_convert.TestConvertCommand, TestXLIFF2PO):
     """This tests a basic XLIFF file without xmlns attribute"""
+    convertmodule = xliff2po
 
     xliffskeleton = '''<?xml version="1.0" ?>
 <xliff version="1.1">
@@ -220,3 +228,88 @@ class TestBasicXLIFF2PO(TestXLIFF2PO):
     </body>
   </file>
 </xliff>'''
+
+    def test_simple_convert(self):
+        self.create_testfile("simple_convert.xlf", self.xliffskeleton % """
+                             <trans-unit xml:space="preserve" id="1" approved="yes">
+                               <source>One</source>
+                               <target state="translated">Een</target>
+                             </trans-unit>
+                             """)
+        self.run_command(i="simple_convert.xlf", o="simple_convert.po")
+        assert 'msgstr "Een"' in self.read_testfile("simple_convert.po")
+
+
+class TestXLIFF2POCommand(test_convert.TestConvertCommand, TestXLIFF2PO):
+    """Tests running actual xliff2po commands on files"""
+    convertmodule = xliff2po
+
+    def singleelement(self, pofile):
+        """checks that the pofile contains a single non-header element, and returns it"""
+        if isinstance(pofile, poheader):
+            assert len(pofile.units) == 2
+            assert pofile.units[0].isheader()
+            return pofile.units[1]
+        else:
+            assert len(pofile.units) == 1
+            return pofile.units[0]
+
+    def test_help(self):
+        """tests getting help"""
+        options = test_convert.TestConvertCommand.test_help(self)
+        options = self.help_check(options, "-P, --pot")
+        options = self.help_check(options, "--duplicates=DUPLICATESTYLE")
+
+    def test_preserve_filename(self):
+        """Ensures that the filename is preserved."""
+        xliffsource = self.xliffskeleton % '''<trans-unit xml:space="preserve">
+        <source>nonsense</source>
+        <target>matlhapolosa</target>
+</trans-unit>'''
+        self.create_testfile("snippet.xlf", xliffsource)
+        xlifffile = xliff.xlifffile(self.open_testfile("snippet.xlf"))
+        assert xlifffile.filename.endswith("snippet.xlf")
+        xlifffile.parse(xliffsource)
+        assert xlifffile.filename.endswith("snippet.xlf")
+
+    def test_simple_pot(self):
+        """tests the simplest possible conversion to a pot file"""
+        xliffsource = self.xliffskeleton % '''<trans-unit xml:space="preserve">
+        <source>nonsense</source>
+        <target></target>
+</trans-unit>'''
+        self.create_testfile("simple.xlf", xliffsource)
+        self.run_command("simple.xlf", "simple.pot", pot=True)
+        pofile = po.pofile(self.open_testfile("simple.pot"))
+        poelement = self.singleelement(pofile)
+        assert poelement.source == "nonsense"
+        assert poelement.target == ""
+
+    def test_simple_po(self):
+        """tests the simplest possible conversion to a po file"""
+        xliffsource = self.xliffskeleton % '''<trans-unit xml:space="preserve">
+        <source>nonsense</source>
+        <target>matlhapolosa</target>
+</trans-unit>'''
+        self.create_testfile("simple.xlf", xliffsource)
+        self.run_command("simple.xlf", "simple.po")
+        pofile = po.pofile(self.open_testfile("simple.po"))
+        poelement = self.singleelement(pofile)
+        assert poelement.source == "nonsense"
+        assert poelement.target == "matlhapolosa"
+
+    def test_remove_duplicates(self):
+        """test that removing of duplicates works correctly"""
+        xliffsource = self.xliffskeleton % '''<trans-unit xml:space="preserve">
+        <source>nonsense</source>
+        <target>matlhapolosa</target>
+</trans-unit>
+<trans-unit xml:space="preserve">
+        <source>nonsense</source>
+        <target>matlhapolosa</target>
+</trans-unit>'''
+        self.create_testfile("simple.xlf", xliffsource)
+        self.run_command("simple.xlf", "simple.po", error="traceback", duplicates="merge")
+        pofile = self.target_filetype(self.open_testfile("simple.po"))
+        assert len(pofile.units) == 2
+        assert pofile.units[1].target == u"matlhapolosa"
diff --git a/translate/convert/xliff2oo.py b/translate/convert/xliff2oo.py
index 446c045..8777bb1 100644
--- a/translate/convert/xliff2oo.py
+++ b/translate/convert/xliff2oo.py
@@ -27,6 +27,7 @@ for examples and usage instructions.
 import os
 import sys
 import time
+import logging
 
 from translate.storage import oo
 from translate.storage import factory
@@ -34,6 +35,7 @@ from translate.filters import pofilter
 from translate.filters import checks
 from translate.filters import autocorrect
 
+logger = logging.getLogger(__name__)
 
 class reoo:
 
@@ -87,14 +89,15 @@ class reoo:
                 theoo = self.index[key]  # find the oo
                 self.applytranslation(key, subkey, theoo, unit)
             else:
-                print >> sys.stderr, "couldn't find key %s from po in %d keys" % (key, len(self.index))
+                logger.warning("couldn't find key %s from po in %d keys",
+                               key, len(self.index))
                 try:
                     sourceunitlines = str(unit)
                     if isinstance(sourceunitlines, unicode):
                         sourceunitlines = sourceunitlines.encode("utf-8")
-                    print >> sys.stderr, sourceunitlines
+                    logger.warning(sourceunitlines)
                 except:
-                    print >> sys.stderr, "error outputting source unit %r" % (str(unit),)
+                    logger.error("error outputting source unit %r", str(unit))
 
     def applytranslation(self, key, subkey, theoo, unit):
         """applies the translation from the source unit to the oo unit"""
@@ -162,10 +165,12 @@ class oocheckfilter(pofilter.pocheckfilter):
                 for filtername, filtermessage in filterresult.iteritems():
                     location = unit.getlocations()[0]
                     if filtername in self.options.error:
-                        print >> sys.stderr, "Error at %s::%s: %s" % (filename, location, filtermessage)
+                        logger.error("Error at %s::%s: %s",
+                                     filename, location, filtermessage)
                         return not filteraction in ["exclude-all", "exclude-serious"]
                     if filtername in self.options.warning or self.options.alwayswarn:
-                        print >> sys.stderr, "Warning at %s::%s: %s" % (filename, location, filtermessage)
+                        logger.warning("Warning at %s::%s: %s",
+                                       filename, location, filtermessage)
                         return not filteraction in ["exclude-all"]
         return True
 
diff --git a/translate/convert/xliff2po.py b/translate/convert/xliff2po.py
index 8b0c840..37e902c 100644
--- a/translate/convert/xliff2po.py
+++ b/translate/convert/xliff2po.py
@@ -66,7 +66,7 @@ class xliff2po:
 
         return thepo
 
-    def convertstore(self, inputfile):
+    def convertstore(self, inputfile, duplicatestyle="msgctxt"):
         """Converts a .xliff file to .po format"""
         # XXX: The inputfile is converted to string because Pootle supplies
         # XXX: a PootleFile object as input which cannot be sent to PoXliffFile
@@ -92,14 +92,15 @@ class xliff2po:
                 continue
             thepo = self.converttransunit(transunit)
             thetargetfile.addunit(thepo)
+        thetargetfile.removeduplicates(duplicatestyle)
         return thetargetfile
 
 
-def convertxliff(inputfile, outputfile, templates):
+def convertxliff(inputfile, outputfile, templates, duplicatestyle="msgctxt"):
     """reads in stdin using fromfileclass, converts using convertorclass,
     writes to stdout"""
     convertor = xliff2po()
-    outputstore = convertor.convertstore(inputfile)
+    outputstore = convertor.convertstore(inputfile, duplicatestyle)
     if outputstore.isempty():
         return 0
     outputfile.write(str(outputstore))
diff --git a/translate/filters/checks.py b/translate/filters/checks.py
index 314494d..35758a5 100644
--- a/translate/filters/checks.py
+++ b/translate/filters/checks.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2004-2011 Zuza Software Foundation
+# 2013 F Wolff
 #
 # This file is part of translate.
 #
@@ -25,11 +26,12 @@ Derivatives of UnitChecker (like StandardUnitChecker) check translation units,
 and derivatives of TranslationChecker (like StandardChecker) check
 (source, target) translation pairs.
 
-When adding a new test here, please document and explain the behaviour on the
-`wiki <http://translate.sourceforge.net/wiki/toolkit/pofilter_tests>`_.
+When adding a new test here, please document and explain their behaviour on the
+:doc:`pofilter tests </commands/pofilter_tests>` page.
 """
 
 import re
+import logging
 
 from translate.filters import decoration
 from translate.filters import helpers
@@ -40,6 +42,10 @@ from translate.filters.decorators import (critical, functional, cosmetic,
 from translate.lang import factory
 from translate.lang import data
 
+from translate.misc import lru
+
+logger = logging.getLogger(__name__)
+
 # These are some regular expressions that are compiled for use in some tests
 
 # printf syntax based on http://en.wikipedia.org/wiki/Printf which doesn't
@@ -289,7 +295,7 @@ class UnitChecker(object):
 
     #: Categories where each checking function falls into
     #: Function names are used as keys, categories are the values
-    categories =  {}
+    categories = {}
 
 
     def __init__(self, checkerconfig=None, excludefilters=None,
@@ -484,6 +490,9 @@ class TranslationChecker(UnitChecker):
         super(TranslationChecker, self).__init__(checkerconfig, excludefilters,
                                                  limitfilters, errorhandler)
 
+        # caches for spell checking results across units/runs
+        self.source_spell_cache = lru.LRUCachingDict(256, cullsize=5, aggressive_gc=False)
+        self.target_spell_cache = lru.LRUCachingDict(512, cullsize=5, aggressive_gc=False)
 
     def run_test(self, test, unit):
         """Runs the given test on the given unit.
@@ -528,7 +537,7 @@ class TeeChecker:
 
     #: Categories where each checking function falls into
     #: Function names are used as keys, categories are the values
-    categories =  {}
+    categories = {}
 
 
     def __init__(self, checkerconfig=None, excludefilters=None,
@@ -578,8 +587,7 @@ class TeeChecker:
             for filtername in limitfilters:
 
                 if not filtername in self.combinedfilters:
-                    import sys
-                    print >> sys.stderr, "warning: could not find filter %s" % filtername
+                    logger.warning("could not find filter %s", filtername)
 
         return self.combinedfilters
 
@@ -885,7 +893,7 @@ class StandardChecker(TranslationChecker):
         return 1
 
 
-    @critical
+    @functional
     def accelerators(self, str1, str2):
         """Checks whether accelerators are consistent between the
         two strings.
@@ -1353,7 +1361,7 @@ class StandardChecker(TranslationChecker):
     @functional
     def filepaths(self, str1, str2):
         """Checks that file paths have not been translated."""
-        for word1 in self.filteraccelerators(str1).split():
+        for word1 in self.filteraccelerators(self.filterxml(str1)).split():
             if word1.startswith(u"/"):
                 if not helpers.countsmatch(str1, str2, (word1,)):
                     raise FilterFailure(u"Different file paths")
@@ -1451,31 +1459,33 @@ class StandardChecker(TranslationChecker):
             return True
 
         # TODO: filterxml?
-        str1 = self.filteraccelerators_by_list(self.filtervariables(str1),
+        str1 = self.filteraccelerators_by_list(self.removevariables(str1),
                                                self.config.sourcelang.validaccel)
-        str2 = self.filteraccelerators_by_list(self.filtervariables(str2),
+        str2 = self.filteraccelerators_by_list(self.removevariables(str2),
                                                self.config.lang.validaccel)
-        ignore1 = []
-        messages = []
-
-        for word, index, suggestions in spelling.check(str1, lang="en"):
-            ignore1.append(word)
-
-        for word, index, suggestions in spelling.check(str2, lang=self.config.targetlanguage):
-            if word in self.config.notranslatewords:
-                continue
-
-            if word in ignore1:
-                continue
-
-            # hack to ignore hyphenisation rules
-            if word in suggestions:
-                continue
-
-            messages.append(u"Check the spelling of %s (could be %s)" %
-                            (word, u" / ".join(suggestions[:5])))
-
-        if messages:
+        errors = set()
+
+        # We cache spelling results of source texts:
+        ignore1 = self.source_spell_cache.get(str1, None)
+        if ignore1 is None:
+            ignore1 = set(spelling.simple_check(str1, lang=self.config.sourcelang.code))
+            self.source_spell_cache[str1] = ignore1
+
+        # We cache spelling results of target texts sentence-by-sentence. This
+        # way we can reuse most of the results while someone is typing a long
+        # segment in Virtaal.
+        sentences2 = self.config.lang.sentences(str2)
+        for sentence in sentences2:
+            sentence_errors = self.target_spell_cache.get(sentence, None)
+            if sentence_errors is None:
+                sentence_errors = spelling.simple_check(sentence, lang=self.config.targetlanguage)
+                self.target_spell_cache[sentence] = sentence_errors
+            errors.update(sentence_errors)
+
+        errors.difference_update(ignore1, self.config.notranslatewords)
+
+        if errors:
+            messages = [u"Check the spelling of: %s" % u", ".join(errors)]
             raise FilterFailure(messages)
 
         return True
@@ -1672,6 +1682,14 @@ class MozillaChecker(StandardChecker):
 
         return super(MozillaChecker, self).unchanged(str1, str2)
 
+    @cosmetic
+    def accelerators(self, str1, str2):
+        """Checks whether accelerators are consistent between the
+        two strings.
+
+        For Mozilla we lower the severity to cosmetic.
+        """
+        return super(MozillaChecker, self).accelerators(str1, str2)
 
 drupalconfig = CheckerConfig(
     varmatches=[("%", None), ("@", None), ("!", None)],
diff --git a/translate/filters/pofilter b/translate/filters/pofilter
index 12978b0..7cd23e4 100755
--- a/translate/filters/pofilter
+++ b/translate/filters/pofilter
@@ -16,7 +16,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 """simple script to run all check filters on gettext .po localization file(s)"""
 
diff --git a/translate/filters/pofilter.py b/translate/filters/pofilter.py
index f421eb2..df70b95 100644
--- a/translate/filters/pofilter.py
+++ b/translate/filters/pofilter.py
@@ -19,11 +19,13 @@
 
 """Perform quality checks on Gettext PO, XLIFF and TMX localization files.
 
-Snippet files whenever a test fails.  These can be examined, corrected and
-merged back into the originals using pomerge.
+Snippet files are created whenever a test fails.  These can be examined,
+corrected and merged back into the originals using pomerge.
 
-See: http://translate.sourceforge.net/wiki/toolkit/pofilter for examples and
-usage instructions and http://translate.sourceforge.net/wiki/toolkit/pofilter_tests
+See:
+http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter.html
+for examples and usage instructions and
+http://docs.translatehouse.org/projects/translate-toolkit/en/latest/commands/pofilter_tests.html
 for full descriptions of all tests.
 """
 
@@ -200,8 +202,6 @@ class FilterOptionParser(optrecurse.RecursiveOptionParser):
         options.inputformats = self.inputformats
         options.outputoptions = self.outputoptions
 
-        self.usepsyco(options)
-
         if options.listfilters:
             print options.checkfilter.getfilterdocs()
         else:
diff --git a/translate/filters/spelling.py b/translate/filters/spelling.py
index 592e1a2..4b8f532 100644
--- a/translate/filters/spelling.py
+++ b/translate/filters/spelling.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2007 Zuza Software Foundation
+# 2013 F Wolff
 #
 # This file is part of translate.
 #
@@ -20,7 +21,9 @@
 
 """An API to provide spell checking for use in checks or elsewhere."""
 
-import sys
+import logging
+
+logger = logging.getLogger(__name__)
 
 available = False
 
@@ -30,7 +33,7 @@ try:
     available = True
     checkers = {}
 
-    def check(text, lang):
+    def _get_checker(lang):
         if not lang in checkers:
             try:
                 checkers[lang] = checker.SpellChecker(lang)
@@ -38,17 +41,32 @@ try:
                 checkers[lang].check(u'bla')
             except EnchantError, e:
                 # sometimes this is raised instead of DictNotFoundError
-                print >> sys.stderr, str(e)
+                logger.error(str(e))
                 checkers[lang] = None
 
-        if not checkers[lang]:
+        return checkers[lang]
+
+    def check(text, lang):
+        spellchecker = _get_checker(lang)
+        if not spellchecker:
             return
-        spellchecker = checkers[lang]
         spellchecker.set_text(unicode(text))
         for err in spellchecker:
             yield err.word, err.wordpos, err.suggest()
 
+    def simple_check(text, lang):
+        spellchecker = _get_checker(lang)
+        if not spellchecker:
+            return
+        spellchecker.set_text(unicode(text))
+        for err in spellchecker:
+            yield err.word
+
+
 except ImportError:
 
     def check(text, lang):
         return []
+
+    def simple_check(text, lang):
+        return []
diff --git a/translate/filters/test_checks.py b/translate/filters/test_checks.py
index 1c5d7b3..4de44d6 100644
--- a/translate/filters/test_checks.py
+++ b/translate/filters/test_checks.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark
 
 from translate.filters import checks
 from translate.lang import data
@@ -152,6 +152,21 @@ def test_accelerators():
     # Bug 289: accept accented accelerator characters
     afchecker = checks.StandardChecker(checks.CheckerConfig(accelmarkers="&", targetlanguage="fi"))
     assert passes(afchecker.accelerators, "&Reload Frame", "P&äivitä kehys")
+
+    trchecker = checks.StandardChecker(checks.CheckerConfig(accelmarkers="&", targetlanguage="tr"))
+    assert passes(trchecker.accelerators, "&Download", "&İndir")
+    assert passes(trchecker.accelerators, "&Business", "İ&ş")
+    assert passes(trchecker.accelerators, "&Remove", "Kald&ır")
+    assert passes(trchecker.accelerators, "&Three", "&Üç")
+    assert passes(trchecker.accelerators, "&Three", "Ü&ç")
+    assert passes(trchecker.accelerators, "&Before", "&Önce")
+    assert passes(trchecker.accelerators, "Fo&ur", "D&ört")
+    assert passes(trchecker.accelerators, "Mo&dern", "Ça&ğdaş")
+    assert passes(trchecker.accelerators, "Mo&dern", "&Çağdaş")
+    assert passes(trchecker.accelerators, "&February", "&Şubat")
+    assert passes(trchecker.accelerators, "P&lain", "D&üz")
+    assert passes(trchecker.accelerators, "GAR&DEN", "BA&Ğ")
+
     # Problems:
     # Accelerator before variable - see test_acceleratedvariables
 
@@ -369,6 +384,7 @@ def test_filepaths():
     stdchecker = checks.StandardChecker()
     assert passes(stdchecker.filepaths, "%s to the file /etc/hosts on your system.", "%s na die leer /etc/hosts op jou systeem.")
     assert fails(stdchecker.filepaths, "%s to the file /etc/hosts on your system.", "%s na die leer /etc/gasheer op jou systeem.")
+    assert passes(stdchecker.filepaths, "Text with <br />line break", "Teks met <br /> lynbreuk")
 
 
 def test_kdecomments():
@@ -390,6 +406,7 @@ def test_long():
     assert fails(stdchecker.long, "a", "bc")
 
 
+ at mark.xfail(reason="FIXME: All fails() tests are not working")
 def test_musttranslatewords():
     """tests stopwords"""
     stdchecker = checks.StandardChecker(checks.CheckerConfig(musttranslatewords=[]))
@@ -636,6 +653,7 @@ def test_simplecaps():
     assert passes(stdchecker.simplecaps, "Flies, flies, everywhere! Ack!", u"Vlieë, oral vlieë! Jig!")
 
 
+ at mark.xfail(reason="FIXME: spell checking test not working")
 def test_spellcheck():
     """tests spell checking"""
     stdchecker = checks.StandardChecker(checks.CheckerConfig(targetlanguage="af"))
@@ -648,9 +666,12 @@ def test_spellcheck():
     stdchecker = checks.StandardChecker(checks.CheckerConfig(targetlanguage="af"))
     assert fails(stdchecker.spellcheck, "Mozilla is wonderful", "Mozillaaa is wonderlik")
     # We should pass the test if the "error" occurs in the English
-    assert passes(stdchecker.spellcheck, "Mozilla is wonderful", "Mozilla is wonderlik")
+    assert passes(stdchecker.spellcheck, "Mozillaxxx is wonderful", "Mozillaxxx is wonderlik")
     stdchecker = checks.StandardChecker(checks.CheckerConfig(targetlanguage="af", notranslatewords=["Mozilla"]))
     assert passes(stdchecker.spellcheck, "Mozilla is wonderful", "Mozilla is wonderlik")
+    # Some variables were still being spell checked
+    mozillachecker = checks.MozillaChecker(checkerconfig=checks.CheckerConfig(targetlanguage="af"))
+    assert passes(mozillachecker.spellcheck, "&brandShortName.labels; is wonderful", "&brandShortName.label; is wonderlik")
 
 
 def test_startcaps():
diff --git a/translate/filters/test_decoration.py b/translate/filters/test_decoration.py
index c1bc069..0638c18 100644
--- a/translate/filters/test_decoration.py
+++ b/translate/filters/test_decoration.py
@@ -57,6 +57,7 @@ def test_getnumbers():
     #assert decoration.getnumbers(u"R5,99") == ["5.99"]
     #assert decoration.getnumbers(u"1\u00a0000,99") == ["1000.99"]
     assert decoration.getnumbers(u"36°") == [u"36°"]
+    assert decoration.getnumbers(u"English 123, Bengali \u09e7\u09e8\u09e9") == [u"123", u"\u09e7\u09e8\u09e9"]
 
 
 def test_getfunctions():
diff --git a/translate/lang/af.py b/translate/lang/af.py
index 43a973a..f73de4f 100644
--- a/translate/lang/af.py
+++ b/translate/lang/af.py
@@ -47,6 +47,8 @@ class af(common.Common):
         """ % sentenceend, re.VERBOSE
     )
 
+    specialchars = u"ëïêôûáéíóúý"
+
     def capsstart(cls, text):
         """Modify this for the indefinite article ('n)."""
         match = articlere.search(text, 0, 20)
diff --git a/translate/lang/fi.py b/translate/lang/ak.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/ak.py
index d0a8a9d..3bcbe12 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/ak.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Akan language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Akan_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class ak(common.Common):
+    """This class represents Akan."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    specialchars = "ɛɔƐƆ"
diff --git a/translate/lang/fi.py b/translate/lang/az.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/az.py
index d0a8a9d..9b067b6 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/az.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Azerbaijani language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Azerbaijani_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class az(common.Common):
+    """This class represents Azerbaijani."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    mozilla_nplurals = 1
+    mozilla_pluralequation = "0"
diff --git a/translate/lang/common.py b/translate/lang/common.py
index 5c8999d..1b481bb 100644
--- a/translate/lang/common.py
+++ b/translate/lang/common.py
@@ -61,9 +61,11 @@ TODOs and Ideas for possible features:
 """
 
 import re
+import logging
 
 from translate.lang import data
 
+logger = logging.getLogger(__name__)
 
 class Common(object):
     """This class is the common parent class for all language classes."""
@@ -110,11 +112,20 @@ class Common(object):
     # Don't change these defaults of nplurals or pluralequation willy-nilly:
     # some code probably depends on these for unrecognised languages
 
+    mozilla_nplurals = 0
+    mozilla_pluralequation = "0"
+    """This of languages that has different plural formula in Mozilla than the
+    standard one in Gettext."""
+
     listseperator = u", "
     """This string is used to separate lists of textual elements. Most
     languages probably can stick with the default comma, but Arabic and some
     Asian languages might want to override this."""
 
+    specialchars = u""
+    """Characters used by the language that might not be easy to input with
+    common keyboard layouts"""
+
     commonpunc = u".,;:!?-@#$%^*_()[]{}/\\'`\"<>"
     """These punctuation marks are common in English and most languages that
     use latin script."""
@@ -203,16 +214,12 @@ class Common(object):
 
         language.code = code
         while code:
-            langdata = data.languages.get(code, None)
+            langdata = data.get_language(code)
             if langdata:
                 language.fullname, language.nplurals, \
                     language.pluralequation = langdata
                 break
             code = data.simplercode(code)
-        if not code:
-            #print >> sys.stderr, \
-            #         "Warning: No information found about language code %s" % code
-            pass
         return language
 
     def __deepcopy__(self, memo={}):
@@ -230,7 +237,7 @@ class Common(object):
     def punctranslate(cls, text):
         """Converts the punctuation in a string according to the rules of the
         language."""
-#        TODO: look at po::escapeforpo() for performance idea
+        #TODO: look at po::escapeforpo() for performance idea
         if not text:
             return text
         ellipses_end = text.endswith(u"...")
@@ -344,7 +351,7 @@ class Common(object):
     sentence_iter = classmethod(sentence_iter)
 
     def sentences(cls, text, strip=True):
-        """Returns a list of senteces in text."""
+        """Returns a list of sentences in text."""
         return [s for s in cls.sentence_iter(text, strip=strip)]
     sentences = classmethod(sentences)
 
@@ -355,7 +362,7 @@ class Common(object):
     capsstart = classmethod(capsstart)
 
     def numstart(cls, text):
-        """Determines whether the text starts with a mumeric value."""
+        """Determines whether the text starts with a numeric value."""
         stripped = text.lstrip().lstrip(cls.punctuation)
         return stripped and stripped[0].isnumeric()
     numstart = classmethod(numstart)
diff --git a/translate/lang/data.py b/translate/lang/data.py
index 673efdf..f2472e5 100644
--- a/translate/lang/data.py
+++ b/translate/lang/data.py
@@ -75,6 +75,7 @@ languages = {
 'hi': (u'Hindi', 2, '(n != 1)'),
 'hy': (u'Armenian', 1, '0'),
 'hr': (u'Croatian', 3, '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
+'ht': (u'Haitian; Haitian Creole', 2, '(n != 1)'),
 'hu': (u'Hungarian', 2, '(n != 1)'),
 'ia': (u"Interlingua (International Auxiliary Language Association)", 2, '(n != 1)'),
 'id': (u'Indonesian', 1, '0'),
@@ -112,6 +113,7 @@ languages = {
 'ne': (u'Nepali', 2, '(n != 1)'),
 'nl': (u'Dutch; Flemish', 2, '(n != 1)'),
 'nn': (u'Norwegian Nynorsk; Nynorsk, Norwegian', 2, '(n != 1)'),
+'nqo': (u"N'Ko", 2, '(n > 1)'),
 'nso': (u'Pedi; Sepedi; Northern Sotho', 2, '(n != 1)'),
 'oc': (u'Occitan (post 1500)', 2, '(n > 1)'),
 'or': (u'Oriya', 2, '(n != 1)'),
@@ -127,6 +129,7 @@ languages = {
 'ro': (u'Romanian', 3, '(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);'),
 'ru': (u'Russian', 3,
       '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
+'sah': (u'Yakut', 1, '0'),
 'sco': (u'Scots', 2, '(n != 1)'),
 'si': (u'Sinhala; Sinhalese', 2, '(n != 1)'),
 'sk': (u'Slovak', 3, '(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2'),
@@ -152,7 +155,9 @@ languages = {
 'uk': (u'Ukrainian', 3,
        '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
 'vi': (u'Vietnamese', 1, '0'),
+'ve': (u'Venda', 2, '(n != 1)'),
 'wa': (u'Walloon', 2, '(n > 1)'),
+'wo': (u'Wolof', 2, '(n != 1)'),
 'yo': (u'Yoruba', 2, '(n != 1)'),
 # Chinese is difficult because the main divide is on script, not really
 # country. Simplified Chinese is used mostly in China, Singapore and Malaysia.
@@ -197,7 +202,7 @@ _fixed_names = {
     u"Sinhala; Sinhalese": u"Sinhala",
     u"Sotho, Southern": u"Sotho",
     u"Spanish; Castilian": u"Spanish",
-    u"Uighur; Uyghur": u"Uighur",
+    u"Uighur; Uyghur": u"Uyghur",
 }
 
 
@@ -407,3 +412,10 @@ def simplify_to_common(language_code, languages=languages):
         return language_code
     else:
         return simplify_to_common(simpler)
+
+def get_language(code):
+    code = code.replace("-", "_").replace("@", "_").lower()
+    if "_" in code:
+        # convert ab_cd → ab_CD
+        code = "%s_%s" %(code.split("_")[0], code.split("_", 1)[1].upper())
+    return languages.get(code, None)
diff --git a/translate/lang/fi.py b/translate/lang/dz.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/dz.py
index d0a8a9d..e9e70a6 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/dz.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Dzongkha language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Dzongkha_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class dz(common.Common):
+    """This class represents Dzongkha."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/lang/fi.py b/translate/lang/fi.py
index d0a8a9d..3f921f6 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/fi.py
@@ -18,14 +18,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Finnish language.
 """
 
 from translate.lang import common
 
 
 class fi(common.Common):
-    """This class represents Finish."""
+    """This class represents Finnish."""
 
     validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
                  u"1234567890" + \
diff --git a/translate/lang/fi.py b/translate/lang/gd.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/gd.py
index d0a8a9d..40d4089 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/gd.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Gaelic language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Gaelic_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class gd(common.Common):
+    """This class represents Gaelic."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    specialchars = u'àòùèìÀÈÌÒÙ'
diff --git a/translate/lang/hy.py b/translate/lang/hy.py
index daf313a..599ddf4 100644
--- a/translate/lang/hy.py
+++ b/translate/lang/hy.py
@@ -55,3 +55,6 @@ class hy(common.Common):
     }
 
     ignoretests = ["startcaps", "simplecaps"]
+
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/lang/km.py b/translate/lang/km.py
index 1074317..91aeaf9 100644
--- a/translate/lang/km.py
+++ b/translate/lang/km.py
@@ -54,3 +54,6 @@ class km(common.Common):
     }
 
     ignoretests = ["startcaps", "simplecaps"]
+
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/lang/fi.py b/translate/lang/kw.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/kw.py
index d0a8a9d..037a58c 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/kw.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Cornish language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Cornish_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class kw(common.Common):
+    """This class represents Cornish."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/lang/fi.py b/translate/lang/lo.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/lo.py
index d0a8a9d..af4b9eb 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/lo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Lao language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Lao_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class lo(common.Common):
+    """This class represents Lao."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/lang/fi.py b/translate/lang/ms.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/ms.py
index d0a8a9d..87cb490 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/ms.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Malay language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Malay_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class ms(common.Common):
+    """This class represents Malay."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/lang/vi.py b/translate/lang/nqo.py
similarity index 55%
copy from translate/lang/vi.py
copy to translate/lang/nqo.py
index 6415fb5..e847f79 100644
--- a/translate/lang/vi.py
+++ b/translate/lang/nqo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2007 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,31 +18,37 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Vietnamese language.
+"""This module represents the N'Ko language.
 
-.. seealso:: http://en.wikipedia.org/wiki/Vietnamese_language
+.. seealso:: http://en.wikipedia.org/wiki/N'Ko_language
 """
 
+import re
+
 from translate.lang import common
-from translate.lang import fr
 
 
-class vi(common.Common):
-    """This class represents Vietnamese."""
+def reverse_quotes(text):
+    def convertquotation(match):
+        return u"”%s“" % match.group(1)
+    return re.sub(u'“([^”]+)”', convertquotation, text)
 
-    # Vietnamese uses similar rules for spacing two-part punctuation marks as
-    # French, but does not use a space before '?'.
-    puncdict = {}
-    for c in u":;!#":
-        puncdict[c] = u" %s" % c
 
-    def punctranslate(cls, text):
-        """Implement some extra features for quotation marks.
+class nqo(common.Common):
+    """This class represents N'Ko."""
+
+    listseperator = u"߸ "
 
-        Known shortcomings:
-            - % and $ are not touched yet for fear of variables
-            - Double spaces might be introduced
-        """
+    puncdict = {
+        u",": u"߸",
+        u";": u"؛",
+        u"?": u"؟",
+        u"!": u"߹",
+    }
+
+    ignoretests = ["startcaps", "simplecaps", "acronyms"]
+
+    def punctranslate(cls, text):
         text = super(cls, cls).punctranslate(text)
-        return fr.guillemets(text)
+        return reverse_quotes(text)
     punctranslate = classmethod(punctranslate)
diff --git a/translate/lang/fi.py b/translate/lang/nso.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/nso.py
index d0a8a9d..67797ac 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/nso.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Northern Sotho language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Northern_Sotho_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class nso(common.Common):
+    """This class represents Northern Sotho."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    specialchars = "šŠ"
diff --git a/translate/lang/poedit.py b/translate/lang/poedit.py
index 209c836..d6f271a 100644
--- a/translate/lang/poedit.py
+++ b/translate/lang/poedit.py
@@ -21,8 +21,9 @@
 """Functions to manage Poedit's language features.
 
 .. note:: The ISO 639 maps are from Poedit's
-`isocode.cpp <https://github.com/vslavik/poedit/blob/v1.4.2/src/isocodes.cpp#L36-227>`_ (v1.4.2)
-to ensure that we match currently released versions of Poedit.
+   `isocode.cpp
+   <https://github.com/vslavik/poedit/blob/v1.4.2/src/isocodes.cpp#L36-227>`_
+   (v1.4.2) to ensure that we match currently released versions of Poedit.
 """
 
 lang_codes = {
diff --git a/translate/lang/fi.py b/translate/lang/son.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/son.py
index d0a8a9d..a3a24b2 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/son.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Songhai languages.
+
+.. seealso:: http://en.wikipedia.org/wiki/Songhai_languages
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class son(common.Common):
+    """This class represents Songhai."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    specialchars = u"ɲŋšžãõẽĩƝŊŠŽÃÕẼĨ"
diff --git a/translate/lang/fi.py b/translate/lang/su.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/su.py
index d0a8a9d..296d0d2 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/su.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Sundanese language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Sundanese_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class su(common.Common):
+    """This class represents Sundanese."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/lang/test_common.py b/translate/lang/test_common.py
index 8c74b30..78b1379 100644
--- a/translate/lang/test_common.py
+++ b/translate/lang/test_common.py
@@ -3,7 +3,7 @@
 
 from translate.lang import common
 
-from py.test import mark
+from pytest import mark
 
 
 def test_characters():
diff --git a/translate/lang/test_identify.py b/translate/lang/test_identify.py
index 707ece0..7c119cc 100644
--- a/translate/lang/test_identify.py
+++ b/translate/lang/test_identify.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
-from py.test import raises
+from pytest import raises
 
 from translate.lang.identify import LanguageIdentifier
 from translate.storage.base import TranslationUnit
diff --git a/translate/lang/test_nqo.py b/translate/lang/test_nqo.py
new file mode 100644
index 0000000..3005ccc
--- /dev/null
+++ b/translate/lang/test_nqo.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from translate.lang import factory
+
+
+def test_punctranslate():
+    """Tests that we can translate punctuation."""
+    language = factory.getlanguage('nqo')
+    assert language.punctranslate(u"") == u""
+    assert language.punctranslate(u"abc efg") == u"abc efg"
+    assert language.punctranslate(u"abc efg.") == u"abc efg."
+    assert language.punctranslate(u"abc efg!") == u"abc efg߹"
+    assert language.punctranslate(u"abc, efg; d?") == u"abc߸ efg؛ d؟"
+    # See http://bugs.locamotion.org/show_bug.cgi?id=1819
+    assert language.punctranslate(u"It is called “abc”") == u"It is called ”abc“"
+
+
+def test_sentences():
+    """Tests basic functionality of sentence segmentation."""
+    language = factory.getlanguage('nqo')
+    sentences = language.sentences(u"")
+    assert sentences == []
+
+    # this text probably does not make sense, I just copied it from Firefox
+    # translation and added some punctuation marks
+    sentences = language.sentences(u"ߡߍ߲ ߠߎ߬ ߦߋ߫ ߓߊ߯ߙߊ߫ ߟߊ߫ ߢߐ߲߮ ߝߍ߬ ߞߊ߬ ߓߟߐߟߐ ߟߊߞߊ߬ߣߍ߲ ߕߏ߫. ߖߊ߬ߡߊ ߣߌ߫ ߓߍ߯ ߛߊ߬ߥߏ ߘߐ߫.")
+    print sentences
+    assert sentences == [u"ߡߍ߲ ߠߎ߬ ߦߋ߫ ߓߊ߯ߙߊ߫ ߟߊ߫ ߢߐ߲߮ ߝߍ߬ ߞߊ߬ ߓߟߐߟߐ ߟߊߞߊ߬ߣߍ߲ ߕߏ߫.", u"ߖߊ߬ߡߊ ߣߌ߫ ߓߍ߯ ߛߊ߬ߥߏ ߘߐ߫."]
+    sentences = language.sentences(u"ߡߍ߲ ߠߎ߬ ߦߋ߫ ߓߊ߯ߙߊ߫ ߟߊ߫ ߢߐ߲߮ ߝߍ߬ ߞߊ߬ ߓߟߐߟߐ ߟߊߞߊ߬ߣߍ߲ ߕߏ߫? ߖߊ߬ߡߊ ߣߌ߫ ߓߍ߯ ߛߊ߬ߥߏ ߘߐ߫.")
+    print sentences
+    assert sentences == [u"ߡߍ߲ ߠߎ߬ ߦߋ߫ ߓߊ߯ߙߊ߫ ߟߊ߫ ߢߐ߲߮ ߝߍ߬ ߞߊ߬ ߓߟߐߟߐ ߟߊߞߊ߬ߣߍ߲ ߕߏ߫?", u"ߖߊ߬ߡߊ ߣߌ߫ ߓߍ߯ ߛߊ߬ߥߏ ߘߐ߫."]
diff --git a/translate/lang/test_tr.py b/translate/lang/test_tr.py
new file mode 100644
index 0000000..c1e4da0
--- /dev/null
+++ b/translate/lang/test_tr.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from translate.lang import factory
+
+def test_sentences():
+    """Tests basic functionality of sentence segmentation."""
+    language = factory.getlanguage('tr')
+    sentences = language.sentences(u"Normal case. Nothing interesting.")
+    assert sentences == [u"Normal case.", u"Nothing interesting."]
+    sentences = language.sentences(u"1. sayı, 2. sayı.")
+    assert sentences == [u"1. sayı, 2. sayı."]
diff --git a/translate/__version__.py b/translate/lang/tr.py
similarity index 70%
copy from translate/__version__.py
copy to translate/lang/tr.py
index 9b31e6d..b98fba0 100644
--- a/translate/__version__.py
+++ b/translate/lang/tr.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008-2009 Zuza Software Foundation
+# Copyright 2009,2013 Zuza Software Foundation
 #
 # This file is part of the Translate Toolkit.
 #
@@ -18,8 +18,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This file contains the version of the Translate Toolkit."""
+"""This module represents the Turkish language.
+"""
 
-build = 12016
-sver = "1.10.0"
-ver = (1, 10, 0)
+from translate.lang import common
+
+class tr(common.Common):
+    """This class represents Turkish."""
+
+    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" + u"ığüşöçĞÜŞİÖÇ"
diff --git a/translate/lang/fi.py b/translate/lang/ve.py
similarity index 71%
copy from translate/lang/fi.py
copy to translate/lang/ve.py
index d0a8a9d..1476497 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/ve.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
+"""This module represents the Venda language.
+
+.. seealso:: http://en.wikipedia.org/wiki/Venda_language
 """
 
 from translate.lang import common
 
 
-class fi(common.Common):
-    """This class represents Finish."""
+class ve(common.Common):
+    """This class represents Venda."""
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
+    specialchars = "ḓṋḽṱ ḒṊḼṰ ṅṄ"
diff --git a/translate/lang/vi.py b/translate/lang/vi.py
index 6415fb5..0353f5e 100644
--- a/translate/lang/vi.py
+++ b/translate/lang/vi.py
@@ -46,3 +46,6 @@ class vi(common.Common):
         text = super(cls, cls).punctranslate(text)
         return fr.guillemets(text)
     punctranslate = classmethod(punctranslate)
+
+    mozilla_nplurals = 2
+    mozilla_pluralequation = "n!=1 ? 1 : 0"
diff --git a/translate/convert/po2tmx b/translate/lang/zh_cn.py
old mode 100755
new mode 100644
similarity index 68%
copy from translate/convert/po2tmx
copy to translate/lang/zh_cn.py
index 44fb5a9..06ce1bd
--- a/translate/convert/po2tmx
+++ b/translate/lang/zh_cn.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 Zuza Software Foundation
 #
-# Copyright 2005 Zuza Software Foundation
-# 
 # This file is part of translate.
 #
 # translate is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # translate is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16,13 +17,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
 
-"""Converts Gettext .po files to Qt .ts localization files
-You can convert from .ts to .po using po2ts"""
+"""This module represents the Chinese language (simplified).
+
+.. seealso:: http://en.wikipedia.org/wiki/Chinese_language
+"""
 
-from translate.convert import po2tmx
+from translate.lang.zh import zh
 
-if __name__ == '__main__':
-    po2tmx.main()
+class zh_cn(zh):
+    specialchars = u"←→↔×÷©…—‘’“”【】《》"
 
diff --git a/translate/lang/fi.py b/translate/lang/zh_hk.py
similarity index 68%
copy from translate/lang/fi.py
copy to translate/lang/zh_hk.py
index d0a8a9d..ca48d28 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/zh_hk.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
-"""
+"""This module represents the Chinese language (traditional).
 
-from translate.lang import common
+.. seealso:: http://en.wikipedia.org/wiki/Chinese_language
+"""
 
+from translate.lang.zh import zh
 
-class fi(common.Common):
-    """This class represents Finish."""
+class zh_hk(zh):
+    specialchars = u"←→↔×÷©…—‘’“”「」『』【】《》"
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
diff --git a/translate/lang/fi.py b/translate/lang/zh_tw.py
similarity index 68%
copy from translate/lang/fi.py
copy to translate/lang/zh_tw.py
index d0a8a9d..19fdb74 100644
--- a/translate/lang/fi.py
+++ b/translate/lang/zh_tw.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2008 Zuza Software Foundation
+# Copyright 2013 Zuza Software Foundation
 #
 # This file is part of translate.
 #
@@ -18,15 +18,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""This module represents the Finish language.
-"""
+"""This module represents the Chinese language (traditional).
 
-from translate.lang import common
+.. seealso:: http://en.wikipedia.org/wiki/Chinese_language
+"""
 
+from translate.lang.zh import zh
 
-class fi(common.Common):
-    """This class represents Finish."""
+class zh_tw(zh):
+    specialchars = u"←→↔×÷©…—‘’“”「」『』【】《》"
 
-    validaccel = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + \
-                 u"1234567890" + \
-                 u"äöÄÖ"
diff --git a/translate/misc/dictutils.py b/translate/misc/dictutils.py
index 477b187..32fe365 100644
--- a/translate/misc/dictutils.py
+++ b/translate/misc/dictutils.py
@@ -82,7 +82,7 @@ class cidict(dict):
         return self.__contains__(key)
 
     def get(self, key, default=None):
-        if self.has_key(key):
+        if key in self:
             return self[key]
         else:
             return default
diff --git a/translate/misc/optrecurse.py b/translate/misc/optrecurse.py
index b16e872..cd2c45a 100644
--- a/translate/misc/optrecurse.py
+++ b/translate/misc/optrecurse.py
@@ -18,9 +18,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+import re
 import sys
 import os.path
 import fnmatch
+import logging
 import traceback
 import optparse
 try:
@@ -91,9 +93,9 @@ class RecursiveOptionParser(optparse.OptionParser, object):
         self.setprogressoptions()
         self.seterrorleveloptions()
         self.setformats(formats, usetemplates)
-        self.setpsycooption()
         self.passthrough = []
         self.allowmissingtemplate = allowmissingtemplate
+        logging.basicConfig(format="%(name)s: %(levelname)s: %(message)s")
 
     def get_prog_name(self):
         return os.path.basename(sys.argv[0])
@@ -128,14 +130,15 @@ class RecursiveOptionParser(optparse.OptionParser, object):
         description_lines = self.description.split('\n\n')[1:]
         if description_lines:
             result.append('.SH DESCRIPTION\n')
-            result.append('\n'.join(description_lines))
+            result.append('\n\n'.join([re.sub('\.\. note::', 'Note:', l)
+                                              for l in description_lines]))
         result.append('.SH OPTIONS\n')
         ManHelpFormatter().store_option_strings(self)
         result.append('.PP\n')
         for option in self.option_list:
             result.append('.TP\n')
-            result.append('%s\n' % option)
-            result.append('%s\n' % option.help)
+            result.append('%s\n' % str(option).replace('-', '\-'))
+            result.append('%s\n' % option.help.replace('-', '\-'))
         return "".join(result)
 
     def print_manpage(self, file=None):
@@ -144,39 +147,6 @@ class RecursiveOptionParser(optparse.OptionParser, object):
             file = sys.stdout
         file.write(self.format_manpage())
 
-    def setpsycooption(self):
-        try:
-            import psyco  # pylint: disable=W0612
-        except ImportError:
-            return
-        psycomodes = ["none", "full", "profile"]
-        psycooption = optparse.Option(None, "--psyco", dest="psyco",
-            default=None, choices=psycomodes, metavar="MODE",
-            help="use psyco to speed up the operation, modes: %s" % (", ".join(psycomodes)))
-        self.define_option(psycooption)
-
-    def usepsyco(self, options):
-        # options.psyco == None means the default, which is "full", but don't
-        #                       give a warning...
-        # options.psyco == "none" means don't use psyco at all...
-        if getattr(options, "psyco", "none") == "none":
-            return
-        try:
-            import psyco
-        except ImportError:
-            if options.psyco is not None:
-                self.warning("psyco unavailable", options, sys.exc_info())
-            return
-        if options.psyco is None:
-            options.psyco = "full"
-        if options.psyco == "full":
-            psyco.full()
-        elif options.psyco == "profile":
-            psyco.profile()
-        # tell psyco the functions it cannot compile, to prevent warnings
-        import encodings
-        psyco.cannotcompile(encodings.search_function)
-
     def set_usage(self, usage=None):
         """sets the usage string - if usage not given, uses getusagestring for
         each option"""
@@ -199,7 +169,7 @@ class RecursiveOptionParser(optparse.OptionParser, object):
                 errorinfo = ""
             if errorinfo:
                 msg += ": " + errorinfo
-        print >> sys.stderr, "\n%s: warning: %s" % (self.get_prog_name(), msg)
+        logging.getLogger(self.get_prog_name()).warning(msg)
 
     def getusagestring(self, option):
         """returns the usage string for the given option"""
@@ -433,22 +403,25 @@ class RecursiveOptionParser(optparse.OptionParser, object):
                 outputformat = None
             else:
                 if self.usetemplates:
-                    if templateext is None:
-                        raise ValueError("don't know what to do with input format %s, no template file" %
-                                         (os.extsep + inputext))
-                    else:
-                        raise ValueError("don't know what to do with input format %s, template format %s" %
-                                         (os.extsep + inputext, os.extsep + templateext))
+                    raise ValueError("don't know what to do with input format (no file extension), no template file")
                 else:
-                    raise ValueError("don't know what to do with input format %s" %
-                                     (os.extsep + inputext))
+                    raise ValueError("don't know what to do with input format (no file extension)")
         return outputformat, fileprocessor
 
     def initprogressbar(self, allfiles, options):
         """Sets up a progress bar appropriate to the options and files."""
         if options.progress in ('bar', 'verbose'):
-            self.progressbar = self.progresstypes[options.progress](0, len(allfiles))
-            print >> sys.stderr, "processing %d files..." % len(allfiles)
+            self.progressbar = \
+                self.progresstypes[options.progress](0, len(allfiles))
+            # should use .getChild("progress") but that is only in 2.7
+            logger = logging.getLogger(self.get_prog_name() + ".progress")
+            logger.setLevel(logging.INFO)
+            logger.propagate = False
+            handler = logging.StreamHandler()
+            handler.setLevel(logging.INFO)
+            handler.setFormatter(logging.Formatter())
+            logger.addHandler(handler)
+            logger.info("processing %d files...", len(allfiles))
         else:
             self.progressbar = self.progresstypes[options.progress]()
 
@@ -484,7 +457,6 @@ class RecursiveOptionParser(optparse.OptionParser, object):
         # the options
         options.inputformats = self.inputformats
         options.outputoptions = self.outputoptions
-        self.usepsyco(options)
         self.recursiveprocess(options)
 
     def recursiveprocess(self, options):
diff --git a/translate/misc/profiling.py b/translate/misc/profiling.py
index ada4b92..deeb71d 100644
--- a/translate/misc/profiling.py
+++ b/translate/misc/profiling.py
@@ -97,8 +97,7 @@ def profile_func(filename=None, mode='w+'):
                      decorated function's name is used, followed by
                      ``_func.profile``.
     :type mode: str
-    :param mode: The mode in which to open :param:`filename`. Default is
-                 ``w+``.
+    :param mode: The mode in which to open ``filename``. Default is ``w+``.
     """
     def proffunc(f):
         def profiled_func(*args, **kwargs):
diff --git a/translate/misc/test_autoencode.py b/translate/misc/test_autoencode.py
index 5c68291..4340bff 100644
--- a/translate/misc/test_autoencode.py
+++ b/translate/misc/test_autoencode.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from py import test
+import pytest
 
 from translate.misc import autoencode
 
@@ -33,4 +33,4 @@ class TestAutoencode:
 
     def test_bad_encoding(self):
         """tests that we throw an exception if we don't know the encoding"""
-        assert test.raises(ValueError, self.type2test, 'text', 'some-encoding')
+        assert pytest.raises(ValueError, self.type2test, 'text', 'some-encoding')
diff --git a/translate/misc/test_dictutils.py b/translate/misc/test_dictutils.py
index d35e2d2..dc1caaa 100644
--- a/translate/misc/test_dictutils.py
+++ b/translate/misc/test_dictutils.py
@@ -22,3 +22,12 @@ def test_pop():
     value = d.pop(2)
     assert len(d.order) == 0
     assert value == 3
+
+
+def test_cidict_has_key():
+    cid = dictutils.cidict()
+    cid['lower'] = 'lowercase'
+    assert 'lower' in cid
+    assert 'Lower' in cid
+    assert 'LOWER' in cid
+    assert 'upper' not in cid
diff --git a/translate/misc/test_multistring.py b/translate/misc/test_multistring.py
index cfc7020..f569ff7 100644
--- a/translate/misc/test_multistring.py
+++ b/translate/misc/test_multistring.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from py import test
+import pytest
 
 from translate.misc import multistring
 from translate.misc import test_autoencode
@@ -20,7 +20,7 @@ class TestMultistring(test_autoencode.TestAutoencode):
         assert s2 == "test"
         assert s2.strings == ["test", "me"]
         assert s2 != s1
-        test.raises(ValueError, t, [])
+        pytest.raises(ValueError, t, [])
 
     def test_replace(self):
         t = self.type2test
diff --git a/translate/misc/test_optrecurse.py b/translate/misc/test_optrecurse.py
index 7f64221..fc6e02c 100644
--- a/translate/misc/test_optrecurse.py
+++ b/translate/misc/test_optrecurse.py
@@ -7,11 +7,9 @@ from translate.misc import optrecurse
 
 class TestRecursiveOptionParser:
 
-    def __init__(self):
-        self.parser = optrecurse.RecursiveOptionParser({"txt": ("po", None)})
-
     def test_splitext(self):
         """test the ``optrecurse.splitext`` function"""
+        self.parser = optrecurse.RecursiveOptionParser({"txt": ("po", None)})
         name = "name"
         extension = "ext"
         filename = name + os.extsep + extension
diff --git a/translate/misc/test_zipfileext.py b/translate/misc/test_zipfileext.py
deleted file mode 100755
index 5e029ba..0000000
--- a/translate/misc/test_zipfileext.py
+++ /dev/null
@@ -1,169 +0,0 @@
-import zlib  # implied prerequisite
-import zipfile
-import os
-import StringIO
-import tempfile
-
-try:
-    from test.test_support import TestFailed
-except ImportError:
-    class TestFailed(Exception):
-        pass
-
-from translate.misc import zipfileext
-
-
-BrokenStringIO = StringIO.StringIO
-class FixedStringIO(BrokenStringIO):
-
-    def truncate(self, size=None):
-        BrokenStringIO.truncate(self, size)
-        self.len = len(self.buf)
-
-StringIO.StringIO = FixedStringIO
-
-
-def zipTest(srcname, f, compression, srccontents):
-    zip = zipfileext.ZipFileExt(f, "w", compression)   # Create the ZIP archive
-    zip.write(srcname, "another"+os.extsep+"name")
-    zip.write(srcname, srcname)
-    zip.close()
-
-    zip = zipfileext.ZipFileExt(f, "r", compression)   # Read the ZIP archive
-    readData2 = zip.read(srcname)
-    readData1 = zip.read("another"+os.extsep+"name")
-    zip.close()
-
-    if readData1 != srccontents or readData2 != srccontents:
-        raise TestFailed("Written data doesn't equal read data.")
-
-
-def deleteTest(srcname, f, compression, srccontents):
-    zip = zipfileext.ZipFileExt(f, "w", compression)   # Create the ZIP archive
-    othername = "another"+os.extsep+"name"
-    finalname = "adifferent"+os.extsep+"name"
-    leftname, deletenames = othername, [srcname, finalname]
-    zip.write(srcname, srcname)
-    zip.write(srcname, othername)
-    zip.write(srcname, finalname)
-    zip.close()
-
-    zip = zipfileext.ZipFileExt(f, "a", compression)   # Modify the ZIP archive
-    for deletename in deletenames:
-        zip.delete(deletename)
-    zip.close()
-
-    zip = zipfileext.ZipFileExt(f, "r", compression)   # Read the ZIP archive
-    testfailed = zip.testzip()
-    readData = zip.read(leftname)
-    zip.close()
-
-    if testfailed:
-        raise TestFailed("zip file didn't pass test")
-    if readData != srccontents:
-        raise TestFailed("Written data doesn't equal read data.")
-
-
-class TestZipfile:
-
-    def setup_method(self, method):
-        print repr(method), dir(method)
-        self.srcname = self.__class__.__name__ + "_" + method.__name__ + os.extsep + "tmp"
-        self.zipname = self.__class__.__name__ + "_" + method.__name__ + os.extsep + "zip"
-        if os.path.exists(self.srcname):
-            os.remove(self.srcname)
-        if os.path.exists(self.zipname):
-            os.remove(self.zipname)
-
-    def teardown_method(self, method):
-        if os.path.exists(self.srcname):           # Remove temporary files
-            os.unlink(self.srcname)
-        if os.path.exists(self.zipname):
-            os.unlink(self.zipname)
-
-    def test_consistent(self):
-        fp = open(self.srcname, "wb")               # Make a source file with some lines
-        for i in range(0, 1000):
-            fp.write("Test of zipfile line %d.\n" % i)
-        fp.close()
-
-        fp = open(self.srcname, "rb")
-        writtenData = fp.read()
-        fp.close()
-
-        for file in (self.zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
-            zipTest(self.srcname, file, zipfile.ZIP_STORED, writtenData)
-
-        for file in (self.zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
-            zipTest(self.srcname, file, zipfile.ZIP_DEFLATED, writtenData)
-
-    def test_delete(self):
-        fp = open(self.srcname, "wb")               # Make a source file with some lines
-        for i in range(0, 1000):
-            fp.write("Test of zipfile line %d.\n" % i)
-        fp.close()
-
-        fp = open(self.srcname, "rb")
-        writtenData = fp.read()
-        fp.close()
-
-        for file in (self.zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
-            deleteTest(self.srcname, file, zipfile.ZIP_STORED, writtenData)
-
-        for file in (self.zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
-            deleteTest(self.srcname, file, zipfile.ZIP_DEFLATED, writtenData)
-
-    def test_closes(self):
-        # This test checks that the ZipFile constructor closes the file object
-        # it opens if there's an error in the file.  If it doesn't, the traceback
-        # holds a reference to the ZipFile object and, indirectly, the file object.
-        # On Windows, this causes the os.unlink() call to fail because the
-        # underlying file is still open.  This is SF bug #412214.
-        #
-        fp = open(self.srcname, "w")
-        fp.write("this is not a legal zip file\n")
-        fp.close()
-        try:
-            zf = zipfileext.ZipFileExt(self.srcname)
-        except zipfile.BadZipfile:
-            os.unlink(self.srcname)
-
-    def test_403871(self):
-        # make sure we don't raise an AttributeError when a partially-constructed
-        # ZipFile instance is finalized; this tests for regression on SF tracker
-        # bug #403871.
-        try:
-            zipfileext.ZipFileExt(self.srcname)
-        except IOError:
-            # The bug we're testing for caused an AttributeError to be raised
-            # when a ZipFile instance was created for a file that did not
-            # exist; the .fp member was not initialized but was needed by the
-            # __del__() method.  Since the AttributeError is in the __del__(),
-            # it is ignored, but the user should be sufficiently annoyed by
-            # the message on the output that regression will be noticed
-            # quickly.
-            pass
-        else:
-            raise TestFailed("expected creation of readable ZipFile without\n"
-                             "  a file to raise an IOError.")
-
-    def test_closedthrow(self):
-        # Verify that testzip() doesn't swallow inappropriate exceptions.
-        data = StringIO.StringIO()
-        zipf = zipfileext.ZipFileExt(data, mode="w")
-        zipf.writestr("foo.txt", "O, for a Muse of Fire!")
-        zipf.close()
-        zipf = zipfileext.ZipFileExt(data, mode="r")
-        zipf.close()
-        try:
-            zipf.testzip()
-        except RuntimeError:
-            # This is correct; calling .read on a closed ZipFile should throw
-            # a RuntimeError, and so should calling .testzip.  An earlier
-            # version of .testzip would swallow this exception (and any other)
-            # and report that the first file in the archive was corrupt.
-            pass
-        else:
-            raise TestFailed("expected calling .testzip on a closed ZipFile"
-                             " to raise a RuntimeError")
-        del data, zipf
diff --git a/translate/misc/textwrap.py b/translate/misc/textwrap.py
index bcf08e8..b66471e 100644
--- a/translate/misc/textwrap.py
+++ b/translate/misc/textwrap.py
@@ -5,28 +5,13 @@
 # Copyright (C) 1999-2001 Gregory P. Ward.
 # Copyright (C) 2002, 2003 Python Software Foundation.
 # Written by Greg Ward <gward at python.net>
+# 2013 F Wolff
 
-import string, re
+import re
 
-# Do the right thing with boolean values for all known Python versions
-# (so this module can be copied to projects that don't depend on Python
-# 2.3, e.g. Optik and Docutils).
-try:
-    True, False
-except NameError:
-    (True, False) = (1, 0)
 
 __all__ = ['TextWrapper', 'wrap', 'fill']
 
-# Hardcode the recognized whitespace characters to the US-ASCII
-# whitespace characters.  The main reason for doing this is that in
-# ISO-8859-1, 0xa0 is non-breaking whitespace, so in certain locales
-# that character winds up in string.whitespace.  Respecting
-# string.whitespace in those cases would 1) make textwrap treat 0xa0 the
-# same as any other whitespace char, which is clearly wrong (it's a
-# *non-breaking* space), 2) possibly cause problems with Unicode,
-# since 0xa0 is not in range(128).
-_whitespace = '\t\n\x0b\x0c\r '
 
 class TextWrapper:
     """
@@ -40,98 +25,33 @@ class TextWrapper:
       width (default: 70)
         the maximum width of wrapped lines (unless break_long_words
         is false)
-      initial_indent (default: "")
-        string that will be prepended to the first line of wrapped
-        output.  Counts towards the line's width.
-      subsequent_indent (default: "")
-        string that will be prepended to all lines save the first
-        of wrapped output; also counts towards each line's width.
-      expand_tabs (default: true)
-        Expand tabs in input text to spaces before further processing.
-        Each tab will become 1 .. 8 spaces, depending on its position in
-        its line.  If false, each tab is treated as a single character.
-      drop_whitespace (default: true)
-        Drop leading and trailing whitespace from lines.
-      replace_whitespace (default: true)
-        Replace all whitespace characters in the input text by spaces
-        after tab expansion.  Note that if expand_tabs is false and
-        replace_whitespace is true, every tab will be converted to a
-        single space!
-      fix_sentence_endings (default: false)
-        Ensure that sentence-ending punctuation is always followed
-        by two spaces.  Off by default because the algorithm is
-        (unavoidably) imperfect.
       break_long_words (default: true)
         Break words longer than 'width'.  If false, those words will not
         be broken, and some lines might be longer than 'width'.
     """
 
-    whitespace_trans = string.maketrans(_whitespace, ' ' * len(_whitespace))
-
-    unicode_whitespace_trans = {}
-    uspace = ord(u' ')
-    for x in map(ord, _whitespace):
-        unicode_whitespace_trans[x] = uspace
-
     # This funky little regex is just the trick for splitting
     # text up into word-wrappable chunks.  E.g.
     #   "Hello there -- you goof-ball, use the -b option!"
     # splits into
-    #   Hello/ /there/ /--/ /you/ /goof-/ball,/ /use/ /the/ /-b/ /option!
+    #   Hello /there /--/ /you /goof-/ball,/ /use/ /the /-b/ /option!
     # (after stripping out empty strings).
     wordsep_re = re.compile(
         r'(\s+|'                                  # any whitespace
-        r'%|'                                     # gettext handles % like whitespace
+        r'[\w\!"\'\&\.\,\?]+\s+|'                 # space should go with a word
         r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
         r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
 
-    # XXX this is not locale- or charset-aware -- string.lowercase
-    # is US-ASCII only (and therefore English-only)
-    sentence_end_re = re.compile(r'[%s]'              # lowercase letter
-                                 r'[\.\!\?]'          # sentence-ending punct.
-                                 r'[\"\']?'           # optional end-of-quote
-                                 % string.lowercase)
-
-
     def __init__(self,
                  width=70,
-                 initial_indent="",
-                 subsequent_indent="",
-                 expand_tabs=True,
-                 drop_whitespace=True,
-                 replace_whitespace=True,
-                 fix_sentence_endings=False,
                  break_long_words=True):
         self.width = width
-        self.initial_indent = initial_indent
-        self.subsequent_indent = subsequent_indent
-        self.expand_tabs = expand_tabs
-        self.drop_whitespace = drop_whitespace
-        self.replace_whitespace = replace_whitespace
-        self.fix_sentence_endings = fix_sentence_endings
         self.break_long_words = break_long_words
 
 
     # -- Private methods -----------------------------------------------
     # (possibly useful for subclasses to override)
 
-    def _munge_whitespace(self, text):
-        """_munge_whitespace(text : string) -> string
-
-        Munge whitespace in text: expand tabs and convert all other
-        whitespace characters to spaces.  Eg. " foo\tbar\n\nbaz"
-        becomes " foo    bar  baz".
-        """
-        if self.expand_tabs:
-            text = text.expandtabs()
-        if self.replace_whitespace:
-            if isinstance(text, str):
-                text = text.translate(self.whitespace_trans)
-            elif isinstance(text, unicode):
-                text = text.translate(self.unicode_whitespace_trans)
-        return text
-
-
     def _split(self, text):
         """_split(text : string) -> [string]
 
@@ -147,24 +67,6 @@ class TextWrapper:
         chunks = filter(None, chunks)
         return chunks
 
-    def _fix_sentence_endings(self, chunks):
-        """_fix_sentence_endings(chunks : [string])
-
-        Correct for sentence endings buried in 'chunks'.  Eg. when the
-        original text contains "... foo.\nBar ...", munge_whitespace()
-        and split() will convert that to [..., "foo.", " ", "Bar", ...]
-        which has one too few spaces; this method simply changes the one
-        space to two.
-        """
-        i = 0
-        pat = self.sentence_end_re
-        while i < len(chunks)-1:
-            if chunks[i+1] == " " and pat.search(chunks[i]):
-                chunks[i+1] = "  "
-                i += 2
-            else:
-                i += 1
-
     def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
         """_handle_long_word(chunks : [string],
                              cur_line : [string],
@@ -221,19 +123,8 @@ class TextWrapper:
             cur_line = []
             cur_len = 0
 
-            # Figure out which static string will prefix this line.
-            if lines:
-                indent = self.subsequent_indent
-            else:
-                indent = self.initial_indent
-
             # Maximum width for this line.
-            width = self.width - len(indent)
-
-            # First chunk on line is whitespace -- drop it, unless this
-            # is the very beginning of the text (ie. no lines started yet).
-            if self.drop_whitespace and chunks[-1].strip() == '' and lines:
-                del chunks[-1]
+            width = self.width
 
             while chunks:
                 l = len(chunks[-1])
@@ -252,14 +143,10 @@ class TextWrapper:
             if chunks and len(chunks[-1]) > width:
                 self._handle_long_word(chunks, cur_line, cur_len, width)
 
-            # If the last chunk on this line is all whitespace, drop it.
-            if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
-                del cur_line[-1]
-
             # Convert current line back to a string and store it in list
             # of all lines (return value).
             if cur_line:
-                lines.append(indent + ''.join(cur_line))
+                lines.append(''.join(cur_line))
 
         return lines
 
@@ -275,10 +162,7 @@ class TextWrapper:
         and all other whitespace characters (including newline) are
         converted to space.
         """
-        text = self._munge_whitespace(text)
         chunks = self._split(text)
-        if self.fix_sentence_endings:
-            self._fix_sentence_endings(chunks)
         return self._wrap_chunks(chunks)
 
     def fill(self, text):
@@ -317,62 +201,3 @@ def fill(text, width=70, **kwargs):
     """
     w = TextWrapper(width=width, **kwargs)
     return w.fill(text)
-
-
-# -- Loosely related functionality -------------------------------------
-
-_whitespace_only_re = re.compile('^[ \t]+$', re.MULTILINE)
-_leading_whitespace_re = re.compile('(^[ \t]*)(?:[^ \t\n])', re.MULTILINE)
-
-def dedent(text):
-    """Remove any common leading whitespace from every line in `text`.
-
-    This can be used to make triple-quoted strings line up with the left
-    edge of the display, while still presenting them in the source code
-    in indented form.
-
-    Note that tabs and spaces are both treated as whitespace, but they
-    are not equal: the lines "  hello" and "\thello" are
-    considered to have no common leading whitespace.  (This behaviour is
-    new in Python 2.5; older versions of this module incorrectly
-    expanded tabs before searching for common leading whitespace.)
-    """
-    # Look for the longest leading string of spaces and tabs common to
-    # all lines.
-    margin = None
-    text = _whitespace_only_re.sub('', text)
-    indents = _leading_whitespace_re.findall(text)
-    for indent in indents:
-        if margin is None:
-            margin = indent
-
-        # Current line more deeply indented than previous winner:
-        # no change (previous winner is still on top).
-        elif indent.startswith(margin):
-            pass
-
-        # Current line consistent with and no deeper than previous winner:
-        # it's the new winner.
-        elif margin.startswith(indent):
-            margin = indent
-
-        # Current line and previous winner have no common whitespace:
-        # there is no margin.
-        else:
-            margin = ""
-            break
-
-    # sanity check (testing/debugging only)
-    if 0 and margin:
-        for line in text.split("\n"):
-            assert not line or line.startswith(margin), \
-                   "line = %r, margin = %r" % (line, margin)
-
-    if margin:
-        text = re.sub(r'(?m)^' + margin, '', text)
-    return text
-
-if __name__ == "__main__":
-    #print dedent("\tfoo\n\tbar")
-    #print dedent("  \thello there\n  \t  how are you?")
-    print dedent("Hello there.\n  This is indented.")
diff --git a/translate/misc/xmlwrapper.py b/translate/misc/xmlwrapper.py
index 423c2a1..02bd4f4 100644
--- a/translate/misc/xmlwrapper.py
+++ b/translate/misc/xmlwrapper.py
@@ -20,14 +20,21 @@
 
 """simpler wrapper to the elementtree XML parser"""
 
+import sys
 try:
     from xml.etree import ElementTree
 except ImportError:
     from elementtree import ElementTree
+    elementmod = 'elementtree'
+else:
+    elementmod = 'xml.etree'
+
 # this is needed to prevent expat-version conflicts with wx >= 2.5.2.2
 from xml.parsers import expat
 
-basicfixtag = ElementTree.fixtag
+# don't try this in Sphinx autodoc as xml.etree is Mock()ed
+if sys.modules[elementmod].__path__ != '/dev/null':
+    basicfixtag = ElementTree.fixtag
 
 
 def makefixtagproc(namespacemap):
diff --git a/translate/misc/zipfileext.py b/translate/misc/zipfileext.py
deleted file mode 100644
index b606022..0000000
--- a/translate/misc/zipfileext.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright 2004, 2005 Zuza Software Foundation
-#
-# This file is part of translate.
-#
-# translate is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# translate is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-"""Extensions to zipfile standard module that will hopefully get
-included in future."""
-
-from zipfile import ZipFile, struct, structCentralDir, \
-                    stringCentralDir, structEndArchive, stringEndArchive
-
-
-class ZipFileExt(ZipFile, object):
-    """a ZipFile that can handle replacing objects"""
-
-    def delete(self, name):
-        """Delete the file from the archive. If it appears multiple
-        times only the first instance will be deleted."""
-        for i in range(0, len(self.filelist)):
-            if self.filelist[i].filename == name:
-                if self.debug:
-                    print "Removing", name
-                deleted_offset = self.filelist[i].header_offset
-                # "file_offset" is only available in python up to 2.4
-                if hasattr(self.filelist[i], "file_offset"):
-                    deleted_size = ((self.filelist[i].file_offset -
-                                     self.filelist[i].header_offset) +
-                                    self.filelist[i].compress_size)
-                else:
-                    deleted_size = ((len(self.filelist[i].FileHeader()) -
-                                     self.filelist[i].header_offset) +
-                                    self.filelist[i].compress_size)
-                zinfo_size = (struct.calcsize(structCentralDir) +
-                             len(self.filelist[i].filename) +
-                             len(self.filelist[i].extra))
-                # Remove the file's data from the archive.
-                current_offset = self.fp.tell()
-                # go to the end of the archive to calculate the
-                # total archive_size
-                self.fp.seek(0, 2)
-                archive_size = self.fp.tell()
-                self.fp.seek(deleted_offset + deleted_size)
-                buf = self.fp.read()
-                self.fp.seek(deleted_offset)
-                self.fp.write(buf)
-                self.fp.truncate(archive_size - deleted_size - zinfo_size)
-                # go to the end of the archive to calculate the
-                # total archive_size
-                self.fp.seek(0, 2)
-                if self.debug >= 2:
-                    if self.fp.tell() != (archive_size - deleted_size -
-                                          zinfo_size):
-                        print "truncation failed: %r != %r" % \
-                              (self.fp.tell(),
-                              (archive_size - deleted_size - zinfo_size))
-                if current_offset > deleted_offset + deleted_size:
-                    current_offset -= deleted_size
-                elif current_offset > deleted_offset:
-                    current_offset = deleted_offset
-                self.fp.seek(current_offset, 0)
-                # Remove file from central directory.
-                del self.filelist[i]
-                # Adjust the remaining offsets in the central directory.
-                for j in range(i, len(self.filelist)):
-                    if self.filelist[j].header_offset > deleted_offset:
-                        self.filelist[j].header_offset -= deleted_size
-                    # "file_offset" is only available in python up to 2.4
-                    if hasattr(self.filelist[i], "file_offset"):
-                        if self.filelist[j].file_offset > deleted_offset:
-                            self.filelist[j].file_offset -= deleted_size
-                del self.NameToInfo[name]
-                return
-        if self.debug:
-            print name, "not in archive"
-
-    def close(self):
-        """Close the file, and for mode "w" and "a" write the ending
-        records."""
-        if self.fp is None:
-            return
-        self.writeendrec()
-        if not self._filePassed:
-            self.fp.close()
-        self.fp = None
-
-    def writeendrec(self):
-        """Write the ending records (without neccessarily closing the file)"""
-        if self.mode in ("w", "a"):             # write ending records
-            count = 0
-            pos1 = self.fp.tell()
-            for zinfo in self.filelist:         # write central directory
-                count = count + 1
-                dt = zinfo.date_time
-                dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
-                dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
-                centdir = struct.pack(structCentralDir,
-                  stringCentralDir, zinfo.create_version,
-                  zinfo.create_system, zinfo.extract_version, zinfo.reserved,
-                  zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
-                  zinfo.CRC, zinfo.compress_size, zinfo.file_size,
-                  len(zinfo.filename), len(zinfo.extra), len(zinfo.comment),
-                  0, zinfo.internal_attr, zinfo.external_attr,
-                  zinfo.header_offset)
-                self.fp.write(centdir)
-                self.fp.write(zinfo.filename)
-                self.fp.write(zinfo.extra)
-                self.fp.write(zinfo.comment)
-            pos2 = self.fp.tell()
-            # Write end-of-zip-archive record
-            endrec = struct.pack(structEndArchive, stringEndArchive,
-                     0, 0, count, count, pos2 - pos1, pos1, 0)
-            self.fp.write(endrec)
-            self.fp.seek(pos1)
diff --git a/translate/search/indexing/CommonIndexer.py b/translate/search/indexing/CommonIndexer.py
index a7a3275..2f572dd 100644
--- a/translate/search/indexing/CommonIndexer.py
+++ b/translate/search/indexing/CommonIndexer.py
@@ -447,7 +447,7 @@ class CommonDatabase(object):
         if len(ident_list) == 0:
             # no matching items
             return 0
-        if isinstance(ident_list[0], int):
+        if isinstance(ident_list[0], int) or isinstance(ident_list[0], long):
             # create a list of IDs of all successfully removed documents
             success_delete = [match for match in ident_list
                     if self.delete_document_by_id(match)]
diff --git a/translate/search/indexing/PyLuceneIndexer.py b/translate/search/indexing/PyLuceneIndexer.py
index 8eb05a6..39439e3 100644
--- a/translate/search/indexing/PyLuceneIndexer.py
+++ b/translate/search/indexing/PyLuceneIndexer.py
@@ -197,6 +197,9 @@ class PyLuceneDatabase(CommonIndexer.CommonDatabase):
 
     def _escape_term_value(self, value):
         """Escapes special :param:`value` characters."""
+        # The indexer seems to strip hyphens, but not the analyzer. If we
+        # didn't replace it with space, searching for words with hyphen fails
+        value = value.replace("-", " ")
         return PyLucene.QueryParser.escape(value)
 
     def _create_query_for_string(self, text, require_all=True,
diff --git a/translate/search/indexing/test_indexers.py b/translate/search/indexing/test_indexers.py
index 5394f1a..dd14d92 100644
--- a/translate/search/indexing/test_indexers.py
+++ b/translate/search/indexing/test_indexers.py
@@ -23,10 +23,29 @@
 import os
 import sys
 import shutil
+import pytest
 
 import __init__ as indexing
 import CommonIndexer
 
+# following block only needs running under pytest; unclear how to detect it?
+
+# check whether any indexer is present at all
+noindexer = True
+for indexer in [ "lucene", "PyLucene", "xapian" ]:
+    try:
+        __import__(indexer)
+    except ImportError:
+        continue
+    noindexer = False
+    break
+# mark entire module as skipped for pytest if no indexer available
+pytestmark = pytest.mark.skipif("noindexer")
+
+# FIXME (bug 2819) need to rename most test_* functions, add new "parametrized"
+# test_indexer function to normalize operation whether run directly as script
+# or via pytest
+
 DATABASE = "tmp-index"
 
 # overwrite this value to change the preferred indexing engine
@@ -281,6 +300,27 @@ def test_or_queries():
     # clean up
     clean_database()
 
+def test_string_queries():
+    """test if string queries work as expected"""
+    # clean up everything first
+    clean_database()
+    # initialize the database with example content
+    new_db = _get_indexer(DATABASE)
+    create_example_content(new_db)
+    # do string query
+    q_string1 = new_db.make_query("foo bar")
+    r_string1 = new_db.get_query_result(q_string1).get_matches(0, 10)
+    assert r_string1[0] == 3
+    # do string query with non contagious words
+    q_string2 = new_db.make_query("foo HELO")
+    r_string2 = new_db.get_query_result(q_string2).get_matches(0, 10)
+    assert r_string2[0] == 3
+    # do string query with a named field
+    q_string3 = new_db.make_query({"multiple": "foo bar"})
+    r_string3 = new_db.get_query_result(q_string3).get_matches(0, 10)
+    assert r_string3[0] == 1
+    # clean up
+    clean_database()
 
 def test_lower_upper_case():
     """test if case is ignored for queries and for indexed terms"""
@@ -491,6 +531,7 @@ if __name__ == "__main__":
         test_field_analyzers()
         test_and_queries()
         test_or_queries()
+        test_string_queries()
         test_lower_upper_case()
         test_tokenizing()
         test_searching()
diff --git a/translate/search/lshtein.py b/translate/search/lshtein.py
index f8dd6e7..5ec12ad 100644
--- a/translate/search/lshtein.py
+++ b/translate/search/lshtein.py
@@ -19,11 +19,13 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 """A class to calculate a similarity based on the Levenshtein
-distance. See http://en.wikipedia.org/wiki/Levenshtein_distance.
+distance.
 
-If available, the python-Levenshtein package will be used which will provide
-better performance as it is implemented natively. See
-http://trific.ath.cx/python/levenshtein/
+See http://en.wikipedia.org/wiki/Levenshtein_distance.
+
+If available, the `python-Levenshtein
+<https://pypi.python.org/pypi/python-Levenshtein>`_ will be used which will
+provide better performance as it is implemented natively.
 """
 
 import math
diff --git a/translate/search/match.py b/translate/search/match.py
index 606ed2b..900f30d 100644
--- a/translate/search/match.py
+++ b/translate/search/match.py
@@ -266,7 +266,9 @@ class terminologymatcher(matcher):
             source = unit.source = context_re.sub("", unit.source).lower()
             for ignorepattern_re, replacement in ignorepatterns_re:
                 (newterm, occurrences) = ignorepattern_re.subn(replacement, source)
-                if occurrences:
+                # we'll add it as long as we only replaced one thing, but not
+                # something like "are-you-sure-you-want-to" due to (" ", "-")
+                if occurrences == 1:
                     new_unit = type(unit).buildfromunit(unit)
                     new_unit.source = newterm
                     # We mark it fuzzy to indicate that it isn't pristine
diff --git a/translate/services/tmserver.py b/translate/services/tmserver.py
old mode 100755
new mode 100644
index e7de99a..d8ddbd1
--- a/translate/services/tmserver.py
+++ b/translate/services/tmserver.py
@@ -194,12 +194,6 @@ def main():
         import sys
         if sys.version_info[:2] < (2, 5):
             format = '%(levelname)7s %(module)s [%(filename)s:%(lineno)d]: %(message)s'
-    else:
-        try:
-            import psyco
-            psyco.full()
-        except Exception:
-            pass
 
     logging.basicConfig(level=level, format=format)
 
diff --git a/translate/storage/aresource.py b/translate/storage/aresource.py
old mode 100755
new mode 100644
index 5e0cb9e..ae1efa5
--- a/translate/storage/aresource.py
+++ b/translate/storage/aresource.py
@@ -18,26 +18,31 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""module for handling Android resource files"""
-
-from lxml import etree
+"""Module for handling Android String resource files."""
 
 import re
 
-from translate.storage import lisa
-from translate.storage import base
+from lxml import etree
+
 from translate.lang import data
+from translate.storage import base, lisa
+
 
 EOF = None
-WHITESPACE = ' \n\t' # Whitespace that we collapse
+WHITESPACE = ' \n\t'  # Whitespace that we collapse.
 MULTIWHITESPACE = re.compile('[ \n\t]{2}')
-OPEN_TAG_TO_ESCAPE = re.compile('<(?!/?\S*>)')
+
 
 class AndroidResourceUnit(base.TranslationUnit):
-    """A single term in the Android resource file."""
+    """A single entry in the Android String resource file."""
     rootNode = "string"
     languageNode = "string"
 
+    @classmethod
+    def createfromxmlElement(cls, element):
+        term = cls(None, xmlelement = element)
+        return term
+
     def __init__(self, source, empty=False, xmlelement=None, **kwargs):
         if xmlelement is not None:
             self.xmlelement = xmlelement
@@ -48,15 +53,24 @@ class AndroidResourceUnit(base.TranslationUnit):
             self.setid(source)
         super(AndroidResourceUnit, self).__init__(source)
 
-    def getid(self):
-        return self.xmlelement.get("name")
+    def istranslatable(self):
+        return (
+            bool(self.getid())
+            and self.xmlelement.get('translatable') != 'false'
+        )
 
-    def getcontext(self):
+    def isblank(self):
+        return not bool(self.getid())
+
+    def getid(self):
         return self.xmlelement.get("name")
 
     def setid(self, newid):
         return self.xmlelement.set("name", newid)
 
+    def getcontext(self):
+        return self.xmlelement.get("name")
+
     def unescape(self, text):
         '''
         Remove escaping from Android resource.
@@ -229,13 +243,20 @@ class AndroidResourceUnit(base.TranslationUnit):
 
     def settarget(self, target):
         if '<' in target:
-            # Handle text with markup
-            target = self.escape(target).replace('&', '&')
-            target = OPEN_TAG_TO_ESCAPE.sub('<', target)
-            # Parse new XML
-            newstring = etree.fromstring('<string>%s</string>' % target)
+            # Handle text with possible markup
+            target = target.replace('&', '&')
+            try:
+                # Try as XML
+                newstring = etree.fromstring('<string>%s</string>' % target)
+            except:
+                # Fallback to string with XML escaping
+                target = target.replace('<', '<')
+                newstring = etree.fromstring('<string>%s</string>' % target)
             # Update text
-            self.xmlelement.text = newstring.text
+            if newstring.text is None:
+                self.xmlelement.text = ''
+            else:
+                self.xmlelement.text = newstring.text
             # Remove old elements
             for x in self.xmlelement.iterchildren():
                 self.xmlelement.remove(x)
@@ -249,21 +270,16 @@ class AndroidResourceUnit(base.TranslationUnit):
 
     def gettarget(self, lang=None):
         # Grab inner text
-        target = (self.xmlelement.text or u'')
+        target = self.unescape(self.xmlelement.text or u'')
         # Include markup as well
         target += u''.join([data.forceunicode(etree.tostring(child, encoding='utf-8')) for child in self.xmlelement.iterchildren()])
-        return self.unescape(target)
+        return target
 
     target = property(gettarget, settarget)
 
     def getlanguageNode(self, lang=None, index=None):
         return self.xmlelement
 
-    def createfromxmlElement(cls, element):
-        term = cls(None, xmlelement = element)
-        return term
-    createfromxmlElement = classmethod(createfromxmlElement)
-
     # Notes are handled as previous sibling comments.
     def addnote(self, text, origin=None, position="append"):
         if origin in ['programmer', 'developer', 'source code', None]:
@@ -303,9 +319,9 @@ class AndroidResourceUnit(base.TranslationUnit):
 
 
 class AndroidResourceFile(lisa.LISAfile):
-    """Class representing a Android resource file store."""
+    """Class representing an Android String resource file store."""
     UnitClass = AndroidResourceUnit
-    Name = _("Android Resource")
+    Name = _("Android String Resource")
     Mimetypes = ["application/xml"]
     Extensions = ["xml"]
     rootNode = "resources"
diff --git a/translate/storage/base.py b/translate/storage/base.py
index 821794a..3333d8f 100644
--- a/translate/storage/base.py
+++ b/translate/storage/base.py
@@ -30,7 +30,8 @@ from exceptions import NotImplementedError
 import translate.i18n
 from translate.misc.multistring import multistring
 from translate.misc.typecheck import accepts, Self, IsOneOf
-from translate.storage.placeables import StringElem, general, parse as rich_parse
+from translate.storage.placeables import (StringElem, general,
+                                          parse as rich_parse)
 from translate.storage.workflow import StateEnum as states
 
 
@@ -60,8 +61,8 @@ class ParseError(Exception):
 class TranslationUnit(object):
     """Base class for translation units.
 
-    Our concept of a *translation unit* is influenced heavily by XLIFF:
-    http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm
+    Our concept of a *translation unit* is influenced heavily by `XLIFF
+    <http://docs.oasis-open.org/xliff/xliff-core/xliff-core.html>`_.
 
     As such most of the method- and variable names borrows from XLIFF
     terminology.
@@ -152,6 +153,7 @@ class TranslationUnit(object):
         self._store = store
         return dump
 
+    @classmethod
     def rich_to_multistring(cls, elem_list):
         """Convert a "rich" string tree to a ``multistring``:
 
@@ -161,7 +163,6 @@ class TranslationUnit(object):
            multistring(u'foo bar')
         """
         return multistring([unicode(elem) for elem in elem_list])
-    rich_to_multistring = classmethod(rich_to_multistring)
 
     def multistring_to_rich(self, mulstring):
         """Convert a multistring to a list of "rich" string trees:
@@ -177,13 +178,13 @@ class TranslationUnit(object):
         return [rich_parse(mulstring, self.rich_parsers)]
 
     def setsource(self, source):
-        """Sets the source string to the given value."""
+        """Set the source string to the given value."""
         self._rich_source = None
         self._source = source
     source = property(lambda self: self._source, setsource)
 
     def settarget(self, target):
-        """Sets the target string to the given value."""
+        """Set the target string to the given value."""
         self._rich_target = None
         self._target = target
     target = property(lambda self: self._target, settarget)
@@ -439,6 +440,7 @@ class TranslationUnit(object):
         """This unit in a list."""
         return [self]
 
+    @classmethod
     def buildfromunit(cls, unit):
         """Build a native unit from a foreign unit, preserving as much
         information as possible."""
@@ -454,7 +456,6 @@ class TranslationUnit(object):
         if notes:
             newunit.addnote(notes)
         return newunit
-    buildfromunit = classmethod(buildfromunit)
 
     xid = property(lambda self: None, lambda self, value: None)
     rid = property(lambda self: None, lambda self, value: None)
@@ -507,33 +508,33 @@ class TranslationStore(object):
     targetlanguage = None
 
     def __init__(self, unitclass=None):
-        """Constructs a blank TranslationStore."""
+        """Construct a blank TranslationStore."""
         self.units = []
         if unitclass:
             self.UnitClass = unitclass
 
     def getsourcelanguage(self):
-        """Gets the source language for this store"""
+        """Get the source language for this store."""
         return self.sourcelanguage
 
     def setsourcelanguage(self, sourcelanguage):
-        """Sets the source language for this store"""
+        """Set the source language for this store."""
         self.sourcelanguage = sourcelanguage
 
     def gettargetlanguage(self):
-        """Gets the target language for this store"""
+        """Get the target language for this store."""
         return self.targetlanguage
 
     def settargetlanguage(self, targetlanguage):
-        """Sets the target language for this store"""
+        """Set the target language for this store."""
         self.targetlanguage = targetlanguage
 
     def getprojectstyle(self):
-        """Gets the project type for this store"""
+        """Get the project type for this store."""
         return getattr(self, '_project_style', None)
 
     def setprojectstyle(self, project_style):
-        """Sets the project type for this store"""
+        """Set the project type for this store."""
         self._project_style = project_style
 
     def unit_iter(self):
@@ -546,7 +547,7 @@ class TranslationStore(object):
         return [unit for unit in self.unit_iter()]
 
     def addunit(self, unit):
-        """Appends the given unit to the object's list of units.
+        """Append the given unit to the object's list of units.
 
         This method should always be used rather than trying to modify the
         list manually.
@@ -558,7 +559,7 @@ class TranslationStore(object):
         self.units.append(unit)
 
     def addsourceunit(self, source):
-        """Adds and returns a new unit with the given source string.
+        """Add and returns a new unit with the given source string.
 
         :rtype: :class:`TranslationUnit`
         """
@@ -572,7 +573,7 @@ class TranslationStore(object):
         return self.id_index.get(id, None)
 
     def findunit(self, source):
-        """Finds the unit with the given source string.
+        """Find the unit with the given source string.
 
         :rtype: :class:`TranslationUnit` or None
         """
@@ -586,7 +587,7 @@ class TranslationStore(object):
         return None
 
     def findunits(self, source):
-        """Finds the units with the given source string.
+        """Find the units with the given source string.
 
         :rtype: :class:`TranslationUnit` or None
         """
@@ -604,7 +605,7 @@ class TranslationStore(object):
         return None
 
     def translate(self, source):
-        """Returns the translated string for a given source string.
+        """Return the translated string for a given source string.
 
         :rtype: String or None
         """
@@ -704,7 +705,7 @@ class TranslationStore(object):
         return dump
 
     def isempty(self):
-        """Returns True if the object doesn't contain any translation units."""
+        """Return True if the object doesn't contain any translation units."""
         if len(self.units) == 0:
             return True
         for unit in self.units:
@@ -722,13 +723,13 @@ class TranslationStore(object):
             if filename:
                 self.filename = filename
 
+    @classmethod
     def parsestring(cls, storestring):
-        """Converts the string representation back to an object."""
+        """Convert the string representation back to an object."""
         newstore = cls()
         if storestring:
             newstore.parse(storestring)
         return newstore
-    parsestring = classmethod(parsestring)
 
     def detect_encoding(self, text, default_encodings=None):
         if not default_encodings:
@@ -753,9 +754,14 @@ class TranslationStore(object):
                     encodings.append(encoding)
         else:
             encodings.append(self.encoding)
-            if detected_encoding and detected_encoding['encoding'] != self.encoding:
-                logging.warn("trying to parse %s with encoding: %s but detected encoding is %s (confidence: %s)",
-                             self.filename, self.encoding, detected_encoding['encoding'], detected_encoding['confidence'])
+            if (detected_encoding and
+                    detected_encoding['encoding'] != self.encoding and
+                    detected_encoding['confidence'] != 1.0):
+                logging.warn("trying to parse %s with encoding: %s but "
+                             "detected encoding is %s (confidence: %s)",
+                             self.filename, self.encoding,
+                             detected_encoding['encoding'],
+                             detected_encoding['confidence'])
             encodings.append(self.encoding)
 
         for encoding in encodings:
@@ -775,7 +781,7 @@ class TranslationStore(object):
         self.units = pickle.loads(data).units
 
     def savefile(self, storefile):
-        """Writes the string representation to the given file (or filename)."""
+        """Write the string representation to the given file (or filename)."""
         storestring = str(self)
         if isinstance(storefile, basestring):
             mode = 'w'
@@ -807,6 +813,7 @@ class TranslationStore(object):
             fileobj = fileobj.__class__(filename, mode)
         self.savefile(fileobj)
 
+    @classmethod
     def parsefile(cls, storefile):
         """Reads the given file (or opens the given filename) and parses back
         to an object."""
@@ -826,7 +833,6 @@ class TranslationStore(object):
         newstore.fileobj = storefile
         newstore._assignname()
         return newstore
-    parsefile = classmethod(parsefile)
 
     @property
     def merge_on(self):
diff --git a/translate/storage/benchmark.py b/translate/storage/benchmark.py
index c1d0cdc..7beea0b 100644
--- a/translate/storage/benchmark.py
+++ b/translate/storage/benchmark.py
@@ -22,8 +22,10 @@ import os
 import pstats
 import random
 import sys
+import argparse
 
 from translate.storage import factory
+from translate.storage import placeables
 
 
 class TranslateBenchmarker:
@@ -36,6 +38,7 @@ class TranslateBenchmarker:
         self.extension = self.StoreClass.Extensions[0]
         self.project_dir = os.path.join(self.test_dir, "benchmark")
         self.file_dir = os.path.join(self.project_dir, "zxx")
+        self.parsedfiles = []
 
     def clear_test_dir(self):
         """removes the given directory"""
@@ -72,26 +75,58 @@ class TranslateBenchmarker:
                     sample_unit.target = " ".join(["drow%d" % (random.randint(0, strings_per_file) * i) for i in range(target_words_per_string)])
                 sample_file.savefile(os.path.join(dirname, "file_%d.%s" % (filenum, self.extension)))
 
-    def parse_file(self):
+    def parse_files(self, file_dir=None):
         """parses all the files in the test directory into memory"""
         count = 0
-        for dirpath, subdirs, filenames in os.walk(self.file_dir, topdown=False):
+        self.parsedfiles = []
+        if file_dir is None:
+            file_dir = self.file_dir
+        for dirpath, subdirs, filenames in os.walk(file_dir, topdown=False):
             for name in filenames:
                 pofilename = os.path.join(dirpath, name)
                 parsedfile = self.StoreClass(open(pofilename, 'r'))
                 count += len(parsedfile.units)
+                self.parsedfiles.append(parsedfile)
         print "counted %d units" % count
 
+    def parse_placeables(self):
+        """parses placeables"""
+        count = 0
+        for parsedfile in self.parsedfiles:
+            for unit in parsedfile.units:
+                placeables.parse(unit.source, placeables.general.parsers)
+                placeables.parse(unit.target, placeables.general.parsers)
+            count += len(parsedfile.units)
+        print "counted %d units" % count
+
+
 if __name__ == "__main__":
-    storetype = "po"
-    if len(sys.argv) > 1:
-        storetype = sys.argv[1]
-    if storetype in factory.classes:
-        storeclass = factory.classes[storetype]
+    parser = argparse.ArgumentParser(description='Process some integers.')
+    parser.add_argument('podir', metavar='DIR', type=str, nargs='?',
+                        help='PO dir to use (default: create sample files)')
+    parser.add_argument('--store-type', dest='storetype',
+                        action='store_const', const='po', default="po",
+                        help='type of the store to benchmark (default: po)')
+    parser.add_argument('--check-parsing', dest='check_parsing',
+                        action='store_true',
+                        help='benchmark parsing files')
+    parser.add_argument('--check-placeables', dest='check_placeables',
+                        action='store_true',
+                        help='benchmark placeables')
+    args = parser.parse_args()
+
+    storetype = args.storetype
+
+    if storetype in factory.classes_str:
+        _module, _class = factory.classes_str[storetype]
+        module = __import__("translate.storage.%s" % _module,
+                            globals(), fromlist=_module)
+        storeclass = getattr(module, _class)
     else:
         print "StoreClass: '%s' is not a base class that the class factory can load" % storetype
         sys.exit()
-    for sample_file_sizes in [
+
+    sample_files = [
       # num_dirs, files_per_dir, strings_per_file, source_words_per_string, target_words_per_string
       # (1, 1, 2, 2, 2),
       (1, 1, 10000, 5, 10),   # Creat 1 very large file with German like ratios or source to target
@@ -103,17 +138,28 @@ if __name__ == "__main__":
       # (10, 20, 100, 10, 10),
       # (10, 20, 100, 10, 10),
       # (100, 2, 140, 3, 3),  # OpenOffice.org approximate ratios
-      ]:
+    ]
+
+    for sample_file_sizes in sample_files:
         benchmarker = TranslateBenchmarker("BenchmarkDir", storeclass)
         benchmarker.clear_test_dir()
-        benchmarker.create_sample_files(*sample_file_sizes)
-        methods = [("create_sample_files", "*sample_file_sizes"), ("parse_file", ""), ]
+        if args.podir is None:
+            benchmarker.create_sample_files(*sample_file_sizes)
+        benchmarker.parse_files(file_dir=args.podir)
+        methods = [] # [("create_sample_files", "*sample_file_sizes")]
+
+        if args.check_parsing:
+            methods.append(("parse_files", ""))
+
+        if args.check_placeables:
+            methods.append(("parse_placeables", ""))
+
         for methodname, methodparam in methods:
-            print methodname, "%d dirs, %d files, %d strings, %d/%d words" % sample_file_sizes
+            #print methodname, "%d dirs, %d files, %d strings, %d/%d words" % sample_file_sizes
             print "_______________________________________________________"
             statsfile = "%s_%s" % (methodname, storetype) + '_%d_%d_%d_%d_%d.stats' % sample_file_sizes
             cProfile.run('benchmarker.%s(%s)' % (methodname, methodparam), statsfile)
             stats = pstats.Stats(statsfile)
-            stats.sort_stats('cumulative').print_stats(20)
+            stats.sort_stats('time').print_stats(20)
             print "_______________________________________________________"
-        #benchmarker.clear_test_dir()
+        benchmarker.clear_test_dir()
diff --git a/translate/storage/catkeys.py b/translate/storage/catkeys.py
index 5a77aec..6f356ee 100644
--- a/translate/storage/catkeys.py
+++ b/translate/storage/catkeys.py
@@ -94,14 +94,6 @@ class CatkeysDialect(csv.Dialect):
     delimiter = "\t"
     lineterminator = "\n"
     quoting = csv.QUOTE_NONE
-    if sys.version_info < (2, 5, 0):
-        # We need to define the following items for csv in Python < 2.5
-        quoting = csv.QUOTE_MINIMAL   # catkeys does not quote anything, since we escape
-                                      # \t anyway in _escape this should not be a problem
-        doublequote = False
-        skipinitialspace = False
-        escapechar = None
-        quotechar = '"'
 csv.register_dialect("catkeys", CatkeysDialect)
 
 
diff --git a/translate/storage/cpo.py b/translate/storage/cpo.py
index 5dfd532..1b95812 100644
--- a/translate/storage/cpo.py
+++ b/translate/storage/cpo.py
@@ -29,12 +29,15 @@ to have a look at gettext-tools/libgettextpo/gettext-po.h from the gettext
 package for the public API of the library.
 """
 
+from __future__ import with_statement
+
 from ctypes import c_size_t, c_int, c_uint, c_char_p, c_long, CFUNCTYPE, POINTER
 from ctypes import Structure, cdll
 import ctypes.util
 import os
 import re
 import sys
+import logging
 import tempfile
 
 from translate.lang import data
@@ -43,8 +46,10 @@ from translate.storage import base, pocommon
 from translate.storage import pypo
 from translate.storage.pocommon import encodingToUse
 
+logger = logging.getLogger(__name__)
+
 lsep = " "
-"""Seperator for #: entries"""
+"""Separator for #: entries"""
 
 STRING = c_char_p
 
@@ -78,9 +83,10 @@ class po_error_handler(Structure):
 
 
 # Callback functions for po_xerror_handler
-def xerror_cb(severity, message, filename, lineno, column, multilint_p,
+def xerror_cb(severity, message, filename, lineno, column, multiline_p,
               message_text):
-    print >> sys.stderr, "xerror_cb", severity, message, filename, lineno, column, multilint_p, message_text
+    logger.error("xerror_cb" + severity + message +
+                 filename + lineno + column + multiline_p + message_text)
     if severity >= 1:
         raise ValueError(message_text)
 
@@ -88,10 +94,51 @@ def xerror_cb(severity, message, filename, lineno, column, multilint_p,
 def xerror2_cb(severity, message1, filename1, lineno1, column1, multiline_p1,
                message_text1, message2, filename2, lineno2, column2,
                multiline_p2, message_text2):
-    print >> sys.stderr, "xerror2_cb", severity, message1, filename1, lineno1, column1, multiline_p1, message_text1, message2, filename2, lineno2, column2, multiline_p2, message_text2
+    logger.error("xerror2_cb" + severity +
+                 message1 +
+                 filename1 + lineno1 + column1 + multiline_p1 + message_text1,
+                 filename2 + lineno2 + column2 + multiline_p2 + message_text2)
     if severity >= 1:
         raise ValueError(message_text1)
 
+# Setup return and parameter types
+def setup_call_types(gpo):
+    # File access
+    gpo.po_file_read_v3.argtypes = [STRING, POINTER(po_xerror_handler)]
+    gpo.po_file_write_v2.argtypes = [c_int, STRING, POINTER(po_xerror_handler)]
+    gpo.po_file_write_v2.retype = c_int
+
+    # Header
+    gpo.po_file_domain_header.restype = STRING
+    gpo.po_header_field.restype = STRING
+    gpo.po_header_field.argtypes = [STRING, STRING]
+
+    # Locations (filepos)
+    gpo.po_filepos_file.restype = STRING
+    gpo.po_message_filepos.restype = c_int
+    gpo.po_message_filepos.argtypes = [c_int, c_int]
+    gpo.po_message_add_filepos.argtypes = [c_int, STRING, c_size_t]
+
+    # Message (get methods)
+    gpo.po_message_comments.restype = STRING
+    gpo.po_message_extracted_comments.restype = STRING
+    gpo.po_message_prev_msgctxt.restype = STRING
+    gpo.po_message_prev_msgid.restype = STRING
+    gpo.po_message_prev_msgid_plural.restype = STRING
+    gpo.po_message_is_format.restype = c_int
+    gpo.po_message_is_format.argtypes = [c_int, STRING]
+    gpo.po_message_set_format.argtypes = [c_int, STRING, c_int]
+    gpo.po_message_msgctxt.restype = STRING
+    gpo.po_message_msgid.restype = STRING
+    gpo.po_message_msgid_plural.restype = STRING
+    gpo.po_message_msgstr.restype = STRING
+    gpo.po_message_msgstr_plural.restype = STRING
+
+    # Message (set methods)
+    gpo.po_message_set_comments.argtypes = [c_int, STRING]
+    gpo.po_message_set_extracted_comments.argtypes = [c_int, STRING]
+    gpo.po_message_set_fuzzy.argtypes = [c_int, c_int]
+    gpo.po_message_set_msgctxt.argtypes = [c_int, STRING]
 
 # Load libgettextpo
 gpo = None
@@ -105,51 +152,22 @@ for name in names:
         if gpo:
             break
 else:
-    # Now we are getting desperate, so let's guess a unix type DLL that might
-    # be in LD_LIBRARY_PATH or loaded with LD_PRELOAD
-    try:
-        gpo = cdll.LoadLibrary('libgettextpo.so')
-    except OSError, e:
-        raise ImportError("gettext PO library not found")
-
-# Setup return and paramater types
-# File access
-gpo.po_file_read_v3.argtypes = [STRING, POINTER(po_xerror_handler)]
-gpo.po_file_write_v2.argtypes = [c_int, STRING, POINTER(po_xerror_handler)]
-gpo.po_file_write_v2.retype = c_int
-
-# Header
-gpo.po_file_domain_header.restype = STRING
-gpo.po_header_field.restype = STRING
-gpo.po_header_field.argtypes = [STRING, STRING]
-
-# Locations (filepos)
-gpo.po_filepos_file.restype = STRING
-gpo.po_message_filepos.restype = c_int
-gpo.po_message_filepos.argtypes = [c_int, c_int]
-gpo.po_message_add_filepos.argtypes = [c_int, STRING, c_size_t]
-
-# Message (get methods)
-gpo.po_message_comments.restype = STRING
-gpo.po_message_extracted_comments.restype = STRING
-gpo.po_message_prev_msgctxt.restype = STRING
-gpo.po_message_prev_msgid.restype = STRING
-gpo.po_message_prev_msgid_plural.restype = STRING
-gpo.po_message_is_format.restype = c_int
-gpo.po_message_is_format.argtypes = [c_int, STRING]
-gpo.po_message_set_format.argtypes = [c_int, STRING, c_int]
-gpo.po_message_msgctxt.restype = STRING
-gpo.po_message_msgid.restype = STRING
-gpo.po_message_msgid_plural.restype = STRING
-gpo.po_message_msgstr.restype = STRING
-gpo.po_message_msgstr_plural.restype = STRING
-
-# Message (set methods)
-gpo.po_message_set_comments.argtypes = [c_int, STRING]
-gpo.po_message_set_extracted_comments.argtypes = [c_int, STRING]
-gpo.po_message_set_fuzzy.argtypes = [c_int, c_int]
-gpo.po_message_set_msgctxt.argtypes = [c_int, STRING]
-
+    # Don't raise exception in Sphinx autodoc [where xml is Mock()ed]. There is
+    # nothing special about use of xml here - any of the Mock classes set up
+    # in docs/conf.py would work as well, but xml is likely always to be there.
+    gpo = None
+    if 'xml' not in sys.modules or sys.modules['xml'].__path__ != '/dev/null':
+
+        # Now we are getting desperate, so let's guess a unix type DLL that
+        # might be in LD_LIBRARY_PATH or loaded with LD_PRELOAD
+        try:
+            gpo = cdll.LoadLibrary('libgettextpo.so')
+        except OSError:
+            raise ImportError("gettext PO library not found")
+
+if gpo:
+    setup_call_types(gpo)
+    
 # Setup the po_xerror_handler
 xerror_handler = po_xerror_handler()
 xerror_handler.xerror = xerror_prototype(xerror_cb)
@@ -177,30 +195,47 @@ def get_libgettextpo_version():
     """
     libversion = c_long.in_dll(gpo, 'libgettextpo_version')
     major = libversion.value >> 16
-    minor = libversion.value >> 8
+    minor = (libversion.value >> 8) & 0xff
     subminor = libversion.value - (major << 16) - (minor << 8)
     return major, minor, subminor
 
 
 class pounit(pocommon.pounit):
 
+    #: fixed encoding that is always used for cPO structure (self._gpo_message)
+    CPO_ENC = 'utf-8'
+
     def __init__(self, source=None, encoding='utf-8', gpo_message=None):
         self._rich_source = None
         self._rich_target = None
-        self._encoding = encoding or 'utf-8'
+        encoding = encoding or 'utf-8'
         if not gpo_message:
             self._gpo_message = gpo.po_message_create()
         if source or source == "":
             self.source = source
             self.target = ""
         elif gpo_message:
+            if encoding.lower() != self.CPO_ENC:
+                features = ['msgctxt', 'msgid', 'msgid_plural']
+                features += ['prev_' + x for x in features]
+                features += ['comments', 'extracted_comments',
+                             'msgstr', 'msgstr_plural']
+                for feature in features:
+                    text = getattr(gpo, 'po_message_' + feature)(gpo_message)
+                    if text:
+                        getattr(gpo, 'po_message_set_' + feature)(
+                            gpo_message,
+                            text.decode(encoding).encode(self.CPO_ENC))
             self._gpo_message = gpo_message
         self.infer_state()
 
     def infer_state(self):
         #FIXME: do obsolete
         if gpo.po_message_is_obsolete(self._gpo_message):
-            self.set_state_n(self.STATE[self.S_OBSOLETE][0])
+            if gpo.po_message_is_fuzzy(self._gpo_message):
+                self.set_state_n(self.STATE[self.S_FUZZY_OBSOLETE][0])
+            else:
+                self.set_state_n(self.STATE[self.S_OBSOLETE][0])
         elif gpo.po_message_is_fuzzy(self._gpo_message):
             self.set_state_n(self.STATE[self.S_FUZZY][0])
         elif self.gettarget():
@@ -227,11 +262,11 @@ class pounit(pocommon.pounit):
                     return u""
             else:
                 return text
-        singular = remove_msgid_comments((gpo.po_message_msgid(self._gpo_message) or "").decode(self._encoding))
+        singular = remove_msgid_comments((gpo.po_message_msgid(self._gpo_message) or "").decode(self.CPO_ENC))
         if singular:
             if self.hasplural():
-                multi = multistring(singular, self._encoding)
-                pluralform = (gpo.po_message_msgid_plural(self._gpo_message) or "").decode(self._encoding)
+                multi = multistring(singular, self.CPO_ENC)
+                pluralform = (gpo.po_message_msgid_plural(self._gpo_message) or "").decode(self.CPO_ENC)
                 multi.strings.append(pluralform)
                 return multi
             else:
@@ -243,11 +278,11 @@ class pounit(pocommon.pounit):
         if isinstance(source, multistring):
             source = source.strings
         if isinstance(source, unicode):
-            source = source.encode(self._encoding)
+            source = source.encode(self.CPO_ENC)
         if isinstance(source, list):
-            gpo.po_message_set_msgid(self._gpo_message, source[0].encode(self._encoding))
+            gpo.po_message_set_msgid(self._gpo_message, source[0].encode(self.CPO_ENC))
             if len(source) > 1:
-                gpo.po_message_set_msgid_plural(self._gpo_message, source[1].encode(self._encoding))
+                gpo.po_message_set_msgid_plural(self._gpo_message, source[1].encode(self.CPO_ENC))
         else:
             gpo.po_message_set_msgid(self._gpo_message, source)
             gpo.po_message_set_msgid_plural(self._gpo_message, None)
@@ -259,15 +294,15 @@ class pounit(pocommon.pounit):
             nplural = 0
             plural = gpo.po_message_msgstr_plural(self._gpo_message, nplural)
             while plural:
-                plurals.append(plural.decode(self._encoding))
+                plurals.append(plural.decode(self.CPO_ENC))
                 nplural += 1
                 plural = gpo.po_message_msgstr_plural(self._gpo_message, nplural)
             if plurals:
-                multi = multistring(plurals, encoding=self._encoding)
+                multi = multistring(plurals, encoding=self.CPO_ENC)
             else:
                 multi = multistring(u"")
         else:
-            multi = (gpo.po_message_msgstr(self._gpo_message) or "").decode(self._encoding)
+            multi = (gpo.po_message_msgstr(self._gpo_message) or "").decode(self.CPO_ENC)
         return multi
 
     def settarget(self, target):
@@ -300,7 +335,7 @@ class pounit(pocommon.pounit):
             for i in range(len(target)):
                 targetstring = target[i]
                 if isinstance(targetstring, unicode):
-                    targetstring = targetstring.encode(self._encoding)
+                    targetstring = targetstring.encode(self.CPO_ENC)
                 gpo.po_message_set_msgstr_plural(self._gpo_message, i, targetstring)
         # add the values of a dict
         elif isinstance(target, dict):
@@ -309,7 +344,7 @@ class pounit(pocommon.pounit):
         # add a single string
         else:
             if isinstance(target, unicode):
-                target = target.encode(self._encoding)
+                target = target.encode(self.CPO_ENC)
             if target is None:
                 gpo.po_message_set_msgstr(self._gpo_message, "")
             else:
@@ -317,9 +352,9 @@ class pounit(pocommon.pounit):
     target = property(gettarget, settarget)
 
     def getid(self):
-        """The unique identifier for this unit according to the convensions in
+        """The unique identifier for this unit according to the conventions in
         .mo files."""
-        id = (gpo.po_message_msgid(self._gpo_message) or "").decode(self._encoding)
+        id = (gpo.po_message_msgid(self._gpo_message) or "").decode(self.CPO_ENC)
         # Gettext does not consider the plural to determine duplicates, only
         # the msgid. For generation of .mo files, we might want to use this
         # code to generate the entry for the hash table, but for now, it is
@@ -329,7 +364,7 @@ class pounit(pocommon.pounit):
 #            id = '%s\0%s' % (id, plural)
         context = gpo.po_message_msgctxt(self._gpo_message)
         if context:
-            id = u"%s\04%s" % (context.decode(self._encoding), id)
+            id = u"%s\04%s" % (context.decode(self.CPO_ENC), id)
         return id
 
     def getnotes(self, origin=None):
@@ -346,7 +381,7 @@ class pounit(pocommon.pounit):
         if comments and get_libgettextpo_version() < (0, 17, 0):
             comments = "\n".join([line for line in comments.split("\n")])
         # Let's drop the last newline
-        return comments[:-1].decode(self._encoding)
+        return comments[:-1].decode(self.CPO_ENC)
 
     def addnote(self, text, origin=None, position="append"):
         # ignore empty strings and strings without non-space characters
@@ -380,7 +415,7 @@ class pounit(pocommon.pounit):
                     newlines.append(" " + line)
                 else:
                     newlines.append(line)
-            newnotes = "\n".join(newlines).encode(self._encoding)
+            newnotes = "\n".join(newlines).encode(self.CPO_ENC)
             if origin in ["programmer", "developer", "source code"]:
                 gpo.po_message_set_extracted_comments(self._gpo_message, newnotes)
             else:
@@ -476,7 +511,7 @@ class pounit(pocommon.pounit):
         :return: Returns the extracted msgidcomments found in this unit's msgid.
         """
         if not text:
-            text = (gpo.po_message_msgid(self._gpo_message) or "").decode(self._encoding)
+            text = (gpo.po_message_msgid(self._gpo_message) or "").decode(self.CPO_ENC)
         if text:
             return pocommon.extract_msgid_comment(text)
         return u""
@@ -496,7 +531,7 @@ class pounit(pocommon.pounit):
         i = 0
         location = gpo.po_message_filepos(self._gpo_message, i)
         while location:
-            locname = gpo.po_filepos_file(location).decode(self._encoding)
+            locname = gpo.po_filepos_file(location).decode(self.CPO_ENC)
             locline = gpo.po_filepos_start_line(location)
             if locline == -1:
                 locstring = locname
@@ -522,14 +557,14 @@ class pounit(pocommon.pounit):
     def getcontext(self):
         msgctxt = gpo.po_message_msgctxt(self._gpo_message)
         if msgctxt:
-            return msgctxt.decode(self._encoding)
+            return msgctxt.decode(self.CPO_ENC)
         else:
             msgidcomment = self._extract_msgidcomments()
             return msgidcomment
 
     def setcontext(self, context):
         context = data.forceunicode(context)
-        gpo.po_message_set_msgctxt(self._gpo_message, context.encode(self._encoding))
+        gpo.po_message_set_msgctxt(self._gpo_message, context.encode(self.CPO_ENC))
 
     def buildfromunit(cls, unit, encoding=None):
         """Build a native unit from a foreign unit, preserving as much
@@ -662,15 +697,26 @@ class pofile(pocommon.pofile):
                     while location:
                         gpo.po_message_remove_filepos(unit._gpo_message, 0)
                         location = gpo.po_message_filepos(unit._gpo_message, 0)
+
+        def writefile(filename):
+            self._gpo_memory_file = gpo.po_file_write_v2(self._gpo_memory_file, filename, xerror_handler)
+            with open(filename) as tfile:
+                return tfile.read()
+
         outputstring = ""
         if self._gpo_memory_file:
             obsolete_workaround()
             f, fname = tempfile.mkstemp(prefix='translate', suffix='.po')
             os.close(f)
-            self._gpo_memory_file = gpo.po_file_write_v2(self._gpo_memory_file, fname, xerror_handler)
-            f = open(fname)
-            outputstring = f.read()
-            f.close()
+            outputstring = writefile(fname)
+            if self._encoding != pounit.CPO_ENC:
+                try:
+                    outputstring = outputstring.decode(pounit.CPO_ENC).encode(self._encoding)
+                except UnicodeEncodeError:
+                    self._encoding = pounit.CPO_ENC
+                    self.updateheader(content_type="text/plain; charset=UTF-8",
+                                      content_transfer_encoding="8bit")
+                    outputstring = writefile(fname)
             os.remove(fname)
         return outputstring
 
@@ -710,7 +756,7 @@ class pofile(pocommon.pofile):
 
         self._gpo_memory_file = gpo.po_file_read_v3(input, xerror_handler)
         if self._gpo_memory_file is None:
-            print >> sys.stderr, "Error:"
+            logger.error("Error:")
 
         if needtmpfile:
             os.remove(input)
diff --git a/translate/storage/dtd.py b/translate/storage/dtd.py
index 0c591c4..bdd9170 100644
--- a/translate/storage/dtd.py
+++ b/translate/storage/dtd.py
@@ -149,15 +149,19 @@ def unquotefromdtd(source):
     # string. Of course there could also be quote characters within the string.
     quotechar = source[0]
     extracted, quotefinished = quote.extractwithoutquotes(source, quotechar, quotechar, allowreentry=False)
+    extracted = extracted.decode('utf-8')
     if quotechar == "'":
         extracted = extracted.replace("'", "'")
     extracted = extracted.replace(""", "\"")
+    extracted = extracted.replace("&#x0022;", "\"")
+    # FIXME these should probably be handled with a lookup
+    extracted = extracted.replace("»", u"»")
     extracted = extracted.replace("%", "%")
     extracted = extracted.replace("%", "%")
     extracted = extracted.replace("&#x25;", "%")
     #extracted = extracted.replace("<", "<")  # Not really so useful.
     #extracted = extracted.replace(">", ">")  # Not really so useful.
-    return extracted.decode('utf-8')
+    return extracted
 
 
 def removeinvalidamps(name, value):
diff --git a/translate/storage/factory.py b/translate/storage/factory.py
old mode 100755
new mode 100644
diff --git a/translate/storage/fpo.py b/translate/storage/fpo.py
index 9fa92f1..29f25a7 100644
--- a/translate/storage/fpo.py
+++ b/translate/storage/fpo.py
@@ -38,7 +38,7 @@ from translate.storage import pocommon, base, cpo, poparser
 from translate.storage.pocommon import encodingToUse
 
 lsep = " "
-"""Seperator for #: entries"""
+"""Separator for #: entries"""
 
 basic_header = r'''msgid ""
 msgstr ""
diff --git a/translate/storage/lisa.py b/translate/storage/lisa.py
index 1a79679..4287e5b 100644
--- a/translate/storage/lisa.py
+++ b/translate/storage/lisa.py
@@ -315,7 +315,6 @@ class LISAfile(base.TranslationStore):
         self.body = self.document.find('//%s' % self.namespaced(self.bodyNode))
 
     def addsourceunit(self, source):
-        #TODO: miskien moet hierdie eerder addsourcestring of iets genoem word?
         """Adds and returns a new unit with the given string as first entry."""
         newunit = self.UnitClass(source)
         self.addunit(newunit)
diff --git a/translate/storage/mozilla_lang.py b/translate/storage/mozilla_lang.py
index f3d6d4a..e3d0783 100644
--- a/translate/storage/mozilla_lang.py
+++ b/translate/storage/mozilla_lang.py
@@ -62,7 +62,7 @@ class LangStore(txt.TxtFile):
     Name = _("Mozilla .lang")
     Extensions = ['lang']
 
-    def __init__(self, inputfile=None, flavour=None, encoding="utf-8", mark_active=True):
+    def __init__(self, inputfile=None, flavour=None, encoding="utf-8", mark_active=False):
         self.is_active = False
         self.mark_active = mark_active
         super(LangStore, self).__init__(inputfile, flavour, encoding)
@@ -81,12 +81,14 @@ class LangStore(txt.TxtFile):
                 self.is_active = True
                 continue
 
-            if len(line) == 0:  # Skip blank lines
+            if len(line) == 0 and not readyTrans:  # Skip blank lines
                 continue
 
             if readyTrans:  # If we are expecting a translation, set the target
                 if line != u.source:
                     u.target = line.replace(" {ok}", "")
+                else:
+                    u.target = ""
                 readyTrans = False  # We already have our translation
                 continue
 
diff --git a/translate/storage/omegat.py b/translate/storage/omegat.py
index da27d31..f5ac646 100644
--- a/translate/storage/omegat.py
+++ b/translate/storage/omegat.py
@@ -55,14 +55,6 @@ class OmegaTDialect(csv.Dialect):
     delimiter = "\t"
     lineterminator = "\r\n"
     quoting = csv.QUOTE_NONE
-    if sys.version_info < (2, 5, 0):
-        # We need to define the following items for csv in Python < 2.5
-        # OmegaT does not quote anything FIXME So why MINIMAL?
-        quoting = csv.QUOTE_MINIMAL
-        doublequote = False
-        skipinitialspace = False
-        escapechar = None
-        quotechar = '"'
 csv.register_dialect("omegat", OmegaTDialect)
 
 
diff --git a/translate/storage/oo.py b/translate/storage/oo.py
old mode 100755
new mode 100644
index b86b20e..ec59572
--- a/translate/storage/oo.py
+++ b/translate/storage/oo.py
@@ -22,8 +22,10 @@
 Classes that hold units of .oo files (oounit) or entire files (oofile).
 
 These are specific .oo files for localisation exported by OpenOffice.org - SDF
-format (previously knows as GSI files). For an overview of the format, see
-http://l10n.openoffice.org/L10N_Framework/Intermediate_file_format.html
+format (previously knows as GSI files).
+
+.. There used to be an overview of the format here
+   http://l10n.openoffice.org/L10N_Framework/Intermediate_file_format.html
 
 The behaviour in terms of escaping is explained in detail in the programming
 comments.
diff --git a/translate/storage/php.py b/translate/storage/php.py
index 931df52..6455e78 100644
--- a/translate/storage/php.py
+++ b/translate/storage/php.py
@@ -28,11 +28,18 @@ Only PHP files written with these conventions are supported::
   $some_entity = "value";  # Named variables
   define("ENTITY", "value");
   $lang = array(
-     'item1' => 'value1',
+     'item1' => 'value1'    ,   #Supports space before comma
      'item2' => 'value2',
   );
+  $lang = array(    # Nested arrays
+     'item1' => 'value1',
+     'item2' => array(
+        'key' => 'value'    ,   #Supports space before comma
+        'key2' => 'value2',
+     ),
+  );
 
-Nested arrays are not supported::
+Nested arrays without key for nested array are not supported::
 
   $lang = array(array('key' => 'value'));
 
@@ -42,13 +49,14 @@ implemented as outlined in the PHP documentation for the
 `String type <http://www.php.net/language.types.string>`_.
 """
 
+import logging
 import re
 
 from translate.storage import base
 
 
 def phpencode(text, quotechar="'"):
-    """convert Python string to PHP escaping
+    """Convert Python string to PHP escaping.
 
     The encoding is implemented for
     `'single quote' <http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single>`_
@@ -77,7 +85,7 @@ def phpencode(text, quotechar="'"):
 
 
 def phpdecode(text, quotechar="'"):
-    """convert PHP escaped string to a Python string"""
+    """Convert PHP escaped string to a Python string."""
 
     def decode_octal_hex(match):
         """decode Octal \NNN and Hex values"""
@@ -106,11 +114,10 @@ def phpdecode(text, quotechar="'"):
 
 
 class phpunit(base.TranslationUnit):
-    """a unit of a PHP file i.e. a name and value, and any comments
-    associated"""
+    """A unit of a PHP file: a name, a value, and any comments associated."""
 
     def __init__(self, source=""):
-        """construct a blank phpunit"""
+        """Construct a blank phpunit."""
         self.escape_type = None
         super(phpunit, self).__init__(source)
         self.name = ""
@@ -120,7 +127,7 @@ class phpunit(base.TranslationUnit):
         self.source = source
 
     def setsource(self, source):
-        """Sets the source AND the target to be equal"""
+        """Set the source AND the target to be equal."""
         self._rich_source = None
         self.value = phpencode(source, self.escape_type)
 
@@ -137,15 +144,14 @@ class phpunit(base.TranslationUnit):
     target = property(gettarget, settarget)
 
     def __str__(self):
-        """convert to a string. double check that unicode is handled somehow
-        here"""
+        """Convert to a string. Double check that unicode is handled somehow."""
         source = self.getoutput()
         if isinstance(source, unicode):
             return source.encode(getattr(self, "encoding", "UTF-8"))
         return source
 
     def getoutput(self):
-        """convert the unit back into formatted lines for a php file"""
+        """Convert the unit back into formatted lines for a php file."""
         return "\n".join(self._comments + ["%s='%s';\n" % (self.name, self.translation or self.value)])
 
     def addlocation(self, location):
@@ -174,8 +180,7 @@ class phpunit(base.TranslationUnit):
         self._comments = []
 
     def isblank(self):
-        """Returns whether this is a blank element, containing only comments.
-        """
+        """Return whether this is a blank element, containing only comments."""
         return not (self.name or self.value)
 
     def getid(self):
@@ -183,11 +188,11 @@ class phpunit(base.TranslationUnit):
 
 
 class phpfile(base.TranslationStore):
-    """This class represents a PHP file, made up of phpunits"""
+    """This class represents a PHP file, made up of phpunits."""
     UnitClass = phpunit
 
     def __init__(self, inputfile=None, encoding='utf-8'):
-        """construct a phpfile, optionally reading in from inputfile"""
+        """Construct a phpfile, optionally reading in from inputfile."""
         super(phpfile, self).__init__(unitclass=self.UnitClass)
         self.filename = getattr(inputfile, 'name', '')
         self._encoding = encoding
@@ -197,67 +202,131 @@ class phpfile(base.TranslationStore):
             self.parse(phpsrc)
 
     def parse(self, phpsrc):
-        """Read the source of a PHP file in and include them as units"""
+        """Read the source of a PHP file in and include them as units."""
         newunit = phpunit()
         lastvalue = ""
         value = ""
         invalue = False
         incomment = False
         inarray = False
-        valuequote = ""  # either ' or "
+        valuequote = ""  # Either ' or ".
         equaldel = "="
         enddel = ";"
         prename = ""
+        keys_dict = {}
+        line_number = 0
+
+        # For each line in the PHP translation file.
         for line in phpsrc.decode(self._encoding).split("\n"):
+            line_number += 1
             commentstartpos = line.find("/*")
             commentendpos = line.rfind("*/")
+
+            # If a multiline comment starts in the current line.
             if commentstartpos != -1:
                 incomment = True
+
+                # If a comment ends in the current line.
                 if commentendpos != -1:
                     newunit.addnote(line[commentstartpos:commentendpos+2],
                                     "developer")
                     incomment = False
                 else:
-                    newunit.addnote(line[commentstartpos:],
-                                    "developer")
+                    newunit.addnote(line[commentstartpos:], "developer")
+
+            # If this a multiline comment that ends in the current line.
             if commentendpos != -1 and incomment:
                 newunit.addnote(line[:commentendpos+2], "developer")
                 incomment = False
+
+            # If this is a multiline comment which started in a previous line.
             if incomment and commentstartpos == -1:
                 newunit.addnote(line, "developer")
                 continue
-            if line.lower().find('array(') != -1:
-                equaldel = "=>"
-                enddel = ","
-                inarray = True
-                prename = line[:line.find('=')].strip() + "->"
+
+            # If an array starts in the current line.
+            if line.lower().replace(" ", "").find('array(') != -1:
+                # If this is a nested array.
+                if inarray:
+                    prename = prename + line[:line.find('=')].strip() + "->"
+                else:
+                    equaldel = "=>"
+                    enddel = ","
+                    inarray = True
+                    prename = line[:line.find('=')].strip() + "->"
                 continue
+
+            # If an array ends in the current line, reset variables to default
+            # values.
             if inarray and line.find(');') != -1:
                 equaldel = "="
                 enddel = ";"
                 inarray = False
+                prename = ""
                 continue
+
+            # If a nested array ends in the current line, reset prename to its
+            # parent array default value by stripping out the last part.
+            if inarray and line.find('),') != -1:
+                prename = prename[:prename.find("->")+2]
+                continue
+
+            # If the current line hosts a define syntax translation.
             if line.lstrip().startswith("define("):
                 equaldel = ","
                 enddel = ");"
+
             equalpos = line.find(equaldel)
             hashpos = line.find("#")
             doubleslashpos = line.lstrip().find("//")
+
+            # If this is a '#' comment line or a '//' comment that starts at
+            # the line begining.
             if 0 <= hashpos < equalpos or doubleslashpos == 0:
                 # Assume that this is a '#' comment line
                 newunit.addnote(line.strip(), "developer")
                 continue
+
+            # If equalpos is present in the current line and this line is not
+            # part of a multiline translation.
             if equalpos != -1 and not invalue:
+                # Get the quoting character which encloses the translation
+                # (either ' or ").
                 valuequote = line[equalpos+len(equaldel):].lstrip()[0]
+
                 if valuequote in ['"', "'"]:
-                    newunit.addlocation(prename + line[:equalpos].strip())
+                    # Get the location for the translation unit. prename is the
+                    # array name, or blank if no array is present. The line
+                    # (until the equal delimiter) is appended to the location.
+                    location = prename + line[:equalpos].strip()
+
+                    # Check for duplicate entries.
+                    if location in keys_dict.keys():
+                        # TODO Get the logger from the code that is calling
+                        # this class.
+                        logging.error("Duplicate key %s in %s:%d, first "
+                                      "occurrence in line %d", location,
+                                      self.filename, line_number,
+                                      keys_dict[location])
+                    else:
+                        keys_dict[location] = line_number
+
+                    # Add the location to the translation unit.
+                    newunit.addlocation(location)
+
+                    # Save the translation in the value variable.
                     value = line[equalpos+len(equaldel):].lstrip()[1:]
                     lastvalue = ""
                     invalue = True
             else:
+                # If no equalpos is present in the current line, but this is a
+                # multiline translation.
                 if invalue:
                     value = line
+
+            # Get the end delimiter position (colonpos)
             colonpos = value.rfind(enddel)
+
             while colonpos != -1:
                 # Check if the latest non-whitespace character before the end
                 # delimiter is the valuequote
@@ -268,16 +337,27 @@ class phpfile(base.TranslationStore):
                     newunit.escape_type = valuequote
                     lastvalue = ""
                     invalue = False
+
+                # If there is more text (a comment) after the translation.
                 if not invalue and colonpos != (len(value) - 1):
                     commentinlinepos = value.find("//", colonpos)
                     if commentinlinepos != -1:
                         newunit.addnote(value[commentinlinepos+2:].strip(),
                                         "developer")
+
+                # If the translation is already parsed, save it and initialize
+                # a new translation unit.
                 if not invalue:
                     self.addunit(newunit)
                     value = ""
                     newunit = phpunit()
+
+                # Update end delimiter position (colonpos) to the previous last
+                # appearance of end delimiter.
                 colonpos = value.rfind(enddel, 0, colonpos)
+
+            # If this is part of a multiline translation, just append it to the
+            # previous translation lines.
             if invalue:
                 lastvalue = lastvalue + value + "\n"
 
diff --git a/translate/storage/placeables/general.py b/translate/storage/placeables/general.py
index 9ce9432..6a3499c 100644
--- a/translate/storage/placeables/general.py
+++ b/translate/storage/placeables/general.py
@@ -187,7 +187,7 @@ class FilePlaceable(Ph):
     istranslatable = False
     regex = re.compile(r"(~/|/|\./)([-A-Za-z0-9_\$\.\+\!\*\(\),;:@&=\?/~\#\%]|\\){3,}")
     #TODO: Handle Windows drive letters. Some common Windows paths won't be
-    # handled correctly while note allowing spaces, such as
+    # handled correctly while not allowing spaces, such as
     #     "C:\Documents and Settings"
     #     "C:\Program Files"
     parse = classmethod(regex_parse)
diff --git a/translate/storage/placeables/interfaces.py b/translate/storage/placeables/interfaces.py
index c27eee9..90b353b 100644
--- a/translate/storage/placeables/interfaces.py
+++ b/translate/storage/placeables/interfaces.py
@@ -26,20 +26,25 @@ This file contains abstract (semantic) interfaces for placeable
 from translate.storage.placeables.strelem import StringElem
 
 
-class InvisiblePlaceable(StringElem):
+class BasePlaceable(StringElem):
+    """Base class for all placeables."""
     parse = None
 
 
-class MaskingPlaceable(StringElem):
-    parse = None
+class InvisiblePlaceable(BasePlaceable):
+    pass
 
 
-class ReplacementPlaceable(StringElem):
-    parse = None
+class MaskingPlaceable(BasePlaceable):
+    pass
 
 
-class SubflowPlaceable(StringElem):
-    parse = None
+class ReplacementPlaceable(BasePlaceable):
+    pass
+
+
+class SubflowPlaceable(BasePlaceable):
+    pass
 
 
 class Delimiter(object):
diff --git a/translate/storage/placeables/strelem.py b/translate/storage/placeables/strelem.py
index e10c34e..86e2110 100644
--- a/translate/storage/placeables/strelem.py
+++ b/translate/storage/placeables/strelem.py
@@ -175,18 +175,20 @@ class StringElem(object):
     # METHODS #
     def apply_to_strings(self, f):
         """Apply ``f`` to all actual strings in the tree.
-            :param f: Must take one (str or unicode) argument and return a
-                string or unicode."""
+
+        :param f: Must take one (str or unicode) argument and return a
+                  string or unicode.
+        """
         for elem in self.flatten():
             for i in range(len(elem.sub)):
                 if isinstance(elem.sub[i], basestring):
                     elem.sub[i] = f(elem.sub[i])
 
     def copy(self):
-        """Returns a copy of the sub-tree.
-            This should be overridden in sub-classes with more data.
+	"""Returns a copy of the sub-tree.  This should be overridden in
+	sub-classes with more data.
 
-            NOTE: ``self.renderer`` is **not** copied."""
+	.. note:: ``self.renderer`` is **not** copied."""
         #logging.debug('Copying instance of class %s' % (self.__class__.__name__))
         cp = self.__class__(id=self.id, xid=self.xid, rid=self.rid)
         for sub in self.sub:
@@ -216,7 +218,7 @@ class StringElem(object):
         """Delete the text in the range given by the string-indexes
         ``start_index`` and ``end_index``.
 
-         Partial nodes will only be removed if they are editable.
+        Partial nodes will only be removed if they are editable.
 
         :returns: A ``StringElem`` representing the removed sub-string, the
                   parent node from which it was deleted as well as the offset at
@@ -478,10 +480,13 @@ class StringElem(object):
 
     def get_index_data(self, index):
         """Get info about the specified range in the tree.
-            :returns: A dictionary with the following items:
-                * *elem*: The element in which ``index`` resides.
-                * *index*: Copy of the ``index`` parameter
-                * *offset*: The offset of ``index`` into ``'elem'``."""
+
+        :returns: A dictionary with the following items:
+
+            * *elem*: The element in which ``index`` resides.
+            * *index*: Copy of the ``index`` parameter
+            * *offset*: The offset of ``index`` into ``'elem'``.
+         """
         info = {
             'elem': self.elem_at_offset(index),
             'index': index,
@@ -507,7 +512,7 @@ class StringElem(object):
                     return elem
         return None
 
-    def insert(self, offset, text):
+    def insert(self, offset, text, preferred_parent=None):
         """Insert the given text at the specified offset of this string-tree's
             string (Unicode) representation."""
         if offset < 0 or offset > len(self) + 1:
@@ -603,6 +608,26 @@ class StringElem(object):
         # 4.2 #
         elif before.iseditable and oelem.iseditable:
             #logging.debug('Case 4.2')
+            # We can add to either, but we try hard to add to the correct one
+            # so that we avoid inserting text in the wrong place on undo, for
+            # example.
+            preferred_type = type(preferred_parent)
+            before_type = type(before)
+            oelem_type = type(oelem)
+            if preferred_parent is oelem:
+                # The preferred parent is still in this StringElem
+                return oelem.insert(0, text)
+            elif oelem_type == preferred_type and not before_type == preferred_type:
+                # oelem has the right type and before has the wrong type
+                return oelem.insert(0, text)
+            elif oelem_type != preferred_type and before_type != preferred_type:
+                # Both are the wrong type, so we add it as if neither were
+                # editable
+                bparent = self.get_parent_elem(before)
+                bindex = bparent.sub.index(before)
+                bparent.sub.insert(bindex + 1, text)
+                return True
+
             return before.insert(len(before) + 1, text)  # Reinterpret as a case 2
 
         # 4.3 #
diff --git a/translate/storage/placeables/test_base.py b/translate/storage/placeables/test_base.py
index cd464a2..ab7f9cb 100644
--- a/translate/storage/placeables/test_base.py
+++ b/translate/storage/placeables/test_base.py
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from py.test import mark
+from pytest import mark
 
 from translate.storage.placeables import base, general, parse, xliff, StringElem
 
diff --git a/translate/storage/placeables/xliff.py b/translate/storage/placeables/xliff.py
index 1af6fd0..e5026c1 100644
--- a/translate/storage/placeables/xliff.py
+++ b/translate/storage/placeables/xliff.py
@@ -106,10 +106,11 @@ class UnknownXML(StringElem):
 
     # METHODS #
     def copy(self):
-        """Returns a copy of the sub-tree.
-            This should be overridden in sub-classes with more data.
+	"""Returns a copy of the sub-tree.  This should be overridden in
+	sub-classes with more data.
 
-            .. note:: ``self.renderer`` is **not** copied."""
+        .. note:: ``self.renderer`` is **not** copied.
+        """
         from copy import copy
         cp = self.__class__(id=self.id, rid=self.rid, xid=self.xid,
                             xml_node=copy(self.xml_node))
diff --git a/translate/storage/properties.py b/translate/storage/properties.py
index 57d1276..6f3ac45 100644
--- a/translate/storage/properties.py
+++ b/translate/storage/properties.py
@@ -44,12 +44,11 @@ Java
     pairs that are not translated.
 
     The following `.properties file description
-    <http://java.sun.com/j2se/1.4.2/docs/api/java/util/Properties.html#load(java.io.InputStream)>`_
-    and `example <http://www.exampledepot.com/egs/java.util/Props.html>`_ give
-    some good references to the .properties specification.
+    <http://docs.oracle.com/javase/1.4.2/docs/api/java/util/Properties.html#load(java.io.InputStream)>`_
+    gives a good references to the .properties specification.
 
-    Properties file may also hold Java
-    `MessageFormat <http://java.sun.com/j2se/1.4.2/docs/api/java/text/MessageFormat.html>`_
+    Properties file may also hold Java `MessageFormat
+    <http://docs.oracle.com/javase/1.4.2/docs/api/java/text/MessageFormat.html>`_
     messages.  No special handling is provided in this storage class for
     MessageFormat, but this may be implemented in future.
 
@@ -63,8 +62,8 @@ Mozilla
 
 Strings
     Mac OS X strings files are implemented using
-    `these <http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html>`_
-    `two <http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html>`_
+    `these <https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPInternational/Articles/StringsFiles.html>`_
+    `two <https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html>`_
     articles as references.
 
 Flex
@@ -130,7 +129,7 @@ eol = "\n"
 def _find_delimiter(line, delimiters):
     """Find the type and position of the delimiter in a property line.
 
-    Property files can be delimeted by "=", ":" or whitespace (space for now).
+    Property files can be delimited by "=", ":" or whitespace (space for now).
     We find the position of each delimiter, then find the one that appears
     first.
 
@@ -178,7 +177,7 @@ def _find_delimiter(line, delimiters):
 
 
 def find_delimeter(line):
-    """Spelling error that is kept around for in case someone relies on it.
+    """Misspelled function that is kept around in case someone relies on it.
 
     Deprecated."""
     warnings.warn("deprecated use Dialect.find_delimiter instead",
@@ -267,11 +266,11 @@ def _key_strip(key):
 
     :param key: A properties key
     :type key: str
-    :return: Key without any uneeded whitespace
+    :return: Key without any unneeded whitespace
     :rtype: str
     """
     newkey = key.rstrip()
-    # If line now end in \ we put back the whitespace that was escaped
+    # If string now ends in \ we put back the whitespace that was escaped
     if newkey[-1:] == "\\":
         newkey += key[len(newkey):len(newkey)+1]
     return newkey.lstrip()
@@ -308,17 +307,17 @@ class Dialect(object):
     encode = classmethod(encode)
 
     def find_delimiter(cls, line):
-        """Find the delimeter"""
+        """Find the delimiter"""
         return _find_delimiter(line, cls.delimiters)
     find_delimiter = classmethod(find_delimiter)
 
     def key_strip(cls, key):
-        """Strip uneeded characters from the key"""
+        """Strip unneeded characters from the key"""
         return _key_strip(key)
     key_strip = classmethod(key_strip)
 
     def value_strip(cls, value):
-        """Strip uneeded characters from the value"""
+        """Strip unneeded characters from the value"""
         return value.lstrip()
     value_strip = classmethod(value_strip)
 
@@ -384,7 +383,7 @@ class DialectStrings(Dialect):
     def key_strip(cls, key):
         """Strip unneeded characters from the key"""
         newkey = key.rstrip().rstrip('"')
-        # If line now end in \ we put back the char that was escaped
+        # If string now ends in \ we put back the char that was escaped
         if newkey[-1:] == "\\":
             newkey += key[len(newkey):len(newkey)+1]
         ret = newkey.lstrip().lstrip('"')
@@ -392,9 +391,9 @@ class DialectStrings(Dialect):
     key_strip = classmethod(key_strip)
 
     def value_strip(cls, value):
-        """Strip uneeded characters from the value"""
+        """Strip unneeded characters from the value"""
         newvalue = value.rstrip().rstrip(';').rstrip('"')
-        # If line now end in \ we put back the char that was escaped
+        # If string now ends in \ we put back the char that was escaped
         if newvalue[-1:] == "\\":
             newvalue += value[len(newvalue):len(newvalue)+1]
         ret = newvalue.lstrip().lstrip('"')
@@ -412,7 +411,7 @@ class propunit(base.TranslationUnit):
     comments associated."""
 
     def __init__(self, source="", personality="java"):
-        """construct a blank propunit"""
+        """Construct a blank propunit."""
         self.personality = get_dialect(personality)
         super(propunit, self).__init__(source)
         self.name = u""
@@ -423,43 +422,45 @@ class propunit(base.TranslationUnit):
         self.source = source
         # a pair of symbols to enclose delimiter on the output
         # (a " " can be used for the sake of convenience)
-        self.out_delimiter_wrappers = getattr(self.personality, 'out_delimiter_wrappers', u'')
-        # symbol which should ends every property sentence (";" is required for
-        # Mac OS X strings
+        self.out_delimiter_wrappers = getattr(self.personality,
+                                              'out_delimiter_wrappers', u'')
+        # symbol that should end every property sentence
+        # (e.g. ";" is required for Mac OS X strings)
         self.out_ending = getattr(self.personality, 'out_ending', u'')
 
+    def getsource(self):
+        value = quote.propertiesdecode(self.value)
+        return value
+
     def setsource(self, source):
         self._rich_source = None
         source = data.forceunicode(source)
         self.value = self.personality.encode(source or u"", self.encoding)
 
-    def getsource(self):
-        value = quote.propertiesdecode(self.value)
-        return value
-
     source = property(getsource, setsource)
 
-    def settarget(self, target):
-        self._rich_target = None
-        target = data.forceunicode(target)
-        self.translation = self.personality.encode(target or u"", self.encoding)
-
     def gettarget(self):
         translation = quote.propertiesdecode(self.translation)
         translation = re.sub(u"\\\\ ", u" ", translation)
         return translation
 
+    def settarget(self, target):
+        self._rich_target = None
+        target = data.forceunicode(target)
+        self.translation = self.personality.encode(target or u"",
+                                                   self.encoding)
+
     target = property(gettarget, settarget)
 
-    def _get_encoding(self):
+    @property
+    def encoding(self):
         if self._store:
             return self._store.encoding
         else:
             return self.personality.default_encoding
-    encoding = property(_get_encoding)
 
     def __str__(self):
-        """Convert to a string. double check that unicode is handled
+        """Convert to a string. Double check that unicode is handled
         somehow here."""
         source = self.getoutput()
         assert isinstance(source, unicode)
@@ -475,7 +476,8 @@ class propunit(base.TranslationUnit):
             return notes + u"\n"
         else:
             self.value = self.personality.encode(self.source, self.encoding)
-            self.translation = self.personality.encode(self.target, self.encoding)
+            self.translation = self.personality.encode(self.target,
+                                                       self.encoding)
             # encode key, if needed
             key = self.name
             kwc = self.personality.key_wrap_char
@@ -491,11 +493,14 @@ class propunit(base.TranslationUnit):
             wrappers = self.out_delimiter_wrappers
             delimiter = '%s%s%s' % (wrappers, self.delimiter, wrappers)
             ending = self.out_ending
-            return u"%(notes)s%(key)s%(del)s%(value)s%(ending)s\n" % {"notes": notes,
-                                                            "key": key,
-                                                            "del": delimiter,
-                                                            "value": value,
-                                                            "ending": ending}
+            out_dict = {
+                "notes": notes,
+                "key": key,
+                "del": delimiter,
+                "value": value,
+                "ending": ending,
+            }
+            return u"%(notes)s%(key)s%(del)s%(value)s%(ending)s\n" % out_dict
 
     def getlocations(self):
         return [self.name]
@@ -550,7 +555,9 @@ class propfile(base.TranslationStore):
     def parse(self, propsrc):
         """Read the source of a properties file in and include them
         as units."""
-        text, encoding = self.detect_encoding(propsrc, default_encodings=[self.personality.default_encoding, 'utf-8', 'utf-16'])
+        text, encoding = self.detect_encoding(propsrc,
+            default_encodings=[self.personality.default_encoding, 'utf-8',
+                               'utf-16'])
         self.encoding = encoding
         propsrc = text
 
diff --git a/translate/storage/pypo.py b/translate/storage/pypo.py
index 785eac6..786c80f 100644
--- a/translate/storage/pypo.py
+++ b/translate/storage/pypo.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2002-2009 Zuza Software Foundation
+# Copyright 2013 F Wolff
 #
 # This file is part of the Translate Toolkit.
 #
@@ -26,16 +27,16 @@ from __future__ import generators
 import copy
 import cStringIO
 import re
+import textwrap
 
 from translate.lang import data
 from translate.misc.multistring import multistring
 from translate.misc import quote
-from translate.misc import textwrap
 from translate.storage import pocommon, base, poparser
 from translate.storage.pocommon import encodingToUse
 
 lsep = "\n#: "
-"""Seperator for #: entries"""
+"""Separator for #: entries"""
 
 # general functions for quoting / unquoting po strings
 
@@ -67,43 +68,45 @@ def unescapehandler(escape):
     return po_unescape_map.get(escape, escape)
 
 
-def wrapline(line):
-    """Wrap text for po files."""
-    wrappedlines = textwrap.wrap(line, 76, replace_whitespace=False, expand_tabs=False, drop_whitespace=False)
+try:
+    wrapper = textwrap.TextWrapper(
+            width=77,
+            replace_whitespace=False,
+            expand_tabs=False,
+            drop_whitespace=False
+    )
+except TypeError:
+    # Python < 2.6 didn't support drop_whitespace
+    from translate.misc import textwrap
+    wrapper = textwrap.TextWrapper(width=77)
 
-    # Lines should not start with a space...
-    if len(wrappedlines) > 1:
-        for index, line in enumerate(wrappedlines[1:]):
-            if line.startswith(' '):
-                # Remove the space at the beginning of the line:
-                wrappedlines[index+1] = line[1:]
-
-                # Append a space to the previous line:
-                wrappedlines[index] += ' '
-    return wrappedlines
+wrapper.wordsep_re = re.compile(
+    r'(\s+|'                                  # any whitespace
+    r'\w*\\.|'                                # any escape should not be split
+    r'[\w\!\'\&\.\,\?]+\s+|'                  # space should go with a word
+    r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
+    r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
+wrapper.wordsep_re_uni = re.compile(wrapper.wordsep_re.pattern, re.UNICODE)
 
 
 def quoteforpo(text):
     """Quotes the given text for a PO file, returning quoted and
     escaped lines"""
-    polines = []
     if text is None:
-        return polines
-    lines = text.split("\n")
-    if len(lines) > 1 or (len(lines) == 1 and len(lines[0]) > 71):
-        if len(lines) != 2 or lines[1]:
-            polines.extend(['""'])
-        for line in lines[:-1]:
-            #TODO: We should only wrap after escaping
-            lns = wrapline(line)
-            if len(lns) > 0:
-                for ln in lns[:-1]:
-                    polines.extend(['"' + escapeforpo(ln) + '"'])
-                polines.extend(['"' + escapeforpo(lns[-1]) + '\\n"'])
-            else:
-                polines.extend(['"\\n"'])
-    if lines[-1]:
-        polines.extend(['"' + escapeforpo(line) + '"' for line in wrapline(lines[-1])])
+        return []
+    text = escapeforpo(text)
+    lines = text.split(u"\\n")
+    for i, l in enumerate(lines[:-1]):
+        lines[i] = l + u"\\n"
+
+    polines = []
+    len_lines = len(lines)
+    if len_lines > 2 or (len_lines == 2 and lines[1]) or len(lines[0]) > 71:
+        polines.append(u'""')
+    for line in lines:
+        lns = wrapper.wrap(line)
+        for ln in lns:
+            polines.append(u'"%s"' % ln)
     return polines
 
 
diff --git a/translate/storage/qm.py b/translate/storage/qm.py
index 9c9ccaa..76a5f06 100644
--- a/translate/storage/qm.py
+++ b/translate/storage/qm.py
@@ -61,10 +61,13 @@ http://qt.gitorious.org/+kde-developers/qt/kde-qt/blobs/master/tools/linguist/sh
 import codecs
 import struct
 import sys
+import logging
 
 from translate.misc.multistring import multistring
 from translate.storage import base
 
+logger = logging.getLogger(__name__)
+
 QM_MAGIC_NUMBER = (0x3CB86418L, 0xCAEF9C95L, 0xCD211CBFL, 0x60A1BDDDL)
 
 
@@ -203,9 +206,9 @@ class qmfile(base.TranslationStore):
                 elif subsection == 0x04:  # Context16
                     subsection_name = "Context16"
                 else:
-                    subsection_name = "Unkown"
-                print >> sys.stderr, "Unimplemented: %s %s" % \
-                                     (subsection, subsection_name)
+                    subsection_name = "Unknown"
+                logger.warning("Unimplemented: 0x%x %s",
+                               subsection, subsection_name)
                 return
 
     def savefile(self, storefile):
diff --git a/translate/storage/statsdb.py b/translate/storage/statsdb.py
index ae5e406..1cd9364 100644
--- a/translate/storage/statsdb.py
+++ b/translate/storage/statsdb.py
@@ -32,6 +32,7 @@ import re
 import sys
 import stat
 import thread
+import logging
 from UserDict import UserDict
 
 from translate import __version__ as toolkitversion
@@ -40,6 +41,8 @@ from translate.misc.multistring import multistring
 from translate.storage import factory
 from translate.storage.workflow import StateEnum
 
+logger = logging.getLogger(__name__)
+
 #kdepluralre = re.compile("^_n: ") #Restore this if you really need support for old kdeplurals
 brtagre = re.compile("<br\s*?/?>")
 xmltagre = re.compile("<[^>]+>")
@@ -553,8 +556,9 @@ class StatsCache(object):
         if result is not None:
             return result
         else:
-            print >> sys.stderr, """WARNING: Database in inconsistent state.
-            fileid %d and unitid %s have no entries in the table units.""" % (fileid, unitid)
+            logger.warning("Database in inconsistent state - fileid %d and "
+                           "unitid %s have no entries in the table units.",
+                           fileid, unitid)
             # If values.fetchone() is None, then we return an empty list,
             # to make FileTotals.new_record(*self.get_unit_stats(fileid, unitid))
             # do the right thing.
diff --git a/translate/storage/test_aresource.py b/translate/storage/test_aresource.py
old mode 100755
new mode 100644
index 5bc34ab..61d3df4
--- a/translate/storage/test_aresource.py
+++ b/translate/storage/test_aresource.py
@@ -3,54 +3,200 @@
 
 from lxml import etree
 
-from translate.storage import aresource
-from translate.storage import test_monolingual
+from translate.storage import aresource, test_monolingual
 
 
-class TestPropUnit(test_monolingual.TestMonolingualUnit):
+class TestAndroidResourceUnit(test_monolingual.TestMonolingualUnit):
     UnitClass = aresource.AndroidResourceUnit
 
-    escape_data = [
-        ('message\nwith newline', '<string name="Test String">message\\nwith newline</string>\n\n'),
-        ('message \nwith newline in xml', '<string name="Test String">message\n\\nwith newline in xml</string>\n\n'),
-        ('@twitterescape', '<string name="Test String">\\@twitterescape</string>\n\n'),
-        ('quote \'escape\'', '<string name="Test String">quote \\\'escape\\\'</string>\n\n'),
-        ('double  space', '<string name="Test String">"double  space"</string>\n\n'),
-        (' leading space', '<string name="Test String">" leading space"</string>\n\n'),
-        ('>xml&entities', '<string name="Test String">>xml&entities</string>\n\n'),
-        ('some <b>html code</b> here', '<string name="Test String">some <b>html code</b> here</string>\n\n'),
-    ]
-
-    parse_test_data = escape_data + [
-        # Check that double quotes got removed
-        ('double quoted text', '<string name="Test String">"double quoted text"</string>\n\n'),
-        # Check that newline is read as space (at least it seems to be what Android does)
-        ('newline in string', '<string name="Test String">newline\nin string</string>\n\n'),
-    ]
-
-    def test_escape(self):
-        unit = self.unit
-        for string, xml in self.escape_data:
-            unit = self.UnitClass("Test String")
-            unit.target = string
-            print "unit.target:", repr(unit.target)
-            print "xml:", repr(xml)
-            assert str(unit) == xml
-
-    def test_parse(self):
+    def __check_escape(self, string, xml):
+        """Helper that checks that a string is output with the right escape."""
+        unit = self.UnitClass("Test String")
+        unit.target = string
+
+        print("unit.target:", repr(unit.target))
+        print("xml:", repr(xml))
+
+        assert str(unit) == xml
+
+    def __check_parse(self, string, xml):
+        """Helper that checks that a string is parsed correctly."""
         if etree.LXML_VERSION >= (2, 1, 0):
-            #Since version 2.1.0 we can pass the strip_cdata parameter to
-            #indicate that we don't want cdata to be converted to raw XML
+            # Since version 2.1.0 we can pass the strip_cdata parameter to
+            # indicate that we don't want cdata to be converted to raw XML.
             parser = etree.XMLParser(strip_cdata=False)
         else:
             parser = etree.XMLParser()
-        for string, xml in self.parse_test_data:
-            et = etree.fromstring(xml, parser)
-            unit = self.UnitClass.createfromxmlElement(et)
-            print "unit.target:", repr(unit.target)
-            print "string:", string
-            assert unit.target == string
+
+        translatable = 'translatable="false"' not in xml
+        et = etree.fromstring(xml, parser)
+        unit = self.UnitClass.createfromxmlElement(et)
+
+        print("unit.target:", repr(unit.target))
+        print("string:", string)
+        print("translatable:", repr(unit.istranslatable()))
+
+        assert unit.target == string
+        assert unit.istranslatable() == translatable
+
+    ############################ Check string escape ##########################
+
+    def test_escape_message_with_newline(self):
+        string = 'message\nwith newline'
+        xml = '<string name="Test String">message\\nwith newline</string>\n\n'
+        self.__check_escape(string, xml)
+
+    def test_escape_message_with_newline_in_xml(self):
+        string = 'message \nwith newline in xml'
+        xml = ('<string name="Test String">message\n\\nwith newline in xml'
+               '</string>\n\n')
+        self.__check_escape(string, xml)
+
+    def test_escape_twitter(self):
+        string = '@twitterescape'
+        xml = '<string name="Test String">\\@twitterescape</string>\n\n'
+        self.__check_escape(string, xml)
+
+    def test_escape_quote(self):
+        string = 'quote \'escape\''
+        xml = '<string name="Test String">quote \\\'escape\\\'</string>\n\n'
+        self.__check_escape(string, xml)
+
+    def test_escape_double_space(self):
+        string = 'double  space'
+        xml = '<string name="Test String">"double  space"</string>\n\n'
+        self.__check_escape(string, xml)
+
+    def test_escape_leading_space(self):
+        string = ' leading space'
+        xml = '<string name="Test String">" leading space"</string>\n\n'
+        self.__check_escape(string, xml)
+
+    def test_escape_xml_entities(self):
+        string = '>xml&entities'
+        xml = '<string name="Test String">>xml&entities</string>\n\n'
+        self.__check_escape(string, xml)
+
+    def test_escape_html_code(self):
+        string = 'some <b>html code</b> here'
+        xml = ('<string name="Test String">some <b>html code</b> here'
+               '</string>\n\n')
+        self.__check_escape(string, xml)
+
+    def test_escape_arrows(self):
+        string = '<<< arrow'
+        xml = '<string name="Test String"><<< arrow</string>\n\n'
+        self.__check_escape(string, xml)
+
+    def test_escape_link(self):
+        string = '<a href="http://example.net">link</a>'
+        xml = ('<string name="Test String"><a href="http://example.net">link'
+               '</a></string>\n\n')
+        self.__check_escape(string, xml)
+
+    def test_escape_link_and_text(self):
+        string = '<a href="http://example.net">link</a> and text'
+        xml = ('<string name="Test String"><a href="http://example.net">link'
+               '</a> and text</string>\n\n')
+        self.__check_escape(string, xml)
+
+    def test_escape_blank_string(self):
+        string = ''
+        xml = '<string name="Test String"></string>\n\n'
+        self.__check_escape(string, xml)
+
+    ############################ Check string parse ###########################
+
+    def test_parse_message_with_newline(self):
+        string = 'message\nwith newline'
+        xml = '<string name="Test String">message\\nwith newline</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_message_with_newline_in_xml(self):
+        string = 'message \nwith newline in xml'
+        xml = ('<string name="Test String">message\n\\nwith newline in xml'
+               '</string>\n\n')
+        self.__check_parse(string, xml)
+
+    def test_parse_twitter(self):
+        string = '@twitterescape'
+        xml = '<string name="Test String">\\@twitterescape</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_quote(self):
+        string = 'quote \'escape\''
+        xml = '<string name="Test String">quote \\\'escape\\\'</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_double_space(self):
+        string = 'double  space'
+        xml = '<string name="Test String">"double  space"</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_leading_space(self):
+        string = ' leading space'
+        xml = '<string name="Test String">" leading space"</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_xml_entities(self):
+        string = '>xml&entities'
+        xml = '<string name="Test String">>xml&entities</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_html_code(self):
+        string = 'some <b>html code</b> here'
+        xml = ('<string name="Test String">some <b>html code</b> here'
+               '</string>\n\n')
+        self.__check_parse(string, xml)
+
+    def test_parse_arrows(self):
+        string = '<<< arrow'
+        xml = '<string name="Test String"><<< arrow</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_link(self):
+        string = '<a href="http://example.net">link</a>'
+        xml = ('<string name="Test String"><a href="http://example.net">link'
+               '</a></string>\n\n')
+        self.__check_parse(string, xml)
+
+    def test_parse_link_and_text(self):
+        string = '<a href="http://example.net">link</a> and text'
+        xml = ('<string name="Test String"><a href="http://example.net">link'
+               '</a> and text</string>\n\n')
+        self.__check_parse(string, xml)
+
+    def test_parse_blank_string(self):
+        string = ''
+        xml = '<string name="Test String"></string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_blank_string_again(self):
+        string = ''
+        xml = '<string name="Test String"/>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_double_quotes_string(self):
+        """Check that double quotes got removed."""
+        string = 'double quoted text'
+        xml = '<string name="Test String">"double quoted text"</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_newline_in_string(self):
+        """Check that newline is read as space.
+
+        At least it seems to be what Android does.
+        """
+        string = 'newline in string'
+        xml = '<string name="Test String">newline\nin string</string>\n\n'
+        self.__check_parse(string, xml)
+
+    def test_parse_not_translatable_string(self):
+        string = 'string'
+        xml = ('<string name="Test String" translatable="false">string'
+               '</string>\n\n')
+        self.__check_parse(string, xml)
 
 
-class TestProp(test_monolingual.TestMonolingualStore):
+class TestAndroidResourceFile(test_monolingual.TestMonolingualStore):
     StoreClass = aresource.AndroidResourceFile
diff --git a/translate/storage/test_base.py b/translate/storage/test_base.py
index 3b45fa9..213afd4 100644
--- a/translate/storage/test_base.py
+++ b/translate/storage/test_base.py
@@ -23,7 +23,7 @@
 import os
 import warnings
 
-from py import test
+import pytest
 
 from translate.misc.multistring import multistring
 from translate.storage import base, factory
@@ -64,8 +64,8 @@ def test_force_override():
     assert baseobject.test()
     assert baseobject.classtest()
     derivedobject = DerivedClass()
-    assert test.raises(NotImplementedError, derivedobject.test)
-    assert test.raises(NotImplementedError, derivedobject.classtest)
+    assert pytest.raises(NotImplementedError, derivedobject.test)
+    assert pytest.raises(NotImplementedError, derivedobject.classtest)
 
 
 class TestTranslationUnit:
diff --git a/translate/storage/test_cpo.py b/translate/storage/test_cpo.py
index 7b8ec4d..ed8a219 100644
--- a/translate/storage/test_cpo.py
+++ b/translate/storage/test_cpo.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import raises, mark
+from pytest import raises, mark, importorskip
 
 from translate.misc import wStringIO
 from translate.misc.multistring import multistring
 from translate.storage import test_po
-from translate.storage import cpo
+cpo = importorskip("translate.storage.cpo")
 
 
 class TestCPOUnit(test_po.TestPOUnit):
diff --git a/translate/storage/test_dtd.py b/translate/storage/test_dtd.py
index 7057216..684c97d 100644
--- a/translate/storage/test_dtd.py
+++ b/translate/storage/test_dtd.py
@@ -20,8 +20,7 @@
 
 import warnings
 
-from py import test
-from py.test import mark
+from pytest import mark
 
 from translate.misc import wStringIO
 from translate.storage import dtd
@@ -108,19 +107,27 @@ def test_unquotefromdtd_unimplemented_cases():
 
 def test_unquotefromdtd():
     """Test unquoting DTD definitions"""
+    # %
     assert dtd.unquotefromdtd('"Completed %S"') == "Completed %S"
     assert dtd.unquotefromdtd('"Completed %S"') == "Completed %S"
     assert dtd.unquotefromdtd('"Completed &#x25;S"') == "Completed %S"
+    # &entity;
     assert dtd.unquotefromdtd('"Color&light █"') == "Color&light █"
     assert dtd.unquotefromdtd('"Color & Light; Red"') == "Color & Light; Red"
     assert dtd.unquotefromdtd('"&blockAttackSites;"') == "&blockAttackSites;"
-    assert dtd.unquotefromdtd('"&#x00A0;"') == "&#x00A0;"
     assert dtd.unquotefromdtd('"&intro-point2-a;"') == "&intro-point2-a;"
     assert dtd.unquotefromdtd('"&basePBMenu.label"') == "&basePBMenu.label"
+    # nbsp
+    assert dtd.unquotefromdtd('"&#x00A0;"') == "&#x00A0;"
+    # '
     assert dtd.unquotefromdtd("'Don't buy'") == "Don't buy"
+    # "
     assert dtd.unquotefromdtd("'Don't "buy"'") == 'Don\'t "buy"'
     assert dtd.unquotefromdtd('"A "thing""') == "A \"thing\""
+    assert dtd.unquotefromdtd('"A &#x0022;thing&#x0022;"') == "A \"thing\""
     assert dtd.unquotefromdtd("'<a href=\"http'") == "<a href=\"http"
+    # other chars
+    assert dtd.unquotefromdtd('"»"') == u"»"
 
 
 def test_android_roundtrip_quoting():
diff --git a/translate/storage/test_html.py b/translate/storage/test_html.py
index 732be30..b50da6e 100644
--- a/translate/storage/test_html.py
+++ b/translate/storage/test_html.py
@@ -20,7 +20,7 @@
 
 """Tests for the HTML classes"""
 
-from py.test import raises, mark
+from pytest import raises, mark
 
 from translate.storage import base
 from translate.storage import html
diff --git a/translate/storage/test_mo.py b/translate/storage/test_mo.py
index 6935a50..62bc99a 100644
--- a/translate/storage/test_mo.py
+++ b/translate/storage/test_mo.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
-import os.path
+import os
+import sys
 import StringIO
 import subprocess
 
@@ -8,6 +9,17 @@ from translate.storage import factory
 from translate.storage import mo
 from translate.storage import test_base
 
+# get directory of this test
+dir = os.path.dirname(os.path.abspath(__file__))
+# get top-level directory (moral equivalent of ../..)
+dir = os.path.dirname(os.path.dirname(dir))
+# load python modules from top-level
+sys.path.insert(0, dir)
+# add top-level to PYTHONPATH for subprocesses
+os.environ["PYTHONPATH"] = os.pathsep.join(sys.path)
+# add {top-level}/translate/tools to PATH for pocompile
+os.environ["PATH"] = os.pathsep.join([os.path.join(dir, "translate", "tools"),
+                                      os.environ["PATH"]])
 
 class TestMOUnit(test_base.TestTranslationUnit):
     UnitClass = mo.mounit
diff --git a/translate/storage/test_monolingual.py b/translate/storage/test_monolingual.py
index 436d827..f5f22df 100644
--- a/translate/storage/test_monolingual.py
+++ b/translate/storage/test_monolingual.py
@@ -5,8 +5,7 @@
 # These test classes should be used as super class of test classes for the
 # classes that doesn't support the target property
 
-from translate.storage import base
-from translate.storage import test_base
+from translate.storage import base, test_base
 
 
 class TestMonolingualUnit(test_base.TestTranslationUnit):
@@ -35,17 +34,18 @@ class TestMonolingualStore(test_base.TestTranslationStore):
         pass
 
     def check_equality(self, store1, store2):
-        """asserts that store1 and store2 are the same"""
+        """Check that store1 and store2 are the same."""
         assert len(store1.units) == len(store2.units)
+
         for n, store1unit in enumerate(store1.units):
             store2unit = store2.units[n]
-            match = str(store1unit) == str(store2unit)
-            if not match:
-                print "match failed between elements %d of %d" % ((n + 1), len(store1.units))
-                print "store1:"
-                print str(store1)
-                print "store2:"
-                print str(store2)
-                print "store1.units[%d].__dict__:" % n, store1unit.__dict__
-                print "store2.units[%d].__dict__:" % n, store2unit.__dict__
+
+            if str(store1unit) != str(store2unit):
+                print("match failed between elements %d of %d" % ((n + 1), len(store1.units)))
+                print("store1:")
+                print(str(store1))
+                print("store2:")
+                print(str(store2))
+                print("store1.units[%d].__dict__:" % n, store1unit.__dict__)
+                print("store2.units[%d].__dict__:" % n, store2unit.__dict__)
                 assert str(store1unit) == str(store2unit)
diff --git a/translate/storage/test_mozilla_lang.py b/translate/storage/test_mozilla_lang.py
index 4eacc8f..46463b5 100644
--- a/translate/storage/test_mozilla_lang.py
+++ b/translate/storage/test_mozilla_lang.py
@@ -80,3 +80,21 @@ class TestMozLangFile(test_base.TestTranslationStore):
                 "Target\n")
         store = self.StoreClass.parsestring(lang)
         assert str(store) == lang
+
+    def test_template(self):
+        """A template should have source == target, though it could be blank"""
+        lang = (";Source\n"
+                "Source\n")
+        store = self.StoreClass.parsestring(lang)
+        unit = store.units[0]
+        assert unit.source == "Source"
+        assert unit.target == ""
+        assert str(store) == lang
+        lang2 = (";Source\n"
+                "\n"
+                ";Source2\n")
+        store2 = self.StoreClass.parsestring(lang2)
+        assert store2.units[0].source == "Source"
+        assert store2.units[0].target == ""
+        assert store2.units[1].source == "Source2"
+        assert store2.units[1].target == ""
diff --git a/translate/storage/test_omegat.py b/translate/storage/test_omegat.py
index 837f292..ca04afe 100644
--- a/translate/storage/test_omegat.py
+++ b/translate/storage/test_omegat.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark
 
 from translate.storage import omegat as ot
 from translate.storage import test_base
diff --git a/translate/storage/test_php.py b/translate/storage/test_php.py
index 786c9c1..c3c0bbe 100644
--- a/translate/storage/test_php.py
+++ b/translate/storage/test_php.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark
 
 from translate.storage import php
 from translate.storage import test_monolingual
@@ -388,7 +388,8 @@ define("_RELOAD", "Recargar");"""
         assert phpunit.source == "Recargar"
 
     def test_parsing_simpledefinition_spaces_before_end_delimiter(self):
-        """Parse define syntax with spaces before the end delimiter"""
+        """Parse simple definition syntax with spaces before the end
+        delimiter"""
         phpsource = """$month_jan = 'Jan';
 $month_feb = 'Feb'  ;
 $month_mar = 'Mar';"""
@@ -437,7 +438,6 @@ $month_mar = 'Mar';"""
         assert phpunit.name == "$lang->'item2'"
         assert phpunit.source == "value2"
 
-    @mark.xfail(reason="Bug #2646")
     def test_parsing_arrays_with_space_before_array_declaration(self):
         """parse the array syntax with spaces before the array declaration.
         Bug #2646"""
@@ -454,7 +454,6 @@ $month_mar = 'Mar';"""
         assert phpunit.name == "$lang->'item2'"
         assert phpunit.source == "value2"
 
-    @mark.xfail(reason="Bug #2240")
     def test_parsing_nested_arrays(self):
         """parse the nested array syntax. Bug #2240"""
         phpsource = '''$app_list_strings = array(
@@ -484,6 +483,36 @@ $month_mar = 'Mar';"""
         assert phpunit.name == "$app_list_strings->'FAQ'"
         assert phpunit.source == "FAQ"
 
+    def test_parsing_nested_arrays_with_space_before_array_declaration(self):
+        """parse the nested array syntax with whitespace before the array
+        declaration."""
+        phpsource = '''$app_list_strings = array  (
+            'Mailbox' => 'Mailbox',
+            'moduleList' => array  (
+                'Home' => 'Home',
+                'Contacts' => 'Contacts',
+                'Accounts' => 'Accounts',
+            ),
+            'FAQ' => 'FAQ',
+        );'''
+        phpfile = self.phpparse(phpsource)
+        assert len(phpfile.units) == 5
+        phpunit = phpfile.units[0]
+        assert phpunit.name == "$app_list_strings->'Mailbox'"
+        assert phpunit.source == "Mailbox"
+        phpunit = phpfile.units[1]
+        assert phpunit.name == "$app_list_strings->'moduleList'->'Home'"
+        assert phpunit.source == "Home"
+        phpunit = phpfile.units[2]
+        assert phpunit.name == "$app_list_strings->'moduleList'->'Contacts'"
+        assert phpunit.source == "Contacts"
+        phpunit = phpfile.units[3]
+        assert phpunit.name == "$app_list_strings->'moduleList'->'Accounts'"
+        assert phpunit.source == "Accounts"
+        phpunit = phpfile.units[4]
+        assert phpunit.name == "$app_list_strings->'FAQ'"
+        assert phpunit.source == "FAQ"
+
     @mark.xfail(reason="Bug #2647")
     def test_parsing_nested_arrays_with_array_declaration_in_next_line(self):
         """parse the nested array syntax with array declaration in the next
diff --git a/translate/storage/test_po.py b/translate/storage/test_po.py
index 244be7c..f270e2e 100644
--- a/translate/storage/test_po.py
+++ b/translate/storage/test_po.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import raises, mark
+from pytest import raises, mark
 
 from translate.misc import wStringIO
 from translate.misc.multistring import multistring
@@ -195,6 +195,15 @@ class TestPOFile(test_base.TestTranslationStore):
         print oldunit
         return str(oldunit)
 
+    def poreflow(self, posource):
+        """Helper to parse and reflow all text according to our code."""
+        pofile = self.poparse(posource)
+        for u in pofile.units:
+            # force rewrapping:
+            u.source = u.source
+            u.target = u.target
+        return str(pofile)
+
     def test_context_only(self):
         """Checks that an empty msgid with msgctxt is handled correctly."""
         posource = '''msgctxt "CONTEXT"
@@ -879,3 +888,91 @@ msgstr[0] ""
         assert "msgid_plural" in str(unit)
         assert not unit.istranslated()
         assert unit.get_state_n() == 0
+
+    def test_wrapping(self):
+        """This tests that we wrap like gettext."""
+        posource = r'''#: file.h:1
+msgid "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345"
+msgstr "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345"
+'''
+        # should be unchanged:
+        assert self.poreflow(posource) == posource
+
+        posource = r'''#: 2
+msgid "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1"
+msgstr "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1"
+'''
+        posource_wanted = r'''#: 2
+msgid ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1"
+msgstr ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1"
+'''
+        assert self.poreflow(posource) == posource_wanted
+
+        posource = r'''#: 7
+msgid "bla\t12345 12345 12345 12345 12345 12 12345 12345 12345 12345 12345 12345 123"
+msgstr "bla\t12345 12345 12345 12345 12345 15 12345 12345 12345 12345 12345 12345 123"
+'''
+        posource_wanted =r'''#: 7
+msgid ""
+"bla\t12345 12345 12345 12345 12345 12 12345 12345 12345 12345 12345 12345 123"
+msgstr ""
+"bla\t12345 12345 12345 12345 12345 15 12345 12345 12345 12345 12345 12345 123"
+'''
+        assert self.poreflow(posource) == posource_wanted
+
+        posource = r'''#: 7
+msgid "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1"
+msgstr "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1"
+'''
+        posource_wanted = r'''#: 7
+msgid ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 "
+"1"
+msgstr ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 "
+"1"
+'''
+        assert self.poreflow(posource) == posource_wanted
+
+        posource = r'''#: 8
+msgid "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1234\n1234"
+msgstr "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1234\n1234"
+
+#: 9
+msgid "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345\n12345"
+msgstr "bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345\n12345"
+'''
+        posource_wanted = r'''#: 8
+msgid ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1234\n"
+"1234"
+msgstr ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 1234\n"
+"1234"
+
+#: 9
+msgid ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 "
+"12345\n"
+"12345"
+msgstr ""
+"bla\t12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 12345 "
+"12345\n"
+"12345"
+'''
+        assert self.poreflow(posource) == posource_wanted
+
+        posource =r'''#: 10
+msgid "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+msgstr "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+'''
+        posource_wanted = r'''#: 10
+msgid ""
+"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+"\\"
+msgstr ""
+"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+"\\"
+'''
diff --git a/translate/storage/test_properties.py b/translate/storage/test_properties.py
index 0053d64..bd61496 100644
--- a/translate/storage/test_properties.py
+++ b/translate/storage/test_properties.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py import test
-from py.test import deprecated_call
+from pytest import deprecated_call
 
 from translate.misc import wStringIO
 from translate.storage import properties
@@ -19,7 +18,7 @@ def test_find_delimiter_pos_simple():
 
 
 def test_find_delimiter_pos_multiple():
-    """Find delimiters when multiple potential delimietes are involved"""
+    """Find delimiters when multiple potential delimiters are involved"""
     assert properties._find_delimiter(u"key=value:value", [u"=", u":", u" "]) == ('=', 3)
     assert properties._find_delimiter(u"key:value=value", [u"=", u":", u" "]) == (':', 3)
     assert properties._find_delimiter(u"key value=value", [u"=", u":", u" "]) == (' ', 3)
@@ -131,7 +130,7 @@ class TestProp(test_monolingual.TestMonolingualStore):
         assert propsource + '\n' == propregen
 
     def test_unicode_escaping(self):
-        """check that escapes unicode is converted properly"""
+        """check that escaped unicode is converted properly"""
         propsource = "unicode=\u0411\u0416\u0419\u0428"
         messagevalue = u'\u0411\u0416\u0419\u0428'.encode("UTF-8")
         propfile = self.propparse(propsource, personality="mozilla")
@@ -323,7 +322,7 @@ key=value
         """test that serializer quotes mac strings properly"""
         propsource = ur'"key with \"quotes\"" = "value with \"quotes\"";'.encode('utf-16')
         propfile = self.propparse(propsource, personality="strings")
-        # we don't care about leading and tralinig newlines and zero bytes
+        # we don't care about leading and trailing newlines and zero bytes
         # in the assert, we just want to make sure that
         # - all quotes are in place
         # - quotes inside are escaped
diff --git a/translate/storage/test_pypo.py b/translate/storage/test_pypo.py
index 1b4b473..20eef47 100644
--- a/translate/storage/test_pypo.py
+++ b/translate/storage/test_pypo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py.test import raises
+from pytest import raises
 
 from translate.misc import wStringIO
 from translate.misc.multistring import multistring
@@ -41,7 +41,9 @@ class TestHelpers():
                                '"A very long sentence. A very long sentence. A very long sentence. A very"']
         # Long line with a newline
         assert pypo.quoteforpo("A very long sentence. A very long sentence. A very long sentence. A very lon\n") == \
-                             ['"A very long sentence. A very long sentence. A very long sentence. A very lon\\n"']
+                             ['""', '"A very long sentence. A very long sentence. A very long sentence. A very "', '"lon\\n"']
+        assert pypo.quoteforpo("A very long sentence. A very long sentence. A very long sentence. A very 123\n") == \
+                             ['""', '"A very long sentence. A very long sentence. A very long sentence. A very "', '"123\\n"']
         # Special 77 char failure.
         assert pypo.quoteforpo("Ukuba uyayiqonda into eyenzekayo, \nungaxelela i-&brandShortName; ukuba iqalise ukuthemba ufaniso lwale sayithi. \n<b>Nokuba uyayithemba isayithi, le mposiso isenokuthetha ukuba   kukho umntu \nobhucabhuca ukudibanisa kwakho.</b>") == \
                              ['""',
@@ -52,6 +54,13 @@ class TestHelpers():
                               '"\\n"',
                               '"obhucabhuca ukudibanisa kwakho.</b>"']
 
+    def test_quoteforpo_escaped_quotes(self):
+        """Ensure that we don't break \" in two when wrapping
+
+	See :bug:`3140`
+	"""
+        assert pypo.quoteforpo('''You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Options on your other device, and selecting  "My Recovery Key" under "Manage Account".''') == [u'""', u'"You can get a copy of your Recovery Key by going to "', u'"&syncBrand.shortName.label; Options on your other device, and selecting  \\""', u'"My Recovery Key\\" under \\"Manage Account\\"."']
+
 
 class TestPYPOUnit(test_po.TestPOUnit):
     UnitClass = pypo.pounit
diff --git a/translate/storage/test_qm.py b/translate/storage/test_qm.py
index 1da4fe4..91b78fe 100644
--- a/translate/storage/test_qm.py
+++ b/translate/storage/test_qm.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py import test
+import pytest
 
 from translate.storage import test_base
 from translate.storage import qm
@@ -21,20 +21,20 @@ class TestQtFile(test_base.TestTranslationStore):
 
     def test_save(self):
         # QM does not implement saving
-        assert test.raises(Exception, self.StoreClass.savefile,
+        assert pytest.raises(Exception, self.StoreClass.savefile,
                            self.StoreClass())
 
     def test_files(self):
         # QM does not implement saving
-        assert test.raises(Exception, self.StoreClass.savefile,
+        assert pytest.raises(Exception, self.StoreClass.savefile,
                            self.StoreClass())
 
     def test_nonascii(self):
         # QM does not implement serialising
-        assert test.raises(Exception, self.StoreClass.__str__,
+        assert pytest.raises(Exception, self.StoreClass.__str__,
                            self.StoreClass())
 
     def test_add(self):
         # QM does not implement serialising
-        assert test.raises(Exception, self.StoreClass.__str__,
+        assert pytest.raises(Exception, self.StoreClass.__str__,
                            self.StoreClass())
diff --git a/translate/storage/test_statsdb.py b/translate/storage/test_statsdb.py
index eab45ac..4e4992b 100644
--- a/translate/storage/test_statsdb.py
+++ b/translate/storage/test_statsdb.py
@@ -4,7 +4,7 @@ import os
 import os.path
 import warnings
 
-import py.test
+import pytest
 
 from translate import storage
 from translate.storage import statsdb, factory
diff --git a/translate/storage/test_tmx.py b/translate/storage/test_tmx.py
index 527c680..5107471 100644
--- a/translate/storage/test_tmx.py
+++ b/translate/storage/test_tmx.py
@@ -52,6 +52,15 @@ class TestTMXfile(test_base.TestTranslationStore):
         newfile = self.tmxparse(str(tmxfile))
         print str(tmxfile)
         assert newfile.translate("A string of characters") == "'n String karakters"
+        
+    def test_withcomment(self):
+        """tests that addtranslation() stores string's comments correctly"""
+        tmxfile = tmx.tmxfile()
+        tmxfile.addtranslation("A string of chars",
+                               "en", "'n String karakters", "af", "comment")
+        newfile = self.tmxparse(str(tmxfile))
+        print str(tmxfile)
+        assert newfile.findunit("A string of chars").getnotes() == "comment"
 
     def test_withnewlines(self):
         """test addtranslation() with newlines"""
diff --git a/translate/storage/test_trados.py b/translate/storage/test_trados.py
index 1d95d99..ddf2634 100644
--- a/translate/storage/test_trados.py
+++ b/translate/storage/test_trados.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from py.test import mark
+from pytest import mark, importorskip
+importorskip("BeautifulSoup")
 
 from translate.storage import test_base
 from translate.storage import trados
diff --git a/translate/storage/test_xliff.py b/translate/storage/test_xliff.py
index 308baa4..443b0a3 100644
--- a/translate/storage/test_xliff.py
+++ b/translate/storage/test_xliff.py
@@ -73,6 +73,22 @@ class TestXLIFFfile(test_base.TestTranslationStore):
         assert newfile.findunit("Bla").source == "Bla"
         assert newfile.findunit("dit") is None
 
+    def test_namespace(self):
+        """Check that we handle namespaces other than the default correctly."""
+        xlfsource = '''<?xml version="1.0" encoding="utf-8"?>
+<xliff:xliff version="1.2" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <xliff:file original="doc.txt" source-language="en-US">
+        <xliff:body>
+            <xliff:trans-unit id="1">
+                <xliff:source>File 1</xliff:source>
+            </xliff:trans-unit>
+        </xliff:body>
+    </xliff:file>
+</xliff:xliff>'''
+        xlifffile = xliff.xlifffile.parsestring(xlfsource)
+        print str(xlifffile)
+        assert xlifffile.units[0].source == "File 1"
+
     def test_rich_source(self):
         xlifffile = xliff.xlifffile()
         xliffunit = xlifffile.addsourceunit(u'')
diff --git a/translate/storage/test_zipfile.py b/translate/storage/test_zipfile.py
deleted file mode 100755
index 457de03..0000000
--- a/translate/storage/test_zipfile.py
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import StringIO
-import tempfile
-import zlib  # implied prerequisite
-import zipfile
-
-from test.test_support import TestFailed
-from py import test
-
-from translate.misc import zipfileext
-
-
-BrokenStringIO = StringIO.StringIO
-class FixedStringIO(BrokenStringIO):
-
-    def truncate(self, size=None):
-        BrokenStringIO.truncate(self, size)
-        self.len = len(self.buf)
-
-StringIO.StringIO = FixedStringIO
-
-# these tests won't all pass on zipfile module in Python 2.4
-# there are extensions in zipfileext to add the delete method etc
-# to test the underlying zipfile module, uncomment the following line:
-zipfile.ZipFile = zipfileext.ZipFileExt
-
-
-class TestZipFiles:
-
-    def setup_method(self, method):
-        self.srcname = "%s-%s%stmp" % (self.__class__.__name__, method.__name__, os.extsep)
-        self.zipname = "%s-%s%szip" % (self.__class__.__name__, method.__name__, os.extsep)
-
-    def teardown_method(self, method):
-        # Remove temporary files
-        if os.path.isfile(self.srcname):
-            os.unlink(self.srcname)
-        if os.path.isfile(self.zipname):
-            os.unlink(self.zipname)
-
-    def zipTest(self, f, compression, srccontents):
-        zip = zipfile.ZipFile(f, "w", compression)   # Create the ZIP archive
-        zip.write(self.srcname, "another" + os.extsep + "name")
-        zip.write(self.srcname, self.srcname)
-        zip.close()
-
-        zip = zipfile.ZipFile(f, "r", compression)   # Read the ZIP archive
-        readData2 = zip.read(self.srcname)
-        readData1 = zip.read("another" + os.extsep + "name")
-        zip.close()
-
-        if readData1 != srccontents or readData2 != srccontents:
-            raise TestFailed("Written data doesn't equal read data.")
-
-    def deleteTest(self, f, compression, srccontents):
-        zip = zipfile.ZipFile(f, "w", compression)   # Create the ZIP archive
-        othername = "another" + os.extsep + "name"
-        finalname = "adifferent" + os.extsep + "name"
-        leftname, deletenames = othername, [self.srcname, finalname]
-        zip.write(self.srcname, self.srcname)
-        zip.write(self.srcname, othername)
-        zip.write(self.srcname, finalname)
-        zip.close()
-
-        zip = zipfile.ZipFile(f, "a", compression)   # Modify the ZIP archive
-        try:
-            for deletename in deletenames:
-                zip.delete(deletename)
-        finally:
-            zip.close()
-
-        zip = zipfile.ZipFile(f, "r", compression)   # Read the ZIP archive
-        try:
-            testfailed = zip.testzip()
-            readData = zip.read(leftname)
-        finally:
-            zip.close()
-
-        assert not testfailed
-        assert readData == srccontents
-
-    def test_create_zip(self):
-        fp = open(self.srcname, "wb")               # Make a source file with some lines
-        for i in range(0, 1000):
-            fp.write("Test of zipfile line %d.\n" % i)
-        fp.close()
-
-        fp = open(self.srcname, "rb")
-        writtenData = fp.read()
-        fp.close()
-
-        for file in (self.zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
-            self.zipTest(file, zipfile.ZIP_STORED, writtenData)
-
-        for file in (self.zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
-            self.zipTest(file, zipfile.ZIP_DEFLATED, writtenData)
-
-    def test_delete_member(self):
-        fp = open(self.srcname, "wb")               # Make a source file with some lines
-        for i in range(0, 1000):
-            fp.write("Test of zipfile line %d.\n" % i)
-        fp.close()
-
-        fp = open(self.srcname, "rb")
-        writtenData = fp.read()
-        fp.close()
-
-        self.deleteTest(self.zipname, zipfile.ZIP_STORED, writtenData)
-        self.deleteTest(tempfile.TemporaryFile(), zipfile.ZIP_STORED, writtenData)
-        self.deleteTest(StringIO.StringIO(), zipfile.ZIP_STORED, writtenData)
-
-        self.deleteTest(self.zipname, zipfile.ZIP_DEFLATED, writtenData)
-        self.deleteTest(tempfile.TemporaryFile(), zipfile.ZIP_DEFLATED, writtenData)
-        self.deleteTest(StringIO.StringIO(), zipfile.ZIP_DEFLATED, writtenData)
-
-    def test_handles_error(self):
-        """This test checks that the ZipFile constructor closes the file object"""
-        """it opens if there's an error in the file.  If it doesn't, the traceback"""
-        """holds a reference to the ZipFile object and, indirectly, the file object."""
-        """On Windows, this causes the os.unlink() call to fail because the"""
-        """underlying file is still open.  This is SF bug #412214."""
-        fp = open(self.srcname, "w")
-        fp.write("this is not a legal zip file\n")
-        fp.close()
-        assert test.raises(zipfile.BadZipfile, zipfile.ZipFile, self.srcname)
-        os.unlink(self.srcname)
-
-    def test_finalize(self):
-        """make sure we don't raise an AttributeError when a partially-constructed"""
-        """ZipFile instance is finalized; this tests for regression on SF tracker"""
-        """bug #403871."""
-        assert test.raises(IOError, zipfile.ZipFile, self.srcname)
-        # The bug we're testing for caused an AttributeError to be raised
-        # when a ZipFile instance was created for a file that did not
-        # exist; the .fp member was not initialized but was needed by the
-        # __del__() method.  Since the AttributeError is in the __del__(),
-        # it is ignored, but the user should be sufficiently annoyed by
-        # the message on the output that regression will be noticed
-        # quickly.
-
-    def test_fail_read_closed(self):
-        # Verify that testzip() doesn't swallow inappropriate exceptions.
-        data = StringIO.StringIO()
-        zipf = zipfile.ZipFile(data, mode="w")
-        zipf.writestr("foo.txt", "O, for a Muse of Fire!")
-        zipf.close()
-        zipf = zipfile.ZipFile(data, mode="r")
-        zipf.close()
-        # This is correct; calling .read on a closed ZipFile should throw
-        # a RuntimeError, and so should calling .testzip.  An earlier
-        # version of .testzip would swallow this exception (and any other)
-        # and report that the first file in the archive was corrupt.
-        assert test.raises(RuntimeError, zipf.testzip)
-        del data, zipf
diff --git a/translate/storage/tiki.py b/translate/storage/tiki.py
index 56a3fb9..02eb721 100644
--- a/translate/storage/tiki.py
+++ b/translate/storage/tiki.py
@@ -28,15 +28,15 @@ sections identified by comments.  Example current as of 2008-12-01::
     // ### Start of unused words
     "aaa" => "zzz",
     // ### end of unused words
-    
+
     // ### start of untranslated words
     // "bbb" => "yyy",
     // ### end of untranslated words
-    
+
     // ### start of possibly untranslated words
     "ccc" => "xxx",
     // ### end of possibly untranslated words
-    
+
     "ddd" => "www",
     "###end###"=>"###end###");
   ?>
diff --git a/translate/storage/tmdb.py b/translate/storage/tmdb.py
index e4d4925..a745a59 100644
--- a/translate/storage/tmdb.py
+++ b/translate/storage/tmdb.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2009 Zuza Software Foundation
+# Copyright 2009, 2013 Zuza Software Foundation
+# Copyright 2013 F Wolff
 #
 # This file is part of translate.
 #
@@ -30,8 +31,8 @@ try:
 except ImportError:
     from pysqlite2 import dbapi2
 
-from translate.search.lshtein import LevenshteinComparer
 from translate.lang import data
+from translate.search.lshtein import LevenshteinComparer
 
 
 STRIP_REGEXP = re.compile("\W", re.UNICODE)
@@ -49,7 +50,8 @@ class LanguageError(Exception):
 class TMDB(object):
     _tm_dbs = {}
 
-    def __init__(self, db_file, max_candidates=3, min_similarity=75, max_length=1000):
+    def __init__(self, db_file, max_candidates=3, min_similarity=75,
+                 max_length=1000):
 
         self.max_candidates = max_candidates
         self.min_similarity = min_similarity
@@ -123,7 +125,8 @@ CREATE UNIQUE INDEX IF NOT EXISTS targets_uniq_idx ON targets (sid, text, lang);
     def init_fulltext(self):
         """detects if fts3 fulltext indexing module exists, initializes fulltext table if it does"""
 
-        #HACKISH: no better way to detect fts3 support except trying to construct a dummy table?!
+        #HACKISH: no better way to detect fts3 support except trying to
+        # construct a dummy table?!
         try:
             script = """
 DROP TABLE IF EXISTS test_for_fts3;
@@ -132,8 +135,8 @@ DROP TABLE test_for_fts3;
 """
             self.cursor.executescript(script)
             logging.debug("fts3 supported")
-            # for some reason CREATE VIRTUAL TABLE doesn't support IF NOT EXISTS syntax
-            # check if fulltext index table exists manually
+            # for some reason CREATE VIRTUAL TABLE doesn't support IF NOT
+            # EXISTS syntax check if fulltext index table exists manually
             self.cursor.execute("SELECT name FROM sqlite_master WHERE name = 'fulltext'")
             if not self.cursor.fetchone():
                 # create fulltext index table, and index all strings in sources
@@ -287,7 +290,8 @@ DROP TRIGGER IF EXISTS sources_delete_trig;
             target_langs = data.normalize_code(target_langs)
 
         minlen = min_levenshtein_length(len(unit_source), self.min_similarity)
-        maxlen = max_levenshtein_length(len(unit_source), self.min_similarity, self.max_length)
+        maxlen = max_levenshtein_length(len(unit_source), self.min_similarity,
+                                        self.max_length)
 
         # split source into words, remove punctuation and special
         # chars, keep words that are at least 3 chars long
@@ -300,23 +304,27 @@ DROP TRIGGER IF EXISTS sources_delete_trig;
                        WHERE s.lang IN (?) AND t.lang IN (?) AND s.length BETWEEN ? AND ?
                        AND fulltext MATCH ?"""
             search_str = " OR ".join(unit_words)
-            self.cursor.execute(query, (source_langs, target_langs, minlen, maxlen, search_str))
+            self.cursor.execute(query, (source_langs, target_langs, minlen,
+                                maxlen, search_str))
         else:
             logging.debug("nonfulltext matching")
             query = """SELECT s.text, t.text, s.context, s.lang, t.lang FROM sources s JOIN targets t ON s.sid = t.sid
             WHERE s.lang IN (?) AND t.lang IN (?)
             AND s.length >= ? AND s.length <= ?"""
-            self.cursor.execute(query, (source_langs, target_langs, minlen, maxlen))
+            self.cursor.execute(query, (source_langs, target_langs, minlen,
+                                        maxlen))
 
         results = []
         for row in self.cursor:
-            result = {}
-            result['source'] = row[0]
-            result['target'] = row[1]
-            result['context'] = row[2]
-            result['quality'] = self.comparer.similarity(unit_source, result['source'], self.min_similarity)
-            if result['quality'] >= self.min_similarity:
-                results.append(result)
+            quality = self.comparer.similarity(unit_source, row[0],
+                                               self.min_similarity)
+            if quality >= self.min_similarity:
+                results.append({
+                    'source': row[0],
+                    'target': row[1],
+                    'context': row[2],
+                    'quality': quality,
+                })
         results.sort(key=lambda match: match['quality'], reverse=True)
         results = results[:self.max_candidates]
         logging.debug("results: %s", unicode(results))
diff --git a/translate/storage/tmx.py b/translate/storage/tmx.py
index 890cf89..9684c5d 100644
--- a/translate/storage/tmx.py
+++ b/translate/storage/tmx.py
@@ -141,10 +141,14 @@ class tmxfile(lisa.LISAfile):
         #headernode.set("creationdate", "YYYYMMDDTHHMMSSZ"
         #headernode.set("creationid", "CodeSyntax"
 
-    def addtranslation(self, source, srclang, translation, translang):
+    def addtranslation(self, source, srclang, translation, translang,
+                       comment=None):
         """addtranslation method for testing old unit tests"""
         unit = self.addsourceunit(source)
         unit.target = translation
+        if comment is not None and len(comment) > 0:
+            unit.addnote(comment)
+
         tuvs = unit.xmlelement.iterdescendants(self.namespaced('tuv'))
         lisa.setXMLlang(tuvs.next(), srclang)
         lisa.setXMLlang(tuvs.next(), translang)
diff --git a/translate/storage/trados.py b/translate/storage/trados.py
index 1151d49..14fbbf4 100644
--- a/translate/storage/trados.py
+++ b/translate/storage/trados.py
@@ -71,8 +71,8 @@ ur"\_": u"‑",  # Nonbreaking hyphen \U2011
 # identify 8-bit values).
 #ur"\'hh": "",
 }
-"""RTF control to Unicode map
-<http://msdn.microsoft.com/en-us/library/aa140283%28v=office.10%29.aspx#rtfspec_specialchar>
+"""RTF control to Unicode map. See
+http://msdn.microsoft.com/en-us/library/aa140283(v=office.10).aspx
 """
 
 
diff --git a/translate/storage/ts.py b/translate/storage/ts.py
index aa129f3..1f1b0ef 100644
--- a/translate/storage/ts.py
+++ b/translate/storage/ts.py
@@ -23,11 +23,11 @@
 
 Currently this module supports the old format of .ts files. Some applictaions
 use the newer .ts format which are documented here:
-`TS file format 4.3 <http://doc.trolltech.com/4.3/linguist-ts-file-format.html>`_,
+`TS file format 4.3 <http://doc.qt.digia.com/4.3/linguist-ts-file-format.html>`_,
 `Example <http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt>`_
 
-`Specification of the valid variable entries  <http://doc.trolltech.com/4.3/qstring.html#arg>`_,
-`2  <http://doc.trolltech.com/4.3/qstring.html#arg-2>`_
+`Specification of the valid variable entries <http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg>`_,
+`2 <http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg-2>`_
 """
 
 from translate.misc import ourdom
diff --git a/translate/storage/ts2.py b/translate/storage/ts2.py
index 946b30e..b7cfbc0 100644
--- a/translate/storage/ts2.py
+++ b/translate/storage/ts2.py
@@ -24,13 +24,13 @@ This will eventually replace the older ts.py which only supports the older
 format. While converters haven't been updated to use this module, we retain
 both.
 
-`TS file format 4.3 <http://doc.trolltech.com/4.3/linguist-ts-file-format.html>`_,
-`4.5 <http://doc.trolltech.com/4.5/linguist-ts-file-format.html>`_,
-`Example <http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt>`_,
-`Plurals forms <http://www.koders.com/cpp/fidE7B7E83C54B9036EB7FA0F27BC56BCCFC4B9DF34.aspx#L200>`_
+`TS file format 4.3 <http://doc.qt.digia.com/4.3/linguist-ts-file-format.html>`_,
+`4.8 <http://qt-project.org/doc/qt-4.8/linguist-ts-file-format.html>`_,
+`5.0 <http://qt-project.org/doc/qt-5.0/qtlinguist/linguist-ts-file-format.html>`_.
+`Example <http://svn.ez.no/svn/ezcomponents/trunk/Translation/docs/linguist-format.txt>`_.
 
-`Specification of the valid variable entries  <http://doc.trolltech.com/4.3/qstring.html#arg>`_,
-`2  <http://doc.trolltech.com/4.3/qstring.html#arg-2>`_
+`Specification of the valid variable entries <http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg>`_,
+`2 <http://qt-project.org/doc/qt-5.0/qtcore/qstring.html#arg-2>`_
 """
 
 from lxml import etree
diff --git a/translate/storage/utx.py b/translate/storage/utx.py
index 5f3a99d..36f7efd 100644
--- a/translate/storage/utx.py
+++ b/translate/storage/utx.py
@@ -31,7 +31,9 @@ The format can manage monolingual dictionaries but these classes don't
 implement that.
 
 Specification
-    The format is implemented according to the `v1.0 UTX <http://www.aamt.info/english/utx/utx-simple-1.00-specification-e.pdf>`_
+    The format is implemented according to UTX v1.0 (No longer available from
+    their website. The current `UTX version
+    <http://www.aamt.info/english/utx/#Download>`_ may be downloaded instead).
 
 Format Implementation
     The UTX format is a Tab Seperated Value (TSV) file in UTF-8.  The
@@ -58,14 +60,6 @@ class UtxDialect(csv.Dialect):
     # differences
     lineterminator = "\r\n"
     quoting = csv.QUOTE_NONE
-    if sys.version_info < (2, 5, 0):
-        # We need to define the following items for csv in Python < 2.5
-        # UTX does not quote anything FIXME So why MINIMAL?
-        quoting = csv.QUOTE_MINIMAL
-        doublequote = False
-        skipinitialspace = False
-        escapechar = None
-        quotechar = '"'
 csv.register_dialect("utx", UtxDialect)
 
 
diff --git a/translate/storage/versioncontrol/__init__.py b/translate/storage/versioncontrol/__init__.py
index 7e82017..4556bac 100644
--- a/translate/storage/versioncontrol/__init__.py
+++ b/translate/storage/versioncontrol/__init__.py
@@ -313,13 +313,22 @@ def get_versioned_object(
     if versioning_systems is None:
         versioning_systems = DEFAULT_RCS[:]
     # go through all RCS and return a versioned object if possible
+    possible_ver_objs = []
     for vers_sys in versioning_systems:
         try:
             vers_sys_class = __get_rcs_class(vers_sys)
-            if not vers_sys_class is None:
-                return vers_sys_class(location, oldest_parent)
+            if vers_sys_class is None:
+                continue
+            ver_obj = vers_sys_class(location, oldest_parent)
+            if not ver_obj.SCAN_PARENTS:
+                return ver_obj
+            possible_ver_objs.append(ver_obj)
         except IOError:
             continue
+    # if we find any RCS, return the one with shorted rel path
+    if len(possible_ver_objs):
+        possible_ver_objs.sort(key=lambda ver_obj: len(ver_obj.location_rel))
+        return possible_ver_objs[0]
     # if 'location' is a symlink, then we should try the original file
     if follow_symlinks and os.path.islink(location):
         return get_versioned_object(os.path.realpath(location),
diff --git a/translate/storage/versioncontrol/hg.py b/translate/storage/versioncontrol/hg.py
index 7cacc36..65dcccb 100644
--- a/translate/storage/versioncontrol/hg.py
+++ b/translate/storage/versioncontrol/hg.py
@@ -93,7 +93,7 @@ class hg(GenericRevisionControlSystem):
     def add(self, files, message=None, author=None):
         """Add and commit the new files."""
         files = prepare_filelist(files)
-        command = ["hg", "add", "-q", "--parents"] + files
+        command = ["hg", "add", "-q"] + files
         exitcode, output, error = run_command(command)
         if exitcode != 0:
             raise IOError("[Mercurial] Error running '%s': %s" %
diff --git a/translate/storage/wordfast.py b/translate/storage/wordfast.py
index 3f24aba..05a0a92 100644
--- a/translate/storage/wordfast.py
+++ b/translate/storage/wordfast.py
@@ -189,15 +189,6 @@ class WordfastDialect(csv.Dialect):
     delimiter = "\t"
     lineterminator = "\r\n"
     quoting = csv.QUOTE_NONE
-    if sys.version_info < (2, 5, 0):
-        # We need to define the following items for csv in Python < 2.5
-        quoting = csv.QUOTE_MINIMAL  # Wordfast does not quote anything, since
-                                     # we escape \t anyway in _char_to_wf this
-                                     # should not be a problem
-        doublequote = False
-        skipinitialspace = False
-        escapechar = None
-        quotechar = '"'
 csv.register_dialect("wordfast", WordfastDialect)
 
 
diff --git a/translate/storage/xliff.py b/translate/storage/xliff.py
index 1734d21..40b7e4f 100644
--- a/translate/storage/xliff.py
+++ b/translate/storage/xliff.py
@@ -536,6 +536,8 @@ class xlifffile(lisa.LISAfile):
 </file>
 </xliff>'''
     namespace = 'urn:oasis:names:tc:xliff:document:1.1'
+    unversioned_namespace = 'urn:oasis:names:tc:xliff:document:'
+
     suggestions_in_format = True
     """xliff units have alttrans tags which can be used to store suggestions"""
 
@@ -545,7 +547,15 @@ class xlifffile(lisa.LISAfile):
         self._messagenum = 0
 
     def initbody(self):
-        self.namespace = self.document.getroot().nsmap.get(None, None)
+        # detect the xliff namespace, handle both 1.1 and 1.2
+        for prefix, ns in self.document.getroot().nsmap.items():
+            if ns and ns.startswith(self.unversioned_namespace):
+                self.namespace = ns
+                break
+        else:
+            # handle crappy xliff docs without proper namespace declaration
+            # by simply using the xmlns default namespace
+            self.namespace = self.document.getroot().nsmap.get(None, None)
 
         if self._filename:
             filenode = self.getfilenode(self._filename, createifmissing=True)
diff --git a/translate/storage/xpi.py b/translate/storage/xpi.py
deleted file mode 100755
index 688d778..0000000
--- a/translate/storage/xpi.py
+++ /dev/null
@@ -1,597 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright 2004, 2005 Zuza Software Foundation
-#
-# This file is part of translate.
-#
-# translate is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# translate is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-"""Module for accessing mozilla xpi packages."""
-
-from __future__ import generators
-import zipfile
-import os.path
-import StringIO
-import re
-
-from translate import __version__
-
-# we have some enhancements to zipfile in a file called zipfileext
-# hopefully they will be included in a future version of python
-from translate.misc import zipfileext
-ZipFileBase = zipfileext.ZipFileExt
-
-
-from translate.misc import wStringIO
-
-
-class FixedStringIO(wStringIO.StringIO):
-    """This is a fix to the StringIO in Python 2.3.3
-    submitted as patch 951915 on sourceforge
-    """
-
-    def truncate(self, size=None):
-        StringIO.StringIO.truncate(self, size)
-        self.len = len(self.buf)
-
-NamedStringInput = wStringIO.StringIO
-NamedStringOutput = wStringIO.StringIO
-
-
-def _commonprefix(itemlist):
-
-    def cp(a, b):
-        l = min(len(a), len(b))
-        for n in range(l):
-            if a[n] != b[n]:
-                return a[:n]
-        return a[:l]
-    if itemlist:
-        return reduce(cp, itemlist)
-    else:
-        return ''
-
-
-def rememberchanged(self, method):
-
-    def changed(*args, **kwargs):
-        self.changed = True
-        method(*args, **kwargs)
-    return changed
-
-
-class CatchPotentialOutput(NamedStringInput, object):
-    """catches output if there has been, before closing"""
-
-    def __init__(self, contents, onclose):
-        """Set up the output stream, and remember a method to call on closing"""
-        NamedStringInput.__init__(self, contents)
-        self.onclose = onclose
-        self.changed = False
-        s = super(CatchPotentialOutput, self)
-        self.write = rememberchanged(self, s.write)
-        self.writelines = rememberchanged(self, s.writelines)
-        self.truncate = rememberchanged(self, s.truncate)
-
-    def close(self):
-        """wrap the underlying close method, to pass the value to onclose before it goes"""
-        if self.changed:
-            value = self.getvalue()
-            self.onclose(value)
-        NamedStringInput.close(self)
-
-    def flush(self):
-        """zip files call flush, not close, on file-like objects"""
-        value = self.getvalue()
-        self.onclose(value)
-        NamedStringInput.flush(self)
-
-    def slam(self):
-        """use this method to force the closing of the stream if it isn't closed yet"""
-        if not self.closed:
-            self.close()
-
-
-class ZipFileCatcher(ZipFileBase, object):
-    """a ZipFile that calls any methods its instructed to before closing (useful for catching stream output)"""
-
-    def __init__(self, *args, **kwargs):
-        """initialize the ZipFileCatcher"""
-        # storing oldclose as attribute, since if close is called from __del__ it has no access to external variables
-        self.oldclose = super(ZipFileCatcher, self).close
-        super(ZipFileCatcher, self).__init__(*args, **kwargs)
-
-    def addcatcher(self, pendingsave):
-        """remember to call the given method before closing"""
-        if hasattr(self, "pendingsaves"):
-            if not pendingsave in self.pendingsaves:
-                self.pendingsaves.append(pendingsave)
-        else:
-            self.pendingsaves = [pendingsave]
-
-    def close(self):
-        """close the stream, remembering to call any addcatcher methods first"""
-        if hasattr(self, "pendingsaves"):
-            for pendingsave in self.pendingsaves:
-                pendingsave()
-        # if close is called from __del__, it somehow can't see ZipFileCatcher, so we've cached oldclose...
-        if ZipFileCatcher is None:
-            self.oldclose()
-        else:
-            super(ZipFileCatcher, self).close()
-
-    def overwritestr(self, zinfo_or_arcname, bytes):
-        """writes the string into the archive, overwriting the file if it exists..."""
-        if isinstance(zinfo_or_arcname, zipfile.ZipInfo):
-            filename = zinfo_or_arcname.filename
-        else:
-            filename = zinfo_or_arcname
-        if filename in self.NameToInfo:
-            self.delete(filename)
-        self.writestr(zinfo_or_arcname, bytes)
-        self.writeendrec()
-
-
-class XpiFile(ZipFileCatcher):
-
-    def __init__(self, *args, **kwargs):
-        """sets up the xpi file"""
-        self.includenonloc = kwargs.get("includenonloc", True)
-        if "includenonloc" in kwargs:
-            del kwargs["includenonloc"]
-        if "compression" not in kwargs:
-            kwargs["compression"] = zipfile.ZIP_DEFLATED
-        self.locale = kwargs.pop("locale", None)
-        self.region = kwargs.pop("region", None)
-        super(XpiFile, self).__init__(*args, **kwargs)
-        self.jarfiles = {}
-        self.findlangreg()
-        self.jarprefixes = self.findjarprefixes()
-        self.reverseprefixes = dict([
-            (prefix, jarfilename) for jarfilename, prefix in self.jarprefixes.iteritems() if prefix])
-        self.reverseprefixes["package/"] = None
-
-    def iterjars(self):
-        """iterate through the jar files in the xpi as ZipFile objects"""
-        for filename in self.namelist():
-            if filename.lower().endswith('.jar'):
-                if filename not in self.jarfiles:
-                    jarstream = self.openinputstream(None, filename)
-                    jarfile = ZipFileCatcher(jarstream, mode=self.mode)
-                    self.jarfiles[filename] = jarfile
-                else:
-                    jarfile = self.jarfiles[filename]
-                yield filename, jarfile
-
-    def islocfile(self, filename):
-        """returns whether the given file is needed for localization (basically .dtd and .properties)"""
-        base, ext = os.path.splitext(filename)
-        return ext in (os.extsep + "dtd", os.extsep + "properties")
-
-    def findlangreg(self):
-        """finds the common prefix of all the files stored in the jar files"""
-        dirstructure = {}
-        locale = self.locale
-        region = self.region
-        localematch = re.compile("^[a-z]{2,3}(-[a-zA-Z]{2,3}|)$")
-        regionmatch = re.compile("^[a-zA-Z]{2,3}$")
-        # exclude en-mac, en-win, en-unix for seamonkey
-        osmatch = re.compile("^[a-z]{2,3}-(mac|unix|win)$")
-        for jarfilename, jarfile in self.iterjars():
-            jarname = "".join(jarfilename.split('/')[-1:]).replace(".jar", "", 1)
-            if localematch.match(jarname) and not osmatch.match(jarname):
-                if locale is None:
-                    locale = jarname
-                elif locale != jarname:
-                    locale = 0
-            elif regionmatch.match(jarname):
-                if region is None:
-                    region = jarname
-                elif region != jarname:
-                    region = 0
-            for filename in jarfile.namelist():
-                if filename.endswith('/'):
-                    continue
-                if not self.islocfile(filename) and not self.includenonloc:
-                    continue
-                parts = filename.split('/')[:-1]
-                treepoint = dirstructure
-                for partnum in range(len(parts)):
-                    part = parts[partnum]
-                    if part in treepoint:
-                        treepoint = treepoint[part]
-                    else:
-                        treepoint[part] = {}
-                        treepoint = treepoint[part]
-        localeentries = {}
-        if 'locale' in dirstructure:
-            for dirname in dirstructure['locale']:
-                localeentries[dirname] = 1
-                if localematch.match(dirname) and not osmatch.match(dirname):
-                    if locale is None:
-                        locale = dirname
-                    elif locale != dirname:
-                        print "locale dir mismatch - ", dirname, "but locale is", locale, "setting to 0"
-                        locale = 0
-                elif regionmatch.match(dirname):
-                    if region is None:
-                        region = dirname
-                    elif region != dirname:
-                        region = 0
-        if locale and locale in localeentries:
-            del localeentries[locale]
-        if region and region in localeentries:
-            del localeentries[region]
-        if locale and not region:
-            if "-" in locale:
-                region = locale.split("-", 1)[1]
-            else:
-                region = ""
-        self.setlangreg(locale, region)
-
-    def setlangreg(self, locale, region):
-        """set the locale and region of this xpi"""
-        if locale == 0 or locale is None:
-            raise ValueError("unable to determine locale")
-        self.locale = locale
-        self.region = region
-        self.dirmap = {}
-        if self.locale is not None:
-            self.dirmap[('locale', self.locale)] = ('lang-reg',)
-        if self.region:
-            self.dirmap[('locale', self.region)] = ('reg',)
-
-    def findjarprefixes(self):
-        """checks the uniqueness of the jar files contents"""
-        uniquenames = {}
-        jarprefixes = {}
-        for jarfilename, jarfile in self.iterjars():
-            jarprefixes[jarfilename] = ""
-            for filename in jarfile.namelist():
-                if filename.endswith('/'):
-                    continue
-                if filename in uniquenames:
-                    jarprefixes[jarfilename] = True
-                    jarprefixes[uniquenames[filename]] = True
-                else:
-                    uniquenames[filename] = jarfilename
-        for jarfilename, hasconflicts in jarprefixes.items():
-            if hasconflicts:
-                shortjarfilename = os.path.split(jarfilename)[1]
-                shortjarfilename = os.path.splitext(shortjarfilename)[0]
-                jarprefixes[jarfilename] = shortjarfilename + '/'
-        # this is a clever trick that will e.g. remove zu- from zu-win, zu-mac, zu-unix
-        commonjarprefix = _commonprefix([prefix for prefix in jarprefixes.itervalues() if prefix])
-        if commonjarprefix:
-            for jarfilename, prefix in jarprefixes.items():
-                if prefix:
-                    jarprefixes[jarfilename] = prefix.replace(commonjarprefix, '', 1)
-        return jarprefixes
-
-    def ziptoospath(self, zippath):
-        """converts a zipfile filepath to an os-style filepath"""
-        return os.path.join(*zippath.split('/'))
-
-    def ostozippath(self, ospath):
-        """converts an os-style filepath to a zipfile filepath"""
-        return '/'.join(ospath.split(os.sep))
-
-    def mapfilename(self, filename):
-        """uses a map to simplify the directory structure"""
-        parts = tuple(filename.split('/'))
-        possiblematch = None
-        for prefix, mapto in self.dirmap.iteritems():
-            if parts[:len(prefix)] == prefix:
-                if possiblematch is None or len(possiblematch[0]) < len(prefix):
-                    possiblematch = prefix, mapto
-        if possiblematch is not None:
-            prefix, mapto = possiblematch
-            mapped = mapto + parts[len(prefix):]
-            return '/'.join(mapped)
-        return filename
-
-    def mapxpifilename(self, filename):
-        """uses a map to rename files that occur straight in the xpi"""
-        if filename.startswith('bin/chrome/') and filename.endswith(".manifest"):
-            return 'bin/chrome/lang-reg.manifest'
-        return filename
-
-    def reversemapfile(self, filename):
-        """unmaps the filename..."""
-        possiblematch = None
-        parts = tuple(filename.split('/'))
-        for prefix, mapto in self.dirmap.iteritems():
-            if parts[:len(mapto)] == mapto:
-                if possiblematch is None or len(possiblematch[0]) < len(mapto):
-                    possiblematch = (mapto, prefix)
-        if possiblematch is None:
-            return filename
-        mapto, prefix = possiblematch
-        reversemapped = prefix + parts[len(mapto):]
-        return '/'.join(reversemapped)
-
-    def reversemapxpifilename(self, filename):
-        """uses a map to rename files that occur straight in the xpi"""
-        if filename == 'bin/chrome/lang-reg.manifest':
-            if self.locale:
-                return '/'.join(('bin', 'chrome', self.locale + '.manifest'))
-            else:
-                for otherfilename in self.namelist():
-                    if otherfilename.startswith("bin/chrome/") and otherfilename.endswith(".manifest"):
-                        return otherfilename
-        return filename
-
-    def jartoospath(self, jarfilename, filename):
-        """converts a filename from within a jarfile to an os-style filepath"""
-        if jarfilename:
-            jarprefix = self.jarprefixes[jarfilename]
-            return self.ziptoospath(jarprefix + self.mapfilename(filename))
-        else:
-            return self.ziptoospath(os.path.join("package", self.mapxpifilename(filename)))
-
-    def ostojarpath(self, ospath):
-        """converts an extracted os-style filepath to a jarfilename and filename"""
-        zipparts = ospath.split(os.sep)
-        prefix = zipparts[0] + '/'
-        if prefix in self.reverseprefixes:
-            jarfilename = self.reverseprefixes[prefix]
-            filename = self.reversemapfile('/'.join(zipparts[1:]))
-            if jarfilename is None:
-                filename = self.reversemapxpifilename(filename)
-            return jarfilename, filename
-        else:
-            filename = self.ostozippath(ospath)
-            if filename in self.namelist():
-                return None, filename
-            filename = self.reversemapfile('/'.join(zipparts))
-            possiblejarfilenames = [jarfilename for jarfilename, prefix in self.jarprefixes.iteritems() if not prefix]
-            for jarfilename in possiblejarfilenames:
-                jarfile = self.jarfiles[jarfilename]
-                if filename in jarfile.namelist():
-                    return jarfilename, filename
-            raise IndexError("ospath not found in xpi file, could not guess location: %r" % ospath)
-
-    def jarfileexists(self, jarfilename, filename):
-        """checks whether the given file exists inside the xpi"""
-        if jarfilename is None:
-            return filename in self.namelist()
-        else:
-            jarfile = self.jarfiles[jarfilename]
-            return filename in jarfile.namelist()
-
-    def ospathexists(self, ospath):
-        """checks whether the given file exists inside the xpi"""
-        jarfilename, filename = self.ostojarpath(ospath)
-        if jarfilename is None:
-            return filename in self.namelist()
-        else:
-            jarfile = self.jarfiles[jarfilename]
-            return filename in jarfile.namelist()
-
-    def openinputstream(self, jarfilename, filename):
-        """opens a file (possibly inside a jarfile as a StringIO"""
-        if jarfilename is None:
-            contents = self.read(filename)
-
-            def onclose(contents):
-                if contents != self.read(filename):
-                    self.overwritestr(filename, contents)
-            inputstream = CatchPotentialOutput(contents, onclose)
-            self.addcatcher(inputstream.slam)
-        else:
-            jarfile = self.jarfiles[jarfilename]
-            contents = jarfile.read(filename)
-            inputstream = NamedStringInput(contents)
-        inputstream.name = self.jartoospath(jarfilename, filename)
-        if hasattr(self.fp, 'name'):
-            inputstream.name = "%s:%s" % (self.fp.name, inputstream.name)
-        return inputstream
-
-    def openoutputstream(self, jarfilename, filename):
-        """opens a file for writing (possibly inside a jarfile as a StringIO"""
-        if jarfilename is None:
-
-            def onclose(contents):
-                self.overwritestr(filename, contents)
-        else:
-            if jarfilename in self.jarfiles:
-                jarfile = self.jarfiles[jarfilename]
-            else:
-                jarstream = self.openoutputstream(None, jarfilename)
-                jarfile = ZipFileCatcher(jarstream, "w")
-                self.jarfiles[jarfilename] = jarfile
-                self.addcatcher(jarstream.slam)
-
-            def onclose(contents):
-                jarfile.overwritestr(filename, contents)
-        outputstream = wStringIO.CatchStringOutput(onclose)
-        outputstream.name = "%s %s" % (jarfilename, filename)
-        if jarfilename is None:
-            self.addcatcher(outputstream.slam)
-        else:
-            jarfile.addcatcher(outputstream.slam)
-        return outputstream
-
-    def close(self):
-        """Close the file, and for mode "w" and "a" write the ending records."""
-        for jarfile in self.jarfiles.itervalues():
-            jarfile.close()
-        super(XpiFile, self).close()
-
-    def testzip(self):
-        """test the xpi zipfile and all enclosed jar files..."""
-        for jarfile in self.jarfiles.itervalues():
-            jarfile.testzip()
-        super(XpiFile, self).testzip()
-
-    def restructurejar(self, origjarfilename, newjarfilename, otherxpi, newlang, newregion):
-        """Create a new .jar file with the same contents as the given name, but rename directories, write to outputstream"""
-        jarfile = self.jarfiles[origjarfilename]
-        origlang = self.locale[:self.locale.find("-")]
-        if newregion:
-            newlocale = "%s-%s" % (newlang, newregion)
-        else:
-            newlocale = newlang
-        for filename in jarfile.namelist():
-            filenameparts = filename.split("/")
-            for i in range(len(filenameparts)):
-                part = filenameparts[i]
-                if part == origlang:
-                    filenameparts[i] = newlang
-                elif part == self.locale:
-                    filenameparts[i] = newlocale
-                elif part == self.region:
-                    filenameparts[i] = newregion
-            newfilename = '/'.join(filenameparts)
-            fileoutputstream = otherxpi.openoutputstream(newjarfilename, newfilename)
-            fileinputstream = self.openinputstream(origjarfilename, filename)
-            fileoutputstream.write(fileinputstream.read())
-            fileinputstream.close()
-            fileoutputstream.close()
-
-    def clone(self, newfilename, newmode=None, newlang=None, newregion=None):
-        """Create a new .xpi file with the same contents as this one..."""
-        other = XpiFile(newfilename, "w", locale=newlang, region=newregion)
-        origlang = self.locale[:self.locale.find("-")]
-        # TODO: check if this language replacement code is still neccessary
-        if newlang is None:
-            newlang = origlang
-        if newregion is None:
-            newregion = self.region
-        if newregion:
-            newlocale = "%s-%s" % (newlang, newregion)
-        else:
-            newlocale = newlang
-        for filename in self.namelist():
-            filenameparts = filename.split('/')
-            basename = filenameparts[-1]
-            if basename.startswith(self.locale):
-                newbasename = basename.replace(self.locale, newlocale)
-            elif basename.startswith(origlang):
-                newbasename = basename.replace(origlang, newlang)
-            elif basename.startswith(self.region):
-                newbasename = basename.replace(self.region, newregion)
-            else:
-                newbasename = basename
-            if newbasename != basename:
-                filenameparts[-1] = newbasename
-                renamefilename = "/".join(filenameparts)
-                print "cloning", filename, "and renaming to", renamefilename
-            else:
-                print "cloning", filename
-                renamefilename = filename
-            if filename.lower().endswith(".jar"):
-                self.restructurejar(filename, renamefilename, other, newlang, newregion)
-            else:
-                inputstream = self.openinputstream(None, filename)
-                outputstream = other.openoutputstream(None, renamefilename)
-                outputstream.write(inputstream.read())
-                inputstream.close()
-                outputstream.close()
-        other.close()
-        if newmode is None:
-            newmode = self.mode
-        if newmode == "w":
-            newmode = "a"
-        other = XpiFile(newfilename, newmode)
-        other.setlangreg(newlocale, newregion)
-        return other
-
-    def iterextractnames(self, includenonjars=False, includedirs=False):
-        """iterates through all the localization files with the common prefix stripped and a jarfile name added if neccessary"""
-        if includenonjars:
-            for filename in self.namelist():
-                if filename.endswith('/') and not includedirs:
-                    continue
-                if not self.islocfile(filename) and not self.includenonloc:
-                    continue
-                if not filename.lower().endswith(".jar"):
-                    yield self.jartoospath(None, filename)
-        for jarfilename, jarfile in self.iterjars():
-            for filename in jarfile.namelist():
-                if filename.endswith('/'):
-                    if not includedirs:
-                        continue
-                if not self.islocfile(filename) and not self.includenonloc:
-                    continue
-                yield self.jartoospath(jarfilename, filename)
-
-    # the following methods are required by translate.convert.ArchiveConvertOptionParser #
-    def __iter__(self):
-        """iterates through all the files. this is the method use by the converters"""
-        for inputpath in self.iterextractnames(includenonjars=True):
-            yield inputpath
-
-    def __contains__(self, fullpath):
-        """returns whether the given pathname exists in the archive"""
-        try:
-            jarfilename, filename = self.ostojarpath(fullpath)
-        except IndexError:
-            return False
-        return self.jarfileexists(jarfilename, filename)
-
-    def openinputfile(self, fullpath):
-        """opens an input file given the full pathname"""
-        jarfilename, filename = self.ostojarpath(fullpath)
-        return self.openinputstream(jarfilename, filename)
-
-    def openoutputfile(self, fullpath):
-        """opens an output file given the full pathname"""
-        try:
-            jarfilename, filename = self.ostojarpath(fullpath)
-        except IndexError:
-            return None
-        return self.openoutputstream(jarfilename, filename)
-
-
-if __name__ == '__main__':
-    import optparse
-    optparser = optparse.OptionParser(version="%prog " + __version__.sver)
-    optparser.usage = "%prog [-l|-x] [options] file.xpi"
-    optparser.add_option("-l", "--list", help="list files", \
-        action="store_true", dest="listfiles", default=False)
-    optparser.add_option("-p", "--prefix", help="show common prefix", \
-        action="store_true", dest="showprefix", default=False)
-    optparser.add_option("-x", "--extract", help="extract files", \
-        action="store_true", dest="extractfiles", default=False)
-    optparser.add_option("-d", "--extractdir", help="extract into EXTRACTDIR", \
-        default=".", metavar="EXTRACTDIR")
-    (options, args) = optparser.parse_args()
-    if len(args) < 1:
-        optparser.error("need at least one argument")
-    xpifile = XpiFile(args[0])
-    if options.showprefix:
-        for prefix, mapto in xpifile.dirmap.iteritems():
-            print "/".join(prefix), "->", "/".join(mapto)
-    if options.listfiles:
-        for name in xpifile.iterextractnames(includenonjars=True, includedirs=True):
-            print name  # , xpifile.ostojarpath(name)
-    if options.extractfiles:
-        if options.extractdir and not os.path.isdir(options.extractdir):
-            os.mkdir(options.extractdir)
-        for name in xpifile.iterextractnames(includenonjars=True, includedirs=False):
-            abspath = os.path.join(options.extractdir, name)
-            # check neccessary directories exist - this way we don't create empty directories
-            currentpath = options.extractdir
-            subparts = os.path.dirname(name).split(os.sep)
-            for part in subparts:
-                currentpath = os.path.join(currentpath, part)
-                if not os.path.isdir(currentpath):
-                    os.mkdir(currentpath)
-            outputstream = open(abspath, 'w')
-            jarfilename, filename = xpifile.ostojarpath(name)
-            inputstream = xpifile.openinputstream(jarfilename, filename)
-            outputstream.write(inputstream.read())
-            outputstream.close()
diff --git a/translate/storage/zip.py b/translate/storage/zip.py
index 003b68f..4f03029 100644
--- a/translate/storage/zip.py
+++ b/translate/storage/zip.py
@@ -25,8 +25,6 @@
 
 #TODO: consider also providing directories as we currently provide files
 
-#TODO: refactor with existing zip code (xpi.py, etc.)
-
 from os import path
 from zipfile import ZipFile
 
diff --git a/translate/tools/build_tmdb.py b/translate/tools/build_tmdb.py
old mode 100755
new mode 100644
index 9aa22e6..6c9cb28
--- a/translate/tools/build_tmdb.py
+++ b/translate/tools/build_tmdb.py
@@ -21,12 +21,15 @@
 """Import units from translations files into tmdb."""
 
 import os
-from optparse import OptionParser
 import sys
+import logging
+
+from optparse import OptionParser
 
 from translate.storage import factory
 from translate.storage import tmdb
 
+logger = logging.getLogger(__name__)
 
 class Builder:
 
@@ -37,7 +40,7 @@ class Builder:
 
         for filename in filenames:
             if not os.path.exists(filename):
-                print >> sys.stderr, "cannot process %s: does not exist" % filename
+                logger.error("cannot process %s: does not exist", filename)
                 continue
             elif os.path.isdir(filename):
                 self.handledir(filename)
@@ -49,7 +52,7 @@ class Builder:
         try:
             store = factory.getobject(filename)
         except Exception, e:
-            print >> sys.stderr, str(e)
+            logger.error(str(e))
             return
         # do something useful with the store and db
         try:
@@ -75,11 +78,6 @@ class Builder:
 
 
 def main():
-    try:
-        import psyco
-        psyco.full()
-    except Exception:
-        pass
     parser = OptionParser(usage="%prog [options] <input files>")
     parser.add_option(
         "-d", "--tmdb", dest="tmdb_file", default="tm.db",
@@ -98,6 +96,8 @@ def main():
     if len(args) < 1:
         parser.error('No input file(s) specified.')
 
+    logging.basicConfig(format="%(name)s: %(levelname)s: %(message)s")
+
     Builder(options.tmdb_file, options.source_lang, options.target_lang, args)
 
 if __name__ == '__main__':
diff --git a/translate/tools/poconflicts.py b/translate/tools/poconflicts.py
index 2f2ea14..6e68478 100644
--- a/translate/tools/poconflicts.py
+++ b/translate/tools/poconflicts.py
@@ -70,7 +70,6 @@ class ConflictOptionParser(optrecurse.RecursiveOptionParser):
         (options, args) = self.parse_args()
         options.inputformats = self.inputformats
         options.outputoptions = self.outputoptions
-        self.usepsyco(options)
         self.recursiveprocess(options)
 
     def recursiveprocess(self, options):
diff --git a/translate/tools/pocount.py b/translate/tools/pocount.py
index 28251cf..9e27521 100644
--- a/translate/tools/pocount.py
+++ b/translate/tools/pocount.py
@@ -29,10 +29,13 @@ for examples and usage instructions.
 from optparse import OptionParser
 import os
 import sys
+import logging
 
 from translate.storage import factory
 from translate.storage import statsdb
 
+logger = logging.getLogger(__name__)
+
 # define style constants
 style_full, style_csv, style_short_strings, style_short_words = range(4)
 
@@ -47,7 +50,7 @@ def calcstats_old(filename):
     try:
         store = factory.getobject(filename)
     except ValueError, e:
-        print str(e)
+        logger.warning(e)
         return {}
     units = filter(lambda unit: unit.istranslatable(), store.units)
     translated = translatedmessages(units)
@@ -204,7 +207,7 @@ Review Messages, Review Source Words"
                     self.longestfilename = len(filename)
         for filename in filenames:
             if not os.path.exists(filename):
-                print >> sys.stderr, "cannot process %s: does not exist" % filename
+                logger.error("cannot process %s: does not exist", filename)
                 continue
             elif os.path.isdir(filename):
                 self.handledir(filename)
@@ -239,7 +242,7 @@ Review Messages, Review Source Words"
                                              self.incomplete_only)
             self.filecount += 1
         except:  # This happens if we have a broken file.
-            print >> sys.stderr, sys.exc_info()[1]
+            logger.error(sys.exc_info()[1])
 
     def handlefiles(self, dirname, filenames):
         for filename in filenames:
@@ -303,11 +306,7 @@ def main():
     if options.style_short_words:
         style = style_short_words
 
-    try:
-        import psyco
-        psyco.full()
-    except Exception:
-        pass
+    logging.basicConfig(format="%(name)s: %(levelname)s: %(message)s")
 
     summarizer(args, style, options.incomplete_only)
 
diff --git a/translate/tools/pogrep.py b/translate/tools/pogrep.py
index 99ce4a9..d12d979 100644
--- a/translate/tools/pogrep.py
+++ b/translate/tools/pogrep.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2002-2011 Zuza Software Foundation
+# Copyright 2013 F Wolff
 #
 # This file is part of translate.
 #
@@ -120,9 +121,13 @@ def find_matches(unit, part, strings, re_search):
         if not string:
             continue
         normalized = data.normalize(string)
+        if normalized == string:
+            index_func = lambda s, i: i
+        else:
+            index_func = real_index
         for matchobj in re_search.finditer(normalized):
-            start = real_index(string, matchobj.start())
-            end = real_index(string, matchobj.end())
+            start = index_func(string, matchobj.start())
+            end = index_func(string, matchobj.end())
             matches.append(GrepMatch(unit, part=part, part_n=n, start=start, end=end))
     return matches
 
@@ -323,7 +328,6 @@ class GrepOptionParser(optrecurse.RecursiveOptionParser):
                                          options.keeptranslations,
                                          options.accelchar,
                                          locale.getpreferredencoding())
-        self.usepsyco(options)
         self.recursiveprocess(options)
 
 
diff --git a/translate/tools/poterminology.py b/translate/tools/poterminology.py
index 35c94fd..d2a54a6 100644
--- a/translate/tools/poterminology.py
+++ b/translate/tools/poterminology.py
@@ -32,6 +32,7 @@ from translate.storage import po
 from translate.storage import factory
 from translate.misc import file_discovery
 
+logger = logging.getLogger(__name__)
 
 def create_termunit(term, unit, targets, locations, sourcenotes, transnotes, filecounts):
     termunit = po.pounit(term)
@@ -118,14 +119,17 @@ class TerminologyExtractor(object):
                     elif stopline[1] == 'I':
                         self.stopignorecase = True
                     else:
-                        logging.warning("%s line %d - bad case mapping directive", (self.stopfile, line))
+                        logger.warning("%s:%d - bad case mapping directive",
+                                       self.stopfile, line)
                 elif stoptype == '/':
                     self.stoprelist.append(re.compile(stopline[1:-1] + '$'))
                 else:
                     self.stopwords[stopline[1:-1]] = actions[stoptype]
         except KeyError, character:
-            logging.warning("%s line %d - bad stopword entry starts with", (self.stopfile, line))
-            logging.warning("%s line %d all lines after error ignored", (self.stopfile, line + 1))
+            logger.warning("%s:%d - bad stopword entry starts with '%s'",
+                           self.stopfile, line, str(character))
+            logger.warning("%s:%d all lines after error ignored",
+                           self.stopfile, line + 1)
         stopfile.close()
 
     def clean(self, string):
@@ -235,8 +239,7 @@ class TerminologyExtractor(object):
     def extract_terms(self, create_termunit=create_termunit, inputmin=1, fullmsgmin=1, substrmin=2, locmin=2):
         terms = {}
         locre = re.compile(r":[0-9]+$")
-        print >> sys.stderr, ("%d terms from %d units" %
-                              (len(self.glossary), self.units))
+        logger.info("%d terms from %d units", len(self.glossary), self.units)
         for term, translations in self.glossary.iteritems():
             if len(translations) <= 1:
                 continue
@@ -297,7 +300,7 @@ class TerminologyExtractor(object):
         """reduce subphrases from extracted terms"""
         # reduce subphrase
         termlist = terms.keys()
-        print >> sys.stderr, "%d terms after thresholding" % len(termlist)
+        logger.info("%d terms after thresholding", len(termlist))
         termlist.sort(lambda x, y: cmp(len(x), len(y)))
         for term in termlist:
             words = term.split()
@@ -316,7 +319,7 @@ class TerminologyExtractor(object):
                 words.pop(0)
                 if terms[term][0] == terms.get(' '.join(words), [0])[0]:
                     del terms[' '.join(words)]
-        print >> sys.stderr, "%d terms after subphrase reduction" % len(terms.keys())
+        logger.info("%d terms after subphrase reduction", len(terms.keys()))
         termitems = terms.values()
         if sortorders is None:
             sortorders = self.sortorders_default
@@ -329,7 +332,7 @@ class TerminologyExtractor(object):
             elif order == "length":
                 termitems.sort(lambda x, y: cmp(len(x[1].source), len(y[1].source)))
             else:
-                logging.warning("unknown sort order %s", order)
+                logger.warning("unknown sort order %s", order)
         return termitems
 
 
@@ -395,7 +398,6 @@ class TerminologyOptionParser(optrecurse.RecursiveOptionParser):
         (options, args) = self.parse_args()
         options.inputformats = self.inputformats
         options.outputoptions = self.outputoptions
-        self.usepsyco(options)
         self.extractor = TerminologyExtractor(foldtitle=options.foldtitle, ignorecase=options.ignorecase,
                                               accelchars=options.accelchars, termlength=options.termlength,
                                               sourcelanguage=options.sourcelanguage,
@@ -443,7 +445,7 @@ class TerminologyOptionParser(optrecurse.RecursiveOptionParser):
     def outputterminology(self, options):
         """saves the generated terminology glossary"""
         termfile = po.pofile()
-        print >> sys.stderr, ("scanned %d files" % self.files)
+        logger.info("scanned %d files", self.files)
         terms = self.extractor.extract_terms(inputmin=options.inputmin, fullmsgmin=options.fullmsgmin,
                                    substrmin=options.substrmin, locmin=options.locmin)
         termitems = self.extractor.filter_terms(terms, nonstopmin=options.nonstopmin, sortorders=options.sortorders)
diff --git a/translate/tools/test_pocount.py b/translate/tools/test_pocount.py
index aba61d0..3890d27 100644
--- a/translate/tools/test_pocount.py
+++ b/translate/tools/test_pocount.py
@@ -4,7 +4,7 @@
 import StringIO
 from translate.tools import pocount
 
-from py.test import mark
+from pytest import mark
 
 from translate.storage import po
 from translate.storage import statsdb
diff --git a/translate/tools/test_pomerge.py b/translate/tools/test_pomerge.py
index 573cf64..e5b6aa7 100644
--- a/translate/tools/test_pomerge.py
+++ b/translate/tools/test_pomerge.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from py import test
-from py.test import mark
+import pytest
+from pytest import mark
 
 from translate.tools import pomerge
 from translate.storage import factory
@@ -19,7 +19,7 @@ def test_str2bool():
     assert not pomerge.str2bool("no")
     assert not pomerge.str2bool("false")
     assert not pomerge.str2bool("0")
-    test.raises(ValueError, pomerge.str2bool, "2")
+    pytest.raises(ValueError, pomerge.str2bool, "2")
 
 
 class TestPOMerge:
@@ -85,9 +85,9 @@ class TestPOMerge:
         templatefile = wStringIO.StringIO("")
         inputfile = wStringIO.StringIO("")
         outputfile = wStringIO.StringIO()
-        test.raises(ValueError, pomerge.mergestore, inputfile, outputfile,
+        pytest.raises(ValueError, pomerge.mergestore, inputfile, outputfile,
                     templatefile, mergeblanks="yay")
-        test.raises(ValueError, pomerge.mergestore, inputfile, outputfile,
+        pytest.raises(ValueError, pomerge.mergestore, inputfile, outputfile,
                     templatefile, mergecomments="yay")
 
     def test_simplemerge(self):
diff --git a/translate/tools/test_pretranslate.py b/translate/tools/test_pretranslate.py
index 00e7142..6a101db 100644
--- a/translate/tools/test_pretranslate.py
+++ b/translate/tools/test_pretranslate.py
@@ -3,7 +3,7 @@
 
 import warnings
 
-from py.test import mark
+from pytest import mark
 
 from translate.tools import pretranslate
 from translate.convert import test_convert

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-l10n/translate-toolkit.git



More information about the Debian-l10n-commits mailing list