Merge branch 'ja/diff-opt-typofix'

Typofix.

* ja/diff-opt-typofix:
diff: fix mistake in translatable strings

diff --cc diff.c
Simple merge