From 634cff5b801dec10adc63efd92d9599f25776505 Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Mon, 12 Oct 2015 11:14:05 +0200 Subject: [PATCH] =?utf8?q?Change=20how=20language=20specific=20chapter=20i?= =?utf8?q?s=20included.=20=20Based=20on=20patch=20from=20Beno=C3=AEt=20Gui?= =?utf8?q?llon.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile | 5 +-- freeculture-about-edition-en.xml | 16 +++++++ freeculture.nb.po | 6 ++- freeculture.pot | 73 +++++++++++++++++--------------- freeculture.xml | 6 ++- po4a.cfg | 2 +- 6 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 freeculture-about-edition-en.xml diff --git a/Makefile b/Makefile index 4b96add..e994d08 100644 --- a/Makefile +++ b/Makefile @@ -60,16 +60,14 @@ PDF_XSLT = \ all: lint lint.nb html epub pdf mobi -freeculture.nb.po: freeculture.pot +freeculture.nb.po freeculture.fr.po: freeculture.pot po4a --no-translations --msgmerge-opt --no-location po4a.cfg freeculture.nb.xml: freeculture.nb.po freeculture.xml po4a --translate-only freeculture.nb.xml po4a.cfg - sed -i 's%&aboutedition;%%' $@ freeculture.fr.xml: freeculture.fr.po freeculture.xml po4a --translate-only freeculture.fr.xml po4a.cfg - sed -i 's%&aboutedition;%%' $@ freeculture.es_419.po: freeculture.pot po4a --no-translations --msgmerge-opt --no-location po4a.cfg @@ -156,6 +154,7 @@ freeculture.xml: # po4a. freeculture.pot: freeculture.xml cover-text.xml po4a-gettextize -o nodefault='' -o inline='' \ + -o attributes='href' \ -f docbook -m freeculture.xml -m cover-text.xml > $@.new && mv $@.new $@ stats: update-stats progress.png diff --git a/freeculture-about-edition-en.xml b/freeculture-about-edition-en.xml new file mode 100644 index 0000000..16d9bf2 --- /dev/null +++ b/freeculture-about-edition-en.xml @@ -0,0 +1,16 @@ + + + + + About this edition + +This new edition of Free Culture is published +by volunteers as part of a project to translate the book to Norwegian +bokmÃ¥l. + + +– Petter Reinholdtsen, Oslo 2015-10-11 + + + diff --git a/freeculture.nb.po b/freeculture.nb.po index 6321bd1..34a986e 100644 --- a/freeculture.nb.po +++ b/freeculture.nb.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Free Culture by Lawrence Lessig\n" -"POT-Creation-Date: 2015-10-10 18:52+0200\n" +"POT-Creation-Date: 2015-10-12 11:12+0200\n" "PO-Revision-Date: 2015-10-11 21:40+0000\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/pere/free-culture-" @@ -29176,6 +29176,10 @@ msgstr "" "har hatt rett. Denne trege eleven er som alltid takknemlig for hennes " "evigvarende tÃ¥lmodighet og kjærlighet." +#. type: Attribute 'href' of: +msgid "freeculture-about-edition-en.xml" +msgstr "freeculture-about-edition-nb.xml" + #. type: Content of: msgid "" "Free culture: How big media uses technology and the law to lock down culture " diff --git a/freeculture.pot b/freeculture.pot index 65a93ae..0d96259 100644 --- a/freeculture.pot +++ b/freeculture.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2015-10-10 18:52+0200\n" +"POT-Creation-Date: 2015-10-12 11:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -117,7 +117,7 @@ msgid "" msgstr "" #. type: Content of: -#: freeculture.xml:95 freeculture.xml:15879 +#: freeculture.xml:95 freeculture.xml:15881 msgid "" "This book is licensed under a Creative Commons license. This license permits " "non-commercial use of this work, so long as attribution is given. For more " @@ -21759,25 +21759,30 @@ msgid "" "patience and love." msgstr "" +#. type: Attribute 'href' of: +#: freeculture.xml:15761 +msgid "freeculture-about-edition-en.xml" +msgstr "" + #. type: Content of: -#: freeculture.xml:15769 +#: freeculture.xml:15771 msgid "" "Free culture: How big media uses technology and the law to lock down culture " "and control creativity / Lawrence Lessig." msgstr "" #. type: Content of: -#: freeculture.xml:15773 +#: freeculture.xml:15775 msgid "Copyright © 2004 Lawrence Lessig. Some rights reserved." msgstr "" #. type: Content of: -#: freeculture.xml:15777 +#: freeculture.xml:15779 msgid "" msgstr "" #. type: Content of: -#: freeculture.xml:15781 +#: freeculture.xml:15783 msgid "" "Published in English and Norwegian BokmÃ¥l 2015 by Petter Reinholdtsen with " "help from many volunteers. Typeset with -#: freeculture.xml:15788 +#: freeculture.xml:15790 msgid "First published 2004 by The Penguin Press." msgstr "" #. type: Content of: -#: freeculture.xml:15792 +#: freeculture.xml:15794 msgid "" "Excerpt from an editorial titled The Coming of Copyright " "Perpetuity, The New York Times, January 16, " @@ -21800,7 +21805,7 @@ msgid "" msgstr "" #. type: Content of: -#: freeculture.xml:15798 +#: freeculture.xml:15800 msgid "" "Cartoon in figure by Paul Conrad, copyright " @@ -21809,7 +21814,7 @@ msgid "" msgstr "" #. type: Content of: -#: freeculture.xml:15804 +#: freeculture.xml:15806 msgid "" "Diagram in figure courtesy of the office " @@ -21817,19 +21822,19 @@ msgid "" msgstr "" #. type: Content of: -#: freeculture.xml:15810 +#: freeculture.xml:15812 msgid "Cover created by Petter Reinholdtsen using inkscape." msgstr "" #. type: Content of: -#: freeculture.xml:15814 +#: freeculture.xml:15816 msgid "" "The quotes on the cover came from ." msgstr "" #. type: Content of: -#: freeculture.xml:15819 +#: freeculture.xml:15821 msgid "" "Portrait on the cover was created 2013 by ActuaLitté and licensed under a " "Creative Commons Attribution-ShareAlike 2.0 license. It was downloaded from " @@ -21838,49 +21843,49 @@ msgid "" msgstr "" #. type: Content of: -#: freeculture.xml:15826 +#: freeculture.xml:15828 msgid "Classifications:" msgstr "" #. type: Content of: -#: freeculture.xml:15830 +#: freeculture.xml:15832 msgid "(Dewey) 306.4, 306.40973, 306.46, 341.7582, 343.7309/9" msgstr "" #. type: Content of: -#: freeculture.xml:15839 +#: freeculture.xml:15841 msgid "(UDK) 347.78" msgstr "" #. type: Content of: -#: freeculture.xml:15843 +#: freeculture.xml:15845 msgid "(US Library of Congress) KF2979.L47 2004" msgstr "" #. type: Content of: -#: freeculture.xml:15847 +#: freeculture.xml:15849 msgid "(ACM CRCS) K.4.1" msgstr "" #. type: Content of: -#: freeculture.xml:15851 +#: freeculture.xml:15853 msgid "Thomas Gramstad Forlag donated the ISBN numbers." msgstr "" #. type: Content of: -#: freeculture.xml:15855 +#: freeculture.xml:15857 msgid "" "Printing was sponsed by NUUG Foundation, ." msgstr "" #. type: Content of: -#: freeculture.xml:15860 +#: freeculture.xml:15862 msgid "Includes index." msgstr "" #. type: Content of: -#: freeculture.xml:15867 +#: freeculture.xml:15869 msgid "" "The Docbook source is available from . Please " @@ -21888,64 +21893,64 @@ msgid "" msgstr "" #. type: Attribute 'fileref' of: -#: freeculture.xml:15874 +#: freeculture.xml:15876 msgid "images/cc.svg" msgstr "" #. type: Content of: -#: freeculture.xml:15886 +#: freeculture.xml:15888 msgid "" "This book is a proof reading draft. Please visit the github URL above to " "get the latest version." msgstr "" #. type: Content of: -#: freeculture.xml:15895 +#: freeculture.xml:15897 msgid "Format / MIME-type" msgstr "" #. type: Content of: -#: freeculture.xml:15896 +#: freeculture.xml:15898 msgid "ISBN" msgstr "" #. type: Content of: -#: freeculture.xml:15901 +#: freeculture.xml:15903 msgid "US Trade edition from lulu.com" msgstr "" #. type: Content of: -#: freeculture.xml:15902 +#: freeculture.xml:15904 msgid "978-82-8067-010-6" msgstr "" #. type: Content of: -#: freeculture.xml:15905 +#: freeculture.xml:15907 msgid "application/pdf" msgstr "" #. type: Content of: -#: freeculture.xml:15906 +#: freeculture.xml:15908 msgid "978-82-8067-011-3" msgstr "" #. type: Content of: -#: freeculture.xml:15909 +#: freeculture.xml:15911 msgid "application/epub+zip" msgstr "" #. type: Content of: -#: freeculture.xml:15910 +#: freeculture.xml:15912 msgid "978-82-8067-012-0" msgstr "" #. type: Content of: -#: freeculture.xml:15913 +#: freeculture.xml:15915 msgid "application/x-mobipocket-ebook" msgstr "" #. type: Content of: -#: freeculture.xml:15914 +#: freeculture.xml:15916 msgid "978-82-8067-013-7" msgstr "" diff --git a/freeculture.xml b/freeculture.xml index 3b53073..786336f 100644 --- a/freeculture.xml +++ b/freeculture.xml @@ -9,7 +9,7 @@ + ]> @@ -15758,7 +15758,9 @@ grateful for her perpetual patience and love. -&aboutedition; + + + diff --git a/po4a.cfg b/po4a.cfg index 2e34adb..50b66b9 100644 --- a/po4a.cfg +++ b/po4a.cfg @@ -1,7 +1,7 @@ [po_directory] . [type: docbook] freeculture.xml $lang:$lang.xml \ - opt:"-o untranslated='' -M UTF-8 -k 1" + opt:"-o untranslated='' -o attributes='href' -M UTF-8 -k 1" [type: docbook] cover-text.xml $lang:cover-text.$lang.xml \ opt:"-M UTF-8 -k 1" -- 2.47.2