[ckan-discuss] Merged ckan-i18n into ckan main

[Rufus Pollock]

Thanks largely to the efforts of Benoit we now have merged the latest
i18n work from ckan-i18n into ckan main (and also established a
process for doing this in future [1]).

This involved a lot of additional changeset appearing (in part thanks
to transifex usage) so anyone developing against ckan main should pull
asap.

Regards,

Rufus

[1]: As detailed in cset:1c688ab14a97

[branch,metastable][xs]: make tip back into metastable after merging
ckan-i18n repo (bboisin).

Performed following sequence of steps:
  * ckan-i18n: bboisin merged ckan(-main) metastable into default and
made some additional fixes
  * ckan-main: hg up metastable
  * ckan-main: hg pull ckan-i18n
    * (+ 1 heads -- default now has 2 heads one of which is really metastable)
  * ckan-main: hg up tip
  * ckan-main: hg branch --force metastable
  * ckan-main: hg ci (this log message)

[Finally, if you want to merge metastable back into default you would
do something like, Next you would do:

hg up default
hg up --clean -r {last revision in default not from i18n)
hg merge metastable