shrink: handle all combinations of inline/non-inline revlogs

commands: clarify --config syntax

progress: provide an explicit disable method for developers The other three checks for disabling the progress bar have serious side effects for any class that derives from ui.ui()

url: only mark format string for translation

Merge with hg-i18n

i18n-da: fixed typo

i18n-ja: synchronized with eddf859343de

i18n-pt_BR: synchronized with 076e8a8000a3, minor fixes

url: avoid traceback when parsing [auth] (issue2056)

filemerge: use native path separators when merging (issue1399)

gpg: make 13448eab08ca work when not on repo root

hgweb: use string join instead of slower cStringIO

hgweb: fix handling of arguments in the between command The 'pairs' argument was coded to be optional, but the code would crash if it was not provided.

hgcia: report RPC errors

merge with stable