X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=doc%2Fdokumentation.xml;h=36dbc8197bd628920b13959c4743bed692cba700;hb=ee75e5986c75b6cf9886bf315e83d05ae210add0;hp=c7f3400791d494564578c00603499c4129013ec4;hpb=bd1f0a5a8aac0ed1060e72be48d54a5c5d45d6a3;p=kivitendo-erp.git

diff --git a/doc/dokumentation.xml b/doc/dokumentation.xml
index c7f340079..36dbc8197 100644
--- a/doc/dokumentation.xml
+++ b/doc/dokumentation.xml
@@ -1091,7 +1091,7 @@ ln -s $(pwd)/kivitendo-task-server.service /etc/systemd/system/</programlisting>
         <para>Sollen die Benutzerpasswörter in der Authentifizierungsdatenbank
         gespeichert werden, so muss der Parameter <varname>module</varname>
         den Wert <literal>DB</literal> enthalten. In diesem Fall können sowohl
-        der Administrator als auch die Benutzer selber ihre Psaswörter in
+        der Administrator als auch die Benutzer selber ihre Passwörter in
         kivitendo ändern.</para>
 
         <para>Soll hingegen ein externer LDAP- oder Active-Directory-Server
@@ -6170,9 +6170,6 @@ sub run {
         are built. Currently the only language fully supported is German, and
         since most of the internal messages are held in English the English
         version is usable too.</para>
-
-        <para>A stub version of French is included but not functunal at this
-        point.</para>
       </sect2>
 
       <sect2 id="translations-languages.character-set"
@@ -6346,6 +6343,43 @@ filenames</programlisting>
               want to keep this safe somewhere.</para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term>more/all</term>
+
+            <listitem>
+              <para>This subdir and file is not a part of the language package
+              itself.</para>
+
+              <para>If the directory more exists and contains a file called all
+              it will be parsed in addition to the mandatory all (see above).
+              The file is useful if you want to change some translations for
+              the current installation without conflicting further upgrades.
+              The file is not autogenerated and has the same format as the all,
+              but needs another key (more_texts). See the german translation
+              for an example or copy the following code:
+              <programlisting>
+#!/usr/bin/perl
+# -*- coding: utf-8; -*-
+# vim: fenc=utf-8
+
+use utf8;
+
+# These are additional texts for custom translations.
+# The format is the same as for the normal file all, only
+# with another key (more_texts instead of texts).
+# The file has the form of 'english text'  => 'foreign text',
+
+$self->{more_texts} = {
+
+  'Ship via'                    => 'Terms of delivery',
+  'Shipping Point'              => 'Delivery time',
+}
+              </programlisting>
+              </para>
+            </listitem>
+          </varlistentry>
+
+
         </variablelist>
       </sect2>
     </sect1>