Remove duplicate files. Allow partial translations.

Makefile

@@ -17,6 +17,13 @@ book.xml: $(addprefix $(LANG)/,$(TXTFILES))
 	( for FILE in $^ ; do cat $$FILE ; echo ; done ) | \
     asciidoc -a lang=$(LANG) -d book -b docbook -f conf - > $@
 
+# Allow unfinished translations to build with this dummy rule.
+# Report an error if we reach this rule for the English version.
+$(addprefix $(LANG)/,$(TXTFILES)) :
+ifeq ($(LANG),en)
+	echo English file missing: $@; exit 123
+endif
+
 # Ignore tidy's exit code because Asciidoc generates section IDs beginning with
 # "_", which xmlto converts to "id" attributes of <a> tags. The standard
 # insists that "id" attributes begin with a letter, which causes tidy to

en/secrets.txt

@@ -48,8 +48,7 @@ This http://lkml.org/lkml/2005/4/6/121[Linux Kernel Mailing List post] describes
 
 === The Object Database ===
 
-Are you a systems programmer? Then here's how to write a Git-like
-system from scratch in a few hours.
+Here's how to write a Git-like system from scratch in a few hours.
 
 ==== Blobs ====
 
@@ -86,7 +85,7 @@ object and the length of its contents in bytes, to simplify internal
 bookkeeping. This is how I knew what you would see. The file's name is
 irrelevant: only the data inside is used to construct the blob object.
 
-You may be wondering: what happens with identical files? Try adding copies of
+You may be wondering what happens to identical files. Try adding copies of
 your file, with any filenames whatsoever. The contents of +.git/objects+ stay
 the same no matter how many copies you add. Git only stores the data once.
 
@@ -111,12 +110,13 @@ You should now see 3 objects. This time I cannot tell you what the 2 new files a
  $ git filter-branch --tree-filter 'mv YOUR_FILENAME rose'
  $ find .git/objects -type f
 
-Now you should see +.git/objects/05/b217bb859794d08bb9e4f7f04cbda4b207fbe9+,
-because this is the SHA1 hash of:
+Now you should see the file
++.git/objects/05/b217bb859794d08bb9e4f7f04cbda4b207fbe9+, because this is the
+SHA1 hash of its contents:
 
  "tree" SP "32" NUL "100644 rose" NUL 0xaa823728ea7d592acc69b36875a482cdf3fd5c8d
 
-Check this file does indeed contain this by typing:
+Check this file does indeed contain the above by typing:
 
  $ echo 05b217bb859794d08bb9e4f7f04cbda4b207fbe9 | git cat-file --batch
 
@@ -143,9 +143,9 @@ delete them now to make our toy example easier to follow:
 
 For real projects you should typically avoid commands like this, as you are
 destroying backups. If you want a clean repository, it is usually best to make
-a fresh clone. Also, take care if you directly manipulate +.git+: what if a Git
+a fresh clone. Also, take care when directly manipulating +.git+: what if a Git
 command is running at the same time, or a sudden power outage occurs?
-Ideally, refs should be deleted with *git update-ref -d*,
+In general, refs should be deleted with *git update-ref -d*,
 though usually it's safe to remove +refs/original+ by hand.
 
 ==== Commits ====