From: ben Date: Sat, 1 Aug 2015 19:58:32 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: edition-2015-10-10~361^2~1 X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/af2f3e09346f3c7ba0c49fd5efa59277a26f64f9?hp=ccc8b85c586af9be7d2f432d271c098adc4faca7 Merge remote-tracking branch 'upstream/master' --- diff --git a/Makefile b/Makefile index 68b3e68..4775fc2 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ html: freeculture.nb.html freeculture.html echo "Using $$pipeline pipeline" ; \ case "$$pipeline" in \ dblatex) \ - $(DBLATEX) $< ; \ + PATH=$(PWD)/bin:$$PATH $(DBLATEX) $< ; \ ;; \ xmlto) \ xmlto --noautosize \ diff --git a/bin/inkscape b/bin/inkscape new file mode 100755 index 0000000..ab13ab6 --- /dev/null +++ b/bin/inkscape @@ -0,0 +1,3 @@ +#!/bin/sh +# Workaround for +exec /usr/bin/inkscape --export-dpi=300 "$@" diff --git a/freeculture.nb.po b/freeculture.nb.po index 9aa9097..33bd1ff 100644 --- a/freeculture.nb.po +++ b/freeculture.nb.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Free Culture by Lawrence Lessig\n" -"POT-Creation-Date: 2015-07-29 07:17+0000\n" -"PO-Revision-Date: 2015-07-29 07:41+0000\n" +"POT-Creation-Date: 2015-07-30 07:31+0000\n" +"PO-Revision-Date: 2015-07-30 08:04+0000\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/free-" "culture-lessig/language/nb/)\n" @@ -113,29 +113,27 @@ msgstr "Creative Commons, noen rettigheter forbeholdt" msgid "" msgstr "" -#. type: Content of: +#. type: Content of: msgid "" "This version of Free Culture is licensed under a " "Creative Commons license. This license permits non-commercial use of this " "work, so long as attribution is given. For more information about the " -"license, click the icon above, or visit http://creativecommons.org/licenses/by-nc/1.0/" +"license visit http://creativecommons.org/licenses/by-nc/1.0/" msgstr "" -"Denne versjonen av Fri kultur er lisensiert under en " +"Denne versjonen av Fri kultur er lisensiert med en " "Creative Commons-lisens. Denne lisensen tillater ikke-kommersiell " -"utnyttelse av verket dersom opphavsmannen er navngitt. For mer informasjon " -"om lisensen, klikk pÃ¥ ikonet over eller besøk http://creativecommons.org/" -"licenses/by-nc/1.0/" +"utnyttelse av verket, hvis opphavsinnehaveren er navngitt. For mer " +"informasjon om lisensen, besøk http://creativecommons.org/licenses/by-nc/1.0/" #. type: Content of: -msgid "ABOUT THE AUTHOR" +msgid "About the author" msgstr "Om forfatteren" #. type: Content of: <book><bookinfo><abstract><para> msgid "" -"LAWRENCE LESSIG (<ulink url=\"http://www.lessig.org\">http://www.lessig.org</" +"Lawrence Lessig (<ulink url=\"http://www.lessig.org\">http://www.lessig.org</" "ulink>), professor of law and a John A. Wilson Distinguished Faculty Scholar " "at Stanford Law School, is founder of the Stanford Center for Internet and " "Society and is chairman of the Creative Commons (<ulink url=\"http://" @@ -165,6 +163,10 @@ msgstr "" "Cambridge University, og Yale Law School, assisterte Lessig dommer Richard " "Posner ved USAs syvende ankekrets." +#. type: Content of: <book><colophon><para> +msgid "<ulink url=\"http://free-culture.cc/\"/>" +msgstr "<ulink url=\"http://free-culture.cc/\"/>" + #. testing different ways to tag the cover page #. <imageobject remap="s" role="front"> #. <imagedata fileref="images/cover_thumbnail.png" format="PNG" width="444" /> @@ -189,11 +191,11 @@ msgstr "" #. type: Content of: <book><bookinfo> msgid "" " <placeholder type=\"mediaobject\" id=\"0\"/> <biblioid class=\"isbn" -"\">978-82-92812-XX-Y</biblioid> <biblioid class=\"libraryofcongress" +"\">978-82-8067-010-6</biblioid> <biblioid class=\"libraryofcongress" "\">2003063276</biblioid>" msgstr "" " <placeholder type=\"mediaobject\" id=\"0\"/> <biblioid class=\"isbn" -"\">978-82-92812-XX-Y</biblioid> <biblioid class=\"libraryofcongress" +"\">978-82-8067-014-4</biblioid> <biblioid class=\"libraryofcongress" "\">2003063276</biblioid>" #. type: Content of: <book><dedication><title> @@ -2554,8 +2556,8 @@ msgid "" "(1953), <citetitle>Lady and the Tramp</citetitle> (1955), <citetitle>Mulan</" "citetitle> (1998), <citetitle>Sleeping Beauty</citetitle> (1959), " "<citetitle>101 Dalmatians</citetitle> (1961), <citetitle>The Sword in the " -"Stone</citetitle> (1963), and <citetitle>The Jungle Book</citetitle> " -"(1967)—not to mention a recent example that we should perhaps quickly " +"Stone</citetitle> (1963), and <citetitle>The Jungle Book</citetitle> (1967)" +"—not to mention a recent example that we should perhaps quickly " "forget, <citetitle>Treasure Planet</citetitle> (2003). In all of these " "cases, Disney (or Disney, Inc.) ripped creativity from the culture around " "him, mixed that creativity with his own extraordinary talent, and then " @@ -2576,13 +2578,12 @@ msgstr "" "(1953), <citetitle>Lady og landstrykeren</citetitle> (1955), " "<citetitle>Mulan</citetitle> (1998), <citetitle>Tornerose</citetitle> " "(1959), <citetitle>101 Dalmatinere</citetitle> (1961), <citetitle>Sverdet i " -"steinen</citetitle> (1963), og <citetitle>Jungelboken</citetitle> " -"(1967)—for ikke Ã¥ nevne et nylig eksempel som vi bør kanskje glemme " -"raskt, <citetitle>Treasure Planet</citetitle> (2003). I alle disse " -"tilfellene, har Disney (eller Disney, Inc.) hentet kreativitet fra kultur " -"rundt seg, blandet med kreativiteten fra sitt eget ekstraordinære talent, og " -"deretter brent denne blandingen inn i sjelen til kulturen sin. Hente, blande " -"og brenne." +"steinen</citetitle> (1963), og <citetitle>Jungelboken</citetitle> (1967)" +"—for ikke Ã¥ nevne et nylig eksempel som vi bør kanskje glemme raskt, " +"<citetitle>Treasure Planet</citetitle> (2003). I alle disse tilfellene, har " +"Disney (eller Disney, Inc.) hentet kreativitet fra kultur rundt seg, blandet " +"med kreativiteten fra sitt eget ekstraordinære talent, og deretter brent " +"denne blandingen inn i sjelen til kulturen sin. Hente, blande og brenne." #. type: Content of: <book><part><chapter><para> msgid "" @@ -2932,12 +2933,12 @@ msgstr "Mehra, Salil" msgid "" "See Salil K. Mehra, <quote>Copyright and Comics in Japan: Does Law Explain " "Why All the Comics My Kid Watches Are Japanese Imports?</quote> " -"<citetitle>Rutgers Law Review</citetitle> 55 (2002): 155, 182. " -"<quote>[T]here might be a collective economic rationality that would lead " -"manga and anime artists to forgo bringing legal actions for infringement. " -"One hypothesis is that all manga artists may be better off collectively if " -"they set aside their individual self-interest and decide not to press their " -"legal rights. This is essentially a prisoner's dilemma solved.</quote>" +"<citetitle>Rutgers Law Review</citetitle> 55 (2002): 155, 182. <quote>[T]" +"here might be a collective economic rationality that would lead manga and " +"anime artists to forgo bringing legal actions for infringement. One " +"hypothesis is that all manga artists may be better off collectively if they " +"set aside their individual self-interest and decide not to press their legal " +"rights. This is essentially a prisoner's dilemma solved.</quote>" msgstr "" "Se Salil K. Mehra, <quote>Copyright and Comics in Japan: Does Law Explain " "Why All the Comics My Kid Watches Are Japanese Imports?</quote> " @@ -8373,9 +8374,9 @@ msgid "" "machines. Under the Ninth Circuit's rule, this totally familiar " "technology—which Jack Valenti had called <quote>the Boston Strangler " "of the American film industry</quote> (worse yet, it was a " -"<emphasis>Japanese</emphasis> Boston Strangler of the American film " -"industry)—was an illegal technology.<placeholder type=\"footnote\" id=" -"\"0\"/> <placeholder type=\"indexterm\" id=\"1\"/>" +"<emphasis>Japanese</emphasis> Boston Strangler of the American film industry)" +"—was an illegal technology.<placeholder type=\"footnote\" id=\"0\"/> " +"<placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" "Det tok Ã¥tte Ã¥r før denne saken ble avgjort av høyesterett. I mellomtiden " "hadde den niende ankekrets, som har Hollywood i sin jurisdiksjon—det " @@ -8385,9 +8386,9 @@ msgstr "" "maskiner. I følge regelen til niende ankrekrets var denne kjente " "teknologien—som Jack Valenti hadde omtalt som <quote>Boston-kveleren " "for amerikansk filmindustri</quote> (verre enn dette, det var en " -"<emphasis>japansk</emphasis> Boston-kveler for amerikansk " -"filmindustri)— en ulovlig teknologi.<placeholder type=\"footnote\" id=" -"\"0\"/> <placeholder type=\"indexterm\" id=\"1\"/>" +"<emphasis>japansk</emphasis> Boston-kveler for amerikansk filmindustri)" +"— en ulovlig teknologi.<placeholder type=\"footnote\" id=\"0\"/> " +"<placeholder type=\"indexterm\" id=\"1\"/>" #. PAGE BREAK 90 #. type: Content of: <book><part><chapter><section><para> @@ -8475,7 +8476,7 @@ msgstr "Lovbestemt lisens" msgid "Recording artists" msgstr "Plateartister" -#. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> +#. type: Content of: <book><part><chapter><section><informaltable><tgroup><tbody><row><entry> msgid "N/A" msgstr "N/A" @@ -24568,6 +24569,19 @@ msgid "" "Compassion, a Synopsis,</quote> <citetitle>Widener Law Symposium Journal</" "citetitle> (Spring 2001): 175." msgstr "" +"Se Sabin Russel, <quote>New Crusade to Lower AIDS Drug Costs: Africa's Needs " +"at Odds with Firms' Profit Motive,</quote> <citetitle>San Francisco " +"Chronicle</citetitle>, 24. mai 1999, A1, tilgjengelig fra <ulink url=" +"\"http://free-culture.cc/notes/\">link #57</ulink> (<quote>tvangslisenser og " +"grÃ¥markeder utgjør en trussel for hele systemet for beskyttelse av " +"immateriell eiendom</quote>); Robert Weissman, <quote>AIDS and Developing " +"Countries: Democratizing Access to Essential Medicines,</quote> " +"<citetitle>Foreign Policy in Focus</citetitle> 4:23 (august 1999), " +"tilgjengelig fra <ulink url=\"http://free-culture.cc/notes/\">link #58</" +"ulink> (beskriver USAs policy); John A. Harrelson, <quote>TRIPS, " +"Pharmaceutical Patents, and the HIV/AIDS Crisis: Finding the Proper Balance " +"Between Intellectual Property Rights and Compassion, a Synopsis,</quote> " +"<citetitle>Widener Law Symposium Journal</citetitle> (vÃ¥ren 2001): 175." #. type: Content of: <book><chapter><para> msgid "" @@ -28778,33 +28792,18 @@ msgstr "" "Ã¥ begrense kulturen og kontrollere kreativiteten / Lawrence Lessig." #. type: Content of: <book><colophon><para> -msgid "Copyright © Lawrence Lessig. Some rights reserved." -msgstr "" -"Opphavsrettbeskyttet © Lawrence Lessig. Noen rettigheter forbeholdt." - -#. type: Content of: <book><colophon><para> -msgid "" -"This version of <citetitle>Free Culture</citetitle> is licensed under a " -"Creative Commons license. This license permits non-commercial use of this " -"work, so long as attribution is given. For more information about the " -"license visit <ulink url=\"http://creativecommons.org/licenses/by-nc/1.0/" -"\">http://creativecommons.org/licenses/by-nc/1.0/</ulink>" +msgid "Copyright © 2004 Lawrence Lessig. Some rights reserved." msgstr "" -"Denne versjonen av <citetitle>Fri kultur</citetitle> er lisensert med en " -"Creative Commons-lisens. Denne lisensen tillater ikke-kommersiell " -"utnyttelse av verket, hvis opphavsinnehaveren er navngitt. For mer " -"informasjon om lisensen, besøk <ulink url=\"http://creativecommons.org/" -"licenses/by-nc/1.0/\">http://creativecommons.org/licenses/by-nc/1.0/</ulink>" +"Opphavsrettbeskyttet © 2004 Lawrence Lessig. Noen rettigheter " +"forbeholdt." #. type: Content of: <book><colophon><para> msgid "" -"This digital book was published by Petter Reinholdtsen in 2015 in his spare " -"time, because he believe it should be available in Norwegian. The original " -"hardcover paper book was published in 2004 by The Penguin Press." +"Published 2015 by Petter Reinholdtsen in his spare time. First published " +"2004 by The Penguin Press. Thomas Gramstad Forlag donated the ISBN numbers." msgstr "" -"Denne digitale boken ble publisert pÃ¥ fritiden av Petter Reinholdtsen i " -"2015, pÃ¥ grunn av at han mener den bør være tilgjengelig pÃ¥ norsk. Den " -"opprinnelige innbundede boken ble publisert i 2004 av The Penguin Press." +"Publisert 2015 av Petter Reinholdtsen pÃ¥ fritiden. Først publisert 2004 av " +"The Penguin Press. Thomas Gramstad Forlag donerte ISBN-nummer." #. type: Content of: <book><colophon><para> msgid "" @@ -28852,37 +28851,27 @@ msgstr "" #. type: Content of: <book><colophon><para> msgid "" -"Typeset using the Crimson Text font and dblatex. The dblatex author " -"provided valuable help in formatting the print version of this book. Thomas " -"Gramstad Forlag provided the ISBN numbers." -msgstr "" -"Typesatt med skrifttypen Crimson Text og dblatex. Forfatteren av dblatex " -"bidro med verdiful hjelp i formatteringen av utskriftsversjonen av boka. " -"Thomas Gramstad Forslag bidro med ISBN-nummer." - -#. type: Content of: <book><colophon><para> -msgid "" -"The source of this version of the book is written using DocBook notation and " -"the other formats are derived from the DocBook source. The DocBook source " -"is based on a DocBook XML version created by Hans Schou, and extended by " -"Petter Reinholdtsen with formatting and index references. The source files " -"for this book are available from <ulink url=\"https://github.com/" -"petterreinholdtsen/free-culture-lessig\"/>." +"The book source is in DocBook notation and the other formats are derived " +"from this. The source is based on a version from Hans Schou. Typeset using " +"Crimson Text and formatted using dblatex. Many thanks to the dblatex " +"developer for his help. The source is available from <ulink url=\"https://" +"github.com/petterreinholdtsen/free-culture-lessig\"/>. Please report any " +"problems using the GitHub issue tracker." msgstr "" -"Kildekoden for denne versjonen av boken er skrevet i DocBook-notasjon og de " -"andre formatene er avledet fra DocBook-kilden. DocBook-koden er basert pÃ¥ en " -"DocBook XML-versjon laget av Hans Schou, utvidet av Petter Reinholdtsen med " -"formattering og registerreferanser. Kildefilene til denne boken er " -"tilgjengelig fra <ulink url=\"https://github.com/petterreinholdtsen/free-" -"culture-lessig\"/>." +"Bokens kildekode er i DocBok-notasjon og de andre formatene er utledet fra " +"dette. Kildekoden er basert pÃ¥ en versjon fra Hans Schou. Typesatt med " +"Crimson Text og formattert med dblatex. Mange takk til dblatex-utvikleren " +"for hans hjelp. Kildekoden er tilgjengelig fra <ulink url=\"https://github." +"com/petterreinholdtsen/free-culture-lessig\"/>. Rapporter problemer via " +"GitHub." #. type: Content of: <book><colophon><para> msgid "&translationblock;" msgstr "" -"Boken er oversatt til bokmÃ¥l pÃ¥ dugnad av Petter Reinholdtsen med hjelp fra " +"BokmÃ¥lsutgave er oversatt pÃ¥ dugnad av Petter Reinholdtsen med hjelp fra " "Anders Hagen Jarmund, Kirill Miazine og Odd Kleiva. Takk til Ralph Amissah " "for hjelp med registeroppføringene samt Morten Sickel og Alexander Alemayhu " -"for hjelp med bildene. Rapporter feil i oversettelsen via GitHub." +"for hjelp med bildene." #. type: Content of: <book><colophon><para><informaltable><tgroup><thead><row><entry> msgid "ISBN" @@ -28893,32 +28882,32 @@ msgid "Format / MIME-type" msgstr "Format / MIME-type" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> -msgid "978-82-92812-XX-Y" -msgstr "978-82-92812-XX-Y" +msgid "978-82-8067-010-6" +msgstr "978-82-8067-014-4" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> msgid "Paper copy from XXX" msgstr "Papireksemplar fra XXX" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> -msgid "text/plain" -msgstr "text/plain" +msgid "978-82-8067-011-3" +msgstr "978-82-8067-015-1" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> msgid "application/pdf" msgstr "application/pdf" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> -msgid "text/html" -msgstr "text/html" +msgid "978-82-8067-012-0" +msgstr "978-82-8067-016-8" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> msgid "application/epub+zip" msgstr "application/epub+zip" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> -msgid "application/docbook+xml" -msgstr "application/docbook+xml" +msgid "978-82-8067-013-7" +msgstr "978-82-8067-017-5" #. type: Content of: <book><colophon><para><informaltable><tgroup><tbody><row><entry> msgid "application/x-mobipocket-ebook" diff --git a/myclass.cls b/myclass.cls index bb8664b..5477cf9 100644 --- a/myclass.cls +++ b/myclass.cls @@ -141,3 +141,22 @@ % Hint for figure with empty title: remove the colon label separator \usepackage{caption} \captionsetup[figure]{labelsep=none} + +% Fix the page number reset done by abstract by redefining it +% Patch from +% https://github.com/petterreinholdtsen/free-culture-lessig/pull/7 + +\def\nocount#1#2{} +\let\stdsetcounter\setcounter +\let\stdabstract=\abstract +\let\endstdabstract=\endabstract +\renewenvironment{abstract}{% + \let\setcounter\nocount% + \begin{stdabstract}% + \noindent% + \setlength\parskip{\medskipamount}% + \setlength\parindent{0pt}% +}{ + \end{stdabstract} + \let\setcounter\stdsetcounter +} diff --git a/progress.png b/progress.png index 0411160..0a7b1ac 100644 Binary files a/progress.png and b/progress.png differ diff --git a/stats.txt b/stats.txt index c1a635a..c7570ef 100644 --- a/stats.txt +++ b/stats.txt @@ -601,3 +601,4 @@ 2015-04-22T2229 2320 oversatte meldinger, 8 antatte oversettelser, 7 oversatte meldinger. 2015-04-24T1437 2321 oversatte meldinger, 7 antatte oversettelser, 7 oversatte meldinger. 2015-07-21T2219 2322 oversatte meldinger, 13 oversatte meldinger. +2015-07-30T1011 2307 oversatte meldinger, 11 oversatte meldinger.