From: Petter Reinholdtsen Date: Sun, 16 Dec 2012 07:39:27 +0000 (+0100) Subject: Undo changes to line ending done by commit from Kirill, and merge his changes. X-Git-Tag: edition-2015-10-10~1037 X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/19197aec7b883ef17e75b51e5d55acb3eaf09243?hp=ea706cb336ab7ffe39c7060637e04119df3f8912 Undo changes to line ending done by commit from Kirill, and merge his changes. --- diff --git a/freeculture.nb.po b/freeculture.nb.po index 2d52206..06bd2ce 100644 --- a/freeculture.nb.po +++ b/freeculture.nb.po @@ -260,9 +260,8 @@ msgstr "" "kommer fra kontoret til FCC-kommisjonæren, Michael J. Copps." #. type: Content of: -#, mtrans, fuzzy msgid "Library of Congress Cataloging-in-Publication Data" -msgstr "Library of congress cataloging i publikasjonen data" +msgstr "Cataloging-in-Publication-data til Library of Congress" #. type: Content of: msgid "" @@ -529,9 +528,8 @@ msgid "power, concentration of" msgstr "makt, konsentrasjon av" #. type: Content of: -#, mtrans, fuzzy msgid "CodePink Women in Peace" -msgstr "codepink kvinner i fred" +msgstr "codePink-kvinner i fred" #. type: Content of: msgid "Safire, William" @@ -1148,7 +1146,6 @@ msgstr "" "" #. type: Content of: -#, mtrans, fuzzy msgid "FCC" msgstr "FCC" @@ -4748,7 +4745,6 @@ msgstr "" "\"0\"/>" #. type: Content of: -#, mtrans, fuzzy msgid "commercial imperatives of" msgstr "kommersielle imperativer av" @@ -5447,9 +5443,8 @@ msgid "Recording Industry Association of America (RIAA)" msgstr "Recording Industry Association of America (RIAA)" #. type: Content of:
-#, mtrans, fuzzy msgid "copyright infringement lawsuits filed by" -msgstr "krenkelse av opphavsrett søksmål" +msgstr "stevning i sak om om krenkelse av opphavsrett tatt ut av" #. type: Content of: msgid "" @@ -5501,9 +5496,8 @@ msgid "statutory damages of" msgstr "lovbestemte skader for" #. type: Content of: -#, mtrans, fuzzy msgid "individual defendants intimidated by" -msgstr "individuelle saksøkte skremt av" +msgstr "de enkelte saksøkte skremt av" #. type: Content of: msgid "statutory damages" @@ -5654,14 +5648,12 @@ msgid "recording industry payments to" msgstr "musikkindustriens betaling til" #. type: Content of:
-#, mtrans, fuzzy msgid "artist remuneration in" -msgstr "artist godtgjørelse i" +msgstr "artisthonorar i" #. type: Content of:
-#, mtrans, fuzzy msgid "lobbying power of" -msgstr "lobbyvirksomhet makt" +msgstr "lobbymakten til" #. f2 #. type: Content of: @@ -5748,9 +5740,8 @@ msgid "CHAPTER FOUR: Pirates" msgstr "Kapittel fire: Pirater" #. type: Content of: -#, mtrans, fuzzy msgid "in development of content industry" -msgstr "i utviklingen av innhold industri" +msgstr "i utviklingen av innholdsindustri" #. type: Content of: msgid "" @@ -8233,9 +8224,8 @@ msgid "copyright protections in" msgstr "opphavsrettbeskyttelser i" #. type: Content of:
-#, mtrans, fuzzy msgid "composer's rights vs. producers' rights in" -msgstr "composer's rettigheter vs. produsentenes rettigheter i" +msgstr "komponistens rettigheter versus produsentenes rettigheter i" #. type: Content of:
msgid "" @@ -8362,9 +8352,8 @@ msgstr "" "for arkitekturen de valgte." #. type: Content of:
-#, mtrans, fuzzy msgid "on VCR technology" -msgstr "på vcr-teknologi" +msgstr "på videospiller-teknologi" #. f18 #. type: Content of:
@@ -8681,9 +8670,8 @@ msgstr "" "en advokat for å få tillatelse til å spille inn en sang?" #. type: Content of:
-#, mtrans, fuzzy msgid "on balance of interests in copyright law" -msgstr "på balanse mellom interesser i lov om opphavsrett" +msgstr "om interesseavveininger i opphavsrettslovgivning" #. f25 #. type: Content of:
@@ -8889,9 +8877,8 @@ msgstr "" "\"footnote\" id=\"0\"/>" #. type: Content of: -#, mtrans, fuzzy msgid "intangibility of" -msgstr "intangibility av" +msgstr "ubegripelighet av" #. type: Content of: msgid "" @@ -8975,9 +8962,8 @@ msgid "United Kingdom" msgstr "Storbritannia" #. type: Content of: -#, mtrans, fuzzy msgid "history of copyright law in" -msgstr "historie om opphavsrett i" +msgstr "historie av opphavsrettslovgivning i" #. type: Content of: msgid "Branagh, Kenneth" @@ -9091,14 +9077,12 @@ msgid "British Parliament" msgstr "Britiske parlamentet, det" #. type: Content of:
-#, mtrans, fuzzy msgid "renewability of" -msgstr "fornyelsesevne av" +msgstr "fornyelsesevnen til" #. type: Content of:
-#, mtrans, fuzzy msgid "Statute of Anne (1710)" -msgstr "Vedtektene for anne (1710)" +msgstr "Statute of Anne (1710)" #. type: Content of: msgid "" @@ -9141,14 +9125,12 @@ msgid "common vs. positive" msgstr "felles vs. positive" #. type: Content of: -#, mtrans, fuzzy msgid "positive law" -msgstr "positiv lov" +msgstr "positiv rett" #. type: Content of: -#, mtrans, fuzzy msgid "Licensing Act (1662)" -msgstr "lisensiering act (1662)" +msgstr "Licensing Act (1662)" #. type: Content of: msgid "" @@ -9345,9 +9327,8 @@ msgid "monopoly, copyright as" msgstr "monopol, opphavsrett som" #. type: Content of: -#, mtrans, fuzzy msgid "Statute of Monopolies (1656)" -msgstr "Rhuddlan monopoler (1656)" +msgstr "Statute of Monopolis (1656)" #. type: Content of: msgid "" @@ -9879,9 +9860,8 @@ msgstr "" "stemte resten av Overhuset." #. type: Content of: -#, mtrans, fuzzy msgid "English legal establishment of" -msgstr "engelsk juridisk etableringen av" +msgstr "den engelske juridiske etableringen av" #. PAGE BREAK 104 #. type: Content of: @@ -10492,8 +10472,9 @@ msgstr "" "forsket Starwave på ny teknologi for å levere underholdning uten nettverk." #. type: Content of: +#, mtrans, fuzzy msgid "retrospective compilations on" -msgstr "retrospektiv samling av" +msgstr "retrospektiv samleplater på" #. type: Content of: msgid "CD-ROMs, film clips used in"