[fr] Update chapter on diffing
[fr] sync with 90c92ceb
[fr] sync with 21e84add
[fr] sync with 2a0a8371
[fr] apply 15f2bf1b
[fr] apply bdef6f76 and 1ca5ef16
fix  chap 4.
[fr] update with bdef6f76
[fr] sync with c418e2ea
[fr] Sync with ceba7dfb
[fr] Sync with 60e26189
[zh]Translate binary file type name
[zh]Translate a part of chapter 7
Translate OpenDocument Text files section in chapter 7
[zh-tw] Correct some typos on chapter3
[fa] Persian translation started. includes two paragraphs from chapter 1 and an inirial README file to complete as the work progresses
chapter 1 progressing, chapter 3 started
Update link to download P4Merge tool
Merge pull request #820 from Oxtay/master

[fa] Initiating Persian translation
Merge pull request #822 from zhukangyi/translate

[zh]Translate a part of chapter 7
Merge pull request #823 from randomecho/ch7-p4merge-download-link

Update link to download P4Merge tool