[svnbook commit] r3332 - trunk/src/de/book
jmfelderhoff
noreply at red-bean.com
Wed Oct 15 15:43:56 CDT 2008
Author: jmfelderhoff
Date: Wed Oct 15 15:43:56 2008
New Revision: 3332
Log:
* ch04-branching-and-merging.xml
* ch07-customizing-svn.xml
* ch09-reference.xml
- Merged changes r3329 and r3331 from English version.
Modified:
trunk/src/de/book/ch04-branching-and-merging.xml (contents, props changed)
trunk/src/de/book/ch07-customizing-svn.xml (contents, props changed)
trunk/src/de/book/ch09-reference.xml (contents, props changed)
Modified: trunk/src/de/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/de/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/de/book/ch04-branching-and-merging.xml Wed Oct 15 15:43:56 2008
@@ -2247,7 +2247,7 @@
damit beginnen müssen, kompliziertere Argumente an <command>svn
merge</command> zu übergeben. Der nächste Abschnitt beschreibt
die vollständig erweiterte Syntax des Befehls und behandelt eine
- Anzahl verbreiteter Szenarios, die diese benötigen.</para>
+ Anzahl verbreiteter Szenarien, die diese benötigen.</para>
<!-- =============================================================== -->
<sect2 id="svn.branchmerge.cherrypicking">
@@ -2655,7 +2655,7 @@
revert, and rerun <command>svn merge</command> with
different arguments.</para>
- <para>Also notice that the preceeding example shows a conflict
+ <para>Also notice that the preceding example shows a conflict
happening on <filename>glorb.h</filename>. We already
stated that the working copy has no local edits: how can a
conflict possibly happen? Again, because the user can use
Modified: trunk/src/de/book/ch07-customizing-svn.xml
==============================================================================
--- trunk/src/de/book/ch07-customizing-svn.xml (original)
+++ trunk/src/de/book/ch07-customizing-svn.xml Wed Oct 15 15:43:56 2008
@@ -892,7 +892,7 @@
installed somewhere on your system. On Unix, they typically
live in <filename>/usr/share/locale/</filename>, while
on Windows they're often found in the
- <filename>\share\locale\</filename> folder in Subversion's
+ <filename>share\locale\</filename> folder in Subversion's
installation area. Once installed, a module is named after
the program for which it provides translations. For example, the
<filename>de.mo</filename> file may ultimately end up
Modified: trunk/src/de/book/ch09-reference.xml
==============================================================================
--- trunk/src/de/book/ch09-reference.xml (original)
+++ trunk/src/de/book/ch09-reference.xml Wed Oct 15 15:43:56 2008
@@ -9243,7 +9243,7 @@
<sect2 id="svn.ref.properties.unversioned-props">
<title>Unversioned Properties</title>
- <para>These are the unversioned properties tht Subversion reserves
+ <para>These are the unversioned properties that Subversion reserves
for its own use:</para>
<variablelist>
More information about the svnbook-dev
mailing list