Git commit 2094fbbcb8dea70279252979bad982530aab9088 by Luigi Toscano.
Committed on 20/06/2011 at 05:56.
Pushed by ltoscano into branch 'master'.

local.l10n.xml: load the correct file, adapt the configuration

Previously, local.l10n.xml was defined to use a build-time generated
file containing the a list of languages for which we provides
customizations (see kdoctools/customization/xsl). It seems that this
is not the intended way for customization to work; it used to work by
accident for docbook-xsl<=1.75 but the new optimized l10n structure
introduced with docbook-xsl>=1.76 broke it (see:
http://lists.oasis-open.org/archives/docbook-apps/201009/msg00143.html )

The idea now is to directly load the correct customization file for
the required language.

WARNING: in order to make this change working (especially the
changes to kdoctools/customization/kde-include-common.xsl.cmake)
few changes have been performed to the files under
kdoctools/customization/xsl. For each of them:
- the <?xml ... ?> header was removed
- the opening tag like:
  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en" english-language-name="English">
  was changed as follow:
  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
  <l:l10n language="en" english-language-name="English">
- the corresponding closing tag for <l:i18n> was added at the end of
  the file.

REVIEW:101791
BUG: 271331
CCMAIL: kde-docbook@kde.org
CCMAIL: kde-i18n-doc@kde.org
(cherry picked from commit dd11f66a38a20c4fe9421c70784da05be85e111c)

M  +3    -2    kdoctools/customization/xsl/gl.xml
M  +3    -2    kdoctools/customization/xsl/en.xml
M  +3    -2    kdoctools/customization/xsl/sv.xml
M  +1    -2    kdoctools/customization/kde-include-common.xsl.cmake
M  +3    -2    kdoctools/customization/xsl/es.xml
M  +0    -4    kdoctools/docbookl10nhelper.cpp
M  +3    -2    kdoctools/customization/xsl/sl.xml
M  +3    -2    kdoctools/customization/xsl/uk.xml
M  +3    -2    kdoctools/customization/xsl/pl.xml
M  +3    -2    kdoctools/customization/xsl/it.xml
M  +3    -2    kdoctools/customization/xsl/lt.xml
M  +3    -2    kdoctools/customization/xsl/el.xml
M  +3    -3    kdoctools/customization/xsl/sr.xml
M  +0    -1    kdoctools/customization/kde-include-man.xsl.cmake
M  +3    -2    kdoctools/customization/xsl/fr.xml
M  +3    -2    kdoctools/customization/xsl/ru.xml
M  +3    -2    kdoctools/customization/xsl/nl.xml
M  +3    -2    kdoctools/customization/xsl/de.xml
M  +3    -2    kdoctools/customization/xsl/pt_br.xml
M  +3    -2    kdoctools/customization/xsl/et.xml
M  +3    -2    kdoctools/customization/xsl/tr.xml
M  +3    -2    kdoctools/customization/xsl/nn.xml
M  +3    -2    kdoctools/customization/xsl/ca.xml
M  +3    -2    kdoctools/customization/xsl/pt.xml
M  +1    -3    kdoctools/CMakeLists.txt

http://commits.kde.org/kdelibs/2094fbbcb8dea70279252979bad982530aab9088

diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 06525c6..af4e935 100644
--- a/kdoctools/CMakeLists.txt
+++ b/kdoctools/CMakeLists.txt
@@ -219,9 +219,7 @@ add_custom_command( TARGET docbookl10nhelper POST_BUILD
   ${DOCBOOKXSL_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/customization/xsl
   ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl
 )
-# all-l10n.xml and kde-custom-l10n.xml are generated by docbookl10nhelper
+# all-l10n.xml is generated by docbookl10nhelper
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml
   DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/xsl/ )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/kde-custom-l10n.xml
-  DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/xsl/ )
 
diff --git a/kdoctools/customization/kde-include-common.xsl.cmake b/kdoctools/customization/kde-include-common.xsl.cmake
index ad35f20..c7bdd87 100644
--- a/kdoctools/customization/kde-include-common.xsl.cmake
+++ b/kdoctools/customization/kde-include-common.xsl.cmake
@@ -5,6 +5,5 @@
    <xsl:import href="@DOCBOOKXSL_DIR@/html/chunk.xsl"/>
 
    <xsl:param name="l10n.xml" select="document('xsl/all-l10n.xml')"/>
-   <xsl:param name="local.l10n.xml" select="document('xsl/kde-custom-l10n.xml')"/>
-        
+   <xsl:param name="local.l10n.xml" select="document(concat('xsl/',/*/@lang,'.xml'))"/>
 </xsl:stylesheet>
diff --git a/kdoctools/customization/kde-include-man.xsl.cmake b/kdoctools/customization/kde-include-man.xsl.cmake
index 8727ef2..079f41d 100644
--- a/kdoctools/customization/kde-include-man.xsl.cmake
+++ b/kdoctools/customization/kde-include-man.xsl.cmake
@@ -7,6 +7,5 @@
    <xsl:output method="text" encoding="UTF-8" indent="no"/>
 
    <xsl:param name="l10n.xml" select="document('xsl/all-l10n.xml')"/>
-   <xsl:param name="local.l10n.xml" select="document('xsl/kde-custom-l10n.xml')"/>
 
 </xsl:stylesheet>
diff --git a/kdoctools/customization/xsl/ca.xml b/kdoctools/customization/xsl/ca.xml
index fd79185..d219007 100644
--- a/kdoctools/customization/xsl/ca.xml
+++ b/kdoctools/customization/xsl/ca.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ca" english-language-name="Catalan">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="ca" english-language-name="Catalan">
    <l:gentext key="footer-doc-comment" text="Voleu fer un comentari o col&#183;laborar amb una actualitzaci&#243; d'aquesta p&#224;gina?"/>
    <l:gentext key="footer-doc-feedback" text="Envieu els comentaris a "/>
    <l:gentext key="footer-doc-teamname" text="l'equip de Documentaci&#243; del KDE"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/de.xml b/kdoctools/customization/xsl/de.xml
index 7a96565..749f005 100644
--- a/kdoctools/customization/xsl/de.xml
+++ b/kdoctools/customization/xsl/de.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de" english-language-name="German">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="de" english-language-name="German">
    <l:gentext key="footer-doc-comment" text="M&#246;chten Sie Kommentare und Verbesserungen zu dieser Seite beitragen?"/>
    <l:gentext key="footer-doc-feedback" text="Senden Sie Ihre Vorschl&#228;ge an das "/>
    <l:gentext key="footer-doc-teamname" text="KDE Dokumentationsteam"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/el.xml b/kdoctools/customization/xsl/el.xml
index b1aa01f..c6b900a 100644
--- a/kdoctools/customization/xsl/el.xml
+++ b/kdoctools/customization/xsl/el.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="el" english-language-name="Greek">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="el" english-language-name="Greek">
 
    <l:gentext key="nav-home" text="Περιεχόμενα"/>
    
@@ -55,3 +55,4 @@
       <l:template name="Sun" text="Κυρ"/>
    </l:context>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/en.xml b/kdoctools/customization/xsl/en.xml
index 0a6f7e6..369aa83 100644
--- a/kdoctools/customization/xsl/en.xml
+++ b/kdoctools/customization/xsl/en.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en" english-language-name="English">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="en" english-language-name="English">
 
    <l:gentext key="nav-home" text="Contents"/>
 
@@ -7,3 +7,4 @@
    <l:gentext key="footer-doc-feedback" text="Send feedback to the "/>
    <l:gentext key="footer-doc-teamname" text="KDE Docs Team"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/es.xml b/kdoctools/customization/xsl/es.xml
index 04663f4..970146e 100644
--- a/kdoctools/customization/xsl/es.xml
+++ b/kdoctools/customization/xsl/es.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="es" english-language-name="Spanish">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="es" english-language-name="Spanish">
    <l:gentext key="footer-doc-comment" text="&#191;Le gustar&#237;a hacer alg&#250;n comentario o aportar una actualizaci&#243;n a esta p&#225;gina?"/>
    <l:gentext key="footer-doc-feedback" text="Env&#237;e sus comentarios al "/>
    <l:gentext key="footer-doc-teamname" text="equipo de documentaci&#243;n de KDE"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/et.xml b/kdoctools/customization/xsl/et.xml
index d764e42..2471578 100644
--- a/kdoctools/customization/xsl/et.xml
+++ b/kdoctools/customization/xsl/et.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="et" english-language-name="Estonian">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="et" english-language-name="Estonian">
    <l:gentext key="RevHistory" text="Versioonide ajalugu"/>
    <l:gentext key="revhistory" text="Versioonide ajalugu"/>
    <l:gentext key="revision" text="Versioon"/>
@@ -9,3 +9,4 @@
    <l:gentext key="footer-doc-feedback" text="Saada oma tagasiside "/>
    <l:gentext key="footer-doc-teamname" text="KDE dokumentatsiooni meeskonnale"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/fr.xml b/kdoctools/customization/xsl/fr.xml
index 15a642c..4aa6ce1 100644
--- a/kdoctools/customization/xsl/fr.xml
+++ b/kdoctools/customization/xsl/fr.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fr" english-language-name="French">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="fr" english-language-name="French">
    <l:gentext key="footer-doc-comment" text="Vous souhaitez faire un commentaire ou participer au contenu de cette page&#160;?"/>
    <l:gentext key="footer-doc-feedback" text="Envoyez vos contributions &#224; l'"/>
    <l:gentext key="footer-doc-teamname" text="&#233;quipe de documentation de KDE"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/gl.xml b/kdoctools/customization/xsl/gl.xml
index c13a714..d6aa03c 100644
--- a/kdoctools/customization/xsl/gl.xml
+++ b/kdoctools/customization/xsl/gl.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="gl" english-language-name="Galician">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="gl" english-language-name="Galician">
 <l:gentext key="footer-doc-comment" text="Desexa facer un comentario ou actualizar esta páxina?"/>
 <l:gentext key="footer-doc-feedback" text="Envíe as súas aportacións á "/>
 <l:gentext key="footer-doc-teamname" text="Equipa de documentación de KDE"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/it.xml b/kdoctools/customization/xsl/it.xml
index 770b459..4c9a268 100644
--- a/kdoctools/customization/xsl/it.xml
+++ b/kdoctools/customization/xsl/it.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="it" english-language-name="Italian">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="it" english-language-name="Italian">
    <l:dingbat key="startquote" text="&#171;"/>
    <l:dingbat key="endquote" text="&#187;"/>
    <l:dingbat key="nestedstartquote" text="&#8220;"/>
@@ -46,3 +46,4 @@
       <l:template name="table" text="Tabella&#160;%n, &#171;%t&#187;"/>
    </l:context>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/lt.xml b/kdoctools/customization/xsl/lt.xml
index 5221d96..433da91 100644
--- a/kdoctools/customization/xsl/lt.xml
+++ b/kdoctools/customization/xsl/lt.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="lt" english-language-name="Lithuanian">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="lt" english-language-name="Lithuanian">
    <l:gentext key="footer-doc-comment" text="Ar nor&#279;tum&#279;te pakomentuoti ar atnaujinti &#353;&#303; puslap&#303;?"/>
    <l:gentext key="footer-doc-feedback" text="Atsiliepimus si&#371;skite "/>
    <l:gentext key="footer-doc-teamname" text="KDE dokumentacijos komanda"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/nl.xml b/kdoctools/customization/xsl/nl.xml
index f3996ca..e1e676e 100644
--- a/kdoctools/customization/xsl/nl.xml
+++ b/kdoctools/customization/xsl/nl.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nl" english-language-name="Dutch">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="nl" english-language-name="Dutch">
    <l:gentext key="footer-doc-comment" text="Wilt u een opmerking maken of een bijdragen leveren aan deze pagina?"/>
    <l:gentext key="footer-doc-feedback" text="Stuur uw bericht aan het "/>
    <l:gentext key="footer-doc-teamname" text="KDE Documentatieteam"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/nn.xml b/kdoctools/customization/xsl/nn.xml
index e93a3f9..03599d0 100644
--- a/kdoctools/customization/xsl/nn.xml
+++ b/kdoctools/customization/xsl/nn.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nn" english-language-name="Norwegian Nynorsk">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="nn" english-language-name="Norwegian Nynorsk">
 
    <l:gentext key="abstract" text="samandrag"/>
    <l:gentext key="Bibliography" text="Litteratur"/>
@@ -200,3 +200,4 @@
    </l:context>
 
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/pl.xml b/kdoctools/customization/xsl/pl.xml
index a9c0922..139bc34 100644
--- a/kdoctools/customization/xsl/pl.xml
+++ b/kdoctools/customization/xsl/pl.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pl" english-language-name="Polish">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="pl" english-language-name="Polish">
    <l:gentext key="footer-doc-comment" text="Je&#347;li chcesz skomentowa&#263; t&#261; stron&#281; lub j&#261; uaktualni&#263; "/>
    <l:gentext key="footer-doc-feedback" text="Wy&#347;lij swoje uwagi (po angielsku) do "/>
    <l:gentext key="footer-doc-teamname" text="Zespo&#322;u dokumentacji KDE"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/pt.xml b/kdoctools/customization/xsl/pt.xml
index e218846..d85ef8a 100644
--- a/kdoctools/customization/xsl/pt.xml
+++ b/kdoctools/customization/xsl/pt.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt" english-language-name="Portuguese">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="pt" english-language-name="Portuguese">
    <l:gentext key="footer-doc-comment" text="Would you like to make a comment or contribute an update to this page?"/>
    <l:gentext key="footer-doc-feedback" text="Send feedback to the "/>
    <l:gentext key="footer-doc-teamname" text="KDE Docs Team"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/pt_br.xml b/kdoctools/customization/xsl/pt_br.xml
index 9d6b962..c199b6e 100644
--- a/kdoctools/customization/xsl/pt_br.xml
+++ b/kdoctools/customization/xsl/pt_br.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt_br" english-language-name="Portuguese (Brazil)">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="pt_br" english-language-name="Portuguese (Brazil)">
    <l:gentext key="footer-doc-comment" text="Gostaria de fazer um coment&#225;rio ou contribuir com uma atualiza&#231;&#227;o para esta p&#225;gina?"/>
    <l:gentext key="footer-doc-feedback" text="Envie uma mensagem para a "/>
    <l:gentext key="footer-doc-teamname" text="Equipe de Documenta&#231;&#227;o do KDE"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/ru.xml b/kdoctools/customization/xsl/ru.xml
index ff8c842..f15ed5d 100644
--- a/kdoctools/customization/xsl/ru.xml
+++ b/kdoctools/customization/xsl/ru.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ru" english-language-name="Russian">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="ru" english-language-name="Russian">
    <l:gentext key="footer-doc-comment" text="Вам есть что добавить на эту страницу?"/>
    <l:gentext key="footer-doc-feedback" text="Напишите "/>
    <l:gentext key="footer-doc-teamname" text="команде документации KDE"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/sl.xml b/kdoctools/customization/xsl/sl.xml
index 058e939..8a8de29 100644
--- a/kdoctools/customization/xsl/sl.xml
+++ b/kdoctools/customization/xsl/sl.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sl" english-language-name="Slovenian">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="sl" english-language-name="Slovenian">
 
    <l:gentext key="PubDate" text="Datum objave"/>
    <l:gentext key="pubdate" text="Datum objave"/>
@@ -119,3 +119,4 @@
    </l:context>
 
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/sr.xml b/kdoctools/customization/xsl/sr.xml
index 3572284..1fd22bd 100644
--- a/kdoctools/customization/xsl/sr.xml
+++ b/kdoctools/customization/xsl/sr.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-        language="sr"
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="sr"
         english-language-name="Serbian">
 
 <l:gentext key="Abstract" text="Сажетак"/>
@@ -692,3 +691,4 @@
 <l:l i="56">z</l:l>
 </l:letters>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/sv.xml b/kdoctools/customization/xsl/sv.xml
index af3031c..1294ca7 100644
--- a/kdoctools/customization/xsl/sv.xml
+++ b/kdoctools/customization/xsl/sv.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sv" english-language-name="Swedish">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="sv" english-language-name="Swedish">
    <l:gentext key="footer-doc-comment" text="Vill du ge en kommentar eller bidra med en uppdatering av den h&#228;r sidan?"/>
    <l:gentext key="footer-doc-feedback" text="Skicka dina f&#246;rslag till "/>
    <l:gentext key="footer-doc-teamname" text="KDE:s dokumentationsgrupp"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/tr.xml b/kdoctools/customization/xsl/tr.xml
index 7ceae61..2e18ef7 100644
--- a/kdoctools/customization/xsl/tr.xml
+++ b/kdoctools/customization/xsl/tr.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="tr" english-language-name="Turkish">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="tr" english-language-name="Turkish">
    <l:gentext key="footer-doc-comment" text="Bu sayfa hakk&#305;nda bir yorum yapmak ya da katk&#305;da bulunmak ister misniz?"/>
    <l:gentext key="footer-doc-feedback" text="Geribildirimlerinizi g&#246;nderin "/>
    <l:gentext key="footer-doc-teamname" text="KDE Belgelendirme Ekibi"/>
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/customization/xsl/uk.xml b/kdoctools/customization/xsl/uk.xml
index 60ab441..48075ed 100644
--- a/kdoctools/customization/xsl/uk.xml
+++ b/kdoctools/customization/xsl/uk.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="uk" english-language-name="Ukranian">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:l10n language="uk" english-language-name="Ukranian">
 
    <l:gentext key="Bibliography" text="&#1051;&#1110;&#1090;&#1077;&#1088;&#1072;&#1090;&#1091;&#1088;&#1072;"/>
    <l:gentext key="bibliography" text="&#1083;&#1110;&#1090;&#1077;&#1088;&#1072;&#1090;&#1091;&#1088;&#1072;"/>
@@ -33,3 +33,4 @@
    <l:gentext key="footer-doc-teamname" text="&#1050;&#1086;&#1084;&#1072;&#1085;&#1076;&#1080; &#1079; &#1076;&#1086;&#1082;&#1091;&#1084;&#1077;&#1085;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; KDE"/>
 
 </l:l10n>
+</l:i18n>
diff --git a/kdoctools/docbookl10nhelper.cpp b/kdoctools/docbookl10nhelper.cpp
index 41e4f63..abd980c 100644
--- a/kdoctools/docbookl10nhelper.cpp
+++ b/kdoctools/docbookl10nhelper.cpp
@@ -238,13 +238,9 @@ int main( int argc, char **argv ) {
       /* old style (docbook-xsl<=1.75) */
       res = writeLangFile( all10nFName, l10nDir + "common/l10n.dtd",
                            allLangs );
-      res += writeLangFile( customl10nFName, l10nDir + "common/l10n.dtd",
-                            customLangs );
    } else {
       res = writeLangFileNew( all10nFName, l10nDir + "common/l10n.dtd",
                               allLangs );
-      res += writeLangFileNew( customl10nFName, l10nDir + "common/l10n.dtd",
-                               customLangs );
    }
 
    return( res );