[svnbook commit] r2047 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Tue Mar 7 08:49:26 CST 2006
Author: sunny256
Date: Tue Mar 7 08:49:21 2006
New Revision: 2047
Modified:
trunk/src/nb/TRANSLATION-STATUS
trunk/src/nb/book/ch04.xml
Log:
Translated all examples in ch04.xml to Norwegian.
* src/nb/TRANSLATION-STATUS
(Translation of examples): Moved ch04.xml to Finished.
* src/nb/book/ch04.xml
Translated all <screen> examples.
Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS (original)
+++ trunk/src/nb/TRANSLATION-STATUS Tue Mar 7 08:49:21 2006
@@ -93,6 +93,7 @@
book/ch01.xml
book/ch02.xml
book/ch03.xml
+ book/ch04.xml
4.3. Will do
@@ -100,7 +101,6 @@
book/appb.xml
book/appc.xml
book/book.xml
- book/ch04.xml
book/ch05.xml
book/ch06.xml
book/ch07.xml
Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml (original)
+++ trunk/src/nb/book/ch04.xml Tue Mar 7 08:49:21 2006
@@ -346,6 +346,7 @@
Til å begynne med, hent ut en arbeidskopi av prosjektets
rotkatalog, <filename>/calc</filename>:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn checkout http://svn.example.com/repos/calc bigwc
A bigwc/trunk/
@@ -355,6 +356,16 @@
A bigwc/branches/
Checked out revision 340.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn checkout http://svn.example.com/repos/calc bigwc
+A bigwc/trunk/
+A bigwc/trunk/Makefile
+A bigwc/trunk/integer.c
+A bigwc/trunk/button.c
+A bigwc/branches/
+Sjekket ut revisjon 340.
+</screen>
<!-- @ENGLISH {{{
<para>Making a copy is now simply a matter of passing two
@@ -401,12 +412,18 @@
å kopiere <filename>/calc/trunk</filename> istedenfor å sende
hele arbeidskopien over nettverket en gang til:</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
$ svn commit -m "Creating a private branch of /calc/trunk."
Adding branches/my-calc-branch
Committed revision 341.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn commit -m "Lager en privat gren av /calc/trunk."
+Legger til branches/my-calc-branch
+La inn revisjon 341.
+</screen>
<!-- @ENGLISH {{{
<para>And now the easier method of creating a branch, which we
@@ -432,7 +449,7 @@
http://svn.example.com/repos/calc/branches/my-calc-branch \
-m "Lager en privat gren av /calc/trunk."
-Committed revision 341.
+La inn revisjon 341.
</screen>
<!-- @ENGLISH {{{
@@ -568,7 +585,7 @@
<para>Nå som du har laget en gren av prosjektet, kan du hente ut
en ny arbeidskopi for å starte bruken av den:</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
A my-calc-branch/Makefile
@@ -576,6 +593,14 @@
A my-calc-branch/button.c
Checked out revision 341.
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
+A my-calc-branch/Makefile
+A my-calc-branch/integer.c
+A my-calc-branch/button.c
+Sjekket ut revisjon 341.
+</screen>
<!-- @ENGLISH {{{
<para>There's nothing special about this working copy; it simply
@@ -671,40 +696,76 @@
forandringene gjort i din kopi av
<filename>integer.c</filename>:</para>
- <!-- ¤ Eksemplene tas seinere -->
+ <!-- @ENGLISH {{{
<screen>
$ pwd
/home/user/my-calc-branch
-$ svn log --verbose integer.c
-------------------------------------------------------------------------
+$ svn log -ﳢ-verbose integer.c
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r343 | user | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines
Changed paths:
M /calc/branches/my-calc-branch/integer.c
* integer.c: frozzled the wazjub.
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r341 | user | 2002-11-03 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines
Changed paths:
A /calc/branches/my-calc-branch (from /calc/trunk:340)
Creating a private branch of /calc/trunk.
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines
Changed paths:
M /calc/trunk/integer.c
* integer.c: changed a docstring.
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
Changed paths:
M /calc/trunk/integer.c
* integer.c: adding this file to the project.
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
+</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ pwd
+/home/user/my-calc-branch
+
+$ svn log --verbose integer.c
+------------------------------------------------------------------------
+r343 | bruker | 2002-11-07 15:27:56 -0600 (tor, 07 nov 2002) | 2 lines
+Endrede filstier:
+ M /calc/branches/my-calc-branch/integer.c
+
+* integer.c: <!-- ¤ Ja, den blir ikke grei. -->frozzled the wazjub.
+
+------------------------------------------------------------------------
+r341 | bruker | 2002-11-03 15:27:56 -0600 (tor, 07 nov 2002) | 2 lines
+Endrede filstier:
+ A /calc/branches/my-calc-branch (fra /calc/trunk:340)
+
+Lager en privat gren av /calc/trunk.
+
+------------------------------------------------------------------------
+r303 | sally | 2002-10-29 21:14:35 -0600 (tir, 29 okt 2002) | 2 lines
+Endrede filstier:
+ M /calc/trunk/integer.c
+
+* integer.c: Forandret en docstring.
+
+------------------------------------------------------------------------
+r98 | sally | 2002-02-22 15:35:29 -0600 (fre, 22 feb 2002) | 2 lines
+Endrede filstier:
+ M /calc/trunk/integer.c
+
+* integer.c: Legger til denne fila i prosjektet.
+
------------------------------------------------------------------------
</screen>
@@ -727,33 +788,62 @@
Se nå hva som skjer når Sally kjører den samme kommandoen på
hennes kopi av filen:</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
$ pwd
/home/sally/calc
-$ svn log --verbose integer.c
-------------------------------------------------------------------------
+$ svn log -ﳢ-verbose integer.c
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r344 | sally | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines
Changed paths:
M /calc/trunk/integer.c
* integer.c: fix a bunch of spelling errors.
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines
Changed paths:
M /calc/trunk/integer.c
* integer.c: changed a docstring.
-------------------------------------------------------------------------
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
Changed paths:
M /calc/trunk/integer.c
* integer.c: adding this file to the project.
+-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
+</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ pwd
+/home/sally/calc
+
+$ svn log --verbose integer.c
+------------------------------------------------------------------------
+r344 | sally | 2002-11-07 15:27:56 -0600 (tor, 07 nov 2002) | 2 lines
+Endrede filstier:
+ M /calc/trunk/integer.c
+
+* integer.c: Ordnet en dunge med skrivefeil.
+
+------------------------------------------------------------------------
+r303 | sally | 2002-10-29 21:14:35 -0600 (tir, 29 okt 2002) | 2 lines
+Endrede filstier:
+ M /calc/trunk/integer.c
+
+* integer.c: Forandret en docstring.
+
+------------------------------------------------------------------------
+r98 | sally | 2002-02-22 15:35:29 -0600 (fre, 22 feb 2002) | 2 lines
+Endrede filstier:
+ M /calc/trunk/integer.c
+
+* integer.c: Legger til denne fila i prosjektet.
+
------------------------------------------------------------------------
</screen>
@@ -965,12 +1055,13 @@
deg den eksakte forandringen gjort av Sally i revisjon
344:</para>
+ <!-- @ENGLISH {{{
<screen>
$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk
Index: integer.c
===================================================================
---- integer.c (revision 343)
+-ﳢ-ﳢ- integer.c (revision 343)
+++ integer.c (revision 344)
@@ -147,7 +147,7 @@
case 6: sprintf(info->operating_system, "HPFS (OS/2 or NT)"); break;
@@ -1009,6 +1100,51 @@
if (fseek(gzfile, -8, SEEK_END)) {
printf("error: fseek() returned non-zero\n");
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk
+
+Index: integer.c
+===================================================================
+--- integer.c (revisjon 343)
++++ integer.c (revisjon 344)
+@@ -147,7 +147,7 @@
+ case 6: sprintf(info->operating_system, "HPFS (OS/2 or NT)"); break;
+ case 7: sprintf(info->operating_system, "Macintosh"); break;
+ case 8: sprintf(info->operating_system, "Z-System"); break;
+- case 9: sprintf(info->operating_system, "CPM"); break;
++ case 9: sprintf(info->operating_system, "CP/M"); break;
+ case 10: sprintf(info->operating_system, "TOPS-20"); break;
+ case 11: sprintf(info->operating_system, "NTFS (Windows NT)"); break;
+ case 12: sprintf(info->operating_system, "QDOS"); break;
+@@ -164,7 +164,7 @@
+ low = (unsigned short) read_byte(gzfile); /* read LSB */
+ high = (unsigned short) read_byte(gzfile); /* read MSB */
+ high = high << 8; /* interpret MSB correctly */
+- total = low + high; /* add them togethe for correct total */
++ total = low + high; /* add them together for correct total */
+
+ info->extra_header = (unsigned char *) my_malloc(total);
+ fread(info->extra_header, total, 1, gzfile);
+@@ -241,7 +241,7 @@
+ Store the offset with ftell() ! */
+
+ if ((info->data_offset = ftell(gzfile))== -1) {
+- printf("error: ftell() retturned -1.\n");
++ printf("error: ftell() returned -1.\n");
+ exit(1);
+ }
+
+@@ -249,7 +249,7 @@
+ printf("I believe start of compressed data is %u\n", info->data_offset);
+ #endif
+
+- /* Set postion eight bytes from the end of the file. */
++ /* Set position eight bytes from the end of the file. */
+
+ if (fseek(gzfile, -8, SEEK_END)) {
+ printf("error: fseek() returned non-zero\n");
+</screen>
<!-- @ENGLISH {{{
<para>The <command>svn merge</command> command is almost exactly
@@ -1105,11 +1241,11 @@
Committed revision 360.
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+ <screen>
$ svn commit -m "integer.c: Flettet r344 (retting av skrivefeil) fra trunk."
Sending integer.c
-Transmitting file data .
-Committed revision 360.
+Sender fildata .
+La inn revisjon 360.
</screen>
<!-- @ENGLISH {{{
@@ -1287,7 +1423,6 @@
arbeidskopien din, må du spesifisere målkatalogen som skal motta
forandringene:</para>
- <!-- ¤ -->
<screen>
$ svn merge -r 343:344 http://svn.example.com/repos/calc/trunk my-calc-branch
U my-calc-branch/integer.c
@@ -1808,7 +1943,7 @@
<command>svn merge</command> klage over <!-- ¤
--><quote>skipped targets</quote>:</para>
- <!-- ¤ -->
+ <!-- @ENGLISH {{{
<screen>
$ svn merge -r 1288:1351 http://svn.example.com/repos/branch
U foo.c
@@ -1819,6 +1954,17 @@
$
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn merge -r 1288:1351 http://svn.example.com/repos/branch
+U foo.c
+U bar.c
+Hoppet over savnet mål: «baz.c»
+U glub.c
+C glorb.h
+
+$
+</screen>
<!-- @ENGLISH {{{
<para>In the previous example it might be the case that
@@ -2217,9 +2363,9 @@
http://svn.example.com/repos/calc/branches/my-calc-branch
…
------------------------------------------------------------------------
-r341 | user | 2002-11-03 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines
-Changed paths:
- A /calc/branches/my-calc-branch (from /calc/trunk:340)
+r341 | bruker | 2002-11-03 15:27:56 -0600 (Tor, 07 nov 2002) | 2 lines
+Endrede filstier:
+ A /calc/branches/my-calc-branch (fra /calc/trunk:340)
$
</screen>
@@ -2267,10 +2413,10 @@
Committed revision 406.
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+ <screen>
$ cd calc/trunk
$ svn update
-At revision 405.
+På revisjon 405.
$ svn merge -r 341:405 http://svn.example.com/repos/calc/branches/my-calc-branch
U integer.c
@@ -2285,11 +2431,11 @@
# … Undersøk forskjellene, kompiler, test osv …
$ svn commit -m "Flettet forandringer mellom r341:405 fra my-calc-branch til trunk."
-Sending integer.c
-Sending button.c
-Sending Makefile
-Transmitting file data ...
-Committed revision 406.
+Sender integer.c
+Sender button.c
+Sender Makefile
+Sender fildata ...
+La inn revisjon 406.
</screen>
<!-- @ENGLISH {{{
@@ -2351,12 +2497,12 @@
…
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+ <screen>
$ cd calc/trunk
$ svn log
…
------------------------------------------------------------------------
-r406 | bruker | 2004-02-08 11:17:26 -0600 (Sun, 08 Feb 2004) | 1 line
+r406 | bruker | 2004-02-08 11:17:26 -0600 (søn, 08 feb 2004) | 1 line
Flettet forandringer mellom r341:405 fra my-calc-branch til trunk.
------------------------------------------------------------------------
@@ -2397,10 +2543,10 @@
Committed revision 481.
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+ <screen>
$ cd calc/trunk
$ svn update
-At revision 480.
+På revisjon 480.
# Vi ser at HEAD er 480 for øyeblikket, så vi bruker den for å utføre
# flettingen:
@@ -2411,11 +2557,11 @@
U Makefile
$ svn commit -m "Flettet forandringer mellom r406:480 fra my-calc-branch til trunk."
-Sending integer.c
-Sending button.c
-Sending Makefile
-Transmitting file data ...
-Committed revision 481.
+Sender integer.c
+Sender button.c
+Sender Makefile
+Sender fildata ...
+La inn revisjon 481.
</screen>
<!-- @ENGLISH {{{
@@ -2486,7 +2632,7 @@
Committed revision 350.
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+ <screen>
$ svn merge -r 303:302 http://svn.example.com/repos/calc/trunk
U integer.c
@@ -2499,9 +2645,9 @@
…
$ svn commit -m "Fjernet forandringen som ble lagt inn i r303."
-Sending integer.c
-Transmitting file data .
-Committed revision 350.
+Sender integer.c
+Sender fildata .
+La inn revisjon 350.
</screen>
<!-- @ENGLISH {{{
@@ -2711,17 +2857,16 @@
…
</screen>
@ENGLISH }}} -->
- <!-- ¤ Eksempler tas seinere, men det visste du fra før.
- --><screen>
+ <screen>
…
------------------------------------------------------------------------
-r808 | joe | 2003-12-26 14:29:40 -0600 (Fri, 26 Dec 2003) | 3 lines
-Changed paths:
+r808 | joe | 2003-12-26 14:29:40 -0600 (fre, 26 des 2003) | 3 lines
+Endrede filstier:
D /calc/trunk/real.c
M /calc/trunk/integer.c
-Added fast fourier transform functions to integer.c.
-Removed real.c because code now in double.c.
+La inn Fast Fourier transform-funksjoner i integer.c .
+Slettet real.c fordi koden nå ligger i double.c .
…
</screen>
@@ -2834,10 +2979,10 @@
$ svn status
A + real.c
-$ svn commit -m "Hentet tilbake real.c from revisjon 807, /calc/trunk/real.c."
-Adding real.c
-Transmitting file data .
-Committed revision 1390.
+$ svn commit -m "Hentet tilbake real.c from revisjon 807, /calc/trunk/real.c ."
+Legger til real.c
+Sender fildata .
+La inn revisjon 1390.
</screen>
<!-- @ENGLISH {{{
@@ -3235,7 +3380,6 @@
Så i dette spesielle tilfellet, vil du flette ved å
sammenligne grenen med <filename>trunk</filename>:</para>
-<!-- ¤ -->
<!-- @ENGLISH {{{
<screen>
$ cd trunk-working-copy
@@ -3256,7 +3400,7 @@
$ cd trunk-i-arbeidskopien
$ svn update
-At revision 1910.
+På revisjon 1910.
$ svn merge http://svn.example.com/repos/calc/trunk@1910 \
http://svn.example.com/repos/calc/branches/mybranch@1910
@@ -3337,6 +3481,7 @@
arbeidskopien din av <filename>/calc/trunk</filename> til å
avspeile plasseringen til den nye grenen:</para>
+ <!-- @ENGLISH {{{
<screen>
$ cd calc
@@ -3352,6 +3497,22 @@
$ svn info | grep URL
URL: http://svn.example.com/repos/calc/branches/my-calc-branch
</screen>
+ @ENGLISH }}} -->
+ <screen>
+$ cd calc
+
+$ svn info | grep Nettadresse
+Nettadresse: http://svn.example.com/repos/calc/trunk
+
+$ svn switch http://svn.example.com/repos/calc/branches/my-calc-branch
+U integer.c
+U button.c
+U Makefile
+Oppdatert til revisjon 341.
+
+$ svn info | grep Nettadresse
+Nettadresse: http://svn.example.com/repos/calc/branches/my-calc-branch
+</screen>
<!-- @ENGLISH {{{
<para>After <quote>switching</quote> to the branch, your working
@@ -3659,7 +3820,6 @@
<literal>HEAD</literal>-revisjonen, kan du lage en kopi av
den:</para>
- <!-- ¤ -->
<!-- @ENGLISH {{{
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
@@ -3674,7 +3834,7 @@
http://svn.example.com/repos/calc/tags/versjon-1.0 \
-m "Merker 1.0-versjonen av «calc»-prosjektet."
-Committed revision 351.
+La inn revisjon 351.
</screen>
<!-- @ENGLISH {{{
@@ -3838,7 +3998,6 @@
inkludert muligheten til å kopiere et tre av en arbeidskopi til
depotet:</para>
- <!-- ¤ -->
<!-- @ENGLISH {{{
<screen>
$ ls
@@ -3856,7 +4015,7 @@
$ svn copy min-arbeidskopi
http://svn.example.com/repos/calc/tags/mittmerke
-Committed revision 352.
+La inn revisjon 352.
</screen>
<!-- @ENGLISH {{{
@@ -4061,7 +4220,6 @@
<filename>/calc/trunk</filename>, trenger ikke grenkatalogen å
ligge der mer:</para>
- <!-- ¤ -->
<!-- @ENGLISH {{{
<screen>
$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
@@ -4074,7 +4232,7 @@
$ svn delete http://svn.example.com/repos/calc/branches/min-calc-gren \
-m "Fjerner avlegs gren i calc-prosjektet."
-Committed revision 375.
+La inn revisjon 375.
</screen>
<!-- @ENGLISH {{{
@@ -4123,7 +4281,7 @@
$ svn copy -r 374 http://svn.example.com/repos/calc/branches/min-calc-gren \
http://svn.example.com/repos/calc/branches/min-calc-gren
-Committed revision 376.
+La inn revisjon 376.
</screen>
<!-- @ENGLISH {{{
@@ -4158,7 +4316,6 @@
Så istedenfor lager du en <quote>stabil</quote> gren av
programmet som ikke vil forandre seg så mye:</para>
- <!-- ¤ -->
<!-- @ENGLISH {{{
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
@@ -4173,7 +4330,7 @@
http://svn.example.com/repos/calc/branches/stabil-1.0 \
-m "Lager stabil gren av calc-prosjektet."
-Committed revision 377.
+La inn revisjon 377.
</screen>
<!-- @ENGLISH {{{
More information about the svnbook-dev
mailing list