X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fdinbrief.layout;h=6e62aadb6dbf13c7937b857469803b13d19c707b;hb=7cb50d70086faafb22a7dd8ca779278a0f9310e9;hp=4a2ae164065dada703515f2886b4b605ad0cb43c;hpb=c48c33cf3a291432568f13947ec4025bac2e39ac;p=lyx.git

diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout
index 4a2ae16406..6e62aadb6d 100644
--- a/lib/layouts/dinbrief.layout
+++ b/lib/layouts/dinbrief.layout
@@ -1,16 +1,20 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{letter (DIN-Brief, German)}
+#  \DeclareLaTeXClass{DIN-Brief}
+#  \DeclareCategory{Letters}
 # German DIN-Brief textclass definition file.
 # Author : Juergen Vigna <jug@sad.it>
 # Modified by: Carsten Kaemmerer <kammerer@ips.cs.tu-bs.de>
-# Modified by: Guenter Milde <g.milde@users.berlios.de>
+# Modified by: Guenter Milde <milde@lyx.org>
 #    Dummy Style DinBrief for common layout features (removed at eof)
+#    Dummy Style Addresses for common address features (removed at eof)
 #    Generic style names (there are german translations for most names)
 #    Additional Styles and twiddeled layout
 #    Many "ObsoletedBy" to ease conversion from g-brief, scrletter,
 #    or letter (see also the update of the dinbrief.lyx template)
+# Modified by: Juergen Spitzmueller <spitz@lyx.org>
+#    use English strings, localization is done by gettext!
 
-Format 19
+Format 81
 
 Input letter.layout
 
@@ -21,10 +25,13 @@ Preamble
 EndPreamble
 
 # auxiliary style copied by other dinbrief styles
+# the LeftMargin is set to the probably longest string
+# (no typo! the umlaut is delibarately omitted)
 Style DinBrief
+	Category        Letter
 	LatexType	Command
 	Margin		Static
-	LeftMargin	"Unsere Zeichen"
+	LeftMargin	"Rucksende-Adresse:"
 	Align		Left
 	AlignPossible	Left
 	LabelType	Static
@@ -37,12 +44,17 @@ Style DinBrief
 	EndFont
 End
 
+Style Addresses
+	CopyStyle	DinBrief
+	Category        "Postal Data"
+End
+
 # Open a new letter
 # in dinbrief, this is an environment spanning the whole letter
 # (see scrlettr2 for an alternative lyx-implementation)
 Style Send_To_Address
-	CopyStyle	DinBrief
-	LabelString	"Anschrift:"
+	CopyStyle	Addresses
+	LabelString	"Address:"
 	KeepEmpty	1
 	BottomSep	0.1
 	LatexName	letter
@@ -55,8 +67,8 @@ End
 
 # backaddress in letter head
 Style My_Address
-	CopyStyle	DinBrief
-	LabelString	"Briefkopf:"
+	CopyStyle	Addresses
+	LabelString	"Sender Address:"
 	LatexName	address
 	KeepEmpty	1
 	BottomSep	0.5
@@ -65,57 +77,57 @@ End
 
 # backaddress in address window
 Style "Return address"
-	CopyStyle	DinBrief
-	LabelString	"Absender:"
+	CopyStyle	Addresses
+	LabelString	"Backaddress:"
 	LatexName	backaddress
 	TextFont
 	    Size	Small
 	EndFont
 End
 
-# vor der Emfängeranschrift (Einschreiben, Luftpost)
+# Printed above the address (e.g., Air Mail, Registered Mail)
 Style "Postal comment"
-	CopyStyle	DinBrief
-	LabelString	"Postvermerk:"
+	CopyStyle	Addresses
+	LabelString	"Postal Remark:"
 	LatexName	postremark
 End
 
-# rechts neben der Emfängeranschrift (Eilt, Persönlich)
+# Printed right next to Receiver (e.g., Urgent, Confidential)
 Style Handling
-	CopyStyle	DinBrief
-	LabelString	"Zusatz:"
+	CopyStyle	Addresses
+	LabelString	"Handling:"
 	LatexName	handling
 End
 
-# "Ihre Zeichen/Ihre Nachricht vom"
 Style YourRef
 	CopyStyle	DinBrief
-	LabelString	"Ihre Zeichen:"
+	LabelString	"Your ref.:"
 	LatexName	yourmail
 End
 
 Style MyRef
 	CopyStyle	DinBrief
-	LabelString	"Unsere Zeichen:"
+	LabelString	"Our ref.:"
 	LatexName	sign
 End
 
 Style Writer
 	CopyStyle	DinBrief
-	LabelString	"Sachbearbeiter:"
+	LabelString	"Writer:"
 	LatexName	writer
 End
 
 Style Signature
 	CopyStyle	DinBrief
-	LabelString	"Unterschrift:"
+	Category        Closings
+	LabelString	"Signature:"
 	LatexName	signature
 End
 
 # contact info at the bottom of the first page
 Style Bottomtext
 	CopyStyle	DinBrief
-	LabelString	"Fusszeile(n):"
+	LabelString	"Bottom text:"
 	LatexName	bottomtext
 	AlignPossible	Block, Left, Right, Center
 End
@@ -125,20 +137,20 @@ End
 
 Style "Area code"
 	CopyStyle	DinBrief
-	LabelString	"Vorwahl:"
+	LabelString	"Area Code:"
 	LatexName	"renewcommand{\areacode}"
 End
 
 Style Telephone
 	CopyStyle	DinBrief
-	LabelString	"Telefon:"
+	LabelString	"Telephone:"
 	LatexName	phone
 	LatexParam	{\areacode}
 End
 
 Style Location
 	CopyStyle	DinBrief
-	LabelString	"Ort:"
+	LabelString	"Location:"
 	LatexName	place
 	Margin		Right_Address_Box
 	TopSep		0.1
@@ -148,14 +160,14 @@ End
 
 Style Date
 	CopyStyle	Location
-	LabelString	"Datum:"
+	LabelString	"Date:"
 	LatexName	date
 End
 
 # dinbrief does not emphasize the subject line
 Style Subject
 	CopyStyle	DinBrief
-	LabelString	"Betreff:"
+	LabelString	"Subject:"
 	LatexName	subject
 	TopSep		0.4
 	BottomSep	0.4
@@ -171,9 +183,9 @@ End
 
 Style Opening
 	CopyStyle	DinBrief
-	LabelType	Top_Environment
+	LabelType	Above
 	LeftMargin	""
-	LabelString	"Anrede:"
+	LabelString	"Opening:"
 	LatexName	opening
 	KeepEmpty	1
 	TopSep		1.5
@@ -187,15 +199,20 @@ End
 
 Style Closing
 	CopyStyle	Opening
-	LabelString	"Gruss:"
+	Category        Closings
+	LabelString	"Closing:"
 	LatexName	closing
-	OptionalArgs	1
+	Argument 1
+		LabelString   "Signature|S"
+		Tooltip       "Here you can insert a signature scan"
+	EndArgument
 	KeepEmpty	1
 End
 
 Style encl
 	CopyStyle	Opening
-	LabelString	"Anlage(n):"
+	Category        Closings
+	LabelString	"encl:"
 	LatexName	encl
 	TopSep		0.4
 	BottomSep	0.4
@@ -210,13 +227,13 @@ End
 
 Style cc
 	CopyStyle	encl
-	LabelString	"Verteiler:"
+	LabelString	"cc:"
 	LatexName	cc
 End
 
 Style PS
 	CopyStyle	encl
-	LabelString	"PS:"
+	LabelString	"Post Scriptum:"
 	LatexName	ps
 	Align		Block
 	AlignPossible	Block, Left
@@ -268,7 +285,7 @@ Style IhrZeichen
 	ObsoletedBy	YourRef
 End
 
-# Ihr Schreiben vom ist in Dinbrief identisch mit Ihr Zeichen
+# These are identical in this class
 Style YourMail
 	ObsoletedBy	YourRef
 End
@@ -377,6 +394,7 @@ Style Verteiler
 	ObsoletedBy	cc
 End
 
-# Remove auxiliary style
+# Remove auxiliary styles
 NoStyle			DinBrief
+NoStyle			Addresses