diff --git a/doc/guide.html b/doc/guide.html index 423259337..b944bdff0 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -1128,7 +1128,7 @@ To define a shaper named ‘normal’ with traffic speed limi

3.1.7  Default Language

The option language defines the default language of server strings that -can be seen by Jabber clients. If a Jabber client do not support +can be seen by Jabber clients. If a Jabber client does not support xml:lang, the specified language is used. The default value is en. In order to take effect there must be a translation file <language>.msg in ejabberd’s msgs directory.

Examples: @@ -1137,7 +1137,7 @@ To set Russian as default language:

{language, "ru"}.
 
  • To set Spanish as default language:
    {language, "es"}.
    -
  • Translators and developers can check details in Appendix A.

    +

    Appendix A provides more details about internationalization and localization.

    3.1.8  Include Additional Configuration Files

    The option include_config_file in a configuration file instructs ejabberd to include other configuration files immediately.

    The basic usage is:

    {include_config_file, <filename>}.
    @@ -3247,12 +3247,14 @@ There are some simple and safe examples in the article
     Interconnecting Erlang Nodes

    To exit the shell, close the window or press the keys: control+c control+c.

    Appendix A  Internationalization and Localization

    The source code of ejabberd supports localization. -The translators can edit the Gettext PO files using any capable program (KBabel, Lokalizer, Poedit...) or a simple text editor.

    Then Gettext -is used to extract, update and export the language files to the MSG format read by ejabberd. +The translators can edit the +gettext .po files +using any capable program (KBabel, Lokalize, Poedit...) or a simple text editor.

    Then gettext +is used to extract, update and export those .po files to the .msg format read by ejabberd. To perform those management tasks, in the src/ directory execute make translations. The translatable strings are extracted from source code to generate the file ejabberd.pot. -This file is merged with each *.po language file to produce updated language files. -Finally those *.po files are exported to *.msg files, that have a format easily readable by ejabberd.

    All built-in modules support the xml:lang attribute inside IQ queries. +This file is merged with each .po file to produce updated .po files. +Finally those .po files are exported to .msg files, that have a format easily readable by ejabberd.

    All built-in modules support the xml:lang attribute inside IQ queries. Figure A.1, for example, shows the reply to the following query:

    <iq id='5'
         to='example.org'
    diff --git a/doc/guide.tex b/doc/guide.tex
    index 3c0f85912..d2bb0603a 100644
    --- a/doc/guide.tex
    +++ b/doc/guide.tex
    @@ -1392,7 +1392,7 @@ Examples:
     \ind{options!language}\ind{language}
     
     The option \option{language} defines the default language of server strings that
    -can be seen by \Jabber{} clients. If a \Jabber{} client do not support
    +can be seen by \Jabber{} clients. If a \Jabber{} client does not support
     \option{xml:lang}, the specified language is used. The default value is
     \term{en}. In order to take effect there must be a translation file
     \term{.msg} in \ejabberd{}'s \term{msgs} directory.
    @@ -1409,7 +1409,7 @@ Examples:
     \end{verbatim}
     \end{itemize}
     
    -Translators and developers can check details in Appendix \ref{i18ni10n}.
    +Appendix \ref{i18ni10n} provides more details about internationalization and localization.
     
     
     \makesubsection{includeconfigfile}{Include Additional Configuration Files}
    @@ -4267,14 +4267,16 @@ To exit the shell, close the window or press the keys: control+c control+c.
     \ind{xml:lang}\ind{internationalization}\ind{localization}\ind{i18n}\ind{l10n}
     
     The source code of \ejabberd{} supports localization.
    -The translators can edit the Gettext PO files using any capable program (KBabel, Lokalizer, Poedit...) or a simple text editor.
    +The translators can edit the 
    +\footahref{http://www.gnu.org/software/gettext/}{gettext} .po files 
    +using any capable program (KBabel, Lokalize, Poedit...) or a simple text editor.
     
    -Then \footahref{http://www.gnu.org/software/gettext/}{Gettext}
    -is used to extract, update and export the language files to the MSG format read by \ejabberd{}.
    +Then gettext
    +is used to extract, update and export those .po files to the .msg format read by \ejabberd{}.
     To perform those management tasks, in the \term{src/} directory execute \term{make translations}.
     The translatable strings are extracted from source code to generate the file \term{ejabberd.pot}.
    -This file is merged with each \term{*.po} language file to produce updated language files.
    -Finally those \term{*.po} files are exported to \term{*.msg} files, that have a format easily readable by \ejabberd{}.
    +This file is merged with each .po file to produce updated .po files.
    +Finally those .po files are exported to .msg files, that have a format easily readable by \ejabberd{}.
     
     All built-in modules support the \texttt{xml:lang} attribute inside IQ queries.
     Figure~\ref{fig:discorus}, for example, shows the reply to the following query: