i18n-ja: synchronized with c50a3d7154d2

i18n-pt_BR: synchronized with f142fa3c0a8c

test-fetch: use relative URL to avoid echoing TMP path

fetch: fix newheads calculation (issue2047)

Make annotate --follow an alias for -f/--file to behave like in older versions Since 98a0421b9e52 annotate follows copies/renames by default, but the output of e.g. "annotate --follow --number" should not change without some deprecation time.

win32/hgwebdir_wsgi: clarify copyright license

store: only add new entries to the fncache file Newly added fncache entries were not added to the in-memory cache, making it possible for 'hg convert' to cause duplicates in .hg/store/fncache. Duplicates in the fncache file are harmless, but excessive numbers of duplicates from large converted repositories may slow down execution speed considerably.

Updated test output of test-convert-baz after f2618cacb485

trailing spaces (and one stray tab)

Merge with default