Merge fixes from MartinBorg.

diff --git a/freeculture.nb.po b/freeculture.nb.po
index 565354339ca75db0a26eee268d5558c68ea38df8..704006146f34d7edc9547a3df04aa4669b025db2 100644 (file)
--- a/freeculture.nb.po
+++ b/freeculture.nb.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-07-17 17:55+0300\n"
+"POT-Creation-Date: 2012-07-17 18:50+0300\n"
 "PO-Revision-Date: 2012-07-13 21:50+0200\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -1732,6 +1732,10 @@ msgstr ""
 "fra noen andre, skulle jeg ha deres tillatelse. å ta av noe av verdi fra "
 "noen andre uten tillatelse er galt. Det er en form for piratkopiering."
 
+#. type: Content of: <book><chapter><indexterm><primary>
+msgid "Dreyfuss, Rochelle"
+msgstr "Dreyfuss, Rochelle"
+
 #.  f2
 #. type: Content of: <book><chapter><para><footnote><para>
 #, mtrans, fuzzy
@@ -5423,6 +5427,10 @@ msgstr ""
 "opphavsretten internasjonalt. Vi kan ha vært født en pirat nasjon, men vi "
 "tillater ikke noen annen nasjon til å ha en lignende barndom."
 
+#. type: Content of: <book><chapter><para><footnote><indexterm><primary>
+msgid "Drahos, Peter"
+msgstr "Drahos, Peter"
+
 #.  f2
 #. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
 #, mtrans, fuzzy
@@ -8471,6 +8479,10 @@ msgstr ""
 "og ingen tvil, selve produktet var usedvanlig god. Eastwood elsket det, og "
 "det selges godt."
 
+#. type: Content of: <book><chapter><sect1><indexterm><primary>
+msgid "Drucker, Peter"
+msgstr "Drucker, Peter"
+
 #.  f2
 #. type: Content of: <book><chapter><sect1><para><footnote><para>
 msgid ""
@@ -20253,17 +20265,17 @@ msgstr ""
 "konkurransedyktig trusselen."
 
 #. type: Content of: <book><chapter><sect1><para>
-#, mtrans, fuzzy
 msgid ""
 "I used these two cases as a way to frame the war that this book has been "
 "about. For here, too, a new technology is forcing the law to react.  And "
 "here, too, we should ask, is the law following or resisting common sense? If "
 "common sense supports the law, what explains this common sense?"
 msgstr ""
-"Jeg brukte disse to tilfellene som en måte å ramme som denne boken har vært "
-"om krigen. for her, også, er en ny teknologi tvinge lov til å reagere. og "
-"her vi bør spørre, også, er loven etter eller motsette sunn fornuft? Hvis "
-"sunn fornuft støtter loven, forklarer hva denne sunn fornuft?"
+"Jeg brukte disse to tilfellene som en måte å ramme inn krigen som denne "
+"boken har handlet om.  For her er det også en ny teknologi som tvinger loven "
+"til å reagere.  Og her bør vi også spørre, er loven i tråd med eller i strid "
+"med sunn fornuft.  Hvis sunn fornuft støtter loven, hva forklarer denne "
+"sunne fornuften?"
 
 #.  PAGE BREAK 262
 #. type: Content of: <book><chapter><sect1><para>
@@ -21259,10 +21271,6 @@ msgstr ""
 "Føydalisme depended upon maksimal kontroll og konsentrasjon. det kjempet "
 "noen friheten som kan forstyrre denne kontrollen."
 
-#. type: Content of: <book><chapter><indexterm><primary>
-msgid "Drahos, Peter"
-msgstr "Drahos, Peter"
-
 #.  f10.
 #. type: Content of: <book><chapter><para><footnote><para>
 msgid "See Drahos with Braithwaite, Information Feudalism, 210&ndash;20."
@@ -21496,6 +21504,10 @@ msgstr ""
 "Hvis vi var Akilles, så ville dette være vår hæl. Dette ville være stedet "
 "for våre tragedie."
 
+#. type: Content of: <book><chapter><indexterm><primary>
+msgid "Dylan, Bob"
+msgstr "Dylan, Bob"
+
 #.  f11.
 #. type: Content of: <book><chapter><para><footnote><para>
 msgid ""

diff --git a/freeculture.xml b/freeculture.xml
index e07b6e43b5c54ef432f9d74111fd51c6559ddfa3..9258f032e2577875048fc6edf1cd33296f34dedb 100644 (file)
--- a/freeculture.xml
+++ b/freeculture.xml
@@ -1117,6 +1117,7 @@ from someone else without permission is wrong. It is a form of
 piracy.
 </para>
 </blockquote>
+<indexterm><primary>Dreyfuss, Rochelle</primary></indexterm>
 <para>
 This view runs deep within the current debates. It is what NYU law
 professor Rochelle Dreyfuss criticizes as the "if value, then right" 
@@ -3328,7 +3329,9 @@ childhood.
 If a country is to be treated as a sovereign, however, then its laws are
 its laws regardless of their source. The international law under which
 these nations live gives them some opportunities to escape the burden
-of intellectual property law.<footnote><para>
+of intellectual property law.<footnote>
+<indexterm><primary>Drahos, Peter</primary></indexterm>
+<para>
 <!-- f2 -->
 See Peter Drahos with John Braithwaite, Information Feudalism: Who
 Owns the Knowledge Economy? (New York: The New Press, 2003), 10&ndash;13,
@@ -5205,6 +5208,7 @@ And no doubt, the product itself was exceptionally good. Eastwood
 loved it, and it sold very well.
 </para>
 <indexterm><primary>Alben, Alex</primary></indexterm>
+<indexterm><primary>Drucker, Peter</primary></indexterm>
 <para>
 But I pressed Alben about how weird it seems that it would have to
 take a year's work simply to clear rights. No doubt Alben had done
@@ -12255,6 +12259,7 @@ permitted within the European Union.<footnote>
 See Peter Drahos with John Braithwaite, Information Feudalism: Who
 Owns the Knowledge Economy? (New York: The New Press, 2003), 37.
 <indexterm><primary>Braithwaite, John</primary></indexterm>
+<indexterm><primary>Drahos, Peter</primary></indexterm>
 </para></footnote>
 </para>
 <para>
@@ -12711,7 +12716,9 @@ that control.
 <indexterm><primary>Braithwaite, John</primary></indexterm>
 <para>
 As Peter Drahos and John Braithwaite relate, this is precisely the
-choice we are now making about intellectual property.<footnote><para>
+choice we are now making about intellectual property.<footnote>
+<indexterm><primary>Drahos, Peter</primary></indexterm>
+<para>
 <!-- f10. -->
 See Drahos with Braithwaite, Information Feudalism, 210&ndash;20.
 </para></footnote>
@@ -12838,6 +12845,7 @@ called "property" is not well exercised within this tradition anymore.
 If we were Achilles, this would be our heel. This would be the place
 of our tragedy.
 </para>
+<indexterm><primary>Dylan, Bob</primary></indexterm>
 <para>
 As I write these final words, the news is filled with stories about
 the RIAA lawsuits against almost three hundred individuals.<footnote><para>