merged 2012-08

elzapp · elzapp · commit fbabd70a29b5 · 2013-08-19T11:08:26.000+02:00
diff --git a/plakat.svg b/plakat.svg
@@ -604,8 +604,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.70710678"
-     inkscape:cx="359.51384"
-     inkscape:cy="368.44616"
+     inkscape:cx="356.68541"
+     inkscape:cy="374.10302"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -1892,27 +1892,83 @@
          x="106.68153"
          y="435.07379"
          id="tspan17311"
-         style="font-size:50.72708511px;font-style:normal;line-height:101.99999809%;-inkscape-font-specification:Sans">Desktop publishing </tspan><tspan
+         style="font-size:50.72708511px;font-style:normal;line-height:101.99999809%;-inkscape-font-specification:Sans">Linux og sånn</tspan><tspan
          sodipodi:role="line"
          x="106.68153"
-         y="486.81543"
-         style="font-size:50.72708511px;font-style:normal;line-height:101.99999809%;-inkscape-font-specification:Sans"
-         id="tspan3545">med Inkscape og Scribus </tspan><tspan
-         sodipodi:role="line"
-         x="106.68153"
-         y="513.2984"
+         y="461.55679"
          style="font-size:22.5453701px;font-style:italic;line-height:88.99999857%;-inkscape-font-specification:Sans Italic"
          id="tspan19035">ved L. Cecilie Wian</tspan><tspan
          sodipodi:role="line"
          x="106.68153"
-         y="533.36383"
+         y="481.62216"
          style="font-size:33.81805801px;font-style:normal;line-height:88.99999857%;-inkscape-font-specification:Sans"
          id="tspan17323" /><tspan
          sodipodi:role="line"
          x="106.68153"
-         y="556.14832"
+         y="504.72925"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3361">Linux, <tspan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+   id="tspan3417">Ubuntu</tspan>, SuSE, RedHat. <tspan
+   style="font-style:italic"
+   id="tspan3419">Open Source</tspan> og <tspan
+   style="font-style:italic;-inkscape-font-specification:Sans Italic"
+   id="tspan3423">Fri programvare</tspan>. </tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="528.77667"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3379">Hva er det? Hvordan henger det sammen? </tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="552.25208"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3381">Hva er community, og hva gjør det?</tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="575.72742"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3365" /><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="599.20282"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3367">L. Cecilie Wian gir en nybegynnerinnføring i verdenen rundt </tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="622.67816"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3389">linux, hva består den av, hvordan fungerer den, hvem er det </tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="646.1535"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3369">som lager dette.</tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="669.62891"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3395" /><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="693.10425"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3399">Foredraget er rettet mot for nysgjerrige og nybegynnere, men </tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="716.57965"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3371">også erfarne brukere som vil vite mer om organiseringen og </tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="740.05499"
+         style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
+         id="tspan3373">omgivelsene rundt Fri og Open programvare vil ha glede av dette.</tspan><tspan
+         sodipodi:role="line"
+         x="106.68153"
+         y="763.5304"
          style="font-size:19.72719955px;font-style:normal;line-height:119.00000572%;-inkscape-font-specification:Sans"
-         id="tspan3375">Lorem ipsum </tspan></text>
+         id="tspan3375">Dette er anledningen til å bli bedre kjent med verden rundt Linux. </tspan></text>
     <flowRoot
        xml:space="preserve"
        id="flowRoot17413"
@@ -2063,7 +2119,7 @@
                  id="tspan18424"
                  x="-246.43105"
                  y="796.42114"
-                 style="font-size:72px">29</tspan></text>
+                 style="font-size:72px">30</tspan></text>
             <text
                xml:space="preserve"
                style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:101.99999809%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
