Version: (using KDE KDE 3.4.0) Installed from: Unlisted Binary Package While translating, I stumbled across some typos and errors in the KDiff3 doc: index.docbook:472 "The button bar also contains seven navigation buttons" Nine are mentioned in the following text. :534 "occurance" should read "occurence" :922 "accidently" should read "accidentally" :1372, :1391, :1423 "ressources" should read "resources"
SVN commit 450642 by dannya: BUG:102621 Fix typos M +4 -4 index.docbook --- trunk/extragear/utils/doc/kdiff3/index.docbook #450641:450642 @@ -501,7 +501,7 @@ windows to show the beginning of the same group of lines (as explained in section <link linkend="merging">"Merging"</link>). </para><para> - The button bar also contains seven navigation buttons with which you can + The button bar also contains nine navigation buttons with which you can jump to the current/first/last difference, to the next/previous difference (ctrl-down/ctrl-up), to the next/previous conflict (ctrl-pgdown/ctrl-pgup), or to the next/previous unsolved conflict. Note that for KDiff3 a "conflict" @@ -567,7 +567,7 @@ (Ctrl-F) in the Edit-menu opens a dialog that lets you specify the string to search for. You can also select the windows which should be searched. Searching will always start at the top. Use the "Find Next"-command (F3) - to proceed to the next occurance. If you select to search several windows then the first + to proceed to the next occurrence. If you select to search several windows then the first window will be searched from top to bottom before the search starts in the next window at the top again, etc. </para> @@ -1007,7 +1007,7 @@ <sect2><title>Warning</title> <para> The preprocessor-commands are often very useful, but as with any option that modifies -your texts or hides away certain differences automatically, you might accidently overlook +your texts or hides away certain differences automatically, you might accidentally overlook certain differences and in the worst case destroy important data. </para><para> For this reason during a merge if a normal preprocessor-command is being used KDiff3 @@ -1465,7 +1465,7 @@ KDE supports networktransparency via KIO-slaves. KDiff3 uses this for reading input files and for scanning directories. This means that you can specify files and directories on local and -remote ressources via URLs. +remote resources via URLs. </para><para> Example: </para><para>