X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=doc%2Fdokumentation.xml;h=2570e8ee6d9a283e32f0e812b90d9113581b9d62;hb=5b77c5df6b012e57517d21d7ecb89d1511da2fbe;hp=6d55ddd7032e0584a73c195c90b65d9ce9e66cf4;hpb=9c563fc70a2907684cc25a0b86b23dce842ce543;p=kivitendo-erp.git

diff --git a/doc/dokumentation.xml b/doc/dokumentation.xml
index 6d55ddd70..2570e8ee6 100644
--- a/doc/dokumentation.xml
+++ b/doc/dokumentation.xml
@@ -12,7 +12,7 @@
     <itemizedlist>
       <listitem>
         <para>im Community-Forum: <ulink
-        url="https://forum.kivitendo.org:32443">https://forum.kivitendo.org:32443</ulink></para>
+        url="https://forum.kivitendo.de:32443">https://forum.kivitendo.de:32443</ulink></para>
       </listitem>
       <listitem>
         <para>im Kunden-Forum: <ulink
@@ -2933,7 +2933,7 @@ empfang@revamp-it.ch
               <term><varname>template_meta.language.template_code</varname></term>
 
               <listitem>
-                <para>Vorlagenürzel der verwendeten Sprache, identisch mit dem
+                <para>Vorlagenkürzel der verwendeten Sprache, identisch mit dem
                 Kürzel das im Dateinamen verwendetet wird.</para>
               </listitem>
             </varlistentry>
@@ -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>