From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 23 Nov 2015 17:43:45 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.4.1~582
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/8f1192dd1fa78ac98bdf8fd045be28bdb862575c?hp=-c

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

8f1192dd1fa78ac98bdf8fd045be28bdb862575c
diff --combined doc/dokumentation.xml
index 9ae4c2faf,6d55ddd70..36dbc8197
--- a/doc/dokumentation.xml
+++ b/doc/dokumentation.xml
@@@ -1091,7 -1091,7 +1091,7 @@@ ln -s $(pwd)/kivitendo-task-server.serv
          <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,6 -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"
@@@ -6343,43 -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>