Merge branch 'master' into nested-bookparts

[lilypond.git] / Documentation / fr / user / setup.itely

diff --git a/Documentation/fr/user/setup.itely b/Documentation/fr/user/setup.itely
index 1ec935d2c349c4e7fac3ae14a0470f96b65b2a49..44f4ca245ca44be633da7ba07e0e98861bce01df 100644 (file)
--- a/Documentation/fr/user/setup.itely
+++ b/Documentation/fr/user/setup.itely
@@ -1,81 +1,97 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
 @c This file is part of lilypond-program.tely
 @ignore
-    Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0
+    Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.38"
-
 
 @node Setup
 @chapter Setup
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
-@menu 
+@menu
 * Setup for specific Operating Systems::
 * Text editor support::
 * Point and click::
-@end menu 
+@end menu
+
 @node Setup for specific Operating Systems
 @section Setup for specific Operating Systems
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
-@menu 
+
+@menu
 * MacOS X on the command-line::
-@end menu 
+@end menu
+
 @node MacOS X on the command-line
 @subsection MacOS X on the command-line
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 @node Text editor support
 @section Text editor support
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
-@menu 
+@menu
 * Emacs mode::
 * Vim mode::
 * jEdit::
 * TexShop::
 * TextMate::
-@end menu 
+* LilyKDE::
+@end menu
+
 @node Emacs mode
 @subsection Emacs mode
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 @node Vim mode
 @subsection Vim mode
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 @node jEdit
 @subsection jEdit
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 @node TexShop
 @subsection TexShop
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 @node TextMate
 @subsection TextMate
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
+
+@node LilyKDE
+@subsection LilyKDE
+
+@untranslated
+
 
 @node Point and click
 @section Point and click
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
+
 
 
--- SKELETON FILE --
-When you actually translate this file, please remove these lines as
-well as all `UNTRANSLATED NODE: IGNORE ME' lines.
+@c -- SKELETON FILE --