-Randy
--------------------------------------------------
diff -ru thot-2.0b.orig/config/en-compdialogue thot-2.0b/config/en-compdialogue
--- thot-2.0b.orig/config/en-compdialogue Tue Jan 14 07:37:29 1997
+++ thot-2.0b/config/en-compdialogue Mon Feb 10 19:41:19 1997
@@ -11,7 +11,7 @@
10 Wrong Keyword in The Renaming File %s\n
11 Wrong New Schema Code of the Conversion Rules file In %s\n
12 Wrong Old Schema Code of the Conversion Rules file In %s\n
-13 Autorized Switches <%s>\n
+13 Authorized Switches <%s>\n
14 Wrong Switches\n
15 Wrong Instances\n
16 COMP: Name 0f The New Schema\n
diff -ru thot-2.0b.orig/config/en-compildialogue
thot-2.0b/config/en-compildialogue
--- thot-2.0b.orig/config/en-compildialogue Tue Jan 14 07:37:30 1997
+++ thot-2.0b/config/en-compildialogue Mon Feb 10 19:41:47 1997
@@ -1,6 +1,6 @@
0 Invalid character\n
1 Incorrect number\n
-2 ncorrect word\n
+2 Incorrect word\n
3 Identifier table is full\n
4 Invalid symbol\n
5 Syntax error\n
diff -ru thot-2.0b.orig/config/en-corrdialogue thot-2.0b/config/en-corrdialogue
--- thot-2.0b.orig/config/en-corrdialogue Tue Jan 14 07:37:30 1997
+++ thot-2.0b/config/en-corrdialogue Mon Feb 10 19:42:08 1997
@@ -18,5 +18,5 @@
17 Word "%s" added in the document dictionary
18 End of spell checking
19 Spell checking aborted
-20 Please, select a document
+20 Please select a document
21 Document dictionary saved: %s
diff -ru thot-2.0b.orig/config/en-drawdialogue thot-2.0b/config/en-drawdialogue
--- thot-2.0b.orig/config/en-drawdialogue Tue Jan 14 07:37:30 1997
+++ thot-2.0b/config/en-drawdialogue Mon Feb 10 19:42:39 1997
@@ -1,9 +1,9 @@
0 Cross-reference origin
1 Cross-reference target
-2 Select a set or a set elemnt first
+2 Select a set or a set element first
3 Select at least two elements
4 Cannot load the palette
-5 Ploygon attributes
+5 Polygon attributes
6 Preference
7 Shape parameters
8 Shadow parameters
diff -ru thot-2.0b.orig/config/en-grmdialogue thot-2.0b/config/en-grmdialogue
--- thot-2.0b.orig/config/en-grmdialogue Tue Jan 14 07:37:30 1997
+++ thot-2.0b/config/en-grmdialogue Mon Feb 10 19:42:55 1997
@@ -1,4 +1,4 @@
-0 Incorrect key-word\n
+0 Incorrect keyword\n
1 Rule too long\n
2 String too long\n
3 Rules table full\n
diff -ru thot-2.0b.orig/config/en-inddialogue thot-2.0b/config/en-inddialogue
--- thot-2.0b.orig/config/en-inddialogue Tue Jan 14 07:37:30 1997
+++ thot-2.0b/config/en-inddialogue Mon Feb 10 19:43:37 1997
@@ -10,14 +10,14 @@
9 INDEX: cross-reference undefined
10 INDEX: building table %2d
11 INDEX: No sort, bad key: %s
-12 INDEX: an index mark is cut, the associated descriptor still exist
+12 INDEX: an index mark is cut, the associated descriptor still exists
13 INDEX: index table %2d empty
14 INDEX: loop in cross-references
15 INDEX: do not copy an index mark
16 Extension schema now loaded
17 Undefined extension
18 INDEX: too much semantics
-19 INDEX: environnement variable INDPAR undefined
+19 INDEX: environment variable INDPAR undefined
20 INDEX: sort file for table %2d unknown
21 INDEX: bad option for table %2d : illegal group definition
22 INDEX: index tables built
diff -ru thot-2.0b.orig/config/en-libdialogue thot-2.0b/config/en-libdialogue
--- thot-2.0b.orig/config/en-libdialogue Thu Jan 16 08:24:01 1997
+++ thot-2.0b/config/en-libdialogue Mon Feb 10 19:47:05 1997
@@ -68,7 +68,7 @@
73 Writing ...
74 Empty reference.
75 Don\'t copy page breaks!
-76 You have selected an element %s. You had to select an element %s.
+76 You have selected a %s element. You had to select a %s element.
77 Changing directory list
78 Printing
79 Exporting document %s ...
@@ -144,7 +144,7 @@
149 Done
150 Document directories
151 Document name
-152 The document %s already exists. Would you recreate it?
+152 The document %s already exists. Do you want to overwrite it?
153 Button 1 sets the text color
154 Button 2 sets the background color
155 Font family
@@ -277,4 +277,4 @@
283 4 pages/sheet
284 Pages per sheet
285 Views to print
-286 Printing with %s presentation
\ No newline at end of file
+286 Printing with %s presentation
diff -ru thot-2.0b.orig/config/en-mediadialogue
thot-2.0b/config/en-mediadialogue
--- thot-2.0b.orig/config/en-mediadialogue Tue Jan 14 07:37:31 1997
+++ thot-2.0b/config/en-mediadialogue Mon Feb 10 19:48:18 1997
@@ -7,7 +7,7 @@
7 TCL extension is loaded
8 File name missing
9 TCL result: %s
-10 Recording under preparataion ...
+10 Recording in preparation ...
11 Unknown file
12 Not able to create file
13 No recording: this file already exists
@@ -16,12 +16,12 @@
15 File recording the TCL program
16 Sound file
17 Photo file
-18 Vodeo file
+18 Video file
19 Script TCL
20 Please save in a file BEFORE leaving audiotool!
21 Please save in a file BEFORE leaving phototool!
-22 Please save in a file BEFORE leaving phototool videotool !
-23 Don't forget to save the script in an attribute To_action!
+22 Please save in a file BEFORE leaving videotool !
+23 Don't forget to save the script in a To_action attribute!
24 Record new sound
25 Record new photo
26 Record new video
diff -ru thot-2.0b.orig/config/en-sortdialogue thot-2.0b/config/en-sortdialogue
--- thot-2.0b.orig/config/en-sortdialogue Tue Jan 14 07:37:31 1997
+++ thot-2.0b/config/en-sortdialogue Mon Feb 10 19:51:31 1997
@@ -1,13 +1,13 @@
1 Sort bibliography
2 tri
-3 texte
-4 attribut
+3 text
+4 attribute
5 type
6 reference
7 volume
8 entrant
-9 origine
+9 origin
10 destination
11 inverse
12 fusion
@@ -31,13 +31,13 @@
29 SORT: Warning, no text to sort !
30 SORT: File %s not found
31 No bibliography in this document
-32 SORT: environnement variable %s undefined
-33 %s cann\'ot be opened or created
+32 SORT: environment variable %s undefined
+33 %s cannot be opened or created
34 SORT: Read only element
35 SORT: No sorting by value of %s
36 SORT: terminated
-37 SORT: Parameter's error
+37 SORT: Parameter error
38 SORT: Starting error
39 SORT: Begin of sort ...
-40 SORT: Sorting of %d elements ...
+40 SORT: Sorting %d elements ...
41 SORT: No selection
diff -ru thot-2.0b.orig/config/en-tcldialogue thot-2.0b/config/en-tcldialogue
--- thot-2.0b.orig/config/en-tcldialogue Tue Jan 14 07:37:32 1997
+++ thot-2.0b/config/en-tcldialogue Mon Feb 10 19:53:23 1997
@@ -29,13 +29,13 @@
28 Sort order not found
29 No bibliography in this document
30 SORT: Sorting of %d elements ...
-31 %s cann\'ot be opened or created
+31 %s cannot be opened or created
32 Read only element
33 No sorting by this value
34 SORT: ... terminated
35 Bad parameter in a sort command
-36 No sort. Please, select a list.
-37 SORT: Begin of sort ...
+36 No sort. Please select a list.
+37 SORT: Starting sort ...
38 Delete the selection
39 Text
40 Action
diff -ru thot-2.0b.orig/config/en-thotdialogue thot-2.0b/config/en-thotdialogue
--- thot-2.0b.orig/config/en-thotdialogue Wed Feb 5 09:56:21 1997
+++ thot-2.0b/config/en-thotdialogue Mon Feb 10 19:55:40 1997
@@ -1,5 +1,5 @@
0 File
-1 Environnement
+1 Environment
2 Palettes
3 Help
4 Document
@@ -13,8 +13,8 @@
12 New document...
13 Open document...
14 Exit thot
-15 Schemas directories...
-16 Documents directories...
+15 Schema directories...
+16 Document directories...
17 Spaces
18 Math symbols
19 Graphic symbols
@@ -40,7 +40,7 @@
39 Split
40 Surround...
41 Change...
-42 Holophraste
+42 Holophrast
43 Search
44 Text and structure...
45 Empty elements...
@@ -62,6 +62,6 @@
61 Paginate document
62 Paginate view
63 Insert page break
-64 Goto page number...
+64 Go to page number...
65 Index to build...
66 Save the palette
diff -ru thot-2.0b.orig/config/en-thotmessage thot-2.0b/config/en-thotmessage
--- thot-2.0b.orig/config/en-thotmessage Thu Jan 16 04:59:19 1997
+++ thot-2.0b/config/en-thotmessage Mon Feb 10 19:55:57 1997
@@ -4,7 +4,7 @@
3 Abstract tree
4 Statistics
5 Abstract image
-6 Memory occupation
+6 Memory usage
7 Boxes
8 Global Layout
9 Autosave
diff -ru thot-2.0b.orig/config/en-thotversion thot-2.0b/config/en-thotversion
--- thot-2.0b.orig/config/en-thotversion Tue Jan 14 07:37:32 1997
+++ thot-2.0b/config/en-thotversion Mon Feb 10 19:56:33 1997
@@ -1,5 +1,5 @@
# Ressources file
-# It is a list of <Code Message> paires where
+# It is a list of <Code Message> pairs where
# Code is the code used in the source programme
# Message is the message to print out
# Empty lines and lines starting with # are ignored.
diff -ru thot-2.0b.orig/config/thot.ini thot-2.0b/config/thot.ini
--- thot-2.0b.orig/config/thot.ini Sat Feb 8 05:43:57 1997
+++ thot-2.0b/config/thot.ini Mon Feb 24 12:31:07 1997
@@ -12,6 +12,7 @@
[thot]
THOTSCH=$(THOTDIR)/schemas:$(THOTDIR)/schemasOPERA
+LANG=en_US
[amaya]
THOTSCH=$(THOTDIR)/amaya
diff -ru thot-2.0b.orig/schemas/Rapport.conf thot-2.0b/schemas/Rapport.conf
--- thot-2.0b.orig/schemas/Rapport.conf Tue Jan 21 08:57:49 1997
+++ thot-2.0b/schemas/Rapport.conf Mon Feb 10 21:16:46 1997
@@ -61,8 +61,8 @@
style RapportPE
open
- Texte_integral: 2 1 174 240
- Table_des_matieres: 205 56 154 100
+ Text_view: 2 1 174 240
+ Table_of_contents: 205 56 154 100
geometry
Vue_biblio: 205 132 152 108
@@ -121,8 +121,8 @@
style RapportPPE
open
- Texte_integral: 2 1 170 240
- Table_des_matieres: 205 56 154 100
+ Text_view: 2 1 170 240
+ Table_of_contents: 205 56 154 100
geometry
Vue_infos: 180 60 154 100
@@ -181,8 +181,8 @@
style RapportPPBE
open
- Texte_integral: 2 1 170 240
- Table_des_matieres: 205 56 154 100
+ Text_view: 2 1 170 240
+ Table_of_contents: 205 56 154 100
geometry
Vue_infos: 180 60 154 100
@@ -267,11 +267,41 @@
orientation: Portrait
#--------------------------------------------
+
+style RapportPPEUS
+
+open
+ Text_view: 2 1 170 240
+ Table_of_contents: 205 56 154 100
+
+geometry
+ Vue_infos: 180 60 154 100
+ Index_tables: 195 1 154 240
+ Renvois: 180 150 154 100
+ Descripteurs: 180 60 154 100
+ Options: 195 140 154 100
+
+presentation
+ RefBib: RefBibPE
+ Math: MathP
+ Paragraphe: ParagraphP
+ Table: TableP
+ Draw2: Draw2P
+ Draw3: Draw3P
+ Arbre2: Arbre2P
+ Fichier: FichierP
+ ExtIndex: ExtIndexPPEUS
+
+options
+ pagesize: US
+ orientation: Portrait
+
+#--------------------------------------------
style RapportPPRUS
open
- Texte_integral: 2 1 170 240
- Table_des_matieres: 205 56 154 100
+ Text_view: 2 1 170 240
+ Table_of_contents: 205 56 154 100
geometry
Vue_infos: 180 60 154 100
@@ -300,8 +330,8 @@
style RapportPPEUS
open
- Texte_integral: 2 1 170 240
- Table_des_matieres: 205 56 154 100
+ Text_view: 2 1 170 240
+ Table_of_contents: 205 56 154 100
geometry
Vue_infos: 180 60 154 100
@@ -360,8 +390,8 @@
style RapportPPBEUS
open
- Texte_integral: 2 1 170 240
- Table_des_matieres: 205 56 154 100
+ Text_view: 2 1 170 240
+ Table_of_contents: 205 56 154 100
geometry
Vue_infos: 180 60 154 100
@@ -410,6 +440,36 @@
Arbre2: Arbre2P
Fichier: FichierP
ExtIndex: ExtIndexPPUS
+
+options
+ pagesize: US
+ orientation: Portrait
+
+#--------------------------------------------
+
+style RapportPPBCEUS
+
+open
+ Text_view: 2 1 170 240
+ Table_of_contents: 205 56 154 100
+
+geometry
+ Vue_infos: 180 60 154 100
+ Index_tables: 195 1 154 240
+ Renvois: 180 150 154 100
+ Descripteurs: 180 60 154 100
+ Options: 195 140 154 100
+
+presentation
+ RefBib: RefBibPECle
+ Math: MathP
+ Paragraphe: ParagraphP
+ Table: TableP
+ Draw2: Draw2P
+ Draw3: Draw3P
+ Arbre2: Arbre2P
+ Fichier: FichierP
+ ExtIndex: ExtIndexPPEUS
options
pagesize: US
diff -ru thot-2.0b.orig/schemas/Rapport.en thot-2.0b/schemas/Rapport.en
--- thot-2.0b.orig/schemas/Rapport.en Tue Jan 14 07:39:59 1997
+++ thot-2.0b/schemas/Rapport.en Mon Feb 10 21:02:00 1997
@@ -11,10 +11,12 @@
RapportPPBE: Two sides with keys
RapportPPB: Two sided with keys, french
RapportPPR: Single side
- RapportPPBC: With cover, french, US format
+ RapportPPBC: With cover, french
RapportPPBEUS: Two sides with keys, US format
RapportPPBUS: Two sided with keys, french, US format
- RapportPPRUS: Single side, US format
+ RapportPPREUS: Single side, US format
+ RapportPPRUS: Single side, french, US format
+ RapportPPBCEUS: With cover, US format
RapportPPBCUS: With cover, french, US format
export
@@ -60,8 +62,8 @@
Ref_affiliation: Ref_affiliation
Heading: Heading
Title: Titre
-Abstract: R\351sum\351
Keywords: Mots_cl\351s
+Abstract: R\351sum\351
Annexe: Appendix
Titre_annexe: Appendix_heading
Titre_courant_annexe: Appendix_title_head
Only in thot-2.0b/schemas: RapportA.TRA
Only in thot-2.0b/schemas: RapportH.TRA
Only in thot-2.0b/schemas: RapportHM.TRA
diff -ru thot-2.0b.orig/schemas/RapportP.P thot-2.0b/schemas/RapportP.P
--- thot-2.0b.orig/schemas/RapportP.P Tue Jan 14 07:39:59 1997
+++ thot-2.0b/schemas/RapportP.P Wed Mar 12 15:07:45 1997
@@ -10,6 +10,11 @@
#define RETRAIT_GROUPE 1
#define Paragraph_Skip 0.3
+#ifdef ENGLISH
+#define Texte_integral Text_view
+#define Table_des_matieres Table_of_contents
+#endif
+
PRESENTATION Rapport;
VIEWS
@@ -70,7 +75,11 @@
VirguleBlanc:
Content: text ', ';
Et:
+#ifdef ENGLISH
+ Content: text ' and ';
+#else
Content: text ' et ';
+#endif
NumPagesTotal:
BEGIN
Content: (text ' - ' Value (MaxRangeVal CptPageCorps, Arabic)
@@ -905,7 +914,7 @@
PageAnnexe:
BEGIN
#ifdef US_PAPER
- Width: 15,6 cm;
+ Width: 15.6 cm;
Height: 22.8 cm;
#else
Width: 15 cm;
@@ -1012,7 +1021,7 @@
PageTableMat:
BEGIN
#ifdef US_PAPER
- Width: 15,6 cm;
+ Width: 15.6 cm;
Height: 21.8 cm;
#else
Width: 15 cm;