Index: kdoctools/CMakeLists.txt =================================================================== --- a/kdoctools/CMakeLists.txt +++ b/kdoctools/CMakeLists.txt 2011-07-03 15:18:25.504284475 -0300 @@ -220,6 +220,4 @@ # all-l10n.xml and kde-custom-l10n.xml are 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/ ) Index: kdoctools/docbookl10nhelper.cpp =================================================================== --- a/kdoctools/docbookl10nhelper.cpp +++ b/kdoctools/docbookl10nhelper.cpp 2011-07-03 15:51:17.881360695 -0300 @@ -85,6 +85,39 @@ int writeLangFile( const QString &fname, return( 0 ); } +int writeLangFileNew( const QString &fname, const QString &dtdPath, + const LangListType &langMap ) { + + QFile outFile( fname ); + if ( ! outFile.open( QIODevice::WriteOnly ) ) { + qCritical() << QString( "Could not write %1" ) + .arg( outFile.fileName() ); + return( 1 ); + } + + QTextStream outStream( &outFile ); + outStream << "<?xml version='1.0'?>" << endl; + outStream << QString( "<!DOCTYPE l:i18n SYSTEM \"%1\">" ) + .arg( dtdPath ) << endl; + + if ( langMap.size() > 0 ) { + outStream + << "<l:i18n xmlns:l=\"http://docbook.sourceforge.net/xmlns/l10n/1.0\">" + << endl; + LangListType::const_iterator i = langMap.constBegin(); + while ( i != langMap.constEnd() ) { + outStream << QString( "<l:l10n language=\"%1\" href=\"%2\"/>" ) + .arg( (*i).first ).arg( (*i).second ) << endl; + ++i; + } + outStream << "</l:i18n>" << endl; + } + + outFile.close(); + + return( 0 ); +} + inline const QString addTrailingSlash( const QString &p ) { return p.endsWith( "/" ) ? p : p + "/"; } @@ -199,11 +232,16 @@ int main( int argc, char **argv ) { ++i; } + int res = 0; - int res = writeLangFile( all10nFName, l10nDir + "common/l10n.dtd", - allLangs ); - res += writeLangFile( customl10nFName, l10nDir + "common/l10n.dtd", - customLangs ); + if ( foundRxEntity ) { + /* old style (docbook-xsl<=1.75) */ + res = writeLangFile( all10nFName, l10nDir + "common/l10n.dtd", + allLangs ); + } else { + res = writeLangFileNew( all10nFName, l10nDir + "common/l10n.dtd", + allLangs ); + } return( res ); } Index: kdoctools/customization/kde-include-common.xsl.cmake =================================================================== --- a/kdoctools/customization/kde-include-common.xsl.cmake +++ b/kdoctools/customization/kde-include-common.xsl.cmake 2011-07-03 15:21:24.173327089 -0300 @@ -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> Index: kdoctools/customization/kde-include-man.xsl.cmake =================================================================== --- a/kdoctools/customization/kde-include-man.xsl.cmake +++ b/kdoctools/customization/kde-include-man.xsl.cmake 2011-07-03 15:22:19.876959476 -0300 @@ -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> Index: kdoctools/customization/xsl/ca.xml =================================================================== --- a/kdoctools/customization/xsl/ca.xml +++ b/kdoctools/customization/xsl/ca.xml 2011-07-03 15:29:24.554718325 -0300 @@ -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:gentext key="footer-doc-comment" text="Voleu fer un comentari o col·laborar amb una actualització d'aquesta pàgina?"/> - <l:gentext key="footer-doc-feedback" text="Envieu els comentaris a "/> - <l:gentext key="footer-doc-teamname" text="l'equip de Documentació del KDE"/> +<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·laborar amb una actualització d'aquesta pàgina?"/> + <l:gentext key="footer-doc-feedback" text="Envieu els comentaris a "/> + <l:gentext key="footer-doc-teamname" text="l'equip de Documentació del KDE"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/de.xml =================================================================== --- a/kdoctools/customization/xsl/de.xml +++ b/kdoctools/customization/xsl/de.xml 2011-07-03 15:30:46.718627413 -0300 @@ -1,6 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?> +<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> +<l:l10n language="de" english-language-name="German"> <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de" english-language-name="German"> <l:gentext key="footer-doc-comment" text="Möchten Sie Kommentare und Verbesserungen zu dieser Seite beitragen?"/> <l:gentext key="footer-doc-feedback" text="Senden Sie Ihre Vorschläge an das "/> <l:gentext key="footer-doc-teamname" text="KDE Dokumentationsteam"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/el.xml =================================================================== --- a/kdoctools/customization/xsl/el.xml +++ b/kdoctools/customization/xsl/el.xml 2011-07-03 15:32:09.094535416 -0300 @@ -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="footer-doc-comment" text="Επιθυμείτε να κάνετε ένα σχόλιο ή να συνεισφέρετε στο περιεχόμενο αυτής της σελίδας;"/> <l:gentext key="footer-doc-feedback" text="Στείλτε τις συνεισφορές σας στην "/> @@ -53,3 +53,4 @@ <l:template name="Sun" text="Κυρ"/> </l:context> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/en.xml =================================================================== --- a/kdoctools/customization/xsl/en.xml +++ b/kdoctools/customization/xsl/en.xml 2011-07-03 15:33:14.862257974 -0300 @@ -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> Index: kdoctools/customization/xsl/es.xml =================================================================== --- a/kdoctools/customization/xsl/es.xml +++ b/kdoctools/customization/xsl/es.xml 2011-07-03 15:34:01.620770446 -0300 @@ -1,6 +1,9 @@ +<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> +<l:l10n language="es" english-language-name="Spanish"> <?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:gentext key="footer-doc-comment" text="¿Le gustaría hacer algún comentario o aportar una actualización a esta página?"/> <l:gentext key="footer-doc-feedback" text="Envíe sus comentarios al "/> <l:gentext key="footer-doc-teamname" text="equipo de documentación de KDE"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/et.xml =================================================================== --- a/kdoctools/customization/xsl/et.xml +++ b/kdoctools/customization/xsl/et.xml 2011-07-03 15:34:55.998365159 -0300 @@ -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> Index: kdoctools/customization/xsl/fr.xml =================================================================== --- a/kdoctools/customization/xsl/fr.xml +++ b/kdoctools/customization/xsl/fr.xml 2011-07-03 15:35:59.432057240 -0300 @@ -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 ?"/> <l:gentext key="footer-doc-feedback" text="Envoyez vos contributions à l'"/> <l:gentext key="footer-doc-teamname" text="équipe de documentation de KDE"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/gl.xml =================================================================== --- a/kdoctools/customization/xsl/gl.xml +++ b/kdoctools/customization/xsl/gl.xml 2011-07-03 15:36:46.975574806 -0300 @@ -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> Index: kdoctools/customization/xsl/it.xml =================================================================== --- a/kdoctools/customization/xsl/it.xml +++ b/kdoctools/customization/xsl/it.xml 2011-07-03 15:37:30.226044804 -0300 @@ -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="«"/> <l:dingbat key="endquote" text="»"/> <l:dingbat key="nestedstartquote" text="“"/> @@ -46,3 +46,4 @@ <l:template name="table" text="Tabella %n, «%t»"/> </l:context> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/lt.xml =================================================================== --- a/kdoctools/customization/xsl/lt.xml +++ b/kdoctools/customization/xsl/lt.xml 2011-07-03 15:38:22.404610784 -0300 @@ -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ėtumėte pakomentuoti ar atnaujinti šį puslapį?"/> <l:gentext key="footer-doc-feedback" text="Atsiliepimus siųskite "/> <l:gentext key="footer-doc-teamname" text="KDE dokumentacijos komanda"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/nl.xml =================================================================== --- a/kdoctools/customization/xsl/nl.xml +++ b/kdoctools/customization/xsl/nl.xml 2011-07-03 15:39:27.285313011 -0300 @@ -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> Index: kdoctools/customization/xsl/nn.xml =================================================================== --- a/kdoctools/customization/xsl/nn.xml +++ b/kdoctools/customization/xsl/nn.xml 2011-07-03 15:40:18.077890790 -0300 @@ -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> Index: kdoctools/customization/xsl/pl.xml =================================================================== --- a/kdoctools/customization/xsl/pl.xml +++ b/kdoctools/customization/xsl/pl.xml 2011-07-03 15:41:08.145549676 -0300 @@ -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śli chcesz skomentować tą stronę lub ją uaktualnić "/> <l:gentext key="footer-doc-feedback" text="Wyślij swoje uwagi (po angielsku) do "/> <l:gentext key="footer-doc-teamname" text="Zespołu dokumentacji KDE"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/pt.xml =================================================================== --- a/kdoctools/customization/xsl/pt.xml +++ b/kdoctools/customization/xsl/pt.xml 2011-07-03 15:41:59.271219492 -0300 @@ -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> Index: kdoctools/customization/xsl/pt_br.xml =================================================================== --- a/kdoctools/customization/xsl/pt_br.xml +++ b/kdoctools/customization/xsl/pt_br.xml 2011-07-03 15:43:17.084233310 -0300 @@ -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ário ou contribuir com uma atualização para esta página?"/> <l:gentext key="footer-doc-feedback" text="Envie uma mensagem para a "/> <l:gentext key="footer-doc-teamname" text="Equipe de Documentação do KDE"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/ru.xml =================================================================== --- a/kdoctools/customization/xsl/ru.xml +++ b/kdoctools/customization/xsl/ru.xml 2011-07-03 15:44:06.439872936 -0300 @@ -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> Index: kdoctools/customization/xsl/sl.xml =================================================================== --- a/kdoctools/customization/xsl/sl.xml +++ b/kdoctools/customization/xsl/sl.xml 2011-07-03 15:44:55.036500199 -0300 @@ -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> Index: kdoctools/customization/xsl/sr.xml =================================================================== --- a/kdoctools/customization/xsl/sr.xml +++ b/kdoctools/customization/xsl/sr.xml 2011-07-03 15:46:19.539585138 -0300 @@ -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> Index: kdoctools/customization/xsl/sv.xml =================================================================== --- a/kdoctools/customization/xsl/sv.xml +++ b/kdoctools/customization/xsl/sv.xml 2011-07-03 15:47:12.712264166 -0300 @@ -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är sidan?"/> <l:gentext key="footer-doc-feedback" text="Skicka dina förslag till "/> <l:gentext key="footer-doc-teamname" text="KDE:s dokumentationsgrupp"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/tr.xml =================================================================== --- a/kdoctools/customization/xsl/tr.xml +++ b/kdoctools/customization/xsl/tr.xml 2011-07-03 15:48:00.702874666 -0300 @@ -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ında bir yorum yapmak ya da katkıda bulunmak ister misniz?"/> <l:gentext key="footer-doc-feedback" text="Geribildirimlerinizi gönderin "/> <l:gentext key="footer-doc-teamname" text="KDE Belgelendirme Ekibi"/> </l:l10n> +</l:i18n> Index: kdoctools/customization/xsl/uk.xml =================================================================== --- a/kdoctools/customization/xsl/uk.xml +++ b/kdoctools/customization/xsl/uk.xml 2011-07-03 15:49:04.242679626 -0300 @@ -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="Література"/> <l:gentext key="bibliography" text="література"/> @@ -33,3 +33,4 @@ <l:gentext key="footer-doc-teamname" text="Команди з документування KDE"/> </l:l10n> +</l:i18n>