Merge branch 'master' of vcs.fsf.org:enc

diff --cc en/index.html
Simple merge

diff --cc en/mac.html
Simple merge

diff --cc en/windows.html
Simple merge

diff --cc fr/index.html
Simple merge

diff --cc fr/mac.html
Simple merge

diff --cc fr/windows.html
Simple merge

diff --cc ja/index.html
Simple merge

diff --cc ja/mac.html
Simple merge

diff --cc ja/windows.html
Simple merge

diff --cc ko/index.html
Simple merge

diff --cc pt-br/index.html
Simple merge

diff --cc pt-br/mac.html
Simple merge

diff --cc pt-br/windows.html
Simple merge

diff --cc ro/index.html
Simple merge

diff --cc ro/mac.html
Simple merge

diff --cc ro/windows.html
Simple merge

diff --cc ru/index.html
Simple merge

diff --cc ru/mac.html
Simple merge

diff --cc ru/windows.html
Simple merge

diff --cc tr/index.html
Simple merge

diff --cc tr/mac.html
Simple merge

diff --cc tr/windows.html
Simple merge