[svnbook commit] r2777 - in trunk/src/nb: . bin book
sunny256
noreply at red-bean.com
Mon Apr 9 19:14:12 CDT 2007
Author: sunny256
Date: Mon Apr 9 19:14:12 2007
New Revision: 2777
Log:
The src/nb/TRANSLATION-STATUS file is now generated by a new make
command (make status) which uses a new kind of commented-out markers in
the DocBook files.
* src/nb/bin/genstat
New script. Generates translation statistics for DocBook files
specified on the command line.
* src/nb/Makefile
(BOOKFILES): Ordered the same way they appear in the book. Every file
name has its own line for readability.
(BDFILES): Deleted, use BOOKFILES instead.
(status): New rule, updates the TRANSLATION-STATUS file.
(bookdiff): Replace use of $(BDFILES) with $(BOOKFILES).
* src/nb/book/app-svn-for-cvs-users.xml
* src/nb/book/app-third-party-tools.xml
* src/nb/book/app-webdav.xml
* src/nb/book/ch-advanced-topics.xml
* src/nb/book/ch-basic-usage.xml
* src/nb/book/ch-branching-and-merging.xml
* src/nb/book/ch-customizing-svn.xml
* src/nb/book/ch-developer-info.xml
* src/nb/book/ch-fundamental-concepts.xml
* src/nb/book/ch-reference.xml
* src/nb/book/ch-repository-admin.xml
* src/nb/book/ch-server-configuration.xml
* src/nb/book/copyright.xml
Added markers for untranslated parts and parts that need proofreading.
* src/nb/METHOD
Updated to reflect the changes.
* src/nb/TRANSLATION-STATUS
Generated by "make status".
Added:
trunk/src/nb/bin/genstat (contents, props changed)
Modified:
trunk/src/nb/METHOD
trunk/src/nb/Makefile
trunk/src/nb/TRANSLATION-STATUS
trunk/src/nb/book/app-svn-for-cvs-users.xml
trunk/src/nb/book/app-third-party-tools.xml
trunk/src/nb/book/app-webdav.xml
trunk/src/nb/book/ch-advanced-topics.xml
trunk/src/nb/book/ch-basic-usage.xml
trunk/src/nb/book/ch-branching-and-merging.xml
trunk/src/nb/book/ch-customizing-svn.xml
trunk/src/nb/book/ch-developer-info.xml
trunk/src/nb/book/ch-fundamental-concepts.xml
trunk/src/nb/book/ch-reference.xml
trunk/src/nb/book/ch-repository-admin.xml
trunk/src/nb/book/ch-server-configuration.xml
trunk/src/nb/book/copyright.xml
Modified: trunk/src/nb/METHOD
==============================================================================
--- trunk/src/nb/METHOD (original)
+++ trunk/src/nb/METHOD Mon Apr 9 19:14:12 2007
@@ -114,24 +114,29 @@
===========================
The Subversion book isn’t exactly small, so to keep things tidy and
-manageable, the current status of the translation should always be
-logged in the TRANSLATION-STATUS file. If more translators are working
-on the same translation, it’s probably best to let each translator work
-on different files to avoid conflicts. When a translator grabs a new
-file, the first thing to do is to move the name of the file from the
-“Untranslated” section into the “In progress” section where it is marked
-with the user name of the translator who wants that file. When this
-commit succeeds, the file is officially that translator’s domain, and if
-the translator of some reason or another doesn’t want to work more on
-that file, the name is removed so another translator can continue on it.
-When the file is finished, it is moved to the “Finished” section.
-
-Proofreading of the files is also logged in this file, in the
-“Proofread” section. When you start proofreading a file, add the name of
-the file in this section along with the user name and the line number of
-the current proofread position. Example:
+manageable, the current status of the translation is stored in the
+TRANSLATION-STATUS file. This file is generated by "make status" and
+lists the translation status of every file.
- book/ch-branching-and-merging.xml (USERNAME, line 2453)
+To be able to generate this file, special markers are used in the
+DocBook files to mark untranslated blocks and parts which need
+proofreading. The format of the marker is:
+
+ "<!-- @type {{ -->" — Start
+ "<!-- @type }} -->" — End
+
+"type" can be "TR" for untranslated parts, or "CHK" for parts that need
+checking/proofreading.
+
+ <!-- @TR {{ -->
+ <para>This text is not translated yet.</para>
+ <!-- @TR }} -->
+
+ <!-- @CHK {{ -->
+ <para>This text is translated, but needs checking.</para>
+ <!-- @CHK }} -->
+
+The markers should be placed at the beginning of a separate line.
Keeping the translation updated
===============================
@@ -177,6 +182,8 @@
make valid
# If xmllint(1) is not available, make a test build:
make book-html
+ # Update the TRANSLATION-STATUS file
+ # make status
# Commit:
svn checkin
@@ -213,6 +220,8 @@
to the original English data. Creates two files — bd.tmp/eng.txt and
bd.tmp/norw.txt — which can be studied if there are inconsistency
between the versions.
+* make status
+ Update the TRANSLATION-STATUS file with the current statistics.
* make engdir
Create a book/eng/ directory which is nice to have around if it’s
necessary to diff against the master files.
@@ -232,6 +241,9 @@
Used during the translation. Takes care of commenting out the
English text and copies all the XML elements. Called from the <F5>
macro in svnbook.vim and is expected to exist as ~/bin/dings_it .
+* src/nb/bin/genstat
+ Generates translation statistics for use in the TRANSLATION-STATUS
+ file.
* src/nb/bin/h2u
* src/nb/bin/u2h
Two scripts which is not used anymore, converts to/from numerical
Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Mon Apr 9 19:14:12 2007
@@ -9,23 +9,26 @@
COLLAB=https://svn.red-bean.com/svnbook
BUILDTMP_DIR = build.tmp
-BOOKFILES = app-svn-for-cvs-users.xml app-webdav.xml \
- app-third-party-tools.xml book.xml ch-preface.xml \
- app-quickstart.xml ch-fundamental-concepts.xml \
- ch-customizing-svn.xml ch-basic-usage.xml \
- ch-branching-and-merging.xml ch-repository-admin.xml \
- ch-server-configuration.xml ch-advanced-topics.xml \
- ch-developer-info.xml ch-reference.xml copyright.xml \
- foreword.xml
+BOOKFILES = \
+ book.xml \
+ foreword.xml \
+ ch-preface.xml \
+ ch-fundamental-concepts.xml \
+ ch-basic-usage.xml \
+ ch-advanced-topics.xml \
+ ch-branching-and-merging.xml \
+ ch-repository-admin.xml \
+ ch-server-configuration.xml \
+ ch-customizing-svn.xml \
+ ch-developer-info.xml \
+ ch-reference.xml \
+ app-quickstart.xml \
+ app-svn-for-cvs-users.xml \
+ app-webdav.xml \
+ app-third-party-tools.xml \
+ copyright.xml
BDTMP = bd.tmp
-BDFILES = book.xml foreword.xml ch-preface.xml app-quickstart.xml \
- ch-fundamental-concepts.xml ch-basic-usage.xml \
- ch-branching-and-merging.xml ch-customizing-svn.xml \
- app-svn-for-cvs-users.xml ch-repository-admin.xml \
- ch-server-configuration.xml ch-advanced-topics.xml \
- ch-developer-info.xml ch-reference.xml app-webdav.xml \
- app-third-party-tools.xml copyright.xml
build: dircheck htmlbook copytobuild
@@ -50,6 +53,9 @@
commitmode:
$(MAKE) convfiles CONV_PARAM=
+status:
+ ./bin/genstat --directory book --full --precision 2 $(BOOKFILES) >TRANSLATION-STATUS
+
convfiles:
@for _prc in $(BOOKFILES); do \
echo -n "$$_prc: convert..."; \
@@ -74,7 +80,7 @@
}
$(MAKE) engdir
cp -a book/eng $(BDTMP)/
- @for _ptd in $(BDFILES); do \
+ @for _ptd in $(BOOKFILES); do \
cat $(BDTMP)/eng/$$_ptd | bin/clean_files -e >>$(BDTMP)/eng.txt; \
cat book/$$_ptd | bin/clean_files -e >>$(BDTMP)/norw.txt; \
done
Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS (original)
+++ trunk/src/nb/TRANSLATION-STATUS Mon Apr 9 19:14:12 2007
@@ -1,112 +1,87 @@
+TRANSLATION-STATUS for the Norwegian svnbook
+============================================
-Status file for the Norwegian translation of the Subversion
-documentation.
+Status of the Norwegian translation of the Subversion documentation.
+This file is generated and should not be edited manually, update the
+bin/genstat script instead.
-1. Synchronisation history against the English version
-
- The revision number for the last synchronisation is stored in the
- LAST_SYNC file.
-
-2. File status
-
- 2.1. /trunk
-
- 2.1.1. Finished
-
- Makefile
- book/app-svn-for-cvs-users.xml
- book/book.xml
- book/ch-preface.xml
- book/app-quickstart.xml
- book/ch-fundamental-concepts.xml
- book/ch-basic-usage.xml
- book/ch-repository-admin.xml
- book/ch-server-configuration.xml
- book/foreword.xml
- book/images/ch01dia1.png
- book/images/ch02dia1.png
- book/images/ch02dia2.png
- book/images/ch02dia3.png
- book/images/ch02dia4.png
- book/images/ch02dia5.png
- book/images/ch04dia1.png
- book/images/ch04dia4.png
-
- 2.1.2. In progress
-
- book/ch-advanced-topics.xml (19%) -- sunny256
-
- 2.1.3. Needs update
-
- book/ch-branching-and-merging.xml -- Untranslated section after
- r2572 was merged.
-
- 2.1.4. Untranslated
-
- book/app-webdav.xml
- book/app-third-party-tools.xml
- book/ch-customizing-svn.xml
- book/ch-developer-info.xml
- book/ch-reference.xml
- book/copyright.xml
- book/images/VersioningModels.ppt
- book/images/branches.ppt
-
- 2.2. Files not part of the translation at the moment
-
- 2.2.1. Contains no i18n information
-
- book/images/DirectoryModels.ppt
- book/images/ch02dia6.png
- book/images/ch02dia7.png
- book/images/ch04dia2.png
- book/images/ch04dia3.png
- book/images/ch08dia1.png
- book/images/ch08dia2.png
- book/images/info.png
- book/images/note.png
- book/images/warning.png
- book/styles.css
-
-3. Proofread
-
- To find the current end of the proofread text, search for the
- @PROOFREAD marker.
-
- book/foreword.xml
- book/ch-preface.xml
- book/app-quickstart.xml
- book/ch-fundamental-concepts.xml
- book/ch-basic-usage.xml
- book/ch-branching-and-merging.xml
- book/ch-repository-admin.xml
-
-4. Translation of examples
-
- 4.1. Nothing there
-
- book/ch-preface.xml
- book/foreword.xml
-
- 4.2. Finished
-
- book/app-quickstart.xml
- book/ch-fundamental-concepts.xml
- book/ch-basic-usage.xml
- book/ch-branching-and-merging.xml
-
- 4.3. Will do
+$Id$
- book/app-svn-for-cvs-users.xml
- book/app-webdav.xml
- book/app-third-party-tools.xml
- book/book.xml
- book/ch-repository-admin.xml
- book/ch-server-configuration.xml
- book/ch-advanced-topics.xml
- book/ch-developer-info.xml
- book/ch-reference.xml
- book/copyright.xml
+* book/book.xml - 3391 bytes, 131 lines
+ Translation complete
+* book/foreword.xml - 6860 bytes, 145 lines
+ Translation complete
+* book/ch-preface.xml - 44146 bytes, 1004 lines
+ Translation complete
+* book/ch-fundamental-concepts.xml - 44848 bytes, 1015 lines
+ Untranslated: 0.92% - 2 blocks
+ Line 888-899 (10)
+ Line 1098-1110 (11)
+* book/ch-basic-usage.xml - 95177 bytes, 2370 lines
+ Untranslated: 1.34% - 6 blocks
+ Line 2921-2940 (18)
+ Line 2959-2967 (7)
+ Line 2976-2983 (6)
+ Line 3010-3023 (12)
+ Line 3602-3616 (13)
+ Line 4177-4187 (9)
+* book/ch-advanced-topics.xml - 109485 bytes, 2339 lines
+ Untranslated: 80.92% - 3 blocks
+ Line 570-587 (16)
+ Line 887-896 (8)
+ Line 962-2813 (1850)
+ Need proofreading: 19.71% - 1 block
+ Line 1-957 (955)
+* book/ch-branching-and-merging.xml - 123803 bytes, 2698 lines
+ Untranslated: 5.06% - 1 block
+ Line 4861-4987 (125)
+ Need proofreading: 10.22% - 1 block
+ Line 4368-4851 (482)
+* book/ch-repository-admin.xml - 136576 bytes, 3011 lines
+ Untranslated: 2.84% - 9 blocks
+ Line 1983-1993 (9)
+ Line 2489-2502 (12)
+ Line 2838-2849 (10)
+ Line 2959-2969 (9)
+ Line 3090-3109 (18)
+ Line 4151-4159 (7)
+ Line 4376-4388 (11)
+ Line 4455-4484 (28)
+ Line 5532-5560 (27)
+* book/ch-server-configuration.xml - 109701 bytes, 2510 lines
+ Untranslated: 1.45% - 4 blocks
+ Line 562-582 (19)
+ Line 1541-1554 (12)
+ Line 3025-3040 (14)
+ Line 3145-3154 (8)
+ Need proofreading: 83.82% - 1 block
+ Line 784-4759 (3974)
+* book/ch-customizing-svn.xml - 52698 bytes, 1137 lines
+ Untranslated: 35.90% - 2 blocks
+ Line 270-275 (4)
+ Line 1251-1660 (408)
+ Need proofreading: 63.74% - 1 block
+ Line 5-1241 (1235)
+* book/ch-developer-info.xml - 68215 bytes, 1429 lines
+ Untranslated: 100.00% - 1 block
+ Line 1-1429 (1427)
+* book/ch-reference.xml - 204379 bytes, 6484 lines
+ Untranslated: 100.00% - 1 block
+ Line 1-6484 (6482)
+* book/app-quickstart.xml - 12293 bytes, 290 lines
+ Translation complete
+* book/app-svn-for-cvs-users.xml - 26330 bytes, 594 lines
+ Translation complete
+ Need proofreading: 100.00% - 1 block
+ Line 1-1059 (1057)
+* book/app-webdav.xml - 37627 bytes, 830 lines
+ Untranslated: 100.00% - 1 block
+ Line 1-830 (828)
+* book/app-third-party-tools.xml - 737 bytes, 22 lines
+ Untranslated: 100.00% - 1 block
+ Line 1-22 (20)
+* book/copyright.xml - 14776 bytes, 312 lines
+ Untranslated: 100.00% - 1 block
+ Line 1-312 (310)
-$Id$
-vim: set tw=72 nowrap et sw=2 ts=2 sts=2 fo+=2w fenc=utf8 :
+Summa summarum: 59.06% translated, 17.06% need proofreading
Modified: trunk/src/nb/book/app-svn-for-cvs-users.xml
==============================================================================
--- trunk/src/nb/book/app-svn-for-cvs-users.xml (original)
+++ trunk/src/nb/book/app-svn-for-cvs-users.xml Mon Apr 9 19:14:12 2007
@@ -1,3 +1,4 @@
+<!-- @CHK {{ -->
<appendix id="svn.forcvs">
<!-- @ENGLISH {{{
<title>Subversion for CVS Users</title>
@@ -1055,3 +1056,4 @@
end:
vim: set ft=svnbook :
-->
+<!-- @CHK }} -->
Modified: trunk/src/nb/book/app-third-party-tools.xml
==============================================================================
--- trunk/src/nb/book/app-third-party-tools.xml (original)
+++ trunk/src/nb/book/app-third-party-tools.xml Mon Apr 9 19:14:12 2007
@@ -1,3 +1,4 @@
+<!-- @TR {{ -->
<appendix id="svn.3rdparty">
<title>Third Party Tools</title>
@@ -18,3 +19,4 @@
sgml-parent-document: ("book.xml" "appendix")
end:
-->
+<!-- @TR }} -->
Modified: trunk/src/nb/book/app-webdav.xml
==============================================================================
--- trunk/src/nb/book/app-webdav.xml (original)
+++ trunk/src/nb/book/app-webdav.xml Mon Apr 9 19:14:12 2007
@@ -1,3 +1,4 @@
+<!-- @TR {{ -->
<appendix id="svn.webdav">
<title>WebDAV and Autoversioning</title>
@@ -826,3 +827,4 @@
sgml-parent-document: ("book.xml" "appendix")
end:
-->
+<!-- @TR }} -->
Modified: trunk/src/nb/book/ch-advanced-topics.xml
==============================================================================
--- trunk/src/nb/book/ch-advanced-topics.xml (original)
+++ trunk/src/nb/book/ch-advanced-topics.xml Mon Apr 9 19:14:12 2007
@@ -1,3 +1,4 @@
+<!-- @CHK {{ -->
<chapter id="svn.advanced">
<!-- @ENGLISH {{{
<title>Advanced Topics</title>
@@ -566,6 +567,7 @@
…
</screen>
@ENGLISH }}} -->
+<!-- @TR {{ -->
<screen>
$ svn proplist --verbose calc/button.c
Egenskaper for «calc/button.c»:
@@ -582,6 +584,7 @@
red-beans-and-rice.
…
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>The last property-related subcommand is
@@ -881,7 +884,8 @@
$
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+<!-- @TR {{ -->
+ <screen>
$ svn status calc
C calc/button.c
? calc/button.c.prej
@@ -889,6 +893,7 @@
prop 'linecount': user set to '1256', but update set to '1301'.
$
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>To resolve property conflicts, simply ensure that the
@@ -949,10 +954,12 @@
eneste merkbare forskjellen.</para>
</sect2>
+<!-- @CHK }} -->
<!-- =============================================================== -->
<sect2 id="svn.advanced.props.special">
+<!-- @TR {{ -->
<title>Special Properties</title>
<para>Subversion has no particular policy regarding
@@ -2803,3 +2810,4 @@
end:
vim: set ft=svnbook :
-->
+<!-- @TR }} -->
Modified: trunk/src/nb/book/ch-basic-usage.xml
==============================================================================
--- trunk/src/nb/book/ch-basic-usage.xml (original)
+++ trunk/src/nb/book/ch-basic-usage.xml Mon Apr 9 19:14:12 2007
@@ -2918,7 +2918,7 @@
<filename>sandwich.txt</filename> for å løse konfliktene.
Først, la oss ta en kikk på fila:</para>
- <!-- ¤ -->
+<!-- @TR {{ -->
<screen>
$ cat sandwich.txt
Top piece of bread
@@ -2937,6 +2937,7 @@
Creole Mustard
Bottom piece of bread
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>The strings of less-than signs, equal signs, and
@@ -2955,6 +2956,7 @@
Teksten mellom de to første settene med merker er satt sammen
av de forandringene du gjorde i konfliktområdet:</para>
+<!-- @TR {{ -->
<screen>
<<<<<<< .mine
Salami
@@ -2962,6 +2964,7 @@
Prosciutto
=======
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>The text between the second and third sets of conflict
@@ -2970,12 +2973,14 @@
<para>Teksten mellom det andre og tredje settet av
konfliktmerker er teksten fra Sallys innlegging:</para>
+<!-- @TR {{ -->
<screen>
=======
Sauerkraut
Grilled Chicken
>>>>>>> .r2
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Usually you won't want to just delete the conflict
@@ -3002,6 +3007,7 @@
Når dere er blitt enige om forandringene du vil legge inn,
rediger fila din og fjern konfliktmerkene.</para>
+<!-- @TR {{ -->
<screen>
Top piece of bread
Mayonnaise
@@ -3014,6 +3020,7 @@
Creole Mustard
Bottom piece of bread
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Now run <command>svn resolved</command>, and you're
@@ -3592,7 +3599,8 @@
-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-
</screen>
@ENGLISH }}} -->
- <!-- ¤ Ja, det var _det_, ja. --><screen>
+<!-- @TR {{ -->
+ <screen>
$ svn log -r 8 -v
------------------------------------------------------------------------
r8 | sally | 2002-07-14 08:15:29 -0500 | 1 line
@@ -3605,6 +3613,7 @@
------------------------------------------------------------------------
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>
@@ -4165,7 +4174,7 @@
I tillegg vil <command>svn status</command> vise en
<literal>L</literal> ved siden av låste elementer:</para>
- <!-- ¤ -->
+<!-- @TR {{ -->
<screen>
$ svn status
L somedir
@@ -4175,6 +4184,7 @@
$ svn status
M somedir/foo.c
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Don't confuse these working copy locks with the ordinary
Modified: trunk/src/nb/book/ch-branching-and-merging.xml
==============================================================================
--- trunk/src/nb/book/ch-branching-and-merging.xml (original)
+++ trunk/src/nb/book/ch-branching-and-merging.xml Mon Apr 9 19:14:12 2007
@@ -741,7 +741,7 @@
Endrede filstier:
M /calc/branches/my-calc-branch/integer.c
-* integer.c: <!-- ¤ Ja, den blir ikke grei. -->frozzled the wazjub.
+* 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
@@ -4365,6 +4365,7 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
+<!-- @CHK {{ -->
<sect1 id="svn.advanced.vendorbr">
<!-- @ENGLISH {{{
<title>Vendor branches</title>
@@ -4847,6 +4848,7 @@
Men vi er ansvarlig for å fortelle Subversion hvordan
kildekodelayouten forandret seg fra leverandørversjon til
leverandørversjon.</para>
+<!-- @CHK }} -->
</sect2>
@@ -4856,6 +4858,7 @@
running with just svn merge, now that it ignores ancestry. -->
<!-- =============================================================== -->
+<!-- @TR {{ -->
<sect2 id="svn.advanced.vendorbr.svn_load_dirs">
<title><command>svn_load_dirs.pl</command></title>
@@ -4981,6 +4984,7 @@
the regular expression.</para>
</sect2>
+<!-- @TR }} -->
</sect1>
<!-- ================================================================= -->
Modified: trunk/src/nb/book/ch-customizing-svn.xml
==============================================================================
--- trunk/src/nb/book/ch-customizing-svn.xml (original)
+++ trunk/src/nb/book/ch-customizing-svn.xml Mon Apr 9 19:14:12 2007
@@ -2,6 +2,7 @@
<!-- @ENGLISH {{{
<title>Customizing Your Subversion Experience</title>
@ENGLISH }}} -->
+<!-- @CHK {{ -->
<!-- ¤ -->
<title>Tilpassing av Subversion-opplevelsen</title>
@@ -265,10 +266,13 @@
@ENGLISH }}} -->
<para><!-- ¤ Den setninga der er uklar, og jeg vet ikke hvordan
windowsversjonen virker. Så foreløpig får den være uoversatt.
- Stygg sak. -->Registry-based configuration options are parsed
+ Stygg sak. -->
+<!-- @TR {{ -->
+ Registry-based configuration options are parsed
<emphasis>before</emphasis> their file-based counterparts,
so are overridden by values found in the configuration
files.
+<!-- @TR }} -->
Med andre ord er dette rekkefølgen konfigurasjonen blir
prioritert på et MS Windows-system:</para>
@@ -1234,6 +1238,7 @@
<literal>yes</literal> i
<literal>miscellany</literal>-seksjonen hvis du vil at
autoegenskaper skal brukes.</para>
+<!-- @CHK }} -->
</sect3>
@@ -1243,6 +1248,7 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
+<!-- @TR {{ -->
<sect1 id="svn.advanced.l10n">
<title>Localization</title>
@@ -1651,6 +1657,7 @@
</sect2>
</sect1>
+<!-- @TR }} -->
</chapter>
Modified: trunk/src/nb/book/ch-developer-info.xml
==============================================================================
--- trunk/src/nb/book/ch-developer-info.xml (original)
+++ trunk/src/nb/book/ch-developer-info.xml Mon Apr 9 19:14:12 2007
@@ -1,3 +1,4 @@
+<!-- @TR {{ -->
<chapter id="svn.developer">
<title>Developer Information</title>
@@ -1425,3 +1426,4 @@
sgml-parent-document: ("book.xml" "chapter")
end:
-->
+<!-- @TR }} -->
Modified: trunk/src/nb/book/ch-fundamental-concepts.xml
==============================================================================
--- trunk/src/nb/book/ch-fundamental-concepts.xml (original)
+++ trunk/src/nb/book/ch-fundamental-concepts.xml Mon Apr 9 19:14:12 2007
@@ -885,6 +885,7 @@
For eksempel, hvis du henter ut <filename>/calc</filename>, vil
du få en arbeidskopi som dette:</para>
+<!-- @TR {{ -->
<screen>
$ svn checkout http://svn.example.com/repos/calc
A calc/Makefile
@@ -895,6 +896,7 @@
$ ls -A calc
Makefile integer.c button.c .svn/
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>The list of letter A's indicates that Subversion is adding
@@ -1093,6 +1095,7 @@
så vel som alle andre forandringer som er blitt lagt inn i
depotet siden hun sist hentet det ut.</para>
+<!-- @TR {{ -->
<screen>
$ pwd
/home/sally/calc
@@ -1104,6 +1107,7 @@
U button.c
Updated to revision 57.
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>The output from the <command>svn update</command> command
Modified: trunk/src/nb/book/ch-reference.xml
==============================================================================
--- trunk/src/nb/book/ch-reference.xml (original)
+++ trunk/src/nb/book/ch-reference.xml Mon Apr 9 19:14:12 2007
@@ -1,3 +1,4 @@
+<!-- @TR {{ -->
<chapter id="svn.ref">
<title>Subversion Complete Reference</title>
@@ -6480,3 +6481,4 @@
sgml-parent-document: ("book.xml" "chapter")
end:
-->
+<!-- @TR }} -->
Modified: trunk/src/nb/book/ch-repository-admin.xml
==============================================================================
--- trunk/src/nb/book/ch-repository-admin.xml (original)
+++ trunk/src/nb/book/ch-repository-admin.xml Mon Apr 9 19:14:12 2007
@@ -1980,7 +1980,7 @@
<para><command>svnlook</command> har en <!-- ¤ -->likefrem
syntaks:</para>
- <!-- ¤ Legg inn norsk versjon -->
+<!-- @TR {{ -->
<screen>
$ svnlook help
general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]
@@ -1990,6 +1990,7 @@
Type "svnlook help <subcommand>" for help on a specific subcommand.
…
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Nearly every one of <command>svnlook</command>'s
@@ -2485,7 +2486,8 @@
…
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+<!-- @TR {{ -->
+ <screen>
$ svnadmin help
general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]
Type "svnadmin help <subcommand>" for help on a specific subcommand.
@@ -2497,6 +2499,7 @@
help (?, h)
…
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>We've already mentioned <command>svnadmin</command>'s
@@ -2832,7 +2835,7 @@
<para>Syntaksen for <command>svndumpfilter</command> er som
følger:</para>
- <!-- ¤ -->
+<!-- @TR {{ -->
<screen>
$ svndumpfilter help
general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]
@@ -2843,6 +2846,7 @@
include
help (?, h)
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>There are only two interesting subcommands. They allow
@@ -2952,6 +2956,7 @@
$
</screen>
@ENGLISH }}} -->
+<!-- @TR {{ -->
<screen>
$ svnadmin dump /path/to/repos > depot-dumpfil
* Dumped revision 0.
@@ -2961,6 +2966,7 @@
…
$
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Next, run that dump file through the filter, each time
@@ -3081,6 +3087,7 @@
$
</screen>
@ENGLISH }}} -->
+<!-- @TR {{ -->
<screen>
$ svnadmin create calc; svnadmin load calc < calc-dumpfil
<<< Started new transaction, based on original revision 1
@@ -3099,6 +3106,7 @@
…
$
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Both of <command>svndumpfilter</command>'s subcommands
@@ -4140,6 +4148,7 @@
Du vil nå se noe i likhet med dette:</para>
<!-- ¤ Bruke norske meldinger en gang i tida? -->
+<!-- @TR {{ -->
<screen>
Repository lock acquired.
Please wait; recovering the repository may take some time...
@@ -4147,6 +4156,7 @@
Recovery completed.
The latest repos revision is 19.
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>This command may take many minutes to complete.</para>
@ENGLISH }}} -->
@@ -4363,7 +4373,8 @@
* Dumped revision 26.
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+<!-- @TR {{ -->
+ <screen>
$ svnlook youngest mittdepot
26
$ svnadmin dump mittdepot > dumpfil
@@ -4374,6 +4385,7 @@
* Dumped revision 25.
* Dumped revision 26.
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>At the end of the process, you will have a single file
@@ -4440,6 +4452,7 @@
</screen>
@ENGLISH }}} -->
+<!-- @TR {{ -->
<screen>
$ svnadmin load newrepos < dumpfile
<<< Started new txn, based on original revision 1
@@ -4468,6 +4481,7 @@
------- Committed new rev 26 (loaded from original rev 26) >>>
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>The result of a load is new revisions added to a
@@ -5515,6 +5529,7 @@
$
</screen>
@ENGLISH }}} -->
+<!-- @TR {{ -->
<screen>
$ mkdir tmpdir
$ cd tmpdir
@@ -5542,6 +5557,7 @@
$ rm -rf tmpdir
$
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>You can verify the results of the import by running the
Modified: trunk/src/nb/book/ch-server-configuration.xml
==============================================================================
--- trunk/src/nb/book/ch-server-configuration.xml (original)
+++ trunk/src/nb/book/ch-server-configuration.xml Mon Apr 9 19:14:12 2007
@@ -559,7 +559,8 @@
…
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+<!-- @TR {{ -->
+ <screen>
$ svn commit -F log_msg.txt --no-auth-cache
Authentication realm: <svn://host.example.com:3690> example realm
Username: joe
@@ -578,6 +579,7 @@
Username: joe
…
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Or, if you want to disable credential caching permanently,
@@ -774,12 +776,12 @@
</sect2>
</sect1>
- <!-- @PROOFREAD -->
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
+<!-- @CHK {{ -->
<sect1 id="svn.serverconfig.svnserve">
<!-- @ENGLISH {{{
@@ -1536,6 +1538,7 @@
…
</screen>
@ENGLISH }}} -->
+<!-- @TR {{ -->
<screen>
$ whoami
harry
@@ -1548,6 +1551,7 @@
baz
…
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>In this example, the Subversion client is invoking a local
@@ -3018,7 +3022,8 @@
(R)eject, accept (t)emporarily or accept (p)ermanently?
</screen>
@ENGLISH }}} -->
- <!-- ¤ --><screen>
+<!-- @TR {{ -->
+ <screen>
$ svn list https://&server;.example.com/repos/prosjekt
Error validating server certificate for 'https://&server;.example.com:443':
@@ -3032,6 +3037,7 @@
(R)eject, accept (t)emporarily or accept (p)ermanently?
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>This dialogue should look familiar; it's essentially the
@@ -3136,6 +3142,7 @@
…
</screen>
@ENGLISH }}} -->
+<!-- @TR {{ -->
<screen>
$ svn list https://&server;.example.com/repos/prosjekt
@@ -3144,6 +3151,7 @@
Passphrase for '/sti/til/mitt/cert.p12': ********
…
</screen>
+<!-- @TR }} -->
<!-- @ENGLISH {{{
<para>Notice that the client certificate is a
@@ -4748,3 +4756,4 @@
end:
vim: set ft=svnbook :
-->
+<!-- @CHK }} -->
Modified: trunk/src/nb/book/copyright.xml
==============================================================================
--- trunk/src/nb/book/copyright.xml (original)
+++ trunk/src/nb/book/copyright.xml Mon Apr 9 19:14:12 2007
@@ -1,3 +1,4 @@
+<!-- @TR {{ -->
<appendix id="svn.copyright">
<title>Copyright</title>
@@ -308,3 +309,4 @@
sgml-parent-document: ("book.xml" "")
end:
-->
+<!-- @TR }} -->
More information about the svnbook-dev
mailing list