[svnbook commit] r2075 - in trunk/src/nb: . book

[sunny256]

Author: sunny256
Date: Wed Mar 15 18:27:12 2006
New Revision: 2075

Modified:
   trunk/src/nb/TRANSLATION-STATUS
   trunk/src/nb/book/ch07.xml

Log:
Translation in the Norwegian book.

* src/nb/TRANSLATION-STATUS: Updated ch07.xml .

* src/nb/book/ch07.xml: Some translation.


Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS	(original)
+++ trunk/src/nb/TRANSLATION-STATUS	Wed Mar 15 18:27:12 2006
@@ -35,7 +35,7 @@
 
     2.1.2. In progress
 
-      book/ch07.xml (26%) -- sunny256
+      book/ch07.xml (27%) -- sunny256
 
     2.1.3. Needs update
 

Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml	(original)
+++ trunk/src/nb/book/ch07.xml	Wed Mar 15 18:27:12 2006
@@ -1904,6 +1904,7 @@
 
       </sidebar>
 
+      <!-- @ENGLISH {{{
       <para>And as with file contents, your property changes are local
         modifications, only made permanent when you commit them to the
         repository with <command>svn commit</command>.  Your property
@@ -1914,7 +1915,20 @@
         the state of your file and directory properties by using the
         <command>svn status</command> and <command>svn diff</command>
         commands.</para>
+      @ENGLISH }}} -->
+      <para>Og i likhet med filinnhold, er forandringene dine i 
+        egenskapene lokale modifiseringer som kun blir gjort permanente 
+        når du legger dem inn i depotet med <command>svn 
+        commit</command>.
+        Egenskapsforandringene kan lett omgjøres – kommandoen 
+        <command>svn revert</command> vil sette filene og katalogene 
+        dine tilbake til den uredigerte tilstanden – innhold, 
+        egenskaper, alt.
+        Du kan også få interessant informasjon om tilstanden til fil- og 
+        katalogegenskapene ved å bruke kommandoene <command>svn 
+        status</command> og <command>svn diff</command>.</para>
 
+      <!-- @ENGLISH {{{
       <screen>
 $ svn status calc/button.c
  M     calc/button.c
@@ -1926,7 +1940,20 @@
 
 $
 </screen>
+      @ENGLISH }}} -->
+      <screen>
+$ svn status calc/button.c
+ M     calc/button.c
+$ svn diff calc/button.c
+Egenskapsforandringer på: calc/button.c
+___________________________________________________________________
+Navn: copyright
+   + (c) 2003 Red-Bean Software
+
+$
+</screen>
 
+      <!-- @ENGLISH {{{
       <para>Notice how the <command>status</command> subcommand
         displays <literal>M</literal> in the second column instead of
         the first.  That is because we have modified the properties on
@@ -1934,17 +1961,40 @@
         textual contents.  Had we changed both, we would have seen
         <literal>M</literal> in the first column, too (see <xref
         linkend="svn.tour.cycle.examine.status" />).</para>
+      @ENGLISH }}} -->
+      <para>Legg merke til hvordan 
+        <command>status</command>-delkommandoen viser 
+        <literal>M</literal> i den andre kolonnen istedenfor den første.
+        Det er fordi vi har forandret egenskapene på 
+        <filename>calc/button.c</filename>, men ikke forandret 
+        tekstinnholdet.
+        Hadde vi forandret begge to, ville det også vært en 
+        <literal>M</literal> i den første kolonnen (se <xref 
+        linkend="svn.tour.cycle.examine.status" />).</para>
 
       <sidebar>
+        <!-- @ENGLISH {{{
         <title>Property Conflicts</title>
+        @ENGLISH }}} -->
+        <title>Konflikter i egenskaper</title>
 
+        <!-- @ENGLISH {{{
         <para>As with file contents, local property modifications can
           conflict with changes committed by someone else.  If you
           update your working copy directory and receive property
           changes on a versioned resource that clash with your own,
           Subversion will report that the resource is in a conflicted
           state.</para>
+        @ENGLISH }}} -->
+        <para>I likhet med filinnhold, kan lokale egenskapsforandringene 
+          komme i konflikt med forandringer som er lagt inn av noen 
+          andre.
+          Hvis du oppdaterer arbeidskopikatalogen og mottar 
+          egenskapsforandringer på en versjonert ressurs som kolliderer 
+          med dine egne, vil Subversion rapportere at ressursen er i en 
+          konflikttilstand.</para>
  
+        <!-- @ENGLISH {{{
         <screen>
 % svn update calc
 M  calc/Makefile.in
@@ -1952,6 +2002,14 @@
 Updated to revision 143.
 $ 
 </screen>
+        @ENGLISH }}} -->
+        <screen>
+% svn update calc
+M  calc/Makefile.in
+ C calc/button.c
+Oppdatert til revisjon 143.
+$
+</screen>
          
         <para>Subversion will also create, in the same directory as
           the conflicted resource, a file with a