Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

diff --combined Documentation/macros.itexi
index 8ae6d3ab12809acd962203e5ea70261d0ff46218,3a4447a898bffd8301975f84218c30555fb537f4..68e76c37db4944374745ef8b575202d9b8da513e
--- 1/Documentation/macros.itexi
--- 2/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@@ -127,7 -127,7 +127,7 @@@ This document has been placed in the pu
  
  @vskip 0pt plus 1filll
  
 -@insertcopying{}
 +@insertcopying
  
  For LilyPond version @version{}
  @end titlepage
@@@ -708,7 -708,7 +708,7 @@@ The @qq{X image} is not a registered tr
  placed under the GNU Free Documentation License version 1.2 or later.
  We found the image on
  @uref{http://commons.wikimedia.org/wiki/File:Mac_OS_X_Userbox_X.png,
- this Wikipedia Commons page}.
+ this Wikimedia Commons page}.
  
  @end macro
  
@@@ -719,7 -719,7 +719,7 @@@ trademark.  It was created b
  placed under the GNU Free Documentation License version 1.2.  We
  found the image on
  @uref{http://commons.wikimedia.org/wiki/Category:Microsoft_Windows_logos,
- this Wikipedia Commons page}.
+ this Wikimedia Commons page}.
  
  @end macro