[svnbook] r4763 committed - Translation: Merge-Sensitive Logs and Annotations

[svnbook at googlecode.com]

Revision: 4763
Author:   jmfelderhoff at gmx.eu
Date:     Thu May  1 21:21:02 2014 UTC
Log:      Translation: Merge-Sensitive Logs and Annotations

http://code.google.com/p/svnbook/source/detail?r=4763

Modified:
  /branches/1.7/de/book/ch04-branching-and-merging.xml

=======================================
--- /branches/1.7/de/book/ch04-branching-and-merging.xml	Thu May  1  
18:47:06 2014 UTC
+++ /branches/1.7/de/book/ch04-branching-and-merging.xml	Thu May  1  
21:21:02 2014 UTC
@@ -4957,13 +4957,13 @@
        <para>One of the main features of any version control system is
          to keep track of who changed what, and when they did it.
          The <command>svn log</command> and <command>svn
-        blame</command> commands are just the tools for this: when
+        blame</command> subcommands are just the tools for this: when
          invoked on individual files, they show not only the history of
          changesets that affected the file, but also exactly which user
          wrote which line of code, and when she did it.</para>
  -->
        <para>Ein Hauptmerkmal jedes Versionskontrollsystems ist es,
-        darüber Buch zu führen, wer was wann geändert hat. Die Befehle
+        darüber Buch zu führen, wer was wann geändert hat. Die Unterbefehle
          <command>svn log</command> und <command>svn blame</command>
          sind die geeigneten Werkzeuge hierfür: Wenn sie auf
          individuelle Dateien angewendet werden, zeigen sie nicht nur
@@ -5039,7 +5039,7 @@

  <!--
        <para>But is this really an accurate picture of all the changes
-        that happened on the branch?  What's being left out here is
+        that happened on the branch?  What's left out here is
          the fact that revisions 390, 381, and 357 were actually the
          results of merging changes from the trunk.  If you look at one
          of these logs in detail, the multiple trunk changesets that
@@ -5054,25 +5054,19 @@
          Änderungsmengen vom Stamm, die die Änderungen auf dem Zweig
          ausmachen, nirgendwo sehen:</para>

-<!--
        <informalexample>
          <screen>
  $ svn log -v -r 390
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+------------------------------------------------------------------------
+<!--
  r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
  Changed paths:
     M /branches/my-calc-branch/button.c
     M /branches/my-calc-branch/README

  Final merge of trunk changes to my-calc-branch.
-</screen>
-      </informalexample>
  -->
-      <informalexample>
-        <screen>
-$ svn log -v -r 390
-------------------------------------------------------------------------
-r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
+r390 | user | 2002-11-22 11:01:57 -0600 (Fr, 22. Nov 2002) | 1 Zeile
  Geänderte Pfade:
     M /branches/my-calc-branch/button.c
     M /branches/my-calc-branch/README
@@ -5097,58 +5091,56 @@
          diejenigen <quote>Teil</quote>-Änderungen, aus denen die
          Zusammenführung bestand.</para>

-<!--
        <informalexample>
          <screen>
  $ svn log -v -r 390 -g
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+------------------------------------------------------------------------
+<!--
  r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
  Changed paths:
     M /branches/my-calc-branch/button.c
     M /branches/my-calc-branch/README

  Final merge of trunk changes to my-calc-branch.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-r383 | sally | 2002-11-21 03:19:00 -0600 (Thu, 21 Nov 2002) | 2 lines
-Changed paths:
-   M /branches/my-calc-branch/button.c
-Merged via: r390
-
-Fix inverse graphic error on button.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-r382 | sally | 2002-11-20 16:57:06 -0600 (Wed, 20 Nov 2002) | 2 lines
-Changed paths:
-   M /branches/my-calc-branch/README
-Merged via: r390
-
-Document my last fix in README.
-</screen>
-      </informalexample>
  -->
-     <screen>
-$ svn log -v -r 390 -g
-------------------------------------------------------------------------
-r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
+r390 | user | 2002-11-22 11:01:57 -0600 (Fr, 22. Nov 2002) | 1 Zeile
  Geänderte Pfade:
     M /branches/my-calc-branch/button.c
     M /branches/my-calc-branch/README

  Letzte Zusammenführung der Änderungen von trunk changes in my-calc-branch.
  ------------------------------------------------------------------------
+<!--
  r383 | sally | 2002-11-21 03:19:00 -0600 (Thu, 21 Nov 2002) | 2 lines
+Changed paths:
+   M /branches/my-calc-branch/button.c
+Merged via: r390
+
+Fix inverse graphic error on button.
+-->
+r383 | sally | 2002-11-21 03:19:00 -0600 (Do, 21. Nov 2002) | 2 Zeilen
  Geänderte Pfade:
     M /branches/my-calc-branch/button.c
  Zusammengeführt mittels: r390

  Inverse Grafik auf Knopf behoben.
  ------------------------------------------------------------------------
+<!--
  r382 | sally | 2002-11-20 16:57:06 -0600 (Wed, 20 Nov 2002) | 2 lines
+Changed paths:
+   M /branches/my-calc-branch/README
+Merged via: r390
+
+Document my last fix in README.
+-->
+r382 | sally | 2002-11-20 16:57:06 -0600 (Mi, 20. Nov 2002) | 2 Zeilen
  Geänderte Pfade:
     M /branches/my-calc-branch/README
  Zusammengeführt mittels: r390

  Meine letzte Änderung in README dokumentiert.
  </screen>
+      </informalexample>

  <!--
        <para>By making the log operation use merge history, we see not