updates and fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@793 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 4aa581565b7f33e7c5010961740881a1c6b324d0..58148de7aae6c48929cbaefdb8d45f3147677c3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2000-06-06  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * lib/bind/de_menus.bind: updated
+
+2000-06-05  Dekel Tsur  <dekel@math.tau.ac.il>
+
+       * forms/lyx.fd: Correct gravity for objects in form_toc and form_ref
+
+2000-06-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
+  
+       * src/bufferlist.C (close): test of buf->getuser() == NULL
+2000-06-05  Dekel Tsur  <dekel@math.tau.ac.il>
+
+       * src/menus.C (Limit_string_length): New function
+       (ShowTocMenu): Limit the number of items/length of items in the
+       LOT/LOF/LOA menus.
+
+       * src/paragraph.C (String): Correct result for a paragraph inside
+       a footnote.
+
 2000-06-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/bufferlist.C (close): test of buf->getuser() == NULL

diff --git a/forms/lyx.fd b/forms/lyx.fd
index c879241dc14c786c51fdac159d42700dee3c5a09..8ac9045ef4ba722f9a3d40edcb355635a1b81120 100644 (file)
--- a/forms/lyx.fd
+++ b/forms/lyx.fd
@@ -492,8 +492,8 @@ size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: Type|Tt#t
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
 name: toctype
 callback: TocUpdateCB
 argument: 0
@@ -553,7 +553,7 @@ lcol: FL_BLACK
 label: Update|#U
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthEast FL_SouthEast
+gravity: FL_NorthEast FL_NorthEast
 name: 
 callback: RefUpdateCB
 argument: 0
@@ -571,7 +571,7 @@ lcol: FL_BLACK
 label: Close|#C^[
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthEast FL_SouthEast
+gravity: FL_NorthEast FL_NorthEast
 name: 
 callback: RefHideCB
 argument: 0
@@ -589,7 +589,7 @@ lcol: FL_BLACK
 label: Insert Reference|#I^M
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthWest FL_SouthWest
+gravity: FL_NorthEast FL_NorthEast
 name: ref
 callback: RefSelectCB
 argument: 0
@@ -607,7 +607,7 @@ lcol: FL_BLACK
 label: Insert Page Number|#P
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthWest FL_SouthWest
+gravity: FL_NorthEast FL_NorthEast
 name: pageref
 callback: RefSelectCB
 argument: 1
@@ -625,7 +625,7 @@ lcol: FL_BLACK
 label: Go to Reference|#G
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthWest FL_SouthWest
+gravity: FL_NorthEast FL_NorthEast
 name: gotoref
 callback: RefSelectCB
 argument: 5
@@ -643,7 +643,7 @@ lcol: FL_BLACK
 label: Name|#N
 shortcut: 
 resize: FL_RESIZE_X
-gravity: FL_SouthWest FL_SouthEast
+gravity: FL_NorthEast FL_NorthEast
 name: ref_name
 callback: 
 argument: 
@@ -660,8 +660,8 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Sort keys|#S
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
 name: sort
 callback: RefUpdateCB
 argument: 0
@@ -680,7 +680,7 @@ lcol: FL_BLACK
 label: Insert vReference|#V
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthWest FL_SouthWest
+gravity: FL_NorthEast FL_NorthEast
 name: vref
 callback: RefSelectCB
 argument: 2
@@ -698,7 +698,7 @@ lcol: FL_BLACK
 label: Insert vPage Number|#N
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthWest FL_SouthWest
+gravity: FL_NorthEast FL_NorthEast
 name: vpageref
 callback: RefSelectCB
 argument: 3
@@ -716,7 +716,7 @@ lcol: FL_BLACK
 label: Insert Pretty Ref|#T
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthWest FL_SouthWest
+gravity: FL_NorthEast FL_NorthEast
 name: prettyref
 callback: RefSelectCB
 argument: 4
@@ -734,7 +734,7 @@ lcol: FL_BLACK
 label: Go Back|#B
 shortcut: 
 resize: FL_RESIZE_NONE
-gravity: FL_SouthWest FL_SouthWest
+gravity: FL_NorthEast FL_NorthEast
 name: back
 callback: RefSelectCB
 argument: 6

diff --git a/lib/bind/de_menus.bind b/lib/bind/de_menus.bind
index 627362a88fc84c1016520063db09619c7f57cb74..684b9989515aa0a314781d2a728aa48b1928402b 100644 (file)
--- a/lib/bind/de_menus.bind
+++ b/lib/bind/de_menus.bind
@@ -33,6 +33,8 @@
 #
 \bind "F10 d"                  "menu-open Datei"
 \bind "F10 b"                  "menu-open Bearbeiten"
+\bind "F10 i"                  "menu-open Inhalt"
+\bind "F10 r"                  "menu-open Referenzen"
 \bind "F10 l"                  "menu-open Layout"
 \bind "F10 e"                  "menu-open Einfügen"
 \bind "F10 m"                  "menu-open Mathematik"
@@ -61,6 +63,7 @@
 \bind "M-d m a"                 "buffer-import ascii"
 \bind "M-d m t"                 "buffer-import asciiparagraph"
 \bind "M-d m n"                 "buffer-import noweb"
+\bind "M-d m d"                        "buffer-import linuxdoc"
 \bind "M-d e l"                        "buffer-export latex"
 \bind "M-d e d"                        "buffer-export dvi"
 \bind "M-d e p"                 "buffer-export postscript"
@@ -92,6 +95,17 @@
 \bind "M-b space"              "menu-open Bearbeiten" 
 \bind "M-b z"                  "line-delete-forward"
 
+#
+# Menue Inhalt
+#
+\bind "M-i"                    "menu-open Inhalt"
+
+#
+# Menue Referenzen
+#
+\bind "M-r"                    "menu-open Referenzen"
+
+
 #
 # Menue Layout
 #

diff --git a/po/ChangeLog b/po/ChangeLog
index b434eae031427006b8640e75aa4bbde955b622b1..c69cbd7cbbdd2bd1da5747ae7a2825ff8276c0b7 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-06  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * de.po: updated
+
 2000-06-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * fi.po: update from Pauli Virtanen

diff --git a/po/de.po b/po/de.po
index 3be8347aed2b80280712f95e814d7456f2d366cc..6962f7f00f845202645650543636bb8e5d1274a8 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LyX 1.0.4\n"
-"POT-Creation-Date: 2000-05-21 02:28+0200\n"
-"PO-Revision-Date: 2000-01-20 02:56+01:00\n"
+"Project-Id-Version: LyX 1.1.5pre3\n"
+"POT-Creation-Date: 2000-05-21 05:20+0200\n"
+"PO-Revision-Date: 2000-05-23 10:14+02:00\n"
 "Last-Translator: Peter Sütterlin <P.Suetterlin@astro.uu.nl>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -251,9 +251,8 @@ msgstr "' ist schreibgesch
 #. Ask if the file should be checked out for
 #. viewing/editing, if so: load it.
 #: src/bufferlist.C:468
-#, fuzzy
 msgid "Do you want to retrieve file under version control?"
-msgstr "Dokument in Versionskontrolle registrieren"
+msgstr "Das Dokument unterliegt der Versionskontrolle.  Auschecken?"
 
 #: src/bufferlist.C:476
 msgid "Cannot open specified file:"
@@ -346,7 +345,7 @@ msgstr "Randnotiz einf
 
 #: src/bufferview_funcs.C:78
 msgid "Error! unknown language"
-msgstr ""
+msgstr "Fehler! Unbekannte Sprache"
 
 #: src/LyXAction.C:295 src/bufferview_funcs.C:86
 msgid "Melt"
@@ -365,27 +364,24 @@ msgid ", Depth: "
 msgstr ", Tiefe: "
 
 #: src/bufferview_funcs.C:257
-#, fuzzy
 msgid ", Spacing: "
-msgstr "Abstände"
+msgstr ", Abstand: "
 
 #: src/bufferview_funcs.C:260
-#, fuzzy
 msgid "Single"
-msgstr "Einfach|#E"
+msgstr "Einfach"
 
 #: src/bufferview_funcs.C:263
 msgid "Onehalf"
-msgstr ""
+msgstr "Eineinhalb"
 
 #: src/bufferview_funcs.C:266
-#, fuzzy
 msgid "Double"
-msgstr "Doppelt|#D"
+msgstr "Doppelt"
 
 #: src/bufferview_funcs.C:269
 msgid "Other ("
-msgstr ""
+msgstr "Andere ("
 
 #: src/BufferView_pimpl.C:222
 msgid "Formatting document..."
@@ -511,45 +507,44 @@ msgstr "ChkTeX Warnung Nr. "
 
 #: src/ColorHandler.C:82
 msgid "LyX: Unknown X11 color "
-msgstr ""
+msgstr "LyX: Unbekannte X11-Farbe "
 
 #: src/ColorHandler.C:83
-#, fuzzy
 msgid " for "
-msgstr " vom "
+msgstr " für "
 
 #: src/ColorHandler.C:84
 msgid "     Using black instead, sorry!."
-msgstr ""
+msgstr "    Verwende stattdessen Schwarz! "
 
 #: src/ColorHandler.C:91
 msgid "LyX: X11 color "
-msgstr ""
+msgstr "LyX: X11-Farbe "
 
 #: src/ColorHandler.C:92 src/ColorHandler.C:98
 msgid " allocated for "
-msgstr ""
+msgstr " alloziert für "
 
 #: src/ColorHandler.C:97
 msgid "LyX: Using approximated X11 color "
-msgstr ""
+msgstr "LyX: Verwende ähnliche X11-Farbe "
 
 #: src/ColorHandler.C:138
 msgid "LyX: Couldn't allocate '"
-msgstr ""
+msgstr "LyX: Konnte '"
 
 #: src/ColorHandler.C:139
-#, fuzzy
 msgid "' for "
-msgstr "' nach der "
+msgstr "' für "
 
 #: src/ColorHandler.C:140
 msgid " with (r,g,b)=("
-msgstr ""
+msgstr " mit (r,g,b)=("
 
 #: src/ColorHandler.C:143
 msgid "     Using closest allocated color with (r,g,b)=("
-msgstr ""
+msgstr " nicht allozieren.\n  Verwende stattdessen ähnliche Farbe "
+"(r,g,b)=("
 
 #: src/credits.C:55
 msgid "ERROR: LyX wasn't able to read CREDITS file"
@@ -580,13 +575,12 @@ msgid "All these people have contributed to the LyX project. Thanks,"
 msgstr "All diese Menschen haben zum LyX-Projekt beigetragen. Danke,"
 
 #: src/credits_form.C:50
-#, fuzzy
 msgid ""
 "LyX is Copyright 1995 by Matthias Ettrich,\n"
 "1995-2000 LyX Team"
 msgstr ""
 "LyX --- Copyright (C) 1995 Matthias Ettrich,\n"
-"1995-1999 LyX Team"
+"1995-2000 LyX Team"
 
 #: src/credits_form.C:55
 msgid ""
@@ -910,7 +904,7 @@ msgstr "[keine Datei]"
 
 #: src/insets/figinset.C:1070
 msgid "[bad file name]"
-msgstr ""
+msgstr "[ungültiger Dateiname]"
 
 #: src/insets/figinset.C:1072
 msgid "[not displayed]"
@@ -962,7 +956,7 @@ msgstr "Leerzeichen, '#', '~', '$' oder '%'."
 
 #: src/insets/form_graphics.C:34 src/insets/form_graphics.C:35
 msgid "Graphics file|#G"
-msgstr ""
+msgstr "Graphik Datei|#G"
 
 #: src/insets/form_url.C:19
 msgid "Url"
@@ -1057,30 +1051,28 @@ msgstr "LaTeX Fehler"
 
 #: src/insets/insetert.C:29
 msgid "ERT"
-msgstr ""
+msgstr "ERT"
 
 #: src/insets/insetert.C:54
-#, fuzzy
 msgid "Opened ERT Inset"
-msgstr "Einfügung geöffnet"
+msgstr "ERT Einfügung geöffnet"
 
 #: src/insets/insetert.C:67
 msgid "Not permitted to change font-types inside ERT-insets!"
-msgstr ""
+msgstr "Innerhalb einer ERT-Einfügungen dürfen Font Typen nicht "
+"verändert werden!"
 
 #: src/insets/insetfoot.C:29
-#, fuzzy
 msgid "foot"
-msgstr "Fußzeile"
+msgstr "Fußnote"
 
 #: src/insets/insetfoot.C:52
-#, fuzzy
 msgid "Opened Footnote Inset"
-msgstr "Notiz geöffnet"
+msgstr "Einfügungen Fußnote geöffnet"
 
 #: src/insets/insetgraphics.C:87 src/insets/insetgraphics.C:163
 msgid "Graphics"
-msgstr ""
+msgstr "Graphiken"
 
 #: src/insets/insetinclude.C:43 src/insets/insetinclude.C:44
 msgid "Browse|#B"
@@ -1168,9 +1160,8 @@ msgid "Close|#C^["
 msgstr "Schließen|^["
 
 #: src/insets/insetlabel.C:56
-#, fuzzy
 msgid "Enter label:"
-msgstr "Marke einfügen"
+msgstr "Marke eingeben:"
 
 #: src/insets/insetloa.C:35
 msgid "List of Algorithms"
@@ -1197,33 +1188,28 @@ msgid "Page: "
 msgstr "Seite: "
 
 #: src/insets/insetref.C:86
-#, fuzzy
 msgid "vRef: "
-msgstr "Ref: "
+msgstr ""
 
 #: src/insets/insetref.C:86
-#, fuzzy
 msgid "vPage: "
-msgstr "Seite: "
+msgstr ""
 
 #: src/insets/insetref.C:87
-#, fuzzy
 msgid "PrettyRef: "
-msgstr "Ref: "
+msgstr ""
 
 #: src/insets/insettabular.C:235
-#, fuzzy
 msgid "Opened Tabular Inset"
-msgstr "Einfügung geöffnet"
+msgstr "Tabellen Inset geöffnet"
 
 #: src/insets/insettabular.C:1002 src/text.C:2246
 msgid "Multicolumns can only be horizontally."
 msgstr "Mehrfachspalten sind nur horizontal möglich."
 
 #: src/insets/insettext.C:336
-#, fuzzy
 msgid "Opened Text Inset"
-msgstr "Einfügung geöffnet"
+msgstr "Text Inset geöffnet"
 
 #: src/insets/insettext.C:797 src/lyxfunc.C:1163
 msgid "Layout "
@@ -1234,9 +1220,8 @@ msgid " not known"
 msgstr " unbekannt"
 
 #: src/insets/insettext.C:1509
-#, fuzzy
 msgid "Cannot include more than one paragraph!"
-msgstr "Ein Tabelleneintrag kann nur einen Absatz enthalten!"
+msgstr "Es ist nicht möglich, mehr als einen Absatz einzubinden!"
 
 #: src/insets/insettoc.C:18 src/lyxfunc.C:834
 msgid "Table of Contents"
@@ -1276,15 +1261,15 @@ msgstr ""
 
 #: src/language.C:39
 msgid "American"
-msgstr ""
+msgstr "Amerikanisch"
 
 #: src/language.C:40
 msgid "Arabic"
-msgstr ""
+msgstr "Arabisch"
 
 #: src/language.C:41
 msgid "Austrian"
-msgstr ""
+msgstr "Österreichisch"
 
 #: src/language.C:42
 msgid "Bahasa"
@@ -1295,34 +1280,32 @@ msgid "Brazil"
 msgstr ""
 
 #: src/language.C:44
-#, fuzzy
 msgid "Breton"
-msgstr "Dekoration"
+msgstr "Bretonisch"
 
 #: src/language.C:45
 msgid "Catalan"
-msgstr ""
+msgstr "Catalanisch"
 
 #: src/language.C:46
-#, fuzzy
 msgid "Croatian"
-msgstr "Drehung"
+msgstr "Kroatisch"
 
 #: src/language.C:47
 msgid "Czech"
-msgstr ""
+msgstr "Tschechisch"
 
 #: src/language.C:48
 msgid "Danish"
-msgstr ""
+msgstr "Dänisch"
 
 #: src/language.C:49
 msgid "Dutch"
-msgstr ""
+msgstr "Holländisch"
 
 #: src/language.C:50
 msgid "English"
-msgstr ""
+msgstr "Englisch"
 
 #: src/language.C:51
 msgid "Esperanto"
@@ -1330,19 +1313,19 @@ msgstr ""
 
 #: src/language.C:52
 msgid "Estonian"
-msgstr ""
+msgstr "Estonisch"
 
 #: src/language.C:53
 msgid "Finnish"
-msgstr ""
+msgstr "Finnisch"
 
 #: src/language.C:54
 msgid "Francais"
-msgstr ""
+msgstr "Französisch"
 
 #: src/language.C:55
 msgid "French"
-msgstr ""
+msgstr "Französisch"
 
 #: src/language.C:56
 msgid "Frenchb"
@@ -1350,94 +1333,91 @@ msgstr ""
 
 #: src/language.C:57
 msgid "Galician"
-msgstr ""
+msgstr "Galizisch"
 
 #: src/language.C:58
 msgid "German"
-msgstr ""
+msgstr "Deutsch"
 
 #: src/language.C:59 src/mathed/math_forms.C:26
 msgid "Greek"
-msgstr "Greek"
+msgstr "Griechisch"
 
 #: src/language.C:60
 msgid "Hebrew"
-msgstr ""
+msgstr "Herbräisch"
 
 #: src/language.C:61
 msgid "Hungarian"
-msgstr ""
+msgstr "Ungarisch"
 
 #: src/language.C:62
 msgid "Irish"
-msgstr ""
+msgstr "Irisch"
 
 #: src/language.C:63
-#, fuzzy
 msgid "Italian"
-msgstr "Kursiv"
+msgstr "Italienisch"
 
 #: src/language.C:64
 msgid "Lsorbian"
-msgstr ""
+msgstr "Sorbisch (L)"
 
 #: src/language.C:65
-#, fuzzy
 msgid "Magyar"
-msgstr "Magenta"
+msgstr "Ungarisch"
 
 #: src/language.C:66
 msgid "Norsk"
-msgstr ""
+msgstr "Norwegisch"
 
 #: src/language.C:67
 msgid "Polish"
-msgstr ""
+msgstr "Polnisch"
 
 #: src/language.C:68
 msgid "Portuges"
-msgstr ""
+msgstr "Portugiesisch"
 
 #: src/language.C:69
-#, fuzzy
 msgid "Romanian"
-msgstr "Roman"
+msgstr "Romanisch"
 
 #: src/language.C:70
 msgid "Russian"
-msgstr ""
+msgstr "Russisch"
 
 #: src/language.C:71
 msgid "Scottish"
-msgstr ""
+msgstr "Schottisch"
 
 #: src/language.C:72
 msgid "Spanish"
-msgstr ""
+msgstr "Spanisch"
 
 #: src/language.C:73
 msgid "Slovak"
-msgstr ""
+msgstr "Slovakisch"
 
 #: src/language.C:74
 msgid "Slovene"
-msgstr ""
+msgstr "Slovenisch"
 
 #: src/language.C:75
 msgid "Swedish"
-msgstr ""
+msgstr "Schwedisch"
 
 #: src/language.C:76
 msgid "Turkish"
-msgstr ""
+msgstr "Türkisch"
 
 #: src/language.C:77
 msgid "Usorbian"
-msgstr ""
+msgstr "Sorbisch (U)"
 
 #: src/language.C:78
 msgid "Welsh"
-msgstr ""
+msgstr "Walisisch"
 
 #: src/LaTeX.C:178 src/LaTeX.C:203 src/LaTeX.C:269 src/LaTeX.C:319
 msgid "LaTeX run number "
@@ -1966,238 +1946,212 @@ msgstr "Besonderes Spaltenformat"
 
 #.  LColor::color, gui, latex, x11, lyx
 #: src/LColor.C:42
-#, fuzzy
 msgid "none"
-msgstr "Fertig"
+msgstr "keine"
 
 #: src/LColor.C:43
-#, fuzzy
 msgid "black"
 msgstr "Schwarz"
 
 #: src/LColor.C:44
-#, fuzzy
 msgid "white"
 msgstr "Weiß"
 
 #: src/LColor.C:45
-#, fuzzy
 msgid "red"
 msgstr "Rot"
 
 #: src/LColor.C:46
-#, fuzzy
 msgid "green"
 msgstr "Grün"
 
 #: src/LColor.C:47
-#, fuzzy
 msgid "blue"
 msgstr "Blau"
 
 #: src/LColor.C:48
-#, fuzzy
 msgid "cyan"
 msgstr "Cyan"
 
 #: src/LColor.C:49
-#, fuzzy
 msgid "magenta"
 msgstr "Magenta"
 
 #: src/LColor.C:50
-#, fuzzy
 msgid "yellow"
 msgstr "Gelb"
 
 #: src/LColor.C:51
 msgid "background"
-msgstr ""
+msgstr "Hintergrund"
 
 #: src/LColor.C:52
 msgid "foreground"
-msgstr ""
+msgstr "Vordergrund"
 
 #: src/LColor.C:53
-#, fuzzy
 msgid "selection"
-msgstr "Dekoration"
+msgstr "Auswahl"
 
 #: src/LColor.C:54
-#, fuzzy
 msgid "latex"
-msgstr "Latex "
+msgstr "Latex"
 
 #: src/LColor.C:55
 msgid "floats"
-msgstr ""
+msgstr "Floats"
 
 #: src/LColor.C:56
-#, fuzzy
 msgid "note"
 msgstr "Notiz"
 
 #: src/LColor.C:57
 msgid "note background"
-msgstr ""
+msgstr "Notiz (Hintergrund)"
 
 #: src/LColor.C:58
 msgid "note frame"
-msgstr ""
+msgstr "Notiz (Rahmen)"
 
 #: src/LColor.C:59
 msgid "depth bar"
-msgstr ""
+msgstr "Umgebungstiefe Balken"
 
 #: src/LColor.C:60
 msgid "command-inset"
-msgstr ""
+msgstr "Befehlseinfügung"
 
 #: src/LColor.C:61
 msgid "command-inset background"
-msgstr ""
+msgstr "Befehlseinfügung (Hintergrund)"
 
 #: src/LColor.C:62 src/LColor.C:79
-#, fuzzy
 msgid "inset frame"
-msgstr "Marke einfügen"
+msgstr "Rahmen Einfügungen"
 
 #: src/LColor.C:63
-#, fuzzy
 msgid "accent"
-msgstr "Hauptdokument:"
+msgstr "Akzent"
 
 #: src/LColor.C:64
 msgid "accent background"
-msgstr ""
+msgstr "Akzent (Hintergrund)"
 
 #: src/LColor.C:65
 msgid "accent frame"
-msgstr ""
+msgstr "Akzent (Rahmen)"
 
 #: src/LColor.C:66
 msgid "minipage line"
-msgstr ""
+msgstr "Minipage Strich"
 
 #: src/LColor.C:67
 msgid "special char"
-msgstr ""
+msgstr "Sonderzeichen"
 
 #: src/LColor.C:68
-#, fuzzy
 msgid "math"
 msgstr "Mathematik"
 
 #: src/LColor.C:69
 msgid "math background"
-msgstr ""
+msgstr "Mathematik (Hintergrund)"
 
 #: src/LColor.C:70
-#, fuzzy
 msgid "math frame"
-msgstr "Formeleditor"
+msgstr "Mathematik (Rahmen)"
 
 #: src/LColor.C:71
 msgid "math cursor"
-msgstr ""
+msgstr "Mathematik (Cursor)"
 
 #: src/LColor.C:72
-#, fuzzy
 msgid "math line"
-msgstr "Mathematische Symbole"
+msgstr "Mathematik Strich"
 
 #: src/LColor.C:73
-#, fuzzy
 msgid "footnote"
-msgstr "Fußnote einfügen"
+msgstr "Fußnote"
 
 #: src/LColor.C:74
 msgid "footnote background"
-msgstr ""
+msgstr "Fußnote (Hintergrund)"
 
 #: src/LColor.C:75
 msgid "footnote frame"
-msgstr ""
+msgstr "Fußnote (Rahmen)"
 
 #: src/LColor.C:76
-#, fuzzy
 msgid "ert"
-msgstr "Einfügen"
+msgstr "ERT"
 
 #: src/LColor.C:77
-#, fuzzy
 msgid "inset"
-msgstr "Einfügung"
+msgstr "Inset"
 
 #: src/LColor.C:78
 msgid "inset background"
-msgstr ""
+msgstr "Einfügung (Hintergrund)"
 
 #: src/LColor.C:80
-#, fuzzy
 msgid "error"
 msgstr "Fehler"
 
 #: src/LColor.C:81
 msgid "end-of-line marker"
-msgstr ""
+msgstr "Zeilenende-Markierung"
 
 #: src/LColor.C:82
-#, fuzzy
 msgid "appendix line"
-msgstr "Einfügung geöffnet"
+msgstr "Strich Anhang"
 
 #: src/LColor.C:83
 msgid "vfill line"
-msgstr ""
+msgstr "Strich VFill"
 
 #: src/LColor.C:84
 msgid "top/bottom line"
-msgstr ""
+msgstr "Obere/untere Linie"
 
 #: src/LColor.C:85
-#, fuzzy
 msgid "table line"
-msgstr "Tabelle wurde eingefügt"
+msgstr "Strich Tabelle"
 
 #: src/LColor.C:86
-#, fuzzy
 msgid "tabular line"
-msgstr "Tabelle wurde eingefügt"
+msgstr "Tabulator Strich"
 
 #: src/LColor.C:88
-#, fuzzy
 msgid "tabularonoff line"
-msgstr "Tabelle wurde eingefügt"
+msgstr ""
 
 #: src/LColor.C:90
 msgid "bottom area"
-msgstr ""
+msgstr "Unterer Bereich"
 
 #: src/LColor.C:91
-#, fuzzy
 msgid "page break"
 msgstr "Seitenumbruch"
 
 #: src/LColor.C:92
 msgid "top of button"
-msgstr ""
+msgstr "Button (oben)"
 
 #: src/LColor.C:93
 msgid "bottom of button"
-msgstr ""
+msgstr "Button (unten)"
 
 #: src/LColor.C:94
 msgid "left of button"
-msgstr ""
+msgstr "Button (links)"
 
 #: src/LColor.C:95
 msgid "right of button"
-msgstr ""
+msgstr "Button (rechts)"
 
 #: src/LColor.C:96
 msgid "button background"
-msgstr ""
+msgstr "Button (Hintergrund)"
 
 #: src/LColor.C:97
 msgid "inherit"
@@ -2380,18 +2334,16 @@ msgid "Remove all error boxes"
 msgstr "Alle Fehlermarken entfernen"
 
 #: src/LyXAction.C:184
-#, fuzzy
 msgid "Insert a new ERT Inset"
-msgstr "Indexliste einfügen"
+msgstr "Neue ERT Einfügung anlegen"
 
 #: src/LyXAction.C:185 src/lyx_cb.C:2928
 msgid "Insert Figure"
 msgstr "Abbildung einfügen"
 
 #: src/LyXAction.C:187
-#, fuzzy
 msgid "Insert Graphics"
-msgstr "Anhang einfügen"
+msgstr "Graphik einfügen"
 
 #: src/LyXAction.C:192 src/lyxfr0.C:94
 msgid "Find & Replace"
@@ -2490,9 +2442,8 @@ msgid "Insert Label"
 msgstr "Marke einfügen"
 
 #: src/LyXAction.C:237
-#, fuzzy
 msgid "Change language"
-msgstr "Sprache"
+msgstr "Sprache ändern"
 
 #: src/LyXAction.C:238
 msgid "View LaTeX log"
@@ -2527,27 +2478,24 @@ msgid "Insert list of algorithms"
 msgstr "Liste der Algorithmen einfügen"
 
 #: src/LyXAction.C:266
-#, fuzzy
 msgid "View list of algorithms"
-msgstr "Liste der Algorithmen einfügen"
+msgstr "Liste der Algorithmen anzeigen"
 
 #: src/LyXAction.C:268
 msgid "Insert list of figures"
 msgstr "Liste der Abbildungen einfügen"
 
 #: src/LyXAction.C:270
-#, fuzzy
 msgid "View list of figures"
-msgstr "Liste der Abbildungen einfügen"
+msgstr "Liste der Abbildungen anzeigen"
 
 #: src/LyXAction.C:272
 msgid "Insert list of tables"
 msgstr "Liste der Tabellen einfügen"
 
 #: src/LyXAction.C:274
-#, fuzzy
 msgid "View list of tables"
-msgstr "Liste der Tabellen einfügen"
+msgstr "Liste der Tabellen anzeigen"
 
 #: src/LyXAction.C:275
 msgid "Exit"
@@ -2570,9 +2518,8 @@ msgid "Math mode"
 msgstr "Formeleditor"
 
 #: src/LyXAction.C:302
-#, fuzzy
 msgid "Insert a new Number Inset"
-msgstr "Seitennummer einfügen|#S"
+msgstr "Neue Zahl-Einfügung anlegen"
 
 #: src/LyXAction.C:305
 msgid "Go one paragraph down"
@@ -2611,18 +2558,16 @@ msgid "Insert Table"
 msgstr "Tabelle einfügen"
 
 #: src/LyXAction.C:350
-#, fuzzy
 msgid "Insert a new Tabular Inset"
-msgstr "Tabelle einfügen"
+msgstr "Neue Tabular Einfügung anlegen"
 
 #: src/LyXAction.C:351
 msgid "Toggle TeX style"
 msgstr "TeX Modus an/aus"
 
 #: src/LyXAction.C:353
-#, fuzzy
 msgid "Insert a new Text Inset"
-msgstr "Indexliste einfügen"
+msgstr "Neue Text Einfügung anlegen"
 
 #: src/LyXAction.C:355
 msgid "Insert table of contents"
@@ -2678,12 +2623,11 @@ msgstr "Vergr
 
 #: src/lyx.C:129
 msgid "Update|Uu#u"
-msgstr "Aktualisieren|#A"
+msgstr "Aktualisieren|Aa#a"
 
 #: src/lyx.C:133
-#, fuzzy
 msgid "Type|Tt#t"
-msgstr "Art:|#A"
+msgstr "Typ:|Tt#t"
 
 #: src/lyx.C:154
 msgid "Update|#U"
@@ -2702,24 +2646,20 @@ msgid "Go to Reference|#G"
 msgstr "Gehe zu Referenz|#G"
 
 #: src/lyx.C:177
-#, fuzzy
 msgid "Sort keys|#S"
-msgstr "Serie:|#S"
+msgstr "Einträge sortieren|#E"
 
 #: src/lyx.C:181
-#, fuzzy
 msgid "Insert vReference|#V"
-msgstr "Querverweis einfügen"
+msgstr "vReference einfügen|#V"
 
 #: src/lyx.C:185
-#, fuzzy
 msgid "Insert vPage Number|#N"
-msgstr "Seitennummer einfügen|#S"
+msgstr "vPage Nummer einfügen|#N"
 
 #: src/lyx.C:189
-#, fuzzy
 msgid "Insert Pretty Ref|#T"
-msgstr "Seitennummer einfügen|#S"
+msgstr "Pretty Ref einfügen|#P"
 
 #: src/lyx_cb.C:224
 msgid "Save failed. Rename and try again?"
@@ -3252,9 +3192,8 @@ msgid "Default"
 msgstr "Standard"
 
 #: src/lyxfont.C:413
-#, fuzzy
 msgid "Language: "
-msgstr "Sprache:"
+msgstr "Sprache: "
 
 #: src/lyxfr1.C:124 src/lyxfr1.C:161
 msgid "Sorry!"
@@ -3328,9 +3267,8 @@ msgid "Mark on"
 msgstr "Marke ein"
 
 #: src/lyxfunc.C:1989
-#, fuzzy
 msgid "Unknown spacing argument: "
-msgstr "Fehlendes Argument"
+msgstr "Unbekannter Abstand: "
 
 #: src/lyxfunc.C:2228
 msgid "Push-toolbar needs argument > 0"
@@ -3373,9 +3311,8 @@ msgid "Unknown kind of footnote"
 msgstr "Unbekannte Fußnotenart"
 
 #: src/lyxfunc.C:2629
-#, fuzzy
 msgid "No document open"
-msgstr "* Kein Dokument geöffnet *"
+msgstr "Kein Dokument geöffnet"
 
 #: src/lyxfunc.C:2635
 msgid "Document is read only"
@@ -3441,18 +3378,16 @@ msgid "already exists. Overwrite?"
 msgstr "existiert bereits. Überschreiben?"
 
 #: src/lyxfunc.C:2931
-#, fuzzy
 msgid "Importing"
-msgstr "|Importieren%m"
+msgstr "Importiere"
 
 #: src/lyxfunc.C:2938
 msgid "imported."
 msgstr "wurde eingefügt."
 
 #: src/lyxfunc.C:2940
-#, fuzzy
 msgid ": import failed."
-msgstr "wurde eingefügt."
+msgstr ": Einfügen misslungen."
 
 #: src/lyxfunc.C:3013
 msgid "Select Document to Insert"
@@ -3472,24 +3407,20 @@ msgid "Could not insert document"
 msgstr "Das Dokument konnte nicht eingefügt werden"
 
 #: src/lyxfunc.C:3053
-#, fuzzy
 msgid "Select LaTeX file to import"
-msgstr "Auswahl LaTeX-Datei"
+msgstr "Wähle LaTeX-Datei zum Einfügen"
 
 #: src/lyxfunc.C:3057 src/lyxfunc.C:3061
-#, fuzzy
 msgid "Select ASCII file to import"
-msgstr "Auswahl ASCII-Datei"
+msgstr "Wähle ASCII-Datei zum Einfügen"
 
 #: src/lyxfunc.C:3065
-#, fuzzy
 msgid "Select NoWeb file to import"
-msgstr "Auswahl Noweb-Datei"
+msgstr "Wähle Noweb-Datei zum Einfügen"
 
 #: src/lyxfunc.C:3069
-#, fuzzy
 msgid "Select LinuxDoc file to import"
-msgstr "Auswahl Noweb-Datei"
+msgstr "Wähle Noweb-Datei zum Einfügen"
 
 #: src/lyxfunc.C:3072
 msgid "Unknown import type: "
@@ -3567,7 +3498,7 @@ msgstr " ``text'' | ''text'' | ,,text`` | ,,text'' | 
 
 #: src/lyx_gui.C:562
 msgid " TOC | LOF | LOT | LOA "
-msgstr ""
+msgstr " Inhalt | Abbildungen | Tabellen | Algorithmen "
 
 #: src/lyx_gui.C:602
 msgid "LyX Banner"
@@ -3697,7 +3628,6 @@ msgid "Setting debug level to "
 msgstr "Setze Debug-Level auf "
 
 #: src/lyx_main.C:558
-#, fuzzy
 msgid ""
 "Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
 "Command line switches (case sensitive):\n"
@@ -3725,10 +3655,6 @@ msgstr ""
 "                  ausführliche Fehlermeldung aktiviert wird.\n"
 "                  Mit `lyx -dbg' erhalten Sie eine Liste der\n"
 "                  vorhandenen Bereiche.\n"
-"\t-Reverse        Vertauscht Vordergrund- und Hintergrundfarben\n"
-"\t-Mono           Startet LyX im Schwarz-Weiß Modus\n"
-"\t-FastSelection  Verwendet eine schnellere Routine, um markierte\n"
-"                  Bereiche anzuzeigen\n"
 "\n"
 "Weitere Optionen sind in der Online-Hilfe (man lyx) aufgeführt."
 
@@ -3761,7 +3687,6 @@ msgid "Missing file type [eg latex, ps...] after "
 msgstr "Fehlender Datei-Typ [zB latex, ps...] nach "
 
 #: src/lyx_main.C:686
-#, fuzzy
 msgid "Missing type [eg latex, ps...] after "
 msgstr "Fehlender Datei-Typ [zB latex, ps...] nach "
 
@@ -3868,7 +3793,7 @@ msgstr "LyX VK: Protokollmeldung"
 
 #: src/lyxvc.C:141
 msgid "(no log message)"
-msgstr ""
+msgstr "(keine Protokolldatei)"
 
 #: src/lyxvc.C:156
 msgid "Ignore changes and proceed with check out?"
@@ -4040,12 +3965,11 @@ msgstr "Bearbeiten"
 
 #: src/menus.C:186 src/menus.C:274 src/menus.C:275 src/menus.C:276
 msgid "TOC"
-msgstr ""
+msgstr "Inhalt"
 
 #: src/menus.C:188 src/menus.C:288 src/menus.C:289 src/menus.C:290
-#, fuzzy
 msgid "Refs"
-msgstr "Ref: "
+msgstr "Referenzen "
 
 #: src/menus.C:190 src/menus.C:302 src/menus.C:303 src/menus.C:304
 msgid "Layout"
@@ -4073,14 +3997,12 @@ msgid "MB|#E"
 msgstr "MB|#B"
 
 #: src/menus.C:278
-#, fuzzy
 msgid "MB|#T"
-msgstr "MB|#D"
+msgstr "MB|#I"
 
 #: src/menus.C:292
-#, fuzzy
 msgid "MB|#R"
-msgstr "MB|#D"
+msgstr "MB|#R"
 
 #: src/menus.C:306
 msgid "MB|#L"
@@ -4111,13 +4033,12 @@ msgid "Screen Options"
 msgstr "Bildschirmoptionen"
 
 #: src/menus.C:520
-#, fuzzy
 msgid ""
 "Import%t|LaTeX...%x30|Ascii Text as Lines...%x31|Ascii Text as "
 "Paragraphs%x32|Noweb%x33|LinuxDoc%x34"
 msgstr ""
 "Einfügen%t|LaTeX...%x30|Ascii Text als Zeilen...%x31|Ascii Text als "
-"Absätze%x32|Noweb%x33"
+"Absätze%x32|Noweb%x33|LinuxDoc%x34"
 
 #: src/menus.C:527 src/menus.C:784
 msgid "FIM|Ll#l#L"
@@ -4136,9 +4057,8 @@ msgid "FIM|Nn#n#N"
 msgstr "FIM|Nn#n#N"
 
 #: src/menus.C:531 src/menus.C:788
-#, fuzzy
 msgid "FIM|Dd#d#D"
-msgstr "FM|aA#a#A"
+msgstr "FIM|Dd#d#D"
 
 #: src/menus.C:540
 msgid ""
@@ -4149,22 +4069,20 @@ msgstr ""
 "Ascii Text...%x43|als HTML...%x44|Benutzerdefiniert...%x45"
 
 #: src/menus.C:549
-#, fuzzy
 msgid ""
 "Export%t|as LinuxDoc...%x40|as DVI...%x41|as PostScript...%x42|as Ascii "
 "Text...%x43|as HTML...%x44"
 msgstr ""
 "Exportieren%t|als LinuxDoc...%x40|als DVI...%x41|als PostScript...%x42|als "
-"Ascii Text...%x43"
+"Ascii Text...%x43|als HTML...%x44"
 
 #: src/menus.C:557
-#, fuzzy
 msgid ""
 "Export%t|as DocBook...%x40|as DVI...%x41|as PostScript...%x42|as Ascii "
 "Text...%x43|as HTML...%x44"
 msgstr ""
 "Exportieren%t|als DocBook...%x40|als DVI...%x41|als PostScript...%x42|als "
-"Ascii Text...%x43"
+"Ascii Text...%x43|als HTML...%x44"
 
 #: src/menus.C:564
 msgid "FEX|Ll#l#L"
@@ -4183,7 +4101,6 @@ msgid "FEX|Tt#t#T"
 msgstr "FEX|Tt#t#T"
 
 #: src/menus.C:568
-#, fuzzy
 msgid "FEX|Hh#h#H"
 msgstr "FEX|Hh#h#H"
 
@@ -4286,13 +4203,12 @@ msgid "FM|xX#x#X"
 msgstr "FM|Bb#b#B"
 
 #: src/menus.C:777
-#, fuzzy
 msgid ""
 "Import%t|LaTeX...%x15|Ascii Text as Lines...%x16|Ascii Text as "
 "Paragraphs...%x17|Noweb...%x18|LinuxDoc...%x19"
 msgstr ""
 "Import%t|LaTeX...%x15|Ascii Text als Zeilen...%x16|Ascii Text als "
-"Absätze...%x17|Noweb...%x18"
+"Absätze...%x17|Noweb...%x18|LinuxDoc...%x19"
 
 #: src/menus.C:802
 msgid "New...|New from template...|Open...%l|Import%m%l|Exit%l"
@@ -4568,7 +4484,6 @@ msgid "EMV|Hh#h#H"
 msgstr "EMV|hH#h#H"
 
 #: src/menus.C:1124
-#, fuzzy
 msgid ""
 "Undo|Redo %l|Cut|Copy|Paste%l|Find & Replace...|Go to Error|Go to "
 "Note|Floats & Insets%m|Table%m|Spellchecker....|Check TeX|Table of "
@@ -4579,7 +4494,8 @@ msgstr ""
 "Rückgängig|Wiederholen %l|Ausschneiden|Kopieren|Einfügen%l|Suchen & "
 "Ersetzen...|Gehe zu Fehler|Gehe zu Notiz|Float & "
 "Einfügungen%m|Tabellen%m|Rechtschreibprüfung....|Prüfe "
-"TeX|Inhaltsverzeichnis...%l|Versionskontrolle%m%l|Zeige LaTeX "
+"TeX|Inhaltsverzeichnis...|Liste der Abbildungen...|Liste der Tabellen...|"
+"Liste der Algorithmen...%l|Versionskontrolle%m%l|Zeige LaTeX "
 "Protokoll%l|Einfügen als Zeilen|Einfügen als Absätze"
 
 #: src/menus.C:1146
@@ -4629,7 +4545,7 @@ msgstr "EM|Xx#x#X"
 
 #: src/menus.C:1158
 msgid "EM|Tt#t#T"
-msgstr "EM|Tt#t#T"
+msgstr "EM|Ii#i#I"
 
 #. fl_setpup_shortcut(EditMenu, 14, scex(_("EM|Ff#f#F")));
 #. fl_setpup_shortcut(EditMenu, 15, scex(_("EM|bB#b#B")));
@@ -4651,49 +4567,40 @@ msgid "EM|gG#g#G"
 msgstr "EM|bB#b#B"
 
 #: src/menus.C:1342
-#, fuzzy, no-c-format
 msgid "List of Figures%m%l"
-msgstr "Liste der Abbildungen"
+msgstr "Liste der Abbildungen%m%l"
 
 #: src/menus.C:1344
-#, fuzzy, no-c-format
 msgid "List of Tables%m%l"
-msgstr "Liste der Tabellen"
+msgstr "Liste der Tabellen%m%l"
 
 #: src/menus.C:1346
-#, fuzzy, no-c-format
 msgid "List of Algorithms%m%l"
-msgstr "Liste der Algorithmen"
+msgstr "Liste der Algorithmen%m%l"
 
 #: src/menus.C:1434
-#, fuzzy, no-c-format
 msgid "Insert Page Number%m"
-msgstr "Seitennummer einfügen|#S"
+msgstr "Seitennummer einfügen%m"
 
 #: src/menus.C:1436
-#, fuzzy, no-c-format
 msgid "Insert vref%m"
-msgstr "Url einfügen"
+msgstr "Vref einfügen%m"
 
 #: src/menus.C:1438
-#, fuzzy, no-c-format
 msgid "Insert vpageref%m"
-msgstr "Abbildung einfügen"
+msgstr "Vpageref einfügen%m"
 
 #: src/menus.C:1440
-#, fuzzy, no-c-format
 msgid "Insert Pretty Ref%m"
-msgstr "Index-Element einfügen"
+msgstr "Pretty Ref einfügen%m"
 
 #: src/menus.C:1442
-#, fuzzy, no-c-format
 msgid "Goto Reference%m%l"
-msgstr "Gehe zu Referenz|#G"
+msgstr "Gehe zu Referenz%m%l"
 
 #: src/menus.C:1451
-#, fuzzy, c-format
 msgid "Insert Reference:%d%x0"
-msgstr "Querverweis einfügen"
+msgstr "Querverweis einfügen:%d%x0"
 
 #: src/menus.C:1504
 msgid ""
@@ -5032,15 +4939,14 @@ msgid "No Documents Open!%t"
 msgstr "Keine Dokumente geöffnet!%t"
 
 #: src/menus.C:1970
-#, fuzzy
 msgid ""
 "Introduction|Tutorial|User's Guide|Extended Features|Customization|Reference "
 "Manual|FAQ|Table of Contents|Known Bugs|LaTeX Configuration%l|Copyright and "
 "Warranty...|Credits...|Version..."
 msgstr ""
-"Einführung|Tutorium|Benutzerhandbuch|Profi-Tips|Anpassung|Referenzhandbuch|Be"
-"kannte Fehler|LaTeX Konfiguration%l|Copyright und Gewährleistung...|Ruhm & "
-"Ehre...|Version..."
+"Einführung|Tutorium|Benutzerhandbuch|Profi-Tips|Anpassung|Referenzhandbuch|"
+"FAQ|Inhaltsverzeichnis|Bekannte Fehler|LaTeX Konfiguration%l|"
+"Copyright und Gewährleistung...|Ruhm & Ehre...|Version..."
 
 #: src/menus.C:1984
 msgid "HM|Ii#I#i"
@@ -5067,14 +4973,12 @@ msgid "HM|Rr#R#r"
 msgstr "HM|Rr#R#r"
 
 #: src/menus.C:1990
-#, fuzzy
 msgid "HM|Ff#F#f"
-msgstr "FM|Ff#f#F"
+msgstr "HM|Qq#Q#q"
 
 #: src/menus.C:1991
-#, fuzzy
 msgid "HM|aA#a#A"
-msgstr "EM|Ii#i#I"
+msgstr "HM|Ii#i#I"
 
 #: src/menus.C:1992
 msgid "HM|Kk#K#k"
@@ -5113,9 +5017,8 @@ msgid "User directory: "
 msgstr "Nutzerverzeichnis: "
 
 #: src/menus.C:2037
-#, fuzzy
 msgid "Could not find requested Documentation file"
-msgstr "Das Dokument konnte nicht eingefügt werden"
+msgstr "Das gesuchte Dokumentation wurde nicht gefunden"
 
 #: src/menus.C:2041
 msgid "Opening help file"
@@ -5418,17 +5321,16 @@ msgid "unknown"
 msgstr "unbekannt"
 
 #: src/table.C:989 src/tabular.C:1219
-#, fuzzy
 msgid "Warning:"
-msgstr "Achtung!"
+msgstr "Achtung:"
 
 #: src/table.C:990 src/tabular.C:1220
 msgid "Tabular format < 5 is not supported anymore\n"
-msgstr ""
+msgstr "Tabular Format < 5 wird nicht mehr unterstützt.\n"
 
 #: src/table.C:991 src/tabular.C:1221
 msgid "Get an older version of LyX (< 1.1.x) for conversion!"
-msgstr ""
+msgstr "Verwenden sie eine ältere Version von LyX (< 1.1.x) zum konvertieren!"
 
 #: src/TableLayout.C:240
 msgid "Table Extra Form"
@@ -5447,9 +5349,8 @@ msgid "Confirm: press Delete-Button again"
 msgstr "Zum Bestätigen nochmals \"Entfernen\" drücken"
 
 #: src/TabularLayout.C:56
-#, fuzzy
 msgid "Tabular Layout"
-msgstr "Tabellen-Layout"
+msgstr "Tabular Layout"
 
 #: src/text2.C:356
 msgid "Opened float"
@@ -5499,13 +5400,12 @@ msgstr ""
 "Tutorium."
 
 #: src/text.C:3984 src/text.C:3990
-#, fuzzy
 msgid "Page Break (top)"
-msgstr "Seitenumbruch"
+msgstr "Seitenumbruch (oben)"
 
 #: src/text.C:4166 src/text.C:4172
 msgid "Page Break (bottom)"
-msgstr ""
+msgstr "Seitenumbruch (unten)"
 
 #: src/text.C:4584
 msgid "You can't insert a float in a float!"

diff --git a/src/lyx.C b/src/lyx.C
index 6d00442aeb627a39054e4c9e1f31945592a58be4..cb9f670162d1d987e31f340189debcf7728a48ef 100644 (file)
--- a/src/lyx.C
+++ b/src/lyx.C
@@ -14,8 +14,8 @@ FD_form_title *create_form_form_title(void)
   FL_OBJECT *obj;
   FD_form_title *fdui = (FD_form_title *) fl_calloc(1, sizeof(FD_form_title));
 
-  fdui->form_title = fl_bgn_form(FL_NO_BOX, 425, 290);
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 425, 290, "");
+  fdui->form_title = fl_bgn_form(FL_NO_BOX, 420, 290);
+  obj = fl_add_box(FL_UP_BOX, 0, 0, 420, 290, "");
     fl_set_object_color(obj, FL_BLACK, FL_TOP_BCOL);
   fdui->timer_title = obj = fl_add_timer(FL_HIDDEN_TIMER, 110, 170, 190, 60, "");
     fl_set_object_callback(obj, TimerCB, 0);
@@ -130,8 +130,9 @@ FD_form_toc *create_form_form_toc(void)
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, TocUpdateCB, 0);
-  fdui->toctype = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_("Type|Tt#t")));fl_set_button_shortcut(obj,scex(_("Type|Tt#t")),1);
+  fdui->toctype = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_("Type|Tt#t")));fl_set_button_shortcut(obj, scex(_("Type|Tt#t")), 1);
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
+    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, TocUpdateCB, 0);
   fl_end_form();
 
@@ -153,46 +154,46 @@ FD_form_ref *create_form_form_ref(void)
     fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
   obj = fl_add_button(FL_NORMAL_BUTTON, 480, 60, 100, 30, idex(_("Update|#U")));fl_set_button_shortcut(obj, scex(_("Update|#U")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefUpdateCB, 0);
   obj = fl_add_button(FL_NORMAL_BUTTON, 480, 100, 100, 30, idex(_("Close|#C^[")));fl_set_button_shortcut(obj, scex(_("Close|#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefHideCB, 0);
   fdui->ref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 60, 160, 30, idex(_("Insert Reference|#I^M")));fl_set_button_shortcut(obj, scex(_("Insert Reference|#I^M")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefSelectCB, 0);
   fdui->pageref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 100, 160, 30, idex(_("Insert Page Number|#P")));fl_set_button_shortcut(obj, scex(_("Insert Page Number|#P")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefSelectCB, 1);
   fdui->gotoref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 280, 160, 30, idex(_("Go to Reference|#G")));fl_set_button_shortcut(obj, scex(_("Go to Reference|#G")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefSelectCB, 5);
   fdui->ref_name = obj = fl_add_input(FL_NORMAL_INPUT, 380, 20, 200, 30, idex(_("Name|#N")));fl_set_button_shortcut(obj, scex(_("Name|#N")), 1);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
   fdui->sort = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 310, 360, 110, 30, idex(_("Sort keys|#S")));fl_set_button_shortcut(obj, scex(_("Sort keys|#S")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, RefUpdateCB, 0);
     fl_set_button(obj, 1);
   fdui->vref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 140, 160, 30, idex(_("Insert vReference|#V")));fl_set_button_shortcut(obj, scex(_("Insert vReference|#V")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefSelectCB, 2);
   fdui->vpageref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 180, 160, 30, idex(_("Insert vPage Number|#N")));fl_set_button_shortcut(obj, scex(_("Insert vPage Number|#N")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefSelectCB, 3);
   fdui->prettyref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 220, 160, 30, idex(_("Insert Pretty Ref|#T")));fl_set_button_shortcut(obj, scex(_("Insert Pretty Ref|#T")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj, RefSelectCB, 4);
   fdui->back = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 320, 160, 30, idex(_("Go Back|#B")));fl_set_button_shortcut(obj,scex(_("Go Back|#B")), 1);
     fl_set_object_lsize(obj,FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
     fl_set_object_callback(obj,RefSelectCB, 6);
   fl_end_form();
 

diff --git a/src/menus.C b/src/menus.C
index 34a192be72c64a5891ca1173aaebbb0212caea71..1e21d61fa2a85f59f13c50ce353e55c089b28dba 100644 (file)
--- a/src/menus.C
+++ b/src/menus.C
@@ -55,6 +55,7 @@
 using std::vector;
 using std::endl;
 using std::max;
+using std::min;
 using std::sort;
 
 extern FD_form_screen * fd_form_screen;
@@ -1283,21 +1284,27 @@ void Menus::ShowEditMenu(FL_OBJECT * ob, long)
 }
 
 vector<int>::size_type const max_number_of_menus = 32;
+unsigned int const max_number_of_items = 25;
+
+string Limit_string_length(string const & str) {
+       string::size_type const max_item_length = 45;
+
+       if (str.size() > max_item_length)
+               return str.substr(0, max_item_length-3) + "...";
+       else
+               return str;
+}
 
 void Add_to_toc_menu(vector<Buffer::TocItem> const & toclist, 
                     unsigned int from, unsigned int to, int depth,
                     int menu, vector<int> & menus, FL_OBJECT * ob)
 {
-       unsigned int const max_number_of_items = 25;
-       string::size_type const max_item_length = 45;
        if (to - from <= max_number_of_items) {
                for (unsigned int i = from; i < to; ++i) {
                        string entry(4 * max(0, toclist[i].depth - depth),' ');
                        entry += toclist[i].str;
-                       if (entry.size() > max_item_length)
-                               entry = entry.substr(0, max_item_length-3) + "...";
-                       entry += "%x";
-                       entry += tostr(i + 1);
+                       entry = Limit_string_length(entry);
+                       entry += "%x" + tostr(i + 1);
                        fl_addtopup(menu, entry.c_str());
                }
        } else {
@@ -1316,8 +1323,7 @@ void Add_to_toc_menu(vector<Buffer::TocItem> const & toclist,
 
                        string entry(4 * max(0, toclist[pos].depth - depth), ' ');
                        entry += toclist[pos].str;
-                       if (entry.size() > max_item_length)
-                               entry = entry.substr(0, max_item_length-3) + "...";
+                       entry = Limit_string_length(entry);
 
                        if (new_pos == pos + 1) {
                                entry += "%x";
@@ -1372,10 +1378,15 @@ void Menus::ShowTocMenu(FL_OBJECT * ob, long)
                if (!toclist[j].empty()) {
                        int menu2 = fl_newpup(FL_ObjWin(ob));
                        menus.push_back(menu2);
-                       for (unsigned int i = 0; i < toclist[j].size(); ++i)
-                               fl_addtopup(menu2,
-                                           (toclist[j][i].str + "%x"
-                                            + tostr(i+1+j*BIG_NUM)).c_str());
+                       for (unsigned int i = 0; i < toclist[j].size(); ++i) {
+                               if (i > max_number_of_items) {
+                                       fl_addtopup(menu2, ". . .%d");
+                                       break;
+                               }
+                               string entry = Limit_string_length(toclist[j][i].str);
+                               entry += "%x" + tostr(i+1+j*BIG_NUM);
+                               fl_addtopup(menu2, entry.c_str());
+                       }
                        if (j == max_nonempty) {
                                string tmp = _(MenuNames[j-1]);
                                tmp += "%l";
@@ -1437,8 +1448,8 @@ void Add_to_refs_menu(vector<string> const & label_list, int offset,
                                fl_addtopup(menu, ". . .%d");
                                break;
                        }
-                       size_type j = std::min(label_list.size(),
-                                              i+max_number_of_items2);
+                       size_type j = min(label_list.size(),
+                                         i+max_number_of_items2);
 
                        string entry;
                        if (label_list[i].size() > max_item_length2)

diff --git a/src/paragraph.C b/src/paragraph.C
index 11ca5d39a143e758c159d13aa4ac566064fdf1cd..6f1986c8ef4835e994a21de1f58482c188357934 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -4314,7 +4314,8 @@ string LyXParagraph::String(bool label)
                }
        }
 
-       if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+       if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
+           footnoteflag == LyXParagraph::NO_FOOTNOTE)
                s += NextAfterFootnote()->String(false);
 
        if (!IsDummy()) {

diff --git a/src/spellchecker.C b/src/spellchecker.C
index f7536cb74953051a861d64fb70f4eaacde9e8b5a..d44a128e905a182d01db7d47d1bc900ec719adc3 100644 (file)
--- a/src/spellchecker.C
+++ b/src/spellchecker.C
@@ -662,7 +662,7 @@ bool RunSpellChecker(BufferView * bv)
                          "Check /usr/lib/ispell or set another\n"
                          "dictionary in the Spellchecker Options menu."), "", "");
                fclose(out);
-               return true;
+               return false;
        }
 
        // Put ispell in terse mode to improve speed