]> git.lyx.org Git - lyx.git/commitdiff
use more std::functors add some of my own, some change to fl_display etc. read the...
authorLars Gullik Bjønnes <larsbj@gullik.org>
Wed, 11 Oct 2000 21:06:43 +0000 (21:06 +0000)
committerLars Gullik Bjønnes <larsbj@gullik.org>
Wed, 11 Oct 2000 21:06:43 +0000 (21:06 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1102 a592a061-630c-0410-9148-cb99ea01b6c8

73 files changed:
ChangeLog
boost/Makefile.am
config/lyxinclude.m4
po/ChangeLog
po/no.po
src/BufferView_pimpl.C
src/ColorHandler.C
src/FontInfo.C
src/FontLoader.C
src/LColor.C
src/LaTeXFeatures.C
src/LyXAction.C
src/LyXView.C
src/Makefile.am
src/MenuBackend.C
src/Painter.C
src/WorkArea.C
src/bmtable.c
src/buffer.C
src/buffer.h
src/bufferlist.C
src/bufferlist.h
src/bufferview_funcs.C
src/combox.C
src/combox.h
src/commandtags.h
src/debug.C
src/debug.h
src/exporter.C
src/font.C
src/frontends/xforms/FormCitation.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/FormGraphics.C
src/frontends/xforms/FormParagraph.C
src/frontends/xforms/Menubar_pimpl.C
src/frontends/xforms/Toolbar_pimpl.C
src/gettext.C [new file with mode: 0644]
src/gettext.h
src/graphics/GraphicsCacheItem_pimpl.C
src/graphics/Renderer.C
src/graphics/XPM_Renderer.C
src/insets/figinset.C
src/insets/insetexternal.C
src/insets/insettext.C
src/intl.C
src/kbmap.C
src/layout.C
src/lyx_cb.C
src/lyx_gui.C
src/lyx_gui_misc.C
src/lyx_main.C
src/lyxfont.C
src/lyxfunc.C
src/lyxlex_pimpl.C
src/lyxparagraph.h
src/mathed/formula.C
src/mathed/math_parser.C
src/mathed/math_symbols.C
src/minibuffer.C
src/paragraph.C
src/screen.C
src/support/Makefile.am
src/support/StrPool.C
src/support/StrPool.h
src/support/fmt.C [new file with mode: 0644]
src/support/lstrings.C
src/support/lyxfunctional.h [new file with mode: 0644]
src/support/lyxmanip.h
src/support/syscall.C
src/support/translator.h
src/tabular.C
src/tabular.h
src/trans_mgr.C

index 3e18bd538d6256c078b4fd84cd66bcd1412f56d1..6990620b2095db18740c63ea579bb2419a938488 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,137 @@
+2000-10-11  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/support/translator.h: move helper template clsses to
+       lyxfunctional.h, inlcude 2support/lyxfunctional.h"
+
+       * src/support/lyxmanip.h: add delaration of fmt
+
+       * src/support/lyxfunctional.h: new file
+       (class_fun_t): new template class
+       (class_fun): helper template function
+       (back_insert_fun_iterator): new template class
+       (back_inserter_fun): helper template function
+       (compare_memfun_t): new template class
+       (compare_memfun): helper template function
+       (equal_1st_in_pair): moved here from translator
+       (equal_2nd_in_pair): moved here from translatro
+
+       * src/support/fmt.C: new file
+       (fmt): new func, can be used for a printf substute when still
+       using iostreams ex. lyxerr << fmg("Hello %s", "Jürgen") << endl;
+
+       * src/support/StrPool.C: add some comment
+
+       * src/support/Makefile.am (libsupport_la_SOURCES): add fmt.C and
+       lyxfunctional.h
+
+       * src/insets/figinset.C (addpidwait): use std::copy with
+       ostream_iterator to fill the pidwaitlist
+
+       * src/graphics/XPM_Renderer.C (renderImage): use ScreenOfDisplay
+
+       * src/frontends/xforms/Toolbar_pimpl.C (updateLayoutList): remove
+       c_str() 
+
+       * src/frontends/xforms/Menubar_pimpl.C: make several file scope
+       variables static
+
+       * src/frontends/xforms/FormParagraph.C (input): use lyx::atoi
+
+       * src/frontends/xforms/FormDocument.C (build): remove c_str()
+       (class_update): ditto
+       (BulletPanel): ditto
+       (CheckChoiceClass): move initialization of tc and tct
+
+       * src/tabular.C: remove current_view
+       (OldFormatRead): similar to right below [istream::ignore]
+
+       * src/lyxlex_pimpl.C (next): add code for faster skipping of
+       chars, unfortunately this is buggy on gcc 2.95.2, so currently
+       unused [istream::ignore]
+
+       * src/lyxfunc.C: include "support/lyxfunctional.h"
+       (getInsetByCode): use std::find_if and compare_memfun
+
+       * src/lyxfont.C (stateText): remove c_str()
+
+       * src/lyx_main.C (setDebuggingLevel): make static
+       (commandLineHelp): make static
+
+       * src/lyx_gui_misc.C (getScreenDPI): use ScreenOfDisplay to get
+       Screen* together with fl_get_display() and fl_screen
+
+       * src/lyx_gui.C (LyXGUI): use ScreenOfDisplay to get Screen*
+       togheter with fl_get_display() and fl_screen
+       (create_forms): remove c_str()
+
+       * src/layout.C: include "support/lyxfunctional.h"
+       (hasLayout): use std::find_if and compare_memfun
+       (GetLayout): use std::find_if and comapre_memfun
+       (delete_layout): use std::remove_if and compare_memfun
+       (NumberOfClass): use std:.find_if and compare_memfun
+
+       * src/gettext.h: change for the new functions
+
+       * src/gettext.C: new file, make _(char const * str) and _(string
+       const & str) real functions.
+
+       * src/font.C (width): rewrite slightly to avoid one extra variable
+
+       * src/debug.C: initialize Debug::ANY here
+
+       * src/commandtags.h: update number comments
+
+       * src/combox.h (get): make const func
+       (empty): make const
+       (getline): make const
+
+       * src/combox.C (input_cb): handle case where fl_get_input can
+       return NULL
+
+       * src/bufferlist.C: add <functional>, "support/lyxmanip.h",
+       "support/lyxfunctional.h", remove currentview variable.
+       (resize): use std::for_each with std::mem_fun
+       (getFileNames): use std::copy with back_inserter_fun
+       (getBuffer): change arg type to unsigned int
+       (emergencyWriteAll): call emergencyWrite with std::for_each and
+       class_fun.
+       (emergencyWrite): new method, the for loop in emergencyWriteAll
+       has been unrolled.
+       (exists): use std::find_if with compare_memfun
+       (getBuffer): use std::find_if and compare_memfun
+
+       * src/buffer.h: add typedefs for iterator_category, value_type
+       difference_type, pointer and reference for inset_iterator
+       add postfix ++ for inset_iterator
+       make isnet_iterator::getPos() const
+
+       * src/buffer.C: added support/lyxmanip.h
+       (readFile): use lyxerr << fmt instead of printf
+       (makeLaTeXFile): use std::copy to write out encodings
+       
+
+       * src/Painter.C (text): rewrite slightly to avoid extra font variable
+
+       * src/MenuBackend.C (read): remove c_str(), as well as strdup and
+       free and the char * temp.
+       (hasMenu): use std::find_if and compare_memfun
+       (getMenu): ditto
+
+       * src/Makefile.am (lyx_SOURCES): added gettext.C
+
+       * src/LyXAction.C (retrieveActionArg): clear the arg, use
+       string::insert small change to avoid temporary
+
+       * src/LColor.C (getGUIName): remove c_str()
+
+       * several files: change all occurances of fl_display to
+       fl_get_display() 
+
+       * config/lyxinclude.m4 (LYX_PROG_CXX): add a 2.97 clause so
+       that -pedantid is not used for gcc 2.97 (cvs gcc)
+
+       * boost/Makefile.am: begin slowly to prepare for a real boost lib
+
 2000-10-11  Allan Rae  <rae@lyx.org>
 
        * src/frontends/xforms/FormPreferences.C (input): template path must be
index a013476ae906bc2986f223bc799087804ac510c6..6a241be84981bf1dd1afa1aa7281f0fa62ccdc1c 100644 (file)
@@ -1,5 +1,7 @@
+AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES= *.orig *.rej *~ *.bak core
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+# SUBDIRS = libs boost
 ETAGS_ARGS = --lang=c++
 
 EXTRA_DIST = boost libs
index 152bbbe05ed8ebda5d44d51c61d8001ed04709f2..4d2d369467e529b1df015fbd19b739c5d93e4b80 100644 (file)
@@ -205,6 +205,7 @@ dnl Check the version of g++
        case $gxx_version in
            2.95.*) ;;
            2.96*) ;;
+           2.97*) ;;
            *2.91*) ;;
            *) CXXFLAGS="$CXXFLAGS -pedantic";;
         esac
index 9335f6d9ef807efabfb2f2d81c520eefc1e57c03..6f264a22409be97e5497c3a260fa6e0bbeed977c 100644 (file)
@@ -1,3 +1,7 @@
+2000-10-11  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * no.po: update a bit for 1.1.6cvs
+
 2000-10-10  Allan Rae  <rae@lyx.org>
 
        * Makefile.in.in (POTFILES.in): one little tweak to ensure POTFILES.in
index ca01d77aed8022c1e10bbfa5df03584e7c72cc68..443538538ed7c8ed064ad5d39d5aa7fa6fd1e763 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -2,12 +2,19 @@
 # Copyright (C) 1997-1999 LyX Team
 # Lars Gullik Bjønnes <larsbj@lyx.org>, 1999.
 #
-#: src/ext_l10n.h:152
+#: src/ext_l10n.h:171 src/frontends/kde/formindexdialogdata.C:54
+#: src/frontends/kde/formprintdialogdata.C:57
+#: src/frontends/kde/formprintdialogdata.C:103
+#: src/frontends/kde/formprintdialogdata.C:175
+#: src/frontends/kde/formprintdialogdata.C:259
+#: src/frontends/kde/formprintdialogdata.C:285
+#: src/frontends/kde/formprintdialogdata.C:328
+#: src/frontends/kde/formprintdialogdata.C:357
 msgid ""
 msgstr ""
-"Project-Id-Version: lyx 1.1.5\n"
-"POT-Creation-Date: 2000-07-26 12:31+0200\n"
-"PO-Revision-Date: 2000-07-26 12:52+02:00\n"
+"Project-Id-Version: lyx 1.1.6\n"
+"POT-Creation-Date: 2000-10-11 15:04+0200\n"
+"PO-Revision-Date: 2000-10-11 15:40+02:00\n"
 "Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
 "Language-Team: norsk <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,233 +26,189 @@ msgstr ""
 #. or stop loading the file.
 #. I can substitute but I don't see how I can
 #. stop loading... ideas??  ARRae980418
-#: src/buffer.C:503
+#: src/buffer.C:496
 msgid "Textclass Loading Error!"
 msgstr "Tekstklasse lese feil!"
 
-#: src/buffer.C:504
+#: src/buffer.C:497
 msgid "Can't load textclass "
 msgstr "Kan ikke lese tekstklasse "
 
-#: src/buffer.C:506
+#: src/buffer.C:499
 msgid "-- substituting default"
 msgstr "-- erstatter standard verdi"
 
-#: src/buffer.C:1252
+#: src/buffer.C:1051
 #, c-format
 msgid "Warning: need lyxformat %.2f but found %.2f\n"
 msgstr "Advarsel: trenger lyxformat %.2f men fant %.2f\n"
 
-#: src/buffer.C:1256
+#: src/buffer.C:1055
 #, c-format
 msgid "ERROR: need lyxformat %.2f but found %.2f\n"
 msgstr "FEIL: trenger lyxformat %.2f men fant %.2f\n"
 
-#: src/buffer.C:1267
+#: src/buffer.C:1066
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: src/buffer.C:1268
+#: src/buffer.C:1067
 msgid "Reading of document is not complete"
 msgstr "Lesing av dokumentet er ikke fullstendig"
 
-#: src/buffer.C:1269
+#: src/buffer.C:1068
 msgid "Maybe the document is truncated"
 msgstr "Kanskje er dokumentet forkortet"
 
 #. "\\lyxformat" not found
-#: src/buffer.C:1275 src/buffer.C:1282 src/buffer.C:1285
+#: src/buffer.C:1074 src/buffer.C:1081 src/buffer.C:1084
 msgid "ERROR!"
 msgstr "FEIL!"
 
-#: src/buffer.C:1276
+#: src/buffer.C:1075
 msgid "Old LyX file format found. Use LyX 0.10.x to read this!"
 msgstr "Gammelt LyX filformat funnet. Bruk LyX 0.10.x for å lese dette!"
 
-#: src/buffer.C:1282
+#: src/buffer.C:1081
 msgid "Not a LyX file!"
 msgstr "Ikke en LyX fil!"
 
-#: src/buffer.C:1285
+#: src/buffer.C:1084
 msgid "Unable to read file!"
 msgstr "Kan ikke lese filen!"
 
-#: src/buffer.C:1365
-msgid "Could not delete auto-save file!"
-msgstr "Kunne ikke slette autolagre fil!"
-
-#: src/buffer.C:1391 src/buffer.C:1394
+#: src/buffer.C:1178 src/buffer.C:1181
 msgid "Error! Document is read-only: "
-msgstr "Feil! Dokumentet er skrivebeskyttet."
+msgstr "Feil! Dokumentet er skrivebeskyttet"
 
-#: src/buffer.C:1404 src/buffer.C:1407
+#: src/buffer.C:1191 src/buffer.C:1194
 msgid "Error! Cannot write file: "
 msgstr "Feil! Kan ikke skrive til fil: "
 
-#: src/buffer.C:1415 src/buffer.C:1418
+#: src/buffer.C:1202 src/buffer.C:1205
 msgid "Error! Cannot open file: "
 msgstr "Feil! Kan ikke åpne fil: "
 
-#: src/buffer.C:1473
+#: src/buffer.C:1267 src/buffer.C:1679
 msgid "Error: Cannot write file:"
 msgstr "Feil: Kan ikke skrive fil:"
 
-#: src/buffer.C:1817
+#: src/buffer.C:1712
 msgid "Error: Cannot open file: "
 msgstr "Feil: Kan ikke åpne fil: "
 
-#: src/buffer.C:2453 src/buffer.C:3087
+#: src/buffer.C:2323 src/buffer.C:2952
 msgid "LYX_ERROR:"
 msgstr "LYX_FEIL:"
 
-#: src/buffer.C:2453 src/buffer.C:3087
+#: src/buffer.C:2323 src/buffer.C:2952
 msgid "Cannot write file"
 msgstr "Kan ikke skrive fil"
 
-#: src/buffer.C:2540 src/buffer.C:3171
+#: src/buffer.C:2410 src/buffer.C:3036
 msgid "Error : Wrong depth for LatexType Command.\n"
 msgstr "Feil: Gal dybde for LaTeXType kommando.\n"
 
 #. path to LaTeX file
-#: src/buffer.C:3497
-msgid "Running LaTeX..."
-msgstr "Kjører LaTeX..."
-
-#: src/buffer.C:3515
-msgid "LaTeX did not work!"
-msgstr "LaTeX fungerte ikke!"
-
-#: src/buffer.C:3516 src/buffer.C:3583 src/buffer.C:3653
-msgid "Missing log file:"
-msgstr "Mangler logg fil:"
-
-#. no errors or any other things to think about so:
-#: src/buffer.C:3518 src/buffer.C:3527 src/buffer.C:3585 src/buffer.C:3594
-#: src/buffer.C:3655 src/buffer.C:3663 src/combox.C:461
-msgid "Done"
-msgstr "Ferdig"
-
-#. path to Literate file
-#: src/buffer.C:3563
-msgid "Running Literate..."
-msgstr "Kjxrer Literate..."
-
-#: src/buffer.C:3582
-msgid "Literate command did not work!"
-msgstr "Literate kommando fungerte ikke!"
-
-#. path to Literate file
-#: src/buffer.C:3630
-msgid "Building Program..."
-msgstr "Lager programm..."
-
-#: src/buffer.C:3652
-msgid "Build did not work!"
-msgstr "Build did not work!"
-
-#. path to LaTeX file
-#: src/buffer.C:3700
+#: src/buffer.C:3348
 msgid "Running chktex..."
 msgstr "Kjører chktex..."
 
-#: src/buffer.C:3713
+#: src/buffer.C:3361
 msgid "chktex did not work!"
 msgstr "chktex fungerte ikke!"
 
-#: src/buffer.C:3714
+#: src/buffer.C:3362
 msgid "Could not run with file:"
 msgstr "Kunne ikke kjøre filen:"
 
-#: src/bufferlist.C:100 src/bufferlist.C:161 src/lyxvc.C:91 src/lyxvc.C:124
+#: src/bufferlist.C:109 src/bufferlist.C:185 src/lyxvc.C:91 src/lyxvc.C:124
 #: src/lyxvc.C:154
 msgid "Changes in document:"
 msgstr "Dokumentet er endret:"
 
-#: src/bufferlist.C:103 src/bufferlist.C:163
+#: src/bufferlist.C:111 src/bufferlist.C:187
 msgid "Save document?"
 msgstr "Lagre dokument?"
 
-#: src/bufferlist.C:120
+#: src/bufferlist.C:139
 msgid "Some documents were not saved:"
 msgstr "Noen dokumenter er ikke lagret:"
 
-#: src/bufferlist.C:121
+#: src/bufferlist.C:140
 msgid "Exit anyway?"
 msgstr "Vil du avslutte likevel?"
 
-#: src/bufferlist.C:247
-msgid "lyx: Attempting to save document "
-msgstr "LyX: Forsøker å lagre dokument "
-
-#: src/bufferlist.C:250
-msgid " as..."
-msgstr " som..."
+#: src/bufferlist.C:287
+#, c-format
+msgid "lyx: Attempting to save document %s as..."
+msgstr "LyX: Forsøker å lagre dokument %s som..."
 
-#: src/bufferlist.C:276
+#: src/bufferlist.C:325 src/bufferlist.C:344 src/bufferlist.C:357
+#: src/bufferlist.C:371
 msgid "  Save seems successful. Phew."
 msgstr "  Lagring trolig en suksess. Puh."
 
-#: src/bufferlist.C:280
+#: src/bufferlist.C:328 src/bufferlist.C:347 src/bufferlist.C:361
 msgid "  Save failed! Trying..."
 msgstr "  Lagring feilet! Prøver..."
 
-#: src/bufferlist.C:283
+#: src/bufferlist.C:330 src/bufferlist.C:374
 msgid "  Save failed! Bummer. Document is lost."
 msgstr "  Lagring feilet! Æsj. Mistet dokumentet."
 
-#: src/bufferlist.C:312
+#: src/bufferlist.C:399
 msgid "An emergency save of this document exists!"
 msgstr "En nødlagret versjon av dette dokumentet eksisterer!"
 
-#: src/bufferlist.C:314
+#: src/bufferlist.C:401
 msgid "Try to load that instead?"
 msgstr "Skal denne leses isteden?"
 
-#: src/bufferlist.C:336
+#: src/bufferlist.C:423
 msgid "Autosave file is newer."
 msgstr "Autolagret fil er nyere."
 
-#: src/bufferlist.C:338
+#: src/bufferlist.C:425
 msgid "Load that one instead?"
 msgstr "Les den isteden?"
 
-#: src/BufferView2.C:61 src/BufferView2.C:71 src/bufferlist.C:411
-#: src/lyx_cb.C:370 src/lyx_cb.C:732 src/lyx_cb.C:758
-#: src/lyx_sendfax_main.C:264 src/menus.C:2177
+#: src/BufferView2.C:61 src/BufferView2.C:71 src/bufferlist.C:492
+#: src/lyx_cb.C:320 src/lyx_sendfax_main.C:251
 msgid "Error!"
 msgstr "Feil!"
 
-#: src/bufferlist.C:411
+#: src/bufferlist.C:492
 msgid "Unable to open template"
 msgstr "Kan ikke åpne mal"
 
-#: src/bufferlist.C:435 src/lyxfunc.C:2907 src/lyxfunc.C:3059
+#: src/bufferlist.C:518 src/lyxfunc.C:3103 src/lyxfunc.C:3266
 msgid "Document is already open:"
 msgstr "Dokumentet er allerede åpent:"
 
-#: src/bufferlist.C:437
+#: src/bufferlist.C:520
 msgid "Do you want to reload that document?"
 msgstr "Ønsker du å reåpne dokumentet?"
 
-#: src/bufferlist.C:455
+#: src/bufferlist.C:538
 msgid "File `"
 msgstr "Fil `"
 
-#: src/bufferlist.C:456
+#: src/bufferlist.C:539
 msgid "' is read-only."
 msgstr "' er skrivebeskyttet."
 
 #. Ask if the file should be checked out for
 #. viewing/editing, if so: load it.
-#: src/bufferlist.C:471
+#: src/bufferlist.C:554
 msgid "Do you want to retrieve file under version control?"
 msgstr "Vil du hente in filen som er under versionskontroll?"
 
-#: src/bufferlist.C:479
+#: src/bufferlist.C:562
 msgid "Cannot open specified file:"
 msgstr "Kan ikke åpne valgt fil:"
 
-#: src/bufferlist.C:481
+#: src/bufferlist.C:564
 msgid "Create new document with this name?"
 msgstr "Skal det lages ett nytt dokument med dette navnet?"
 
@@ -257,239 +220,111 @@ msgstr "Den spesifiserte file er ulesbar: "
 msgid "Cannot open specified file: "
 msgstr "Kan ikke åpne valgt fil: "
 
-#: src/BufferView2.C:212 src/insets/insetert.C:65
-#: src/insets/insettabular.C:1246 src/lyx_cb.C:2645 src/text.C:2410
-msgid "Impossible Operation!"
-msgstr "Umulig operasjon!"
-
-#: src/BufferView2.C:213
-msgid "Cannot insert table/list in table."
-msgstr "Kan ikke sette inn tabell/liste i tabell."
-
-#: src/BufferView2.C:214 src/CutAndPaste.C:521 src/CutAndPaste.C:532
-#: src/insets/insetert.C:67 src/insets/insettabular.C:1248
-#: src/insets/insettext.C:836 src/lyx_cb.C:2647 src/text.C:2412
-#: src/text.C:5004 src/text.C:5012 src/text.C:5028 src/text.C:5045
-msgid "Sorry."
-msgstr "Beklager."
-
-#: src/BufferView2.C:422 src/BufferView2.C:436
+#: src/BufferView2.C:401 src/BufferView2.C:415
 msgid "Open/Close..."
 msgstr "Åpne/Lukk..."
 
-#: src/BufferView2.C:450 src/LyXAction.C:396
+#: src/BufferView2.C:429 src/LyXAction.C:394
 msgid "Undo"
 msgstr "Angre"
 
-#: src/BufferView2.C:455
+#: src/BufferView2.C:434
 msgid "No further undo information"
 msgstr "Ikke mer \"Angre\" informasjon"
 
-#: src/BufferView2.C:466
+#: src/BufferView2.C:445
 msgid "Redo not yet supported in math mode"
 msgstr "\"Gjør om\" er ennå ikke støttet i matte modus"
 
-#: src/BufferView2.C:471 src/LyXAction.C:352
+#: src/BufferView2.C:450 src/LyXAction.C:348
 msgid "Redo"
 msgstr "Gjør om"
 
-#: src/BufferView2.C:476
+#: src/BufferView2.C:455
 msgid "No further redo information"
 msgstr "Ikke mer \"Gjør om\" informasjon"
 
-#: src/BufferView2.C:573
+#: src/BufferView2.C:552
 msgid "Paragraph environment type copied"
 msgstr "Avsnittsomgivelse kopiert"
 
-#: src/BufferView2.C:582
+#: src/BufferView2.C:561
 msgid "Paragraph environment type set"
 msgstr "Avsnittsomgivelse satt"
 
-#: src/BufferView2.C:596 src/LyXAction.C:173 src/MenuBackend.C:231
+#: src/BufferView2.C:575 src/LyXAction.C:166 src/MenuBackend.C:363
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/BufferView2.C:607 src/LyXAction.C:174 src/MenuBackend.C:230
+#: src/BufferView2.C:586 src/LyXAction.C:167 src/MenuBackend.C:362
 msgid "Cut"
 msgstr "Klipp"
 
-#: src/BufferView2.C:616 src/LyXAction.C:343 src/MenuBackend.C:232
+#: src/BufferView2.C:595 src/LyXAction.C:337 src/MenuBackend.C:364
 msgid "Paste"
 msgstr "Lim inn"
 
-#: src/BufferView2.C:651 src/BufferView2.C:655
+#: src/BufferView2.C:630 src/BufferView2.C:634
 msgid "No more notes"
 msgstr "Ingen flere notiser"
 
-#: src/bufferview_funcs.C:40
+#: src/bufferview_funcs.C:39
 msgid "Inserting Footnote..."
 msgstr "Setter inn fotnote..."
 
-#: src/bufferview_funcs.C:77
+#: src/bufferview_funcs.C:76
 msgid "Inserting margin note..."
 msgstr "Setter inn note i margen..."
 
-#: src/bufferview_funcs.C:95
+#: src/bufferview_funcs.C:100
 msgid "Error! unknown language"
 msgstr "Feil! Ukjent språk"
 
-#: src/LyXAction.C:327 src/bufferview_funcs.C:104
+#: src/LyXAction.C:319 src/bufferview_funcs.C:109
 msgid "Melt"
 msgstr "Smelt"
 
-#: src/bufferview_funcs.C:137
+#: src/bufferview_funcs.C:142
 msgid "Changed environment depth (in possible range, maybe not)"
 msgstr "Endret omgivelsesdybde (kanskje mulig, kanskje ikke)"
 
-#: src/bufferview_funcs.C:263
+#: src/bufferview_funcs.C:270
 msgid "Font: "
 msgstr "Font: "
 
-#: src/bufferview_funcs.C:267
+#: src/bufferview_funcs.C:274
 msgid ", Depth: "
 msgstr ", Dybde: "
 
-#: src/bufferview_funcs.C:273
+#: src/bufferview_funcs.C:280
 msgid ", Spacing: "
 msgstr ", Linjeavstand: "
 
-#: src/bufferview_funcs.C:276
+#: src/bufferview_funcs.C:283
 msgid "Single"
 msgstr "Enkel"
 
-#: src/bufferview_funcs.C:279
+#: src/bufferview_funcs.C:286
 msgid "Onehalf"
 msgstr "Halvannen"
 
-#: src/bufferview_funcs.C:282
+#: src/bufferview_funcs.C:289
 msgid "Double"
 msgstr "Dobbel"
 
-#: src/bufferview_funcs.C:285
+#: src/bufferview_funcs.C:292
 msgid "Other ("
 msgstr "Annet ("
 
-#: src/BufferView_pimpl.C:236
+#: src/BufferView_pimpl.C:250
 msgid "Formatting document..."
 msgstr "Formaterer dokument..."
 
-#: src/BufferView_pimpl.C:320 src/BufferView_pimpl.C:324
+#: src/BufferView_pimpl.C:334 src/BufferView_pimpl.C:338
 msgid "No more errors"
 msgstr "Ingen flere feil"
 
-#: src/bullet_forms.C:37
-msgid "Size|#z"
-msgstr "Størrelse|#S"
-
-#: src/bullet_forms.C:42 src/credits_form.C:19 src/form1.C:43 src/form1.C:117
-#: src/form1.C:261 src/form1.C:284 src/frontends/xforms/form_citation.C:52
-#: src/frontends/xforms/form_copyright.C:30
-#: src/frontends/xforms/form_print.C:47
-#: src/frontends/xforms/form_tabular.C:311 src/insets/form_graphics.C:62
-#: src/insets/insetbib.C:57 src/insets/insetinclude.C:51
-#: src/insets/insetindex.C:43 src/layout_forms.C:72 src/layout_forms.C:282
-#: src/layout_forms.C:418 src/layout_forms.C:482 src/layout_forms.C:702
-#: src/lyx.C:47 src/lyx.C:95 src/lyx.C:243 src/mathed/math_forms.C:109
-#: src/print_form.C:28 src/sp_form.C:38
-msgid "OK"
-msgstr "OK"
-
-#: src/bullet_forms.C:45 src/form1.C:114 src/form1.C:287
-#: src/frontends/xforms/form_print.C:50
-#: src/frontends/xforms/form_tabular.C:314 src/insets/form_graphics.C:56
-#: src/insets/form_graphics.C:57 src/layout_forms.C:68 src/layout_forms.C:236
-#: src/layout_forms.C:286 src/layout_forms.C:392 src/layout_forms.C:421
-#: src/layout_forms.C:479 src/layout_forms.C:706 src/lyx.C:50 src/lyx.C:99
-#: src/lyx_sendfax.C:39 src/mathed/math_forms.C:106
-#: src/mathed/math_forms.C:156 src/mathed/math_forms.C:201 src/print_form.C:31
-#: src/sp_form.C:62
-msgid "Apply|#A"
-msgstr "Bruk|#B"
-
-#: src/bullet_forms.C:48 src/form1.C:120 src/form1.C:264 src/form1.C:290
-#: src/frontends/xforms/form_print.C:53
-#: src/frontends/xforms/form_tabular.C:317 src/insets/form_graphics.C:68
-#: src/insets/form_graphics.C:69 src/insets/insetbib.C:60
-#: src/insets/insetbib.C:61 src/insets/insetinclude.C:54
-#: src/insets/insetinclude.C:55 src/insets/insetindex.C:47
-#: src/insets/insetindex.C:48 src/layout_forms.C:64 src/layout_forms.C:290
-#: src/layout_forms.C:396 src/layout_forms.C:424 src/layout_forms.C:476
-#: src/layout_forms.C:710 src/lyx.C:53 src/lyx.C:103 src/lyx_gui_misc.C:415
-#: src/lyx_gui_misc.C:419 src/lyx_gui_misc.C:426 src/lyx_sendfax.C:35
-#: src/mathed/math_forms.C:100 src/mathed/math_forms.C:130
-#: src/mathed/math_forms.C:198 src/print_form.C:34 src/sp_form.C:42
-msgid "Cancel|^["
-msgstr "Avbryt|^["
-
-#: src/bullet_forms.C:51
-msgid "LaTeX|#L"
-msgstr "LaTeX|#L"
-
-#: src/bullet_forms.C:59
-msgid "1|#1"
-msgstr "1|#1"
-
-#: src/bullet_forms.C:63
-msgid "2|#2"
-msgstr "2|#2"
-
-#: src/bullet_forms.C:66
-msgid "3|#3"
-msgstr "3|#3"
-
-#: src/bullet_forms.C:69
-msgid "4|#4"
-msgstr "4|#4"
-
-#: src/bullet_forms.C:74
-msgid "Bullet Depth"
-msgstr "Bombe dybde"
-
-#: src/bullet_forms.C:79
-msgid "Standard|#S"
-msgstr "Standard|#t"
-
-#: src/bullet_forms.C:84
-msgid "Maths|#M"
-msgstr "Matte|#M"
-
-#: src/bullet_forms.C:88
-msgid "Ding 2|#i"
-msgstr "Ding 2|#i"
-
-#: src/bullet_forms.C:92
-msgid "Ding 3|#n"
-msgstr "Ding 3|#n"
-
-#: src/bullet_forms.C:96
-msgid "Ding 4|#g"
-msgstr "Ding 4|#g"
-
-#: src/bullet_forms.C:100
-msgid "Ding 1|#D"
-msgstr "Ding 1|#D"
-
-#: src/bullet_forms_cb.C:27
-msgid "Sorry, your libXpm is too old."
-msgstr "Beklager, libXpm biblioteket ditt er for gammelt."
-
-#: src/bullet_forms_cb.C:28
-msgid "This feature requires xpm-4.7 (a.k.a 3.4g) or newer."
-msgstr "Denne funksjonen krever xpm-4.7 (alias 3.4g) eller nyere."
-
-#: src/bullet_forms_cb.C:34
-msgid ""
-" default | tiny | script | footnote | small | normal | large | Large | LARGE "
-"| huge | Huge"
-msgstr ""
-"standad | bitteliten | minst | mindre | liten | normal | stor | større | "
-"størst | enorm | gigantisk"
-
-#: src/bullet_forms_cb.C:49
-msgid "Itemize Bullet Selection"
-msgstr "Symbolvalg for unummererte lister"
-
-#: src/Chktex.C:80
+#: src/Chktex.C:79
 msgid "ChkTeX warning id #"
 msgstr "ChkTeX advarsel id #"
 
@@ -545,6 +380,82 @@ msgstr "Pixel ["
 msgid "] is used."
 msgstr "] er brukt."
 
+#: src/combox.C:468
+msgid "Done"
+msgstr "Ferdig"
+
+#: src/converter.C:109 src/converter.C:136
+msgid "Can not view file"
+msgstr "Kan ikke vise fil"
+
+#: src/converter.C:110
+msgid "No information for viewing "
+msgstr "Ingen informasjon om visning "
+
+#: src/converter.C:129 src/converter.C:384
+msgid "Executing command:"
+msgstr "Eksekverer kommando:"
+
+#: src/converter.C:137
+msgid "Error while executing"
+msgstr "Feil under kjøring"
+
+#: src/converter.C:248
+msgid " (using "
+msgstr " (bruker "
+
+#: src/converter.C:292 src/converter.C:317 src/converter.C:409
+msgid "Can not convert file"
+msgstr "Kan ikke konvertere fil"
+
+#: src/converter.C:318
+msgid "No information for converting from "
+msgstr "Ingen informasjon om konvertering fra "
+
+#: src/CutAndPaste.C:449 src/CutAndPaste.C:452 src/converter.C:319
+msgid " to "
+msgstr " til "
+
+#: src/converter.C:406
+msgid "There were errors during the Build process."
+msgstr "Det ble rapportert feil under kjøring av 'Build' prosessen."
+
+#: src/converter.C:407 src/converter.C:486 src/converter.C:548
+msgid "You should try to fix them."
+msgstr "Du burde forsøke å fikse dem."
+
+#: src/converter.C:481 src/converter.C:543
+msgid "One error detected"
+msgstr "En feil oppdaget"
+
+#: src/converter.C:482 src/converter.C:544
+msgid "You should try to fix it."
+msgstr "Du burde forsøke å fikse den."
+
+#: src/converter.C:485 src/converter.C:547
+msgid " errors detected."
+msgstr " feil oppdaget."
+
+#: src/converter.C:490
+msgid "There were errors during running of "
+msgstr "Det ble rapportert feil under kjøring av "
+
+#: src/converter.C:506
+msgid "Running LaTeX..."
+msgstr "Kjører LaTeX..."
+
+#: src/converter.C:536
+msgid "LaTeX did not work!"
+msgstr "LaTeX fungerte ikke!"
+
+#: src/converter.C:537
+msgid "Missing log file:"
+msgstr "Mangler logg fil:"
+
+#: src/converter.C:550
+msgid "There were errors during the LaTeX run."
+msgstr "Det ble rapportert feil under kjøring av LaTeX."
+
 #: src/credits.C:54
 msgid "ERROR: LyX wasn't able to read CREDITS file"
 msgstr "FEIL! LyX Kunne ikke lese filen med Kreditteringer"
@@ -561,6 +472,20 @@ msgstr "alt arbeidet som har blitt lagt ned i Lyx prosjektet."
 msgid "Credits"
 msgstr "Kreditteringer"
 
+#: src/credits_form.C:19 src/form1.C:43 src/form1.C:117 src/form1.C:261
+#: src/frontends/xforms/form_citation.C:59
+#: src/frontends/xforms/form_copyright.C:37
+#: src/frontends/xforms/form_document.C:40
+#: src/frontends/xforms/form_index.C:37
+#: src/frontends/xforms/form_paragraph.C:251
+#: src/frontends/xforms/form_print.C:56 src/frontends/xforms/form_ref.C:54
+#: src/frontends/xforms/form_tabular.C:383 src/frontends/xforms/form_url.C:48
+#: src/insets/form_graphics.C:62 src/insets/insetbib.C:56
+#: src/insets/insetinclude.C:52 src/lyx.C:47 src/lyx.C:105
+#: src/mathed/math_forms.C:109 src/print_form.C:28 src/sp_form.C:38
+msgid "OK"
+msgstr "OK"
+
 #: src/credits_form.C:24
 msgid "Matthias"
 msgstr "Matthias"
@@ -569,15 +494,11 @@ msgstr "Matthias"
 msgid "All these people have contributed to the LyX project. Thanks,"
 msgstr "Alle disse menneskene har bidratt til LyX prosjektet. Takk,"
 
-#: src/CutAndPaste.C:490
+#: src/CutAndPaste.C:448
 msgid "Layout had to be changed from\n"
 msgstr "Stil måtte endres fra\n"
 
-#: src/CutAndPaste.C:491 src/CutAndPaste.C:494
-msgid " to "
-msgstr " til "
-
-#: src/CutAndPaste.C:493
+#: src/CutAndPaste.C:451
 msgid ""
 "\n"
 "because of class conversion from\n"
@@ -585,1987 +506,2090 @@ msgstr ""
 "\n"
 "grunnet klasse endring fra\n"
 
-#: src/CutAndPaste.C:519 src/CutAndPaste.C:530 src/insets/insettext.C:834
-#: src/text.C:5002 src/text.C:5010 src/text.C:5028 src/text.C:5043
-#: src/text2.C:2210 src/text2.C:2223 src/text2.C:2335 src/text2.C:2349
+#: src/CutAndPaste.C:477 src/insets/insettext.C:909 src/text.C:3898
+#: src/text.C:3906 src/text.C:3933 src/text2.C:2198 src/text2.C:2311
 msgid "Impossible operation"
 msgstr "Umulig operasjon"
 
-#: src/CutAndPaste.C:520
+#: src/CutAndPaste.C:478
 msgid "Can't paste float into float!"
 msgstr "Kan ikke lime inn float i float!"
 
-#: src/CutAndPaste.C:531
-msgid "Table cell cannot include more than one paragraph!"
-msgstr "En tabell celle kan ikke inkludere med enn ett avsnitt!"
+#: src/CutAndPaste.C:479 src/insets/insetert.C:67
+#: src/insets/insettabular.C:1478 src/insets/insettext.C:911 src/text.C:3900
+#: src/text.C:3908 src/text.C:3935
+msgid "Sorry."
+msgstr "Beklager."
+
+#: src/exporter.C:67
+msgid "Document exported as "
+msgstr "Dokumentet eksportert som "
 
-#: src/MenuBackend.C:242 src/MenuBackend.C:249 src/ext_l10n.h:1
-#: src/ext_l10n.h:9
+#: src/exporter.C:69
+msgid " to file `"
+msgstr "til fil `"
+
+#: src/MenuBackend.C:374 src/MenuBackend.C:381 src/ext_l10n.h:1
+#: src/ext_l10n.h:11
 msgid "File|F"
 msgstr "Fil|F"
 
-#: src/MenuBackend.C:243 src/ext_l10n.h:2
+#: src/MenuBackend.C:375 src/ext_l10n.h:2
 msgid "Edit|E"
 msgstr "Rediger|R"
 
 #: src/ext_l10n.h:3
+msgid "Toc|T"
+msgstr "Toc|T"
+
+#: src/ext_l10n.h:4
+msgid "Refs|R"
+msgstr "Refs|R"
+
+#: src/ext_l10n.h:5
 msgid "Layout|L"
 msgstr "Stil|S"
 
-#: src/ext_l10n.h:4
+#: src/ext_l10n.h:6
 msgid "Insert|I"
 msgstr "Sett inn|S"
 
-#: src/ext_l10n.h:5
-msgid "Math|M"
-msgstr "Matte|M"
+#: src/ext_l10n.h:7
+msgid "Math|a"
+msgstr "Matte|a"
 
-#: src/ext_l10n.h:6 src/ext_l10n.h:10
+#: src/ext_l10n.h:8 src/ext_l10n.h:12
 msgid "Options|O"
 msgstr "Opsjoner|O"
 
-#: src/MenuBackend.C:245 src/ext_l10n.h:7
+#: src/MenuBackend.C:377 src/ext_l10n.h:9
 msgid "Documents|D"
 msgstr "Dokumenter|D"
 
-#: src/ext_l10n.h:8 src/ext_l10n.h:11
+#: src/ext_l10n.h:10 src/ext_l10n.h:13
 msgid "Help|H"
 msgstr "Hjelp|H"
 
-#: src/MenuBackend.C:212 src/ext_l10n.h:12 src/ext_l10n.h:29
+#: src/MenuBackend.C:344 src/ext_l10n.h:14 src/ext_l10n.h:33
 msgid "New...|N"
 msgstr "Ny...|N"
 
-#: src/ext_l10n.h:13 src/ext_l10n.h:30
+#: src/ext_l10n.h:15 src/ext_l10n.h:34
 msgid "New from template|t"
 msgstr "Ny med mal|m"
 
-#: src/MenuBackend.C:213 src/ext_l10n.h:14 src/ext_l10n.h:31
+#: src/MenuBackend.C:345 src/ext_l10n.h:16 src/ext_l10n.h:35
 msgid "Open...|O"
 msgstr "Åpne...|p"
 
-#: src/ext_l10n.h:15
+#: src/ext_l10n.h:17
 msgid "Close|C"
 msgstr "Lukk|L"
 
-#: src/ext_l10n.h:16
+#: src/ext_l10n.h:18
 msgid "Save|S"
 msgstr "Lagre|a"
 
-#: src/ext_l10n.h:17
+#: src/ext_l10n.h:19
 msgid "Save As|A"
 msgstr "Lagre som|s"
 
-#: src/ext_l10n.h:18
+#: src/ext_l10n.h:20
 msgid "Revert to saved|R"
 msgstr "Tilbake til sist lagret|T"
 
-#: src/ext_l10n.h:19
+#: src/ext_l10n.h:21
 msgid "View dvi|d"
 msgstr "Se på dvi|d"
 
-#: src/ext_l10n.h:20
+#: src/ext_l10n.h:22
 msgid "View Postscript|w"
 msgstr "Se på PostScript|P"
 
-#: src/ext_l10n.h:21
+#: src/LyXAction.C:151 src/ext_l10n.h:23
+msgid "View"
+msgstr "Vis"
+
+#: src/ext_l10n.h:24
 msgid "Update dvi|v"
 msgstr "Oppdater dvi|O"
 
-#: src/ext_l10n.h:22
-msgid "Update Postscript|u"
-msgstr "Oppdater PostScript|p"
+#: src/ext_l10n.h:25
+msgid "Update Postscript|U"
+msgstr "Oppdater PostScript|O"
+
+#: src/LyXAction.C:150 src/ext_l10n.h:26 src/frontends/xforms/form_ref.C:32
+#: src/frontends/xforms/form_toc.C:35
+msgid "Update"
+msgstr "Oppdater"
 
-#: src/ext_l10n.h:23
+#: src/ext_l10n.h:27
 msgid "Build program|B"
 msgstr "Lag programm|o"
 
-#: src/ext_l10n.h:24
+#: src/ext_l10n.h:28
 msgid "Print...|P"
 msgstr "Skriv...|S"
 
-#: src/ext_l10n.h:25
+#: src/ext_l10n.h:29
 msgid "Fax...|F"
 msgstr "Faks...|F"
 
-#: src/MenuBackend.C:214 src/ext_l10n.h:26 src/ext_l10n.h:32
+#: src/MenuBackend.C:346 src/ext_l10n.h:30 src/ext_l10n.h:36
 msgid "Import|I"
 msgstr "Importer|I"
 
-#: src/ext_l10n.h:27
+#: src/ext_l10n.h:31
 msgid "Export|E"
 msgstr "Eksporter|E"
 
-#: src/ext_l10n.h:28 src/ext_l10n.h:33
+#: src/ext_l10n.h:32 src/ext_l10n.h:37
 msgid "Exit|x"
 msgstr "Avslutt|A"
 
-#: src/ext_l10n.h:34
+#: src/ext_l10n.h:38
 msgid "LaTeX|L"
 msgstr "LaTeX|L"
 
-#: src/ext_l10n.h:35
+#: src/ext_l10n.h:39
 msgid "Ascii text as lines|A"
 msgstr "Ascii tekst som linjer|A"
 
-#: src/ext_l10n.h:36
+#: src/ext_l10n.h:40
 msgid "Ascii text as paragraphs|p"
 msgstr "Ascii tekst som avsnitt|a"
 
-#: src/ext_l10n.h:37
+#: src/ext_l10n.h:41
 msgid "Noweb|N"
 msgstr "Noweb|N"
 
-#: src/ext_l10n.h:38
+#: src/ext_l10n.h:42
 msgid "as LaTeX|L"
 msgstr "sombLaTeX|L"
 
-#: src/ext_l10n.h:39
+#: src/ext_l10n.h:43
 msgid "as LinuxDoc|L"
 msgstr "som LinuxDoc|L"
 
-#: src/ext_l10n.h:40
+#: src/ext_l10n.h:44
 msgid "as DocBook|B"
 msgstr "som DocBook|B"
 
-#: src/ext_l10n.h:41
+#: src/ext_l10n.h:45
 msgid "as DVI|D"
 msgstr "som DVI|D"
 
-#: src/ext_l10n.h:42
+#: src/ext_l10n.h:46
 msgid "as Postscript|P"
 msgstr "som PostScript|P"
 
-#: src/ext_l10n.h:43
+#: src/ext_l10n.h:47
 msgid "as Ascii|A"
 msgstr "som Ascii|A"
 
-#: src/ext_l10n.h:44 src/ext_l10n.h:45 src/ext_l10n.h:46
+#: src/ext_l10n.h:48
 msgid "as HTML|H"
 msgstr "som HTML|H"
 
-#: src/ext_l10n.h:47
+#: src/ext_l10n.h:49
 msgid "Custom...|C"
 msgstr "Brukerdefinert|u"
 
-#: src/ext_l10n.h:48
+#: src/ext_l10n.h:50
 msgid "Undo|U"
 msgstr "Angre|A"
 
-#: src/ext_l10n.h:49
+#: src/ext_l10n.h:51
 msgid "Redo|R"
 msgstr "Gjør om|G"
 
-#: src/ext_l10n.h:50
+#: src/ext_l10n.h:52
 msgid "Cut|C"
 msgstr "Klipp|K"
 
-#: src/ext_l10n.h:51
+#: src/ext_l10n.h:53
 msgid "Copy|o"
 msgstr "Kopier|o"
 
-#: src/ext_l10n.h:52
+#: src/ext_l10n.h:54
 msgid "Paste|P"
 msgstr "Lim inn|L"
 
-#: src/ext_l10n.h:53
+#: src/ext_l10n.h:55
 msgid "Find & Replace...|F"
 msgstr "Finn & Erstatt...|F"
 
-#: src/ext_l10n.h:54
+#: src/ext_l10n.h:56
 msgid "Go to Error|E"
 msgstr "Gå til neste feil|G"
 
-#: src/ext_l10n.h:55
+#: src/ext_l10n.h:57
 msgid "Go to Note|N"
 msgstr "Gå til notis|n"
 
-#: src/ext_l10n.h:56
+#: src/ext_l10n.h:58
 msgid "Floats & Insets|I"
 msgstr "Floats & Insets|I"
 
-#: src/ext_l10n.h:57
-msgid "Table"
+#: src/ext_l10n.h:59 src/frontends/xforms/FormTabular.C:81
+msgid "Tabular"
 msgstr "Tabell"
 
-#: src/ext_l10n.h:58
+#: src/ext_l10n.h:60
 msgid "Spellchecker...|S"
 msgstr "Stavekontroll...|S"
 
-#: src/ext_l10n.h:59
+#: src/ext_l10n.h:61
 msgid "Check TeX|h"
 msgstr "Sjekk TeX|j"
 
-#: src/ext_l10n.h:60
+#: src/ext_l10n.h:62
 msgid "Table of Contents|b"
 msgstr "Innholdsfortegnelse|h"
 
-#: src/ext_l10n.h:61
+#: src/ext_l10n.h:63
 msgid "Version control"
 msgstr "Versjonskontroll"
 
-#: src/ext_l10n.h:62
+#: src/ext_l10n.h:64
 msgid "View LaTeX log file|w"
 msgstr "Vis LaTeX Logg|V"
 
-#: src/ext_l10n.h:63
+#: src/ext_l10n.h:65
 msgid "Paste primary selection"
 msgstr "Lim inn primær merking"
 
-#: src/ext_l10n.h:64
-msgid "as Lines|L"
-msgstr "som linjer|l"
-
-#: src/ext_l10n.h:65
-msgid "as Paragraphs|g"
-msgstr "som avsnitt|a"
-
 #: src/ext_l10n.h:66
-msgid "Register|R"
-msgstr "Registrer|R"
+msgid "Multicolumn|M"
+msgstr "Multikolonne|M"
 
 #: src/ext_l10n.h:67
-msgid "Check In Changes|I"
-msgstr "Sjekk inn endringer|i"
+msgid "Line Top|T"
+msgstr "Topp linje|T"
 
 #: src/ext_l10n.h:68
-msgid "Check Out for Edit|O"
-msgstr "Sjekk ut for endring|u"
+msgid "Line Bottom|B"
+msgstr "Bunn linje|B"
 
 #: src/ext_l10n.h:69
-msgid "Revert to last version|l"
-msgstr "Tilbake til siste versjon|s"
+msgid "Line Left|L"
+msgstr "Venstre|V"
 
 #: src/ext_l10n.h:70
-msgid "Undo last check in|U"
-msgstr "Angre siste innsjekking|A"
+msgid "Line Right|R"
+msgstr "Høyre|H"
 
 #: src/ext_l10n.h:71
-msgid "Show History|H"
-msgstr "Vis Historie|H"
+msgid "Align Left|e"
+msgstr "Venstrejustert|e"
 
 #: src/ext_l10n.h:72
-msgid "Character...|C"
-msgstr "Tegnsett...|T"
+msgid "Align Center|C"
+msgstr "Midtjustert|M"
 
 #: src/ext_l10n.h:73
-msgid "Paragraph...|P"
-msgstr "Avsnitt...|A"
+msgid "Align Right|i"
+msgstr "Høyrejustert|y"
 
 #: src/ext_l10n.h:74
-msgid "Paper...|a"
-msgstr "Ark...|A"
+msgid "V.Align Top|o"
+msgstr "V. justering topp|o"
 
 #: src/ext_l10n.h:75
-msgid "Document...|D"
-msgstr "Dokumentet...|D"
+msgid "V.Align Center|n"
+msgstr "V. justering midt|n"
 
-#: src/ext_l10n.h:76 src/ext_l10n.h:87
-msgid "Table...|T"
-msgstr "Tabell...|T"
+#: src/ext_l10n.h:76
+msgid "V.Align Bottom|v"
+msgstr "V. justering bunn|u"
 
 #: src/ext_l10n.h:77
-msgid "Quotes...|Q"
-msgstr "Sitattegn...|S"
+msgid "Append Row|A"
+msgstr "Legg til rad|L"
 
 #: src/ext_l10n.h:78
-msgid "Emphasize Style|E"
-msgstr "Uthevet stil|U"
+msgid "Append Column|u"
+msgstr "Legg til kolonne|k"
 
 #: src/ext_l10n.h:79
-msgid "Noun Style|N"
-msgstr "Substantiv stil|S"
+msgid "Delete Row|w"
+msgstr "Slett rad|l"
 
 #: src/ext_l10n.h:80
+msgid "Delete Column|D"
+msgstr "Slett kolonne|S"
+
+#: src/ext_l10n.h:81
+msgid "as Lines|L"
+msgstr "som linjer|l"
+
+#: src/ext_l10n.h:82
+msgid "as Paragraphs|g"
+msgstr "som avsnitt|a"
+
+#: src/ext_l10n.h:83
+msgid "Register|R"
+msgstr "Registrer|R"
+
+#: src/ext_l10n.h:84
+msgid "Check In Changes|I"
+msgstr "Sjekk inn endringer|i"
+
+#: src/ext_l10n.h:85
+msgid "Check Out for Edit|O"
+msgstr "Sjekk ut for endring|u"
+
+#: src/ext_l10n.h:86
+msgid "Revert to last version|l"
+msgstr "Tilbake til siste versjon|s"
+
+#: src/ext_l10n.h:87
+msgid "Undo last check in|U"
+msgstr "Angre siste innsjekking|A"
+
+#: src/ext_l10n.h:88
+msgid "Show History|H"
+msgstr "Vis Historie|H"
+
+#: src/ext_l10n.h:89
+msgid "Go Back|B"
+msgstr "Tilbake|b"
+
+#: src/ext_l10n.h:90
+msgid "Character...|C"
+msgstr "Tegnsett...|T"
+
+#: src/ext_l10n.h:91
+msgid "Paragraph...|P"
+msgstr "Avsnitt...|A"
+
+#: src/ext_l10n.h:92
+msgid "Document...|D"
+msgstr "Dokumentet...|D"
+
+#: src/ext_l10n.h:93
+msgid "Paper...|a"
+msgstr "Ark...|A"
+
+#: src/ext_l10n.h:94
+msgid "Quotes...|Q"
+msgstr "Sitattegn...|S"
+
+#: src/ext_l10n.h:95
+msgid "Tabular...|a"
+msgstr "Tabell...|T"
+
+#: src/ext_l10n.h:96
+msgid "Table...|T"
+msgstr "Tabell...|T"
+
+#: src/ext_l10n.h:97
+msgid "Emphasize Style|E"
+msgstr "Uthevet stil|U"
+
+#: src/ext_l10n.h:98
+msgid "Noun Style|N"
+msgstr "Substantiv stil|S"
+
+#: src/ext_l10n.h:99
 msgid "Bold Style|B"
 msgstr "Fet stil|F"
 
-#: src/ext_l10n.h:81
-msgid "TeX Style|x"
+#: src/ext_l10n.h:100
+msgid "TeX Style|X"
 msgstr "TeX stil|X"
 
-#: src/ext_l10n.h:82
+#: src/ext_l10n.h:101
 msgid "Change environment depth|v"
-msgstr ""
+msgstr "Endre omgivelsesdybde|v"
 
-#: src/ext_l10n.h:83
+#: src/ext_l10n.h:102
 msgid "LaTeX preamble|a"
-msgstr ""
+msgstr "LaTeX preamble|a"
 
-#: src/ext_l10n.h:84
+#: src/ext_l10n.h:103
 msgid "Start of Appendix|x"
 msgstr "Start appendiks|S"
 
-#: src/ext_l10n.h:85
+#: src/ext_l10n.h:104
 msgid "Save layout as default|S"
-msgstr ""
+msgstr "Lagre stil som standard|s"
 
-#: src/ext_l10n.h:86
+#: src/ext_l10n.h:105
 msgid "Figure...|F"
 msgstr "Figur...|F"
 
-#: src/ext_l10n.h:88
+#: src/ext_l10n.h:106
+msgid "Tabular...|T"
+msgstr "Tabell...|T"
+
+#: src/ext_l10n.h:107
 msgid "Include File...|I"
 msgstr "Inkluder fil...|I"
 
-#: src/ext_l10n.h:89
+#: src/ext_l10n.h:108
 msgid "Import ascii file|a"
 msgstr "Importer ascii fil|a"
 
-#: src/ext_l10n.h:90
+#: src/ext_l10n.h:109
 msgid "Insert LyX file|X"
 msgstr "Sett inn LyX fil|X"
 
-#: src/ext_l10n.h:91
+#: src/ext_l10n.h:110
 msgid "Insert external material...|e"
 msgstr "Sett inn eksternt materiale...|e"
 
-#: src/ext_l10n.h:92
+#: src/ext_l10n.h:111
 msgid "Footnote|F"
 msgstr "Fotnote|F"
 
-#: src/ext_l10n.h:93
+#: src/ext_l10n.h:112
 msgid "Marginnote|M"
 msgstr "Margnotis|M"
 
-#: src/ext_l10n.h:94
+#: src/ext_l10n.h:113
 msgid "Floats|a"
-msgstr ""
+msgstr "Floats|a"
 
-#: src/ext_l10n.h:95
+#: src/ext_l10n.h:114
 msgid "Lists & TOC|T"
-msgstr "Lists & TOC|T"
+msgstr "Lister & TOC|T"
 
-#: src/ext_l10n.h:96
+#: src/ext_l10n.h:115
 msgid "Special character|S"
-msgstr ""
+msgstr "Spesielt tegn|S"
 
-#: src/ext_l10n.h:97
+#: src/ext_l10n.h:116
 msgid "Note...|N"
 msgstr "Notis...|N"
 
-#: src/ext_l10n.h:98
+#: src/ext_l10n.h:117
 msgid "Label...|L"
-msgstr ""
+msgstr "Referansemerke...|R"
 
-#: src/ext_l10n.h:99
+#: src/ext_l10n.h:118
 msgid "Cross reference...|r"
-msgstr ""
+msgstr "Kryssreferanse...|K"
 
-#: src/ext_l10n.h:100
+#: src/ext_l10n.h:119
 msgid "Citation reference...|i"
 msgstr "Siterings referanse...|i"
 
-#: src/ext_l10n.h:101
+#: src/ext_l10n.h:120
 msgid "Index entry...|d"
 msgstr "Indeks element...|d"
 
-#: src/ext_l10n.h:102
+#: src/ext_l10n.h:121
 msgid "Index entry of last word|w"
 msgstr "Indeks element av siste ord|o"
 
-#: src/ext_l10n.h:103
+#: src/ext_l10n.h:122
 msgid "URL...|U"
 msgstr "URL...|U"
 
-#: src/ext_l10n.h:104
+#: src/ext_l10n.h:123
 msgid "As lines|l"
 msgstr "Som linjer|l"
 
-#: src/ext_l10n.h:105
+#: src/ext_l10n.h:124
 msgid "As paragraphs|p"
 msgstr "Som avsnitt|a"
 
-#: src/ext_l10n.h:106
+#: src/ext_l10n.h:125
 msgid "Figure float|F"
-msgstr ""
+msgstr "Figur float|F"
 
-#: src/ext_l10n.h:107
+#: src/ext_l10n.h:126
 msgid "Table float|T"
-msgstr ""
+msgstr "Tabell float|T"
 
-#: src/ext_l10n.h:108
+#: src/ext_l10n.h:127
 msgid "Wide figure float|W"
-msgstr ""
+msgstr "Vid figur float|V"
 
-#: src/ext_l10n.h:109
+#: src/ext_l10n.h:128
 msgid "Wide table float|d"
-msgstr ""
+msgstr "Vid tabell float|b"
 
-#: src/ext_l10n.h:110
+#: src/ext_l10n.h:129
 msgid "Algorithm float|A"
 msgstr "Algoritme float|A"
 
-#: src/ext_l10n.h:111
+#: src/ext_l10n.h:130
 msgid "Table of Contents|C"
 msgstr "Innholdsfortegnelse|I"
 
-#: src/ext_l10n.h:112
+#: src/ext_l10n.h:131
 msgid "List of Figures|F"
 msgstr "Figurliste|F"
 
-#: src/ext_l10n.h:113
+#: src/ext_l10n.h:132
 msgid "List of Tables|T"
 msgstr "Tabell-liste|T"
 
-#: src/ext_l10n.h:114
+#: src/ext_l10n.h:133
 msgid "List of Algorithms|A"
 msgstr "Algoritmeliste|A"
 
-#: src/ext_l10n.h:115
+#: src/ext_l10n.h:134
 msgid "Index List|I"
-msgstr ""
+msgstr "Indeksliste|I"
 
-#: src/ext_l10n.h:116
+#: src/ext_l10n.h:135
 msgid "BibTeX reference|B"
-msgstr ""
+msgstr "BibTeX referanse|B"
 
-#: src/ext_l10n.h:117
+#: src/ext_l10n.h:136
 msgid "HFill|H"
 msgstr "HFILL|H"
 
-#: src/ext_l10n.h:118
+#: src/ext_l10n.h:137
 msgid "Hyphenation point|p"
-msgstr ""
+msgstr "Hyphenation point|p"
 
-#: src/ext_l10n.h:119
+#: src/ext_l10n.h:138
 msgid "Protected blank|b"
-msgstr ""
+msgstr "Protected blank|b"
 
-#: src/ext_l10n.h:120
+#: src/ext_l10n.h:139
 msgid "Linebreak|L"
 msgstr "Linjebrekk|L"
 
-#: src/ext_l10n.h:121
+#: src/ext_l10n.h:140
 msgid "Ellipsis|i"
 msgstr "Ellipsis|i"
 
-#: src/ext_l10n.h:122
+#: src/ext_l10n.h:141
 msgid "End of sentence|E"
-msgstr ""
+msgstr "Slutt på setning|S"
 
-#: src/ext_l10n.h:123
+#: src/ext_l10n.h:142
 msgid "Ordinary Quote|Q"
-msgstr ""
+msgstr "Ordinary Quote|Q"
 
-#: src/ext_l10n.h:124
+#: src/ext_l10n.h:143
 msgid "Menu Separator|M"
 msgstr "Menyseparator|M"
 
-#: src/ext_l10n.h:125
+#: src/ext_l10n.h:144
 msgid "Fraction|F"
 msgstr "Brøk|B"
 
-#: src/ext_l10n.h:126
+#: src/ext_l10n.h:145
 msgid "Square root|S"
 msgstr "Kvadratrot|K"
 
-#: src/ext_l10n.h:127
+#: src/ext_l10n.h:146
 msgid "Exponent|E"
 msgstr "Eksponent|E"
 
-#: src/ext_l10n.h:128
+#: src/ext_l10n.h:147
 msgid "Index|x"
 msgstr "Indeks|d"
 
-#: src/ext_l10n.h:129
+#: src/ext_l10n.h:148
 msgid "Sum|u"
 msgstr "Sum|u"
 
-#: src/ext_l10n.h:130
+#: src/ext_l10n.h:149
 msgid "Integral|I"
 msgstr "Integral|I"
 
-#: src/ext_l10n.h:131
+#: src/ext_l10n.h:150
 msgid "Math mode|M"
 msgstr "Matte modus|M"
 
-#: src/ext_l10n.h:132
+#: src/ext_l10n.h:151
 msgid "Display|D"
-msgstr ""
+msgstr "Display|D"
 
-#: src/ext_l10n.h:133
+#: src/ext_l10n.h:152
 msgid "Math Panel...|P"
 msgstr "Matte panel|p"
 
-#: src/ext_l10n.h:134
+#: src/ext_l10n.h:153
 msgid "Screen Fonts...|F"
 msgstr "Skjermfonter|f"
 
-#: src/ext_l10n.h:135
+#: src/ext_l10n.h:154
 msgid "Spellchecker Options...|S"
 msgstr "Opsjoner til stavekontroll|s"
 
-#: src/ext_l10n.h:136
+#: src/ext_l10n.h:155
 msgid "Keyboard...|K"
 msgstr "Tastatur...|T"
 
-#: src/ext_l10n.h:137
+#: src/ext_l10n.h:156
 msgid "Reconfigure|R"
 msgstr "Rekonfigurer|R"
 
-#: src/ext_l10n.h:138
+#: src/ext_l10n.h:157
 msgid "Preferences|P"
-msgstr ""
+msgstr "Preferences|P"
 
-#: src/ext_l10n.h:139
+#: src/ext_l10n.h:158
 msgid "Introduction|I"
 msgstr "Introduksjon|I"
 
-#: src/ext_l10n.h:140
+#: src/ext_l10n.h:159
 msgid "Tutorial|T"
-msgstr ""
+msgstr "Tutorial|T"
 
-#: src/ext_l10n.h:141
+#: src/ext_l10n.h:160
 msgid "User's Guide|U"
 msgstr "Brukermanual|B"
 
-#: src/ext_l10n.h:142
+#: src/ext_l10n.h:161
 msgid "Extended Features|x"
-msgstr ""
+msgstr "Extended Features|x"
 
-#: src/ext_l10n.h:143
+#: src/ext_l10n.h:162
 msgid "Customization|C"
-msgstr ""
+msgstr "Customization|C"
 
-#: src/ext_l10n.h:144
+#: src/ext_l10n.h:163
 msgid "Reference Manual|R"
 msgstr "Referansemanual|R"
 
-#: src/ext_l10n.h:145
+#: src/ext_l10n.h:164
 msgid "FAQ|F"
 msgstr "FAQ|F"
 
-#: src/ext_l10n.h:146
+#: src/ext_l10n.h:165
 msgid "Table of contents|a"
-msgstr ""
+msgstr "Table of contents|a"
 
-#: src/ext_l10n.h:147
+#: src/ext_l10n.h:166
 msgid "Known Bugs|K"
 msgstr "Kjente feil|f"
 
-#: src/ext_l10n.h:148
+#: src/ext_l10n.h:167
 msgid "LaTeX Configuration|L"
-msgstr ""
+msgstr "LaTeX Konfigurasjon|L"
 
-#: src/ext_l10n.h:149
+#: src/ext_l10n.h:168
 msgid "Copyright and Warranty...|o"
 msgstr "Copyright and Warranty...|o"
 
-#: src/ext_l10n.h:150
+#: src/ext_l10n.h:169
 msgid "Credits...|e"
-msgstr ""
+msgstr "Credits...|e"
 
-#: src/ext_l10n.h:151
+#: src/ext_l10n.h:170
 msgid "Version...|V"
 msgstr "Versjon...|V"
 
-#: src/ext_l10n.h:153
+#: src/ext_l10n.h:172
 msgid "A&A"
-msgstr ""
+msgstr "A&A"
 
-#: src/ext_l10n.h:154
+#: src/ext_l10n.h:173
 msgid "ACT"
-msgstr ""
+msgstr "ACT"
 
-#: src/ext_l10n.h:155
+#: src/ext_l10n.h:174
+msgid "AMS"
+msgstr "AMS"
+
+#: src/ext_l10n.h:175
 msgid "AT_RISE:"
-msgstr ""
+msgstr "AT_RISE:"
 
-#: src/ext_l10n.h:156
+#: src/ext_l10n.h:176
 msgid "Abstract"
 msgstr "Sammendrag"
 
-#: src/ext_l10n.h:157
+#: src/ext_l10n.h:177
 msgid "Accepted"
-msgstr ""
+msgstr "Akseptert"
 
-#: src/ext_l10n.h:158
+#: src/ext_l10n.h:178
 msgid "Acknowledgement"
-msgstr ""
+msgstr "Acknowledgement"
 
-#: src/ext_l10n.h:159
+#: src/ext_l10n.h:179
 msgid "Acknowledgement(s)"
-msgstr ""
+msgstr "Acknowledgement(s)"
 
-#: src/ext_l10n.h:160
+#: src/ext_l10n.h:180
 msgid "Acknowledgement*"
-msgstr ""
+msgstr "Acknowledgement*"
 
-#: src/ext_l10n.h:161
+#: src/ext_l10n.h:181
 msgid "Acknowledgement-numbered"
-msgstr ""
+msgstr "Acknowledgement-numbered"
 
-#: src/ext_l10n.h:162
+#: src/ext_l10n.h:182
 msgid "Acknowledgement-unnumbered"
-msgstr ""
+msgstr "Acknowledgement-unnumbered"
 
-#: src/ext_l10n.h:163
+#: src/ext_l10n.h:183
 msgid "Acknowledgements"
-msgstr ""
+msgstr "Acknowledgements"
 
-#: src/ext_l10n.h:164
+#: src/ext_l10n.h:184
 msgid "Acknowledgments"
-msgstr ""
+msgstr "Acknowledgments"
 
-#: src/ext_l10n.h:165
+#: src/ext_l10n.h:185
 msgid "Acnowledgement"
-msgstr ""
+msgstr "Acnowledgement"
 
-#: src/ext_l10n.h:166
+#: src/ext_l10n.h:186
 msgid "Addchap"
-msgstr ""
+msgstr "Addchap"
 
-#: src/ext_l10n.h:167
+#: src/ext_l10n.h:187
 msgid "Addchap*"
-msgstr ""
+msgstr "Addchap*"
 
-#: src/ext_l10n.h:168
+#: src/ext_l10n.h:188
 msgid "Addition"
-msgstr ""
+msgstr "Tillegg"
 
-#: src/ext_l10n.h:169
+#: src/ext_l10n.h:189
 msgid "Address"
 msgstr "Adresse"
 
-#: src/ext_l10n.h:170
+#: src/ext_l10n.h:190
 msgid "Addsec"
-msgstr ""
+msgstr "Addsec"
 
-#: src/ext_l10n.h:171
+#: src/ext_l10n.h:191
 msgid "Addsec*"
-msgstr ""
+msgstr "Addsec*"
 
-#: src/ext_l10n.h:172
+#: src/ext_l10n.h:192
 msgid "Adresse"
-msgstr ""
+msgstr "Adresse"
 
-#: src/ext_l10n.h:173
+#: src/ext_l10n.h:193
 msgid "Affil"
-msgstr ""
+msgstr "Affil"
 
-#: src/ext_l10n.h:174
+#: src/ext_l10n.h:194
 msgid "Affiliation"
-msgstr ""
+msgstr "Affiliation"
 
-#: src/ext_l10n.h:175
+#: src/ext_l10n.h:195
 msgid "Algorithm"
 msgstr "Algoritme"
 
-#: src/ext_l10n.h:176
+#: src/ext_l10n.h:196
 msgid "Algorithm-numbered"
-msgstr ""
+msgstr "Algorithm-numbered"
 
-#: src/ext_l10n.h:177
+#: src/ext_l10n.h:197
 msgid "Algorithm-plain"
-msgstr ""
+msgstr "Algorithm-plain"
 
-#: src/ext_l10n.h:178
+#: src/ext_l10n.h:198
 msgid "And"
 msgstr "Og"
 
-#: src/ext_l10n.h:179
+#: src/ext_l10n.h:199
 msgid "Anlagen"
-msgstr ""
+msgstr "Anlagen"
 
-#: src/ext_l10n.h:180
+#: src/ext_l10n.h:200
 msgid "Anrede"
-msgstr ""
+msgstr "Anrede"
 
-#: src/ext_l10n.h:181
+#: src/ext_l10n.h:201
 msgid "Appendices"
-msgstr ""
+msgstr "Appendices"
 
-#: src/ext_l10n.h:182
+#: src/ext_l10n.h:202
 msgid "Appendix"
-msgstr ""
+msgstr "Appendix"
 
-#: src/ext_l10n.h:183
+#: src/ext_l10n.h:203
 msgid "Author"
 msgstr "Forfatter"
 
-#: src/ext_l10n.h:184
+#: src/ext_l10n.h:204
 msgid "AuthorRunning"
-msgstr ""
+msgstr "AuthorRunning"
 
-#: src/ext_l10n.h:185
+#: src/ext_l10n.h:205
 msgid "Author_Email"
-msgstr ""
+msgstr "Author_Email"
 
-#: src/ext_l10n.h:186
+#: src/ext_l10n.h:206
 msgid "Author_Running"
-msgstr ""
+msgstr "Author_Running"
 
-#: src/ext_l10n.h:187
+#: src/ext_l10n.h:207
 msgid "Author_URL"
-msgstr ""
+msgstr "Author_URL"
 
-#: src/ext_l10n.h:188
+#: src/ext_l10n.h:208
 msgid "Axiom"
-msgstr ""
+msgstr "Axiom"
 
-#: src/ext_l10n.h:189
+#: src/ext_l10n.h:209
 msgid "Axiom-numbered"
-msgstr ""
+msgstr "Axiom-numbered"
 
-#: src/ext_l10n.h:190
+#: src/ext_l10n.h:210
 msgid "Axiom-plain"
-msgstr ""
+msgstr "Axiom-plain"
 
-#: src/ext_l10n.h:191
+#: src/ext_l10n.h:211
 msgid "BLZ"
-msgstr ""
+msgstr "BLZ"
 
-#: src/ext_l10n.h:192
+#: src/ext_l10n.h:212
 msgid "Backaddress"
-msgstr ""
+msgstr "Backaddress"
 
-#: src/ext_l10n.h:193
+#: src/ext_l10n.h:213
 msgid "Bank"
-msgstr ""
+msgstr "Bank"
 
-#: src/ext_l10n.h:194
+#: src/ext_l10n.h:214
 msgid "BankAccount"
-msgstr ""
+msgstr "Bankkonto"
 
-#: src/ext_l10n.h:195
+#: src/ext_l10n.h:215
 msgid "BankCode"
-msgstr ""
+msgstr "BankCode"
 
-#: src/ext_l10n.h:196
+#: src/ext_l10n.h:216
 msgid "Betreff"
-msgstr ""
+msgstr "Betreff"
 
-#: src/ext_l10n.h:197
+#: src/ext_l10n.h:217
 msgid "Bibliography"
-msgstr ""
+msgstr "Bibliography"
 
-#: src/ext_l10n.h:198
+#: src/ext_l10n.h:218
 msgid "Biography"
-msgstr ""
+msgstr "Biography"
 
-#: src/ext_l10n.h:199
+#: src/ext_l10n.h:219
 msgid "Brieftext"
-msgstr ""
+msgstr "Brieftext"
 
-#: src/ext_l10n.h:200
+#: src/ext_l10n.h:220
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
-#: src/ext_l10n.h:201
+#: src/ext_l10n.h:221
 msgid "CURTAIN"
-msgstr ""
+msgstr "CURTAIN"
 
-#: src/ext_l10n.h:202
+#: src/ext_l10n.h:222
 msgid "Caption"
-msgstr ""
+msgstr "Caption"
 
-#: src/ext_l10n.h:203
+#: src/ext_l10n.h:223
 msgid "Case"
-msgstr ""
+msgstr "Case"
 
-#: src/ext_l10n.h:204
+#: src/ext_l10n.h:224
 msgid "Case-numbered"
-msgstr ""
+msgstr "Case-numbered"
 
-#: src/ext_l10n.h:205
+#: src/ext_l10n.h:225
 msgid "CenteredCaption"
-msgstr ""
+msgstr "CenteredCaption"
 
-#: src/ext_l10n.h:206
+#: src/ext_l10n.h:226
 msgid "Chapter"
 msgstr "Kapittel"
 
-#: src/ext_l10n.h:207
+#: src/ext_l10n.h:227
 msgid "Chapter*"
 msgstr "Kapittel*"
 
-#: src/ext_l10n.h:208
+#: src/ext_l10n.h:228
 msgid "Chapter_Exercises"
-msgstr ""
+msgstr "Chapter_Exercises"
 
-#: src/ext_l10n.h:209
+#: src/ext_l10n.h:229
 msgid "Citta"
-msgstr ""
+msgstr "Citta"
 
-#: src/ext_l10n.h:210
+#: src/ext_l10n.h:230
 msgid "Claim"
 msgstr "Påstand"
 
-#: src/ext_l10n.h:211
+#: src/ext_l10n.h:231
 msgid "Claim*"
 msgstr "Påstand*"
 
-#: src/ext_l10n.h:212
+#: src/ext_l10n.h:232
 msgid "Claim-numbered"
-msgstr ""
+msgstr "Claim-numbered"
 
-#: src/ext_l10n.h:213
+#: src/ext_l10n.h:233
 msgid "Claim-plain"
-msgstr ""
+msgstr "Claim-plain"
 
-#: src/ext_l10n.h:214
+#: src/ext_l10n.h:234
 msgid "Claim-unnumbered"
-msgstr ""
+msgstr "Claim-unnumbered"
 
-#: src/ext_l10n.h:215
+#: src/ext_l10n.h:235
 msgid "Closing"
-msgstr ""
+msgstr "Closing"
 
-#: src/ext_l10n.h:216
+#: src/ext_l10n.h:236
 msgid "Code"
 msgstr "Kode"
 
-#: src/ext_l10n.h:217
+#: src/ext_l10n.h:237
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/ext_l10n.h:218
+#: src/ext_l10n.h:238
 msgid "Conclusion"
-msgstr ""
+msgstr "Conclusion"
 
-#: src/ext_l10n.h:219
+#: src/ext_l10n.h:239
 msgid "Conclusion*"
-msgstr ""
+msgstr "Conclusion*"
 
-#: src/ext_l10n.h:220
+#: src/ext_l10n.h:240
 msgid "Conclusion-numbered"
-msgstr ""
+msgstr "Conclusion-numbered"
 
-#: src/ext_l10n.h:221
+#: src/ext_l10n.h:241
 msgid "Conclusion-unnumbered"
-msgstr ""
+msgstr "Conclusion-unnumbered"
 
-#: src/ext_l10n.h:222
+#: src/ext_l10n.h:242
 msgid "Condition"
-msgstr ""
+msgstr "Condition"
 
-#: src/ext_l10n.h:223
+#: src/ext_l10n.h:243
 msgid "Condition-numbered"
-msgstr ""
+msgstr "Condition-numbered"
 
-#: src/ext_l10n.h:224
+#: src/ext_l10n.h:244
 msgid "Condition-plain"
-msgstr ""
+msgstr "Condition-plain"
 
-#: src/ext_l10n.h:225
+#: src/ext_l10n.h:245
 msgid "Conjecture"
-msgstr ""
+msgstr "Conjecture"
 
-#: src/ext_l10n.h:226
+#: src/ext_l10n.h:246
 msgid "Conjecture*"
-msgstr ""
+msgstr "Conjecture*"
 
-#: src/ext_l10n.h:227
+#: src/ext_l10n.h:247
 msgid "Conjecture-numbered"
-msgstr ""
+msgstr "Conjecture-numbered"
 
-#: src/ext_l10n.h:228
+#: src/ext_l10n.h:248
 msgid "Conjecture-plain"
-msgstr ""
+msgstr "Conjecture-plain"
 
-#: src/ext_l10n.h:229
+#: src/ext_l10n.h:249
 msgid "Conjecture-unnumbered"
-msgstr ""
+msgstr "Conjecture-unnumbered"
 
-#: src/ext_l10n.h:230
+#: src/ext_l10n.h:250
 msgid "CopNum"
-msgstr ""
+msgstr "CopNum"
 
-#: src/ext_l10n.h:231
+#: src/ext_l10n.h:251
 msgid "Copyright"
-msgstr ""
+msgstr "Copyright"
 
-#: src/ext_l10n.h:232
+#: src/ext_l10n.h:252
 msgid "Corollary"
 msgstr "Korollar"
 
-#: src/ext_l10n.h:233
+#: src/ext_l10n.h:253
 msgid "Corollary*"
 msgstr "Korollar*"
 
-#: src/ext_l10n.h:234
+#: src/ext_l10n.h:254
 msgid "Corollary-numbered"
-msgstr ""
+msgstr "Corollary-numbered"
 
-#: src/ext_l10n.h:235
+#: src/ext_l10n.h:255
 msgid "Corollary-plain"
-msgstr ""
+msgstr "Corollary-plain"
 
-#: src/ext_l10n.h:236
+#: src/ext_l10n.h:256
 msgid "Corollary-unnumbered"
-msgstr ""
+msgstr "Corollary-unnumbered"
 
-#: src/ext_l10n.h:237
+#: src/ext_l10n.h:257
 msgid "Correspondence"
-msgstr ""
+msgstr "Correspondence"
 
-#: src/ext_l10n.h:238
+#: src/ext_l10n.h:258
 msgid "Criterion"
-msgstr ""
+msgstr "Criterion"
 
-#: src/ext_l10n.h:239
+#: src/ext_l10n.h:259
 msgid "Criterion-numbered"
-msgstr ""
+msgstr "Criterion-numbered"
 
-#: src/ext_l10n.h:240
+#: src/ext_l10n.h:260
 msgid "Criterion-plain"
-msgstr ""
+msgstr "Criterion-plain"
 
-#: src/ext_l10n.h:241
+#: src/ext_l10n.h:261
 msgid "CrossList"
-msgstr ""
+msgstr "CrossList"
 
-#: src/ext_l10n.h:242
+#: src/ext_l10n.h:262
 msgid "Current"
-msgstr ""
+msgstr "Current"
 
-#: src/ext_l10n.h:243
+#: src/ext_l10n.h:263
 msgid "Current_Address"
-msgstr ""
+msgstr "Current_Address"
 
-#: src/ext_l10n.h:244
+#: src/ext_l10n.h:264
 msgid "Customer"
-msgstr ""
+msgstr "Customer"
 
-#: src/ext_l10n.h:245
+#: src/ext_l10n.h:265
 msgid "Data"
-msgstr ""
+msgstr "Data"
 
-#: src/ext_l10n.h:246
+#: src/ext_l10n.h:266
 msgid "Date"
 msgstr "Dato"
 
-#: src/ext_l10n.h:247
+#: src/ext_l10n.h:267
 msgid "Datum"
-msgstr ""
+msgstr "Datum"
 
-#: src/ext_l10n.h:248
+#: src/ext_l10n.h:268
 msgid "Dedication"
-msgstr ""
+msgstr "Dedication"
 
-#: src/ext_l10n.h:249
+#: src/ext_l10n.h:269
 msgid "Dedicatory"
-msgstr ""
+msgstr "Dedicatory"
 
-#: src/ext_l10n.h:250
+#: src/ext_l10n.h:270
 msgid "Definition"
 msgstr "Definisjon"
 
-#: src/ext_l10n.h:251
+#: src/ext_l10n.h:271
 msgid "Definition*"
-msgstr ""
+msgstr "Definition*"
 
-#: src/ext_l10n.h:252
+#: src/ext_l10n.h:272
 msgid "Definition-numbered"
-msgstr ""
+msgstr "Definition-numbered"
 
-#: src/ext_l10n.h:253
+#: src/ext_l10n.h:273
 msgid "Definition-plain"
-msgstr ""
+msgstr "Definition-plain"
 
-#: src/ext_l10n.h:254
+#: src/ext_l10n.h:274
 msgid "Definition-unnumbered"
-msgstr ""
+msgstr "Definition-unnumbered"
 
-#: src/ext_l10n.h:255
+#: src/ext_l10n.h:275
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/ext_l10n.h:256
+#: src/ext_l10n.h:276
 msgid "Dialogue"
-msgstr ""
+msgstr "Dialog"
 
-#: src/ext_l10n.h:257
+#: src/ext_l10n.h:277
 msgid "EMail"
-msgstr ""
+msgstr "EMail"
 
-#: src/ext_l10n.h:258
+#: src/ext_l10n.h:278
 msgid "EXT."
-msgstr ""
+msgstr "EXT."
 
-#: src/ext_l10n.h:259
+#: src/ext_l10n.h:279
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
-#: src/ext_l10n.h:260
+#: src/ext_l10n.h:280
 msgid "Encl"
-msgstr ""
+msgstr "Encl"
 
-#: src/ext_l10n.h:261
+#: src/ext_l10n.h:281
 msgid "Encl."
-msgstr ""
+msgstr "Encl."
 
-#: src/ext_l10n.h:262
+#: src/ext_l10n.h:282
 msgid "End_All_Slides"
-msgstr ""
+msgstr "End_All_Slides"
 
-#: src/ext_l10n.h:263
+#: src/ext_l10n.h:283
 msgid "Enumerate"
-msgstr ""
+msgstr "Enumerate"
 
-#: src/ext_l10n.h:264
+#: src/ext_l10n.h:284
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/ext_l10n.h:265
+#: src/ext_l10n.h:285
 msgid "Example*"
-msgstr ""
+msgstr "Example*"
 
-#: src/ext_l10n.h:266
+#: src/ext_l10n.h:286
 msgid "Example-numbered"
-msgstr ""
+msgstr "Example-numbered"
 
-#: src/ext_l10n.h:267
+#: src/ext_l10n.h:287
 msgid "Example-plain"
-msgstr ""
+msgstr "Example-plain"
 
-#: src/ext_l10n.h:268
+#: src/ext_l10n.h:288
 msgid "Example-unnumbered"
-msgstr ""
+msgstr "Example-unnumbered"
 
-#: src/ext_l10n.h:269
+#: src/ext_l10n.h:289
 msgid "Exercise"
 msgstr "Øvelse"
 
-#: src/ext_l10n.h:270
+#: src/ext_l10n.h:290
 msgid "Exercise-numbered"
-msgstr ""
+msgstr "Exercise-numbered"
 
-#: src/ext_l10n.h:271
+#: src/ext_l10n.h:291
 msgid "Exercise-plain"
-msgstr ""
+msgstr "Exercise-plain"
 
-#: src/ext_l10n.h:272
+#: src/ext_l10n.h:292
 msgid "Extratitle"
-msgstr ""
+msgstr "Extratitle"
 
-#: src/ext_l10n.h:273
+#: src/ext_l10n.h:293
 msgid "FADE_IN:"
-msgstr ""
+msgstr "FADE_IN:"
 
-#: src/ext_l10n.h:274
+#: src/ext_l10n.h:294
 msgid "FADE_OUT:"
-msgstr ""
+msgstr "FADE_OUT:"
 
-#: src/ext_l10n.h:275
+#: src/ext_l10n.h:295
 msgid "Fact"
 msgstr "Fakta"
 
-#: src/ext_l10n.h:276
+#: src/ext_l10n.h:296
 msgid "Fact*"
 msgstr "Fakta*"
 
-#: src/ext_l10n.h:277
+#: src/ext_l10n.h:297
 msgid "Fact-numbered"
-msgstr ""
+msgstr "Fact-numbered"
 
-#: src/ext_l10n.h:278
+#: src/ext_l10n.h:298
 msgid "Fact-plain"
-msgstr ""
+msgstr "Fact-plain"
 
-#: src/ext_l10n.h:279
+#: src/ext_l10n.h:299
 msgid "Fact-unnumbered"
-msgstr ""
+msgstr "Fact-unnumbered"
 
-#: src/ext_l10n.h:280
+#: src/ext_l10n.h:300
 msgid "FigCaption"
-msgstr ""
+msgstr "FigCaption"
 
-#: src/ext_l10n.h:281
+#: src/ext_l10n.h:301
 msgid "FirstAuthor"
-msgstr ""
+msgstr "FirstAuthor"
 
-#: src/ext_l10n.h:282
+#: src/ext_l10n.h:302
 msgid "FirstName"
 msgstr "Fornavn"
 
-#: src/ext_l10n.h:283
+#: src/ext_l10n.h:303
 msgid "FitBitmap"
-msgstr ""
+msgstr "FitBitmap"
 
-#: src/ext_l10n.h:284
+#: src/ext_l10n.h:304
 msgid "FitFigure"
-msgstr ""
+msgstr "FitFigure"
 
-#: src/ext_l10n.h:285
+#: src/ext_l10n.h:305
 msgid "Foilhead"
-msgstr ""
+msgstr "Foilhead"
 
-#: src/ext_l10n.h:286
+#: src/ext_l10n.h:306
 msgid "Footernote"
-msgstr ""
+msgstr "Footernote"
 
-#: src/ext_l10n.h:287
+#: src/ext_l10n.h:307
 msgid "FourAffiliations"
-msgstr ""
+msgstr "FourAffiliations"
 
-#: src/ext_l10n.h:288
+#: src/ext_l10n.h:308
 msgid "FourAuthors"
-msgstr ""
+msgstr "FourAuthors"
 
-#: src/ext_l10n.h:289
+#: src/ext_l10n.h:309
 msgid "Gruss"
-msgstr ""
+msgstr "Gruss"
 
-#: src/ext_l10n.h:290
+#: src/ext_l10n.h:310
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
-#: src/ext_l10n.h:291
+#: src/ext_l10n.h:311
 msgid "Headnote"
-msgstr ""
+msgstr "Headnote"
 
-#: src/ext_l10n.h:292
+#: src/ext_l10n.h:312
 msgid "INT."
-msgstr ""
+msgstr "INT."
 
-#: src/ext_l10n.h:293
+#: src/ext_l10n.h:313
 msgid "Idea"
 msgstr "Idé"
 
-#: src/ext_l10n.h:294
+#: src/ext_l10n.h:314
 msgid "IhrSchreiben"
-msgstr ""
+msgstr "IhrSchreiben"
 
-#: src/ext_l10n.h:295
+#: src/ext_l10n.h:315
 msgid "IhrZeichen"
-msgstr ""
+msgstr "IhrZeichen"
 
-#: src/ext_l10n.h:296
+#: src/ext_l10n.h:316
 msgid "Institute"
 msgstr "Institutt"
 
-#: src/ext_l10n.h:297
+#: src/ext_l10n.h:317
 msgid "Institution"
-msgstr ""
+msgstr "Institution"
 
-#: src/ext_l10n.h:298
+#: src/ext_l10n.h:318
 msgid "InvisibleText"
-msgstr ""
+msgstr "InvisibleText"
 
-#: src/ext_l10n.h:299
+#: src/ext_l10n.h:319
 msgid "Invoice"
 msgstr "Faktura"
 
-#: src/ext_l10n.h:300
+#: src/ext_l10n.h:320
 msgid "Itemize"
 msgstr "Punktliste"
 
-#: src/ext_l10n.h:301
+#: src/ext_l10n.h:321 src/frontends/gnome/FormCitation.C:531
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
-#: src/ext_l10n.h:302
+#: src/ext_l10n.h:322
 msgid "Keywords"
-msgstr ""
+msgstr "Nøkkelord"
 
-#: src/ext_l10n.h:303
+#: src/ext_l10n.h:323
 msgid "Konto"
-msgstr ""
+msgstr "Konto"
 
-#: src/ext_l10n.h:304
+#: src/ext_l10n.h:324
 msgid "LaTeX"
-msgstr ""
+msgstr "LaTeX"
 
-#: src/ext_l10n.h:305
+#: src/ext_l10n.h:325
 msgid "LaTeX_Title"
-msgstr ""
+msgstr "LaTeX_Title"
 
-#: src/ext_l10n.h:306
+#: src/ext_l10n.h:326
 msgid "Labeling"
-msgstr ""
+msgstr "Labeling"
 
-#: src/ext_l10n.h:307
+#: src/ext_l10n.h:327
 msgid "Land"
-msgstr ""
+msgstr "Land"
 
-#: src/ext_l10n.h:308
+#: src/ext_l10n.h:328
 msgid "LandscapeSlide"
-msgstr ""
+msgstr "LandscapeSlide"
 
-#: src/ext_l10n.h:309
+#: src/ext_l10n.h:329
 msgid "Lemma"
-msgstr ""
+msgstr "Lemma"
 
-#: src/ext_l10n.h:310
+#: src/ext_l10n.h:330
 msgid "Lemma*"
-msgstr ""
+msgstr "Lemma*"
 
-#: src/ext_l10n.h:311
+#: src/ext_l10n.h:331
 msgid "Lemma-numbered"
-msgstr ""
+msgstr "Lemma-numbered"
 
-#: src/ext_l10n.h:312
+#: src/ext_l10n.h:332
 msgid "Lemma-plain"
-msgstr ""
+msgstr "Lemma-plain"
 
-#: src/ext_l10n.h:313
+#: src/ext_l10n.h:333
 msgid "Lemma-unnumbered"
-msgstr ""
+msgstr "Lemma-unnumbered"
 
-#: src/ext_l10n.h:314
+#: src/ext_l10n.h:334
 msgid "Letter"
 msgstr "Brev"
 
-#: src/ext_l10n.h:315
+#: src/ext_l10n.h:335
 msgid "List"
 msgstr "Liste"
 
-#: src/ext_l10n.h:316
+#: src/ext_l10n.h:336
 msgid "ListOfSlides"
-msgstr ""
+msgstr "ListOfSlides"
 
-#: src/ext_l10n.h:317
+#: src/ext_l10n.h:337
 msgid "Literal"
-msgstr ""
+msgstr "Literal"
 
-#: src/ext_l10n.h:318
+#: src/ext_l10n.h:338
 msgid "Location"
-msgstr ""
+msgstr "Location"
 
-#: src/ext_l10n.h:319
+#: src/ext_l10n.h:339
 msgid "Lowertitleback"
-msgstr ""
+msgstr "Lowertitleback"
 
-#: src/ext_l10n.h:320
+#: src/ext_l10n.h:340
 msgid "LyX-Code"
-msgstr ""
+msgstr "LyX-Code"
 
-#: src/ext_l10n.h:321
+#: src/ext_l10n.h:341
 msgid "Lyx-Code"
-msgstr ""
+msgstr "Lyx-Code"
 
-#: src/ext_l10n.h:322
+#: src/ext_l10n.h:342
 msgid "Mail"
-msgstr ""
+msgstr "Mail"
 
-#: src/ext_l10n.h:323
+#: src/ext_l10n.h:343
 msgid "MarkBoth"
-msgstr ""
+msgstr "MarkBoth"
 
-#: src/ext_l10n.h:324
+#: src/ext_l10n.h:344
 msgid "MathLetters"
-msgstr ""
+msgstr "MathLetters"
 
-#: src/ext_l10n.h:325
+#: src/ext_l10n.h:345
 msgid "MeinZeichen"
-msgstr ""
+msgstr "MeinZeichen"
 
-#: src/ext_l10n.h:326
+#: src/ext_l10n.h:346
 msgid "Minisec"
-msgstr ""
+msgstr "Minisec"
 
-#: src/ext_l10n.h:327
+#: src/ext_l10n.h:347
 msgid "MyRef"
-msgstr ""
+msgstr "MyRef"
 
-#: src/ext_l10n.h:328
+#: src/ext_l10n.h:348
 msgid "My_Address"
-msgstr ""
+msgstr "My_Address"
 
-#: src/ext_l10n.h:329
+#: src/ext_l10n.h:349
 msgid "Myref"
-msgstr ""
+msgstr "Myref"
 
-#: src/ext_l10n.h:330 src/insets/form_url.C:23
+#: src/ext_l10n.h:350 src/frontends/gnome/FormUrl.C:119
+#: src/frontends/xforms/form_url.C:33
 msgid "Name"
 msgstr "Navn"
 
-#: src/ext_l10n.h:331
+#: src/ext_l10n.h:351
 msgid "Narrative"
 msgstr "Sammenfatning"
 
-#: src/ext_l10n.h:332
+#: src/ext_l10n.h:352
 msgid "Notation"
-msgstr ""
+msgstr "Notation"
 
-#: src/ext_l10n.h:333
+#: src/ext_l10n.h:353
 msgid "Notation-numbered"
-msgstr ""
+msgstr "Notation-numbered"
 
-#: src/ext_l10n.h:334 src/insets/insetinfo.C:77 src/insets/insetinfo.C:102
+#: src/ext_l10n.h:354 src/insets/insetinfo.C:77 src/insets/insetinfo.C:102
 #: src/insets/insetinfo.C:230
 msgid "Note"
 msgstr "Notis"
 
-#: src/ext_l10n.h:335
+#: src/ext_l10n.h:355
 msgid "Note*"
 msgstr "Notis*"
 
-#: src/ext_l10n.h:336
+#: src/ext_l10n.h:356
 msgid "Note-numbered"
-msgstr ""
+msgstr "Note-numbered"
 
-#: src/ext_l10n.h:337
+#: src/ext_l10n.h:357
 msgid "Note-plain"
-msgstr ""
+msgstr "Note-plain"
 
-#: src/ext_l10n.h:338
+#: src/ext_l10n.h:358
 msgid "Note-unnumbered"
-msgstr ""
+msgstr "Note-unnumbered"
 
-#: src/ext_l10n.h:339
+#: src/ext_l10n.h:359
 msgid "NoteToEditor"
-msgstr ""
+msgstr "NoteToEditor"
 
-#: src/ext_l10n.h:340
+#: src/ext_l10n.h:360
 msgid "Notetoeditor"
-msgstr ""
+msgstr "Notetoeditor"
 
-#: src/ext_l10n.h:341
+#: src/ext_l10n.h:361
 msgid "Offprint"
-msgstr ""
+msgstr "Offprint"
 
-#: src/ext_l10n.h:342
+#: src/ext_l10n.h:362
 msgid "Offprints"
-msgstr ""
+msgstr "Offprints"
 
-#: src/ext_l10n.h:343
+#: src/ext_l10n.h:363
 msgid "Offsets"
-msgstr ""
+msgstr "Offsets"
 
-#: src/ext_l10n.h:344
+#: src/ext_l10n.h:364
 msgid "Oggetto"
-msgstr ""
+msgstr "Oggetto"
 
-#: src/ext_l10n.h:345
+#: src/ext_l10n.h:365
 msgid "Opening"
-msgstr ""
+msgstr "Opening"
 
-#: src/ext_l10n.h:346
+#: src/ext_l10n.h:366
 msgid "Ort"
-msgstr ""
+msgstr "Ort"
 
-#: src/ext_l10n.h:347
+#: src/ext_l10n.h:367
 msgid "Overlay"
-msgstr ""
+msgstr "Overlay"
 
-#: src/ext_l10n.h:348
+#: src/ext_l10n.h:368
 msgid "PACS"
-msgstr ""
+msgstr "PACS"
 
-#: src/ext_l10n.h:349
+#: src/ext_l10n.h:369
 msgid "PS"
-msgstr ""
+msgstr "PS"
 
-#: src/ext_l10n.h:350
+#: src/ext_l10n.h:370
 msgid "Paragraph"
 msgstr "Avsnitt"
 
-#: src/ext_l10n.h:351
+#: src/ext_l10n.h:371
 msgid "Paragraph*"
 msgstr "Avsnitt*"
 
-#: src/ext_l10n.h:352
+#: src/ext_l10n.h:372
 msgid "Paragraph-numbered"
 msgstr "Nummerert Avsnitt"
 
-#: src/ext_l10n.h:353
+#: src/ext_l10n.h:373
 msgid "Parenthetical"
-msgstr ""
+msgstr "Parenthetical"
 
-#: src/ext_l10n.h:354
+#: src/ext_l10n.h:374
 msgid "Part"
 msgstr "Del"
 
-#: src/ext_l10n.h:355
+#: src/ext_l10n.h:375
 msgid "Part*"
 msgstr "Del*"
 
-#: src/ext_l10n.h:356
+#: src/ext_l10n.h:376
 msgid "Petit"
-msgstr ""
+msgstr "Petit"
 
-#: src/ext_l10n.h:357
+#: src/ext_l10n.h:377
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/ext_l10n.h:358
+#: src/ext_l10n.h:378
 msgid "Place"
 msgstr "Sted"
 
-#: src/ext_l10n.h:359
+#: src/ext_l10n.h:379
 msgid "PlaceFigure"
-msgstr ""
+msgstr "PlaceFigure"
 
-#: src/ext_l10n.h:360
+#: src/ext_l10n.h:380
 msgid "PlaceTable"
-msgstr ""
+msgstr "PlaceTable"
 
-#: src/ext_l10n.h:361
+#: src/ext_l10n.h:381
 msgid "Placefigure"
-msgstr ""
+msgstr "Placefigure"
 
-#: src/ext_l10n.h:362
+#: src/ext_l10n.h:382
 msgid "Placetable"
-msgstr ""
+msgstr "Placetable"
 
-#: src/ext_l10n.h:363
+#: src/ext_l10n.h:383
 msgid "PortraitSlide"
-msgstr ""
+msgstr "PortraitSlide"
 
-#: src/ext_l10n.h:364
+#: src/ext_l10n.h:384
 msgid "PostalCommend"
-msgstr ""
+msgstr "PostalCommend"
 
-#: src/ext_l10n.h:365
+#: src/ext_l10n.h:385
 msgid "Postvermerk"
-msgstr ""
+msgstr "Postvermerk"
 
-#: src/ext_l10n.h:366
+#: src/ext_l10n.h:386
 msgid "Preprint"
-msgstr ""
+msgstr "Preprint"
 
-#: src/ext_l10n.h:367
+#: src/ext_l10n.h:387
 msgid "Problem"
-msgstr ""
+msgstr "Problem"
 
-#: src/ext_l10n.h:368
+#: src/ext_l10n.h:388
 msgid "Problem-numbered"
-msgstr ""
+msgstr "Problem-numbered"
 
-#: src/ext_l10n.h:369
+#: src/ext_l10n.h:389
 msgid "Problem-plain"
-msgstr ""
+msgstr "Problem-plain"
 
-#: src/ext_l10n.h:370
+#: src/ext_l10n.h:390
 msgid "ProgressContents"
-msgstr ""
+msgstr "ProgressContents"
 
-#: src/ext_l10n.h:371
+#: src/ext_l10n.h:391
 msgid "Proof"
 msgstr "Bevis"
 
-#: src/ext_l10n.h:372
+#: src/ext_l10n.h:392
 msgid "Property"
-msgstr ""
+msgstr "Property"
 
-#: src/ext_l10n.h:373
+#: src/ext_l10n.h:393
 msgid "Proposition"
-msgstr ""
+msgstr "Proposition"
 
-#: src/ext_l10n.h:374
+#: src/ext_l10n.h:394
 msgid "Proposition*"
-msgstr ""
+msgstr "Proposition*"
 
-#: src/ext_l10n.h:375
+#: src/ext_l10n.h:395
 msgid "Proposition-numbered"
-msgstr ""
+msgstr "Proposition-numbered"
 
-#: src/ext_l10n.h:376
+#: src/ext_l10n.h:396
 msgid "Proposition-plain"
-msgstr ""
+msgstr "Proposition-plain"
 
-#: src/ext_l10n.h:377
+#: src/ext_l10n.h:397
 msgid "Proposition-unnumbered"
-msgstr ""
+msgstr "Proposition-unnumbered"
 
-#: src/ext_l10n.h:378
+#: src/ext_l10n.h:398
 msgid "Publishers"
-msgstr ""
+msgstr "Publishers"
 
-#: src/ext_l10n.h:379
+#: src/ext_l10n.h:399
 msgid "Question"
 msgstr "Spørsmål"
 
-#: src/ext_l10n.h:380
+#: src/ext_l10n.h:400
 msgid "Quotation"
-msgstr ""
+msgstr "Quotation"
 
-#: src/ext_l10n.h:381
+#: src/ext_l10n.h:401
 msgid "Quote"
-msgstr ""
+msgstr "Quote"
 
-#: src/ext_l10n.h:382
+#: src/ext_l10n.h:402
 msgid "REVTEX_Title"
-msgstr ""
+msgstr "REVTEX_Title"
 
-#: src/ext_l10n.h:383
+#: src/ext_l10n.h:403
 msgid "Received"
-msgstr ""
+msgstr "Mottatt"
 
-#: src/ext_l10n.h:384
+#: src/ext_l10n.h:404
 msgid "Recieved"
-msgstr ""
+msgstr "Mottatt"
 
-#: src/ext_l10n.h:385
+#: src/ext_l10n.h:405
 msgid "Recieved/Accepted"
-msgstr ""
+msgstr "Mottatt/Akseptert"
 
-#: src/ext_l10n.h:386
+#: src/ext_l10n.h:406 src/frontends/kde/formrefdialog.C:61
+#: src/frontends/xforms/FormRef.C:37
 msgid "Reference"
 msgstr "Referanse"
 
-#: src/ext_l10n.h:387
+#: src/ext_l10n.h:407
 msgid "References"
-msgstr ""
+msgstr "Referanser"
 
-#: src/ext_l10n.h:388
+#: src/ext_l10n.h:408
 msgid "Remark"
 msgstr "Merknad"
 
-#: src/ext_l10n.h:389
+#: src/ext_l10n.h:409
 msgid "Remark*"
 msgstr "Merknad*"
 
-#: src/ext_l10n.h:390
+#: src/ext_l10n.h:410
 msgid "Remark-numbered"
-msgstr ""
+msgstr "Remark-numbered"
 
-#: src/ext_l10n.h:391
+#: src/ext_l10n.h:411
 msgid "Remark-plain"
-msgstr ""
+msgstr "Remark-plain"
 
-#: src/ext_l10n.h:392
+#: src/ext_l10n.h:412
 msgid "Remark-unnumbered"
-msgstr ""
+msgstr "Remark-unnumbered"
 
-#: src/ext_l10n.h:393
+#: src/ext_l10n.h:413
 msgid "Remarks"
 msgstr "Merknader"
 
-#: src/ext_l10n.h:394
+#: src/ext_l10n.h:414
 msgid "RetourAdresse"
-msgstr ""
+msgstr "Returadresse"
 
-#: src/ext_l10n.h:395
+#: src/ext_l10n.h:415
 msgid "ReturnAddress"
-msgstr ""
+msgstr "Returadresse"
 
-#: src/ext_l10n.h:396
+#: src/ext_l10n.h:416
 msgid "RightHeader"
-msgstr ""
+msgstr "RightHeader"
 
-#: src/ext_l10n.h:397
+#: src/ext_l10n.h:417
 msgid "Right_Address"
-msgstr ""
+msgstr "Right_Address"
 
-#: src/ext_l10n.h:398
+#: src/ext_l10n.h:418
 msgid "Rotatefoilhead"
-msgstr ""
+msgstr "Rotatefoilhead"
 
-#: src/ext_l10n.h:399
+#: src/ext_l10n.h:419
 msgid "Running_LaTeX_Title"
-msgstr ""
+msgstr "Running_LaTeX_Title"
 
-#: src/ext_l10n.h:400
+#: src/ext_l10n.h:420
 msgid "SCENE"
-msgstr ""
+msgstr "SCENE"
 
-#: src/ext_l10n.h:401
+#: src/ext_l10n.h:421
 msgid "SCENE*"
-msgstr ""
+msgstr "SCENE*"
 
-#: src/ext_l10n.h:402
+#: src/ext_l10n.h:422
 msgid "SGML"
-msgstr ""
+msgstr "SGML"
 
-#: src/ext_l10n.h:403
+#: src/ext_l10n.h:423
 msgid "Scrap"
-msgstr ""
+msgstr "Scrap"
 
-#: src/ext_l10n.h:404
+#: src/ext_l10n.h:424
 msgid "Section"
-msgstr ""
+msgstr "Section"
 
-#: src/ext_l10n.h:405
+#: src/ext_l10n.h:425
 msgid "Section*"
-msgstr ""
+msgstr "Section*"
 
-#: src/ext_l10n.h:406
+#: src/ext_l10n.h:426
 msgid "Section-numbered"
-msgstr ""
+msgstr "Section-numbered"
 
-#: src/ext_l10n.h:407
+#: src/ext_l10n.h:427
 msgid "Send"
-msgstr ""
+msgstr "Send"
 
-#: src/ext_l10n.h:408
+#: src/ext_l10n.h:428
 msgid "Send_To_Address"
-msgstr ""
+msgstr "Send_To_Address"
 
-#: src/ext_l10n.h:409
+#: src/ext_l10n.h:429
 msgid "Seriate"
-msgstr ""
+msgstr "Seriate"
 
-#: src/ext_l10n.h:410
+#: src/ext_l10n.h:430
 msgid "ShortFoilhead"
-msgstr ""
+msgstr "ShortFoilhead"
 
-#: src/ext_l10n.h:411
+#: src/ext_l10n.h:431
 msgid "ShortRotatefoilhead"
-msgstr ""
+msgstr "ShortRotatefoilhead"
 
-#: src/ext_l10n.h:412
+#: src/ext_l10n.h:432
 msgid "ShortTitle"
-msgstr ""
+msgstr "ShortTitle"
 
-#: src/ext_l10n.h:413
+#: src/ext_l10n.h:433
 msgid "Shortfoilhead"
-msgstr ""
+msgstr "Shortfoilhead"
 
-#: src/ext_l10n.h:414
+#: src/ext_l10n.h:434
 msgid "Signature"
-msgstr ""
+msgstr "Signature"
 
-#: src/ext_l10n.h:415
+#: src/ext_l10n.h:435
 msgid "Slide"
-msgstr ""
+msgstr "Slide"
 
-#: src/ext_l10n.h:416
+#: src/ext_l10n.h:436
 msgid "Slide*"
-msgstr ""
+msgstr "Slide*"
 
-#: src/ext_l10n.h:417
+#: src/ext_l10n.h:437
 msgid "SlideContents"
-msgstr ""
+msgstr "SlideContents"
 
-#: src/ext_l10n.h:418
+#: src/ext_l10n.h:438
 msgid "SlideHeading"
-msgstr ""
+msgstr "SlideHeading"
 
-#: src/ext_l10n.h:419
+#: src/ext_l10n.h:439
 msgid "SlideSubHeading"
-msgstr ""
+msgstr "SlideSubHeading"
 
-#: src/ext_l10n.h:420
+#: src/ext_l10n.h:440
 msgid "Solution"
-msgstr ""
+msgstr "Solution"
 
-#: src/ext_l10n.h:421
+#: src/ext_l10n.h:441
 msgid "Speaker"
-msgstr ""
+msgstr "Speaker"
 
-#: src/ext_l10n.h:422
+#: src/ext_l10n.h:442
 msgid "Specialmail"
-msgstr ""
+msgstr "Specialmail"
 
-#: src/ext_l10n.h:423
+#: src/ext_l10n.h:443
 msgid "Stadt"
-msgstr ""
+msgstr "Stadt"
 
-#: src/ext_l10n.h:424
+#: src/ext_l10n.h:444
 msgid "Standard"
-msgstr ""
+msgstr "Standard"
 
-#: src/ext_l10n.h:425
+#: src/ext_l10n.h:445
 msgid "State"
-msgstr ""
+msgstr "State"
 
-#: src/ext_l10n.h:426
+#: src/ext_l10n.h:446
 msgid "Strasse"
-msgstr ""
+msgstr "Strasse"
 
-#: src/ext_l10n.h:427
+#: src/ext_l10n.h:447
 msgid "Street"
-msgstr ""
+msgstr "Street"
 
-#: src/ext_l10n.h:428
+#: src/ext_l10n.h:448
 msgid "Style"
 msgstr "Stil"
 
-#: src/ext_l10n.h:429
-msgid "SubSection"
-msgstr ""
-
-#: src/ext_l10n.h:430
+#: src/ext_l10n.h:449
 msgid "SubTitle"
 msgstr "Undertittel"
 
-#: src/ext_l10n.h:431
+#: src/ext_l10n.h:450
 msgid "Subitle"
-msgstr ""
+msgstr "Subitle"
 
-#: src/ext_l10n.h:432
+#: src/ext_l10n.h:451
 msgid "Subject"
-msgstr ""
+msgstr "Subject"
 
-#: src/ext_l10n.h:433
+#: src/ext_l10n.h:452
 msgid "Subjectclass"
-msgstr ""
+msgstr "Subjectclass"
 
-#: src/ext_l10n.h:434
+#: src/ext_l10n.h:453
 msgid "Subparagraph"
 msgstr "Underavsnitt"
 
-#: src/ext_l10n.h:435
+#: src/ext_l10n.h:454
 msgid "Subparagraph*"
 msgstr "Underavsnitt*"
 
-#: src/ext_l10n.h:436
+#: src/ext_l10n.h:455
 msgid "Subsection"
 msgstr "Underseksjon"
 
-#: src/ext_l10n.h:437
+#: src/ext_l10n.h:456
 msgid "Subsection*"
 msgstr "Underseksjon*"
 
-#: src/ext_l10n.h:438
+#: src/ext_l10n.h:457
 msgid "Subsection-numbered"
-msgstr ""
+msgstr "Subsection-numbered"
 
-#: src/ext_l10n.h:439
+#: src/ext_l10n.h:458
 msgid "Subsubsection"
-msgstr ""
+msgstr "Subsubsection"
 
-#: src/ext_l10n.h:440
+#: src/ext_l10n.h:459
 msgid "Subsubsection*"
-msgstr ""
+msgstr "Subsubsection*"
 
-#: src/ext_l10n.h:441
+#: src/ext_l10n.h:460
 msgid "Subsubsection-numbered"
-msgstr ""
+msgstr "Subsubsection-numbered"
 
-#: src/ext_l10n.h:442
+#: src/ext_l10n.h:461
 msgid "Subtitle"
 msgstr "Undertittel"
 
-#: src/ext_l10n.h:443
+#: src/ext_l10n.h:462
 msgid "Suggested"
-msgstr ""
+msgstr "Suggested"
 
-#: src/ext_l10n.h:444
+#: src/ext_l10n.h:463
 msgid "Summary"
-msgstr ""
+msgstr "Summary"
 
-#: src/ext_l10n.h:445
+#: src/ext_l10n.h:464
 msgid "Summary-numbered"
-msgstr ""
+msgstr "Summary-numbered"
 
-#: src/ext_l10n.h:446
+#: src/ext_l10n.h:465
 msgid "Surname"
 msgstr "Etternavn"
 
-#: src/ext_l10n.h:447
+#: src/ext_l10n.h:466
 msgid "TOC_Author"
-msgstr ""
+msgstr "TOC_Author"
 
-#: src/ext_l10n.h:448
+#: src/ext_l10n.h:467
 msgid "TOC_Title"
-msgstr ""
+msgstr "TOC_Title"
 
-#: src/ext_l10n.h:449
+#: src/ext_l10n.h:468
 msgid "TableComments"
-msgstr ""
+msgstr "TableComments"
 
-#: src/ext_l10n.h:450
+#: src/ext_l10n.h:469
 msgid "TableRefs"
-msgstr ""
+msgstr "TableRefs"
 
-#: src/ext_l10n.h:451
+#: src/ext_l10n.h:470
 msgid "Telefax"
-msgstr ""
+msgstr "Telefax"
 
-#: src/ext_l10n.h:452
+#: src/ext_l10n.h:471
 msgid "Telefon"
-msgstr ""
+msgstr "Telefon"
 
-#: src/ext_l10n.h:453
+#: src/ext_l10n.h:472
 msgid "Telephone"
-msgstr ""
+msgstr "Telefon"
 
-#: src/ext_l10n.h:454
+#: src/ext_l10n.h:473
 msgid "Telex"
-msgstr ""
+msgstr "Telex"
 
-#: src/ext_l10n.h:455
+#: src/ext_l10n.h:474
 msgid "Thanks"
 msgstr "Takk"
 
-#: src/ext_l10n.h:456
+#: src/ext_l10n.h:475
 msgid "Theorem"
-msgstr ""
+msgstr "Theorem"
 
-#: src/ext_l10n.h:457
+#: src/ext_l10n.h:476
 msgid "Theorem*"
-msgstr ""
+msgstr "Theorem*"
 
-#: src/ext_l10n.h:458
+#: src/ext_l10n.h:477
 msgid "Theorem-numbered"
-msgstr ""
+msgstr "Theorem-numbered"
 
-#: src/ext_l10n.h:459
+#: src/ext_l10n.h:478
 msgid "Theorem-plain"
-msgstr ""
+msgstr "Theorem-plain"
 
-#: src/ext_l10n.h:460
+#: src/ext_l10n.h:479
 msgid "Theorem-unnumbered"
-msgstr ""
+msgstr "Theorem-unnumbered"
 
-#: src/ext_l10n.h:461
+#: src/ext_l10n.h:480
 msgid "TheoremTemplate"
-msgstr ""
+msgstr "TheoremTemplate"
 
-#: src/ext_l10n.h:462
+#: src/ext_l10n.h:481
 msgid "Thesaurus"
-msgstr ""
+msgstr "Thesaurus"
 
-#: src/ext_l10n.h:463
+#: src/ext_l10n.h:482
 msgid "ThickLine"
-msgstr ""
+msgstr "ThickLine"
 
-#: src/ext_l10n.h:464
+#: src/ext_l10n.h:483
 msgid "This"
-msgstr ""
+msgstr "This"
 
-#: src/ext_l10n.h:465
+#: src/ext_l10n.h:484
 msgid "ThreeAffiliations"
-msgstr ""
+msgstr "ThreeAffiliations"
 
-#: src/ext_l10n.h:466
+#: src/ext_l10n.h:485
 msgid "ThreeAuthors"
-msgstr ""
+msgstr "ThreeAuthors"
 
-#: src/ext_l10n.h:467
+#: src/ext_l10n.h:486
 msgid "TickList"
-msgstr ""
+msgstr "TickList"
 
-#: src/ext_l10n.h:468
+#: src/ext_l10n.h:487 src/frontends/gnome/FormCitation.C:529
 msgid "Title"
-msgstr ""
+msgstr "Tittel"
 
-#: src/ext_l10n.h:469
+#: src/ext_l10n.h:488
 msgid "Title_Running"
-msgstr ""
+msgstr "Title_Running"
 
-#: src/ext_l10n.h:470
+#: src/ext_l10n.h:489
 msgid "Titlehead"
-msgstr ""
+msgstr "Titlehead"
 
-#: src/ext_l10n.h:471
+#: src/ext_l10n.h:490
 msgid "Town"
-msgstr ""
+msgstr "By"
 
-#: src/ext_l10n.h:472
+#: src/ext_l10n.h:491
 msgid "Trans_Keywords"
-msgstr ""
+msgstr "Trans_Keywords"
 
-#: src/ext_l10n.h:473
+#: src/ext_l10n.h:492
 msgid "Transition"
-msgstr ""
+msgstr "Overgang"
 
-#: src/ext_l10n.h:474
+#: src/ext_l10n.h:493
 msgid "Translated"
-msgstr ""
+msgstr "Oversatt"
 
-#: src/ext_l10n.h:475
+#: src/ext_l10n.h:494
 msgid "TranslatedAbstract"
-msgstr ""
+msgstr "TranslatedAbstract"
 
-#: src/ext_l10n.h:476
+#: src/ext_l10n.h:495
 msgid "Translated_Title"
-msgstr ""
+msgstr "Translated_Title"
 
-#: src/ext_l10n.h:477
+#: src/ext_l10n.h:496
 msgid "Translator"
-msgstr ""
+msgstr "Oversetter"
 
-#: src/ext_l10n.h:478
+#: src/ext_l10n.h:497
 msgid "TwoAffiliations"
-msgstr ""
+msgstr "TwoAffiliations"
 
-#: src/ext_l10n.h:479
+#: src/ext_l10n.h:498
 msgid "TwoAuthors"
-msgstr ""
+msgstr "TwoAuthors"
 
-#: src/ext_l10n.h:480
+#. tooltips
+#: src/ext_l10n.h:499 src/frontends/gnome/FormUrl.C:117
+#: src/frontends/kde/formurldialog.C:61 src/frontends/kde/formurldialog.C:62
+#: src/frontends/xforms/form_url.C:28
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
-#: src/ext_l10n.h:481
+#: src/ext_l10n.h:500
 msgid "Unterschrift"
-msgstr ""
+msgstr "Unterschrift"
 
-#: src/ext_l10n.h:482
+#: src/ext_l10n.h:501
 msgid "Uppertitleback"
-msgstr ""
+msgstr "Uppertitleback"
 
-#: src/ext_l10n.h:483
+#: src/ext_l10n.h:502
 msgid "Use"
-msgstr ""
+msgstr "Use"
 
-#: src/ext_l10n.h:484
+#: src/ext_l10n.h:503
 msgid "Verbatim"
-msgstr ""
+msgstr "Verbatim"
 
-#: src/ext_l10n.h:485
+#: src/ext_l10n.h:504
 msgid "Verse"
 msgstr "Vers"
 
-#: src/ext_l10n.h:486
+#: src/ext_l10n.h:505
 msgid "Verteiler"
-msgstr ""
+msgstr "Verteiler"
 
-#: src/ext_l10n.h:487
+#: src/ext_l10n.h:506
 msgid "VisibleText"
-msgstr ""
+msgstr "VisibleText"
 
-#: src/ext_l10n.h:488
+#: src/ext_l10n.h:507
 msgid "YourMail"
-msgstr ""
+msgstr "YourMail"
 
-#: src/ext_l10n.h:489
+#: src/ext_l10n.h:508
 msgid "YourRef"
-msgstr ""
+msgstr "YourRef"
 
-#: src/ext_l10n.h:490
+#: src/ext_l10n.h:509
 msgid "Yourmail"
-msgstr ""
+msgstr "Yourmail"
 
-#: src/ext_l10n.h:491
+#: src/ext_l10n.h:510
 msgid "Yourref"
-msgstr ""
+msgstr "Yourref"
 
-#: src/ext_l10n.h:492
+#: src/ext_l10n.h:511
 msgid "Zusatz"
-msgstr ""
+msgstr "Zusatz"
 
-#: src/ext_l10n.h:493
+#: src/ext_l10n.h:512
 msgid "cc"
-msgstr ""
+msgstr "cc"
 
-#: src/ext_l10n.h:494
+#: src/ext_l10n.h:513
 msgid "encl"
-msgstr ""
+msgstr "encl"
 
-#: src/ext_l10n.h:495
+#: src/ext_l10n.h:514
 msgid "first"
-msgstr ""
+msgstr "first"
 
-#: src/ext_l10n.h:496
+#: src/ext_l10n.h:515
 msgid "foilhead"
-msgstr ""
+msgstr "foilhead"
 
-#: src/ext_l10n.h:497
+#: src/ext_l10n.h:516
 msgid "journal"
-msgstr ""
+msgstr "journal"
 
-#: src/ext_l10n.h:498 src/frontends/xforms/form_preferences.C:181
+#: src/ext_l10n.h:517 src/frontends/xforms/form_preferences.C:230
 msgid "landscape"
-msgstr ""
+msgstr "landscape"
 
-#: src/ext_l10n.h:499
+#: src/ext_l10n.h:518
 msgid "modying"
-msgstr ""
+msgstr "modying"
 
-#: src/ext_l10n.h:500
+#: src/ext_l10n.h:519
 msgid "msnumber"
-msgstr ""
+msgstr "msnumber"
 
-#: src/ext_l10n.h:501
+#: src/ext_l10n.h:520
 msgid "offsets"
-msgstr ""
+msgstr "offsets"
 
-#: src/ext_l10n.h:502
+#: src/ext_l10n.h:521
 msgid "ps"
-msgstr ""
+msgstr "ps"
 
-#: src/ext_l10n.h:503
+#: src/ext_l10n.h:522
 msgid "style"
-msgstr ""
+msgstr "style"
 
-#: src/ext_l10n.h:504
+#: src/ext_l10n.h:523
 msgid "surname"
 msgstr "etternavn"
 
@@ -2573,13 +2597,13 @@ msgstr "etternavn"
 msgid "Warning! Couldn't open directory."
 msgstr "Advarsel! Kunne ikke åpne folder:"
 
-#: src/FontLoader.C:247
+#: src/FontLoader.C:246
 msgid "Loading font into X-Server..."
 msgstr "Laster font inn i X-serveren..."
 
 #: src/form1.C:21
 msgid "Set Charset|#C"
-msgstr "Sett tegnsett"
+msgstr "Sett tegnsett|#t"
 
 #: src/form1.C:23
 msgid "Charset not found!"
@@ -2599,17 +2623,17 @@ msgstr ""
 
 #: src/form1.C:33
 msgid "Character set:|#H"
-msgstr "Tegnsett:|#H"
+msgstr "Tegnsett:|#T"
 
 #: src/form1.C:45
 msgid "Other...|#O"
-msgstr "Annet..."
+msgstr "Annet...|#n"
 
 #: src/form1.C:48
 msgid "Other...|#T"
 msgstr "Annet...|#A"
 
-#: src/form1.C:51
+#: src/form1.C:51 src/frontends/xforms/FormDocument.C:255
 msgid "Language"
 msgstr "Språk"
 
@@ -2619,15 +2643,15 @@ msgstr "Tastaturoppsett"
 
 #: src/form1.C:62
 msgid "Primary key map|#r"
-msgstr "Primært tastatur oppsett"
+msgstr "Primært tastatur oppsett|#r"
 
 #: src/form1.C:64
 msgid "No key mapping|#N"
-msgstr "Intet tastaturoppsett"
+msgstr "Intet tastaturoppsett|#I"
 
 #: src/form1.C:66
 msgid "Secondary key map|#e"
-msgstr "Sekundært tastatur oppsett"
+msgstr "Sekundært tastatur oppsett|#e"
 
 #: src/form1.C:70
 msgid "Secondary"
@@ -2639,17 +2663,52 @@ msgstr "Prim
 
 #: src/form1.C:99
 msgid "EPS file|#E"
-msgstr "EPS fil"
+msgstr "EPS fil|#E"
 
 #: src/form1.C:102
 msgid "Full Screen Preview|#v"
 msgstr "Fullskjerm forhåndsvisning|#F"
 
 #: src/form1.C:105 src/insets/form_graphics.C:40 src/insets/form_graphics.C:41
-#: src/lyx.C:221
+#: src/lyx.C:83
 msgid "Browse...|#B"
 msgstr "Se igjennom...|#j"
 
+#: src/form1.C:114 src/frontends/xforms/form_document.C:36
+#: src/frontends/xforms/form_document.C:37
+#: src/frontends/xforms/form_paragraph.C:247
+#: src/frontends/xforms/form_paragraph.C:248
+#: src/frontends/xforms/form_preferences.C:343
+#: src/frontends/xforms/form_preferences.C:344
+#: src/frontends/xforms/form_print.C:59 src/frontends/xforms/form_print.C:60
+#: src/frontends/xforms/form_tabular.C:386
+#: src/frontends/xforms/form_tabular.C:387 src/insets/form_graphics.C:56
+#: src/insets/form_graphics.C:57 src/layout_forms.C:54 src/layout_forms.C:104
+#: src/lyx.C:50 src/lyx_sendfax.C:39 src/mathed/math_forms.C:106
+#: src/mathed/math_forms.C:156 src/mathed/math_forms.C:201 src/print_form.C:31
+#: src/sp_form.C:62
+msgid "Apply|#A"
+msgstr "Bruk|#B"
+
+#: src/form1.C:120 src/form1.C:264 src/frontends/xforms/form_document.C:32
+#: src/frontends/xforms/form_document.C:33
+#: src/frontends/xforms/form_paragraph.C:243
+#: src/frontends/xforms/form_paragraph.C:244
+#: src/frontends/xforms/form_preferences.C:347
+#: src/frontends/xforms/form_preferences.C:348
+#: src/frontends/xforms/form_print.C:63 src/frontends/xforms/form_print.C:64
+#: src/frontends/xforms/form_tabular.C:390
+#: src/frontends/xforms/form_tabular.C:391 src/insets/form_graphics.C:68
+#: src/insets/form_graphics.C:69 src/insets/insetbib.C:59
+#: src/insets/insetbib.C:60 src/insets/insetinclude.C:55
+#: src/insets/insetinclude.C:56 src/layout_forms.C:108 src/lyx.C:53
+#: src/lyx_gui_misc.C:357 src/lyx_gui_misc.C:361 src/lyx_gui_misc.C:377
+#: src/lyx_sendfax.C:35 src/mathed/math_forms.C:100
+#: src/mathed/math_forms.C:130 src/mathed/math_forms.C:198 src/print_form.C:34
+#: src/sp_form.C:42
+msgid "Cancel|^["
+msgstr "Avbryt|^["
+
 #: src/form1.C:123
 msgid "Display Frame|#F"
 msgstr "Vis ramme|#r"
@@ -2658,15 +2717,13 @@ msgstr "Vis ramme|#r"
 msgid "Do Translations|#r"
 msgstr "Utfør translasjoner|#U"
 
-#: src/form1.C:129 src/insets/form_graphics.C:73 src/menus.C:196
-#: src/menus.C:207 src/menus.C:344 src/menus.C:345 src/menus.C:346
-#: src/menus.C:419 src/menus.C:420 src/menus.C:421 src/sp_form.C:58
+#: src/form1.C:129 src/insets/form_graphics.C:73 src/sp_form.C:58
 msgid "Options"
 msgstr "Opsjoner"
 
 #: src/form1.C:133 src/insets/form_graphics.C:79 src/insets/form_graphics.C:80
 msgid "Angle:|#L"
-msgstr "Vinkel:"
+msgstr "Vinkel:|#V"
 
 #: src/form1.C:139
 #, no-c-format
@@ -2685,16 +2742,18 @@ msgstr "cm|#m"
 msgid "inches|#h"
 msgstr "tommer|#o"
 
-#: src/form1.C:153 src/insets/form_graphics.C:84
+#: src/form1.C:153 src/frontends/xforms/form_graphics.C:48
+#: src/insets/form_graphics.C:84
 msgid "Display"
 msgstr "Vis"
 
-#: src/form1.C:157 src/insets/form_graphics.C:90
+#: src/form1.C:157 src/frontends/xforms/form_graphics.C:40
+#: src/insets/form_graphics.C:90
 msgid "Height"
 msgstr "Høyde"
 
-#: src/form1.C:161 src/insets/form_graphics.C:96 src/layout_forms.C:634
-#: src/layout_forms.C:718
+#: src/form1.C:161 src/frontends/xforms/form_graphics.C:38
+#: src/frontends/xforms/form_paragraph.C:170 src/insets/form_graphics.C:96
 msgid "Width"
 msgstr "Bredde"
 
@@ -2776,4805 +2835,4244 @@ msgstr "Bruker1|#1"
 msgid "User2|#2"
 msgstr "Bruker2|#2"
 
-#: src/form1.C:293 src/frontends/xforms/form_tabular.C:320
-#: src/layout_forms.C:119
-msgid "Columns"
-msgstr "Kolonner"
-
-#: src/form1.C:297 src/frontends/xforms/form_tabular.C:324
-#: src/mathed/math_forms.C:133
-msgid "Rows"
-msgstr "Rader"
-
-#: src/form1.C:318
+#: src/form1.C:286
 msgid "Find|#n"
 msgstr "Finn"
 
-#: src/form1.C:322
+#: src/form1.C:290
 msgid "Replace with|#W"
 msgstr "Erstatt med"
 
-#: src/form1.C:326
+#: src/form1.C:294
 msgid "@>|#F^s"
 msgstr "@>|#F^s"
 
-#: src/form1.C:330
+#: src/form1.C:298
 msgid "@<|#B^r"
 msgstr "@<|#B^r"
 
-#: src/form1.C:334
+#: src/form1.C:302
 msgid "Replace|#R#r"
 msgstr "Erstatt|#E#e"
 
-#: src/form1.C:338
+#: src/form1.C:306
 msgid "Close|^["
 msgstr "Lukk|^["
 
-#: src/form1.C:342
+#: src/form1.C:310
 msgid "Case sensitive|#s#S"
 msgstr "Forskjell på store og små bokstaver|#s#S"
 
-#: src/form1.C:344
+#: src/form1.C:312
 msgid "Match word|#M#m"
 msgstr "Eksakt ord|#k"
 
-#: src/form1.C:346
+#: src/form1.C:314
 msgid "Replace All|#A#a"
 msgstr "Erstatt Alle|#A#a"
 
-#: src/frontends/xforms/FormCitation.C:114
-msgid "Citation"
-msgstr "Sitering"
-
-#: src/frontends/xforms/form_citation.C:22
-msgid "Inset keys"
-msgstr ""
+#: src/frontends/gnome/FormCitation.C:371
+msgid "_Add new citation"
+msgstr "_Sett inn sitat"
 
-#: src/frontends/xforms/form_citation.C:26
-msgid "Bibliography keys"
-msgstr ""
+#: src/frontends/gnome/FormCitation.C:372
+msgid "_Edit/remove citation(s)"
+msgstr "_Edit/remove citation(s)"
 
-#: src/frontends/xforms/form_citation.C:30
-msgid "@4->"
-msgstr "@4->"
+#: src/frontends/gnome/FormCitation.C:397
+msgid " Citation: Select action "
+msgstr " Citation: Select action "
 
-#: src/frontends/xforms/form_citation.C:33
-msgid "@9+"
-msgstr "@9+"
+#: src/frontends/gnome/FormCitation.C:451
+msgid "Use Regular Expression"
+msgstr "Use Regular Expression"
 
-#: src/frontends/xforms/form_citation.C:36
-msgid "@8->"
-msgstr "@8->"
+#: src/frontends/gnome/FormCitation.C:453
+msgid "Search"
+msgstr "Search"
 
-#: src/frontends/xforms/form_citation.C:39
-msgid "@2->"
-msgstr "@2->"
+#: src/frontends/gnome/FormCitation.C:471
+msgid " Insert Citation: Enter keyword(s) or regular expression "
+msgstr " Insert Citation: Enter keyword(s) or regular expression "
 
-#: src/frontends/xforms/form_citation.C:42 src/lyxvc.C:111
-msgid "Info"
-msgstr "Info"
+#: src/frontends/gnome/FormCitation.C:527
+msgid "Key"
+msgstr "Tast"
 
-#: src/frontends/xforms/form_citation.C:45
-msgid "Citation style"
-msgstr ""
+#: src/frontends/gnome/FormCitation.C:528
+msgid "Author(s)"
+msgstr "Forfatter(e)"
 
-#: src/frontends/xforms/form_citation.C:48
-msgid "Text before"
-msgstr ""
+#: src/frontends/gnome/FormCitation.C:530
+msgid "Year"
+msgstr "År"
 
-#: src/frontends/xforms/form_citation.C:50
+#: src/frontends/gnome/FormCitation.C:549
+#: src/frontends/gnome/FormCitation.C:639
+#: src/frontends/kde/formcitationdialog.C:53
+#: src/frontends/xforms/form_citation.C:57
 msgid "Text after"
-msgstr ""
+msgstr "Text after"
 
-#: src/LyXAction.C:162 src/frontends/xforms/form_citation.C:55
-#: src/frontends/xforms/form_preferences.C:267 src/lyxfunc.C:727
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/frontends/gnome/FormCitation.C:560
+msgid " Insert Citation: Select citation "
+msgstr "Sett inn sitat: Velg sitat "
 
-#: src/frontends/xforms/form_citation.C:56
-msgid "^["
-msgstr "^["
+#: src/frontends/gnome/FormCitation.C:607
+msgid "_Remove"
+msgstr "_Fjern"
 
-#: src/frontends/xforms/FormCopyright.C:58
-msgid "Copyright and Warranty"
-msgstr "Copyright and Warranty"
+#: src/frontends/gnome/FormCitation.C:608
+msgid "_Up"
+msgstr "_Opp"
 
-#: src/frontends/xforms/form_copyright.C:21
-msgid ""
-"LyX is Copyright (C) 1995 by Matthias Ettrich, \n"
-"1995-2000 LyX Team"
-msgstr ""
-"LyX is Copyright (C) 1995 by Matthias Ettrich, \n"
-"1995-2000 LyX Team"
+#: src/frontends/gnome/FormCitation.C:609
+msgid "_Down"
+msgstr "_Ned"
 
-#: src/frontends/xforms/form_copyright.C:26
-msgid ""
-"This program is free software; you can redistribute it\n"
-"and/or modify it under the terms of the GNU General\n"
-"Public License as published by the Free Software\n"
-"Foundation; either version 2 of the License, or\n"
-"(at your option) any later version."
-msgstr ""
-"This program is free software; you can redistribute it\n"
-"and/or modify it under the terms of the GNU General\n"
-"Public License as published by the Free Software\n"
-"Foundation; either version 2 of the License, or\n"
-"(at your option) any later version."
+#: src/frontends/gnome/FormCitation.C:657
+msgid " Citation: Edit "
+msgstr "Sitering: Editer "
 
-#: src/frontends/xforms/form_copyright.C:35
-msgid ""
-"LyX is distributed in the hope that it will\n"
-"be useful, but WITHOUT ANY WARRANTY;\n"
-"without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.\n"
-"See the GNU General Public License for more details.\n"
-"You should have received a copy of\n"
-"the GNU General Public License\n"
-"along with this program; if not, write to\n"
-"the Free Software Foundation, Inc., \n"
-"675 Mass Ave, Cambridge, MA 02139, USA."
-msgstr ""
-"LyX is distributed in the hope that it will\n"
-"be useful, but WITHOUT ANY WARRANTY;\n"
-"without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.\n"
-"See the GNU General Public License for more details.\n"
-"You should have received a copy of\n"
-"the GNU General Public License\n"
-"along with this program; if not, write to\n"
-"the Free Software Foundation, Inc., \n"
-"675 Mass Ave, Cambridge, MA 02139, USA."
+#: src/frontends/gnome/FormCitation.C:749
+msgid "--- No such key in the database ---"
+msgstr "--- Ingen slik nøkkel i databasen ---"
 
-#: src/frontends/xforms/FormPreferences.C:61
-msgid "Bindings"
-msgstr "Bindinger"
+#: src/frontends/gnome/FormIndex.C:89 src/frontends/xforms/form_index.C:28
+msgid "Keyword"
+msgstr "Nøkkelord"
 
-#: src/frontends/xforms/FormPreferences.C:64
-msgid "Screen Fonts"
-msgstr "Skjermfonter"
+#: src/frontends/gnome/FormIndex.C:119
+msgid " Index "
+msgstr " Indeks "
 
-#: src/frontends/xforms/FormPreferences.C:67
-msgid "Interface Fonts"
-msgstr ""
+#: src/frontends/gnome/FormPrint.C:165 src/frontends/xforms/FormPrint.C:159
+msgid "Error:"
+msgstr "Feil:"
 
-#: src/frontends/xforms/FormPreferences.C:70
-msgid "Miscellaneous"
-msgstr ""
+#: src/frontends/gnome/FormPrint.C:166 src/frontends/xforms/FormPrint.C:160
+msgid "Unable to print"
+msgstr "Kan ikke lese skrive ut!"
 
-#: src/frontends/xforms/FormPreferences.C:73
-msgid "Printer"
-msgstr "Skriver"
+#: src/frontends/gnome/FormPrint.C:167 src/frontends/xforms/FormPrint.C:161
+msgid "Check that your parameters are correct"
+msgstr "Sjekk at parameterene er riktige"
 
-#: src/frontends/xforms/FormPreferences.C:76
-msgid "Paths"
-msgstr ""
+#: src/frontends/gnome/FormToc.C:100 src/frontends/gnome/FormToc.C:166
+#: src/frontends/kde/FormToc.C:165 src/frontends/kde/FormToc.C:166
+#: src/frontends/kde/formtocdialog.C:27 src/frontends/xforms/FormToc.C:31
+#: src/insets/insettoc.C:21
+msgid "Table of Contents"
+msgstr "Innholdsfortegnelse"
 
-#: src/frontends/xforms/FormPreferences.C:97
-msgid "Preferences"
-msgstr ""
+#: src/frontends/gnome/FormToc.C:104 src/frontends/gnome/FormToc.C:172
+#: src/frontends/kde/FormToc.C:170 src/frontends/kde/FormToc.C:171
+#: src/frontends/kde/formtocdialog.C:28 src/insets/insettoc.C:25
+msgid "List of Figures"
+msgstr "Figurliste"
 
-#: src/frontends/xforms/form_preferences.C:21
-msgid "Bind file"
-msgstr ""
+#: src/frontends/gnome/FormToc.C:108 src/frontends/gnome/FormToc.C:184
+#: src/frontends/kde/FormToc.C:175 src/frontends/kde/FormToc.C:176
+#: src/frontends/kde/formtocdialog.C:29 src/insets/insettoc.C:27
+msgid "List of Tables"
+msgstr "Liste over tabeller"
 
-#: src/frontends/xforms/form_preferences.C:23
-#: src/frontends/xforms/form_preferences.C:213
-#: src/frontends/xforms/form_preferences.C:224
-#: src/frontends/xforms/form_preferences.C:231
-#: src/frontends/xforms/form_preferences.C:235
-#: src/frontends/xforms/form_preferences.C:246
-msgid "Browse..."
-msgstr "Se igjennom..."
+#: src/frontends/gnome/FormToc.C:112 src/frontends/gnome/FormToc.C:178
+#: src/frontends/kde/FormToc.C:180 src/frontends/kde/FormToc.C:181
+#: src/frontends/kde/formtocdialog.C:30 src/insets/insettoc.C:23
+msgid "List of Algorithms"
+msgstr "Liste over algoritmer"
 
-#: src/frontends/xforms/form_preferences.C:41
-msgid "Show banner"
-msgstr "Vis banner"
+#: src/frontends/gnome/FormToc.C:147 src/frontends/xforms/FormToc.C:97
+msgid "*** No Document ***"
+msgstr "*** Intet Dokument ***"
 
-#: src/frontends/xforms/form_preferences.C:44
-msgid "Auto region delete"
-msgstr ""
+#: src/frontends/gnome/FormUrl.C:91 src/frontends/xforms/form_url.C:38
+msgid "HTML type"
+msgstr "HTML type"
 
-#: src/frontends/xforms/form_preferences.C:47
-msgid "Exit confirmation"
-msgstr ""
+#: src/frontends/gnome/FormUrl.C:131
+msgid " URL "
+msgstr " URL "
 
-#: src/frontends/xforms/form_preferences.C:50
-msgid "Display keyboard shortcuts"
-msgstr ""
+#: src/frontends/gnome/Menubar_pimpl.C:119
+msgid "Refresh"
+msgstr "Oppdater"
 
-#: src/frontends/xforms/form_preferences.C:53
-msgid "Autosave interval"
-msgstr ""
+#: src/frontends/gnome/Menubar_pimpl.C:149
+msgid "<No Name>"
+msgstr "<Uten Navn>"
+
+#: src/frontends/kde/FormCitation.C:150 src/frontends/kde/FormRef.C:196
+#: src/frontends/kde/formindexdialog.C:60 src/frontends/kde/formtocdialog.C:47
+msgid "&Close"
+msgstr "&Lukk"
+
+#: src/frontends/kde/FormCitation.C:156 src/frontends/kde/FormRef.C:198
+#: src/frontends/kde/formcitationdialog.C:86
+#: src/frontends/kde/formindexdialog.C:65
+#: src/frontends/kde/formindexdialogdata.C:85
+#: src/frontends/kde/formprintdialogdata.C:133
+#: src/frontends/kde/formrefdialog.C:91 src/frontends/kde/formurldialog.C:57
+msgid "&Cancel"
+msgstr "&Avbryt"
+
+#: src/frontends/kde/FormCitation.C:189
+msgid "LyX: Citation Reference"
+msgstr "LyX: Siteringsreferanse"
+
+#: src/frontends/kde/FormCitation.C:370
+msgid "Key not found in references."
+msgstr "Nøkkel ikke funnet i referanser."
+
+#: src/frontends/kde/formcitationdialog.C:27
+msgid "Selected keys"
+msgstr "Valgte nøkler"
+
+#: src/frontends/kde/formcitationdialog.C:34
+msgid "Available keys"
+msgstr "Tilgjengelige nøkler"
+
+#: src/frontends/kde/formcitationdialog.C:41
+msgid "Reference entry"
+msgstr "Referanse"
 
-#: src/frontends/xforms/form_preferences.C:60
-msgid "Ascii line length"
-msgstr ""
+#: src/frontends/kde/formcitationdialog.C:60
+msgid "&Add"
+msgstr "&Legg til"
 
-#: src/frontends/xforms/form_preferences.C:83 src/lyxfont.C:38
-msgid "Roman"
-msgstr "Roman"
+#: src/frontends/kde/formcitationdialog.C:65
+msgid "&Up"
+msgstr "&Opp"
 
-#: src/frontends/xforms/form_preferences.C:85
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: src/frontends/kde/formcitationdialog.C:70
+msgid "&Down"
+msgstr "&Ned"
 
-#: src/frontends/xforms/form_preferences.C:87 src/lyxfont.C:38
-msgid "Typewriter"
-msgstr "Skrivemaskin"
+#: src/frontends/kde/formcitationdialog.C:75
+msgid "&Remove"
+msgstr "&Fjern"
 
-#: src/frontends/xforms/form_preferences.C:89
-#, c-format
-msgid "%"
-msgstr "%"
+#: src/frontends/kde/FormPrint.C:106 src/frontends/kde/formcitationdialog.C:80
+#: src/frontends/kde/formindexdialogdata.C:68
+#: src/frontends/kde/formrefdialog.C:85 src/frontends/kde/formurldialog.C:51
+msgid "&OK"
+msgstr "&OK"
 
-#: src/frontends/xforms/form_preferences.C:96
-msgid "Allow scaling"
-msgstr "Tillat skalering"
+#. tooltips
+#: src/frontends/kde/formcitationdialog.C:92
+msgid "Keys currently selected"
+msgstr "Keys currently selected"
 
-#: src/frontends/xforms/form_preferences.C:99
-#: src/frontends/xforms/form_preferences.C:141
-msgid "Encoding"
-msgstr "Enkoding"
+#: src/frontends/kde/formcitationdialog.C:93
+msgid "Reference keys available"
+msgstr "Tilgjengelige referansenøkler"
 
-#: src/frontends/xforms/form_preferences.C:101
-msgid "tiny"
-msgstr ""
+#: src/frontends/kde/formcitationdialog.C:94
+msgid "Reference entry text"
+msgstr "Referansetekst"
 
-#: src/frontends/xforms/form_preferences.C:103
-msgid "script"
-msgstr ""
+#: src/frontends/kde/formcitationdialog.C:95
+msgid "Text to place after citation"
+msgstr "Text to place after citation"
 
-#: src/LColor.C:84 src/frontends/xforms/form_preferences.C:105
-msgid "footnote"
-msgstr "fotnote"
+#: src/frontends/kde/FormCopyright.C:42
+#: src/frontends/xforms/FormCopyright.C:19
+msgid "Copyright and Warranty"
+msgstr "Copyright and Warranty"
 
-#: src/frontends/xforms/form_preferences.C:107
-msgid "small"
-msgstr ""
+#: src/frontends/kde/FormIndex.C:92 src/frontends/kde/FormIndex.C:94
+msgid "LyX: Index"
+msgstr "LyX: Indeks"
 
-#: src/frontends/xforms/form_preferences.C:109
-msgid "large"
-msgstr ""
+#. tooltips
+#: src/frontends/kde/formindexdialog.C:27
+#: src/frontends/kde/formindexdialog.C:28
+msgid "Index entry"
+msgstr "Indeks element"
 
-#: src/frontends/xforms/form_preferences.C:111
-msgid "larger"
-msgstr ""
+#: src/frontends/kde/formindexdialogdata.C:42
+msgid "Keyword:"
+msgstr "Nøkkelord:"
 
-#: src/frontends/xforms/form_preferences.C:113
-msgid "largest"
-msgstr ""
+#. FIXME: should have a utility class for this
+#: src/frontends/kde/FormPrint.C:104
+msgid ""
+"An error occured while printing.\n"
+"\n"
+msgstr "En feil oppstod under utskrift.\n\n"
 
-#: src/frontends/xforms/form_preferences.C:115
-msgid "normal"
-msgstr ""
+#: src/frontends/kde/FormPrint.C:105
+msgid "Check the parameters are correct.\n"
+msgstr "Sjekk at parameterene er riktige.\n"
 
-#: src/frontends/xforms/form_preferences.C:117
-msgid "huge"
-msgstr ""
+#: src/frontends/kde/FormPrint.C:106
+msgid "LyX: Print Error"
+msgstr "LyX: Skrive feil"
 
-#: src/frontends/xforms/form_preferences.C:119
-msgid "huger"
-msgstr ""
+#: src/frontends/kde/FormPrint.C:116
+msgid "LyX: Print"
+msgstr "LyX: Skriv ut"
 
-#: src/frontends/xforms/form_preferences.C:137
-msgid "Popup"
-msgstr ""
+#: src/frontends/kde/formprintdialogdata.C:42
+msgid "Pages"
+msgstr "Sider"
 
-#: src/frontends/xforms/form_preferences.C:139
-msgid "Menu"
-msgstr "Meny"
+#: src/frontends/kde/formprintdialogdata.C:73
+#: src/frontends/xforms/form_print.C:109
+msgid "Copies"
+msgstr "Kopier"
 
-#: src/frontends/xforms/form_preferences.C:159
-msgid "command"
-msgstr "kommando"
+#: src/frontends/kde/formprintdialogdata.C:88
+#: src/frontends/xforms/form_print.C:30
+msgid "Print to"
+msgstr "Skriv til"
 
-#: src/frontends/xforms/form_preferences.C:161
-msgid "page range"
-msgstr ""
+#: src/frontends/kde/formprintdialogdata.C:116
+msgid "&Print"
+msgstr "&Skriv ut"
 
-#: src/frontends/xforms/form_preferences.C:163
-msgid "copies"
-msgstr "kopier"
+#: src/frontends/kde/formprintdialogdata.C:149
+msgid "&All pages"
+msgstr "&Alle sidene"
 
-#: src/frontends/xforms/form_preferences.C:165
-msgid "reverse"
-msgstr ""
+#: src/frontends/kde/formprintdialogdata.C:162
+msgid "&Even pages"
+msgstr "&Partallssider"
 
-#: src/frontends/xforms/form_preferences.C:167
-msgid "to printer"
-msgstr "til skriver"
+#: src/frontends/kde/formprintdialogdata.C:192
+msgid "From"
+msgstr "Fra"
 
-#: src/frontends/xforms/form_preferences.C:169
-msgid "file extension"
-msgstr "filekstensjon"
+#: src/frontends/kde/formprintdialogdata.C:208
+msgid "To"
+msgstr "Til"
 
-#: src/frontends/xforms/form_preferences.C:171
-msgid "spool command"
-msgstr ""
+#: src/frontends/kde/formprintdialogdata.C:220
+msgid "&Odd pages"
+msgstr "&Oddetallssider"
+
+#: src/frontends/kde/formprintdialogdata.C:233
+msgid "&Printer"
+msgstr "&Skriver"
+
+#: src/frontends/kde/formprintdialogdata.C:246
+msgid "&File"
+msgstr "&Fil"
+
+#: src/frontends/kde/formprintdialogdata.C:272
+msgid "&Reverse order"
+msgstr "&Omvent rekkefølge"
+
+#: src/frontends/kde/formprintdialogdata.C:298
+msgid "&Sort"
+msgstr "&Sorter"
+
+#: src/frontends/kde/formprintdialogdata.C:312
+msgid "&Browse"
+msgstr "Se &igjennom..."
+
+#: src/frontends/kde/formprintdialogdata.C:345
+msgid "Count"
+msgstr "Antall"
+
+#: src/frontends/kde/FormRef.C:103
+msgid "&Go back"
+msgstr "&Tilbake"
+
+#: src/frontends/kde/FormRef.C:108 src/frontends/kde/FormRef.C:119
+#: src/frontends/kde/FormRef.C:179 src/frontends/kde/formrefdialog.C:75
+msgid "&Goto reference"
+msgstr "&Gå til kryssreferansse"
+
+#: src/frontends/kde/FormRef.C:244
+msgid "LyX: Cross Reference"
+msgstr "LyX: Kryssreferanse"
+
+#: src/frontends/kde/formrefdialog.C:29
+msgid "Available References"
+msgstr "Tilgjengelige referanser"
+
+#: src/frontends/kde/formrefdialog.C:44 src/frontends/kde/formurldialog.C:38
+msgid "Name :"
+msgstr "Navn :"
+
+#: src/frontends/kde/formrefdialog.C:50
+msgid "Reference :"
+msgstr "Referanse :"
+
+#: src/frontends/kde/formrefdialog.C:56 src/frontends/xforms/form_ref.C:36
+msgid "Sort"
+msgstr "Sorter"
+
+#: src/frontends/kde/formrefdialog.C:62
+msgid "Page number"
+msgstr "Sidetall"
+
+#: src/frontends/kde/formrefdialog.C:63
+msgid "Ref on page xxx"
+msgstr "Ref on page xxx"
+
+#: src/frontends/kde/formrefdialog.C:64
+msgid "on page xxx"
+msgstr "on page xxx"
+
+#: src/frontends/kde/formrefdialog.C:65
+msgid "Pretty reference"
+msgstr "Pen referanse"
+
+#: src/frontends/kde/formrefdialog.C:69
+msgid "Reference Type"
+msgstr "Referansetype"
+
+#: src/frontends/kde/formrefdialog.C:80 src/frontends/kde/formtocdialog.C:42
+msgid "&Update"
+msgstr "&Oppdater"
+
+#. tooltips
+#: src/frontends/kde/formrefdialog.C:97
+msgid "Reference as it appears in output"
+msgstr "Reference as it appears in output"
+
+#: src/frontends/kde/formrefdialog.C:98
+msgid "Sort references in alphabetical order ?"
+msgstr "Sort references in alphabetical order ?"
+
+#: src/frontends/kde/FormToc.C:243
+msgid "LyX: Table of Contents"
+msgstr "LyX: Innholdsfortegnelse"
+
+#: src/frontends/kde/formtocdialog.C:56
+msgid "Depth"
+msgstr "Dybde"
+
+#: src/LyXAction.C:123 src/frontends/kde/FormUrl.C:80
+#: src/frontends/xforms/FormBase.h:51 src/frontends/xforms/FormParagraph.C:57
+#: src/frontends/xforms/form_error.C:30 src/frontends/xforms/form_toc.C:31
+#: src/layout_forms.C:58 src/log_form.C:21 src/lyx_sendfax.C:109
+#: src/lyxvc.C:262 src/mathed/math_forms.C:177
+msgid "Close"
+msgstr "Lukk"
 
-#: src/frontends/xforms/form_preferences.C:173
-msgid "paper type"
-msgstr ""
+#: src/LyXAction.C:155 src/frontends/kde/FormUrl.C:87
+#: src/frontends/xforms/FormBase.h:52 src/frontends/xforms/FormParagraph.C:56
+#: src/frontends/xforms/form_citation.C:62
+#: src/frontends/xforms/form_index.C:32 src/frontends/xforms/form_ref.C:57
+#: src/frontends/xforms/form_url.C:43 src/lyxfunc.C:849
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: src/frontends/xforms/form_preferences.C:175
-msgid "even pages"
-msgstr ""
+#: src/frontends/kde/FormUrl.C:117
+msgid "LyX: Url"
+msgstr "LyX: Url"
 
-#: src/frontends/xforms/form_preferences.C:177
-msgid "odd pages"
-msgstr ""
+#: src/frontends/kde/formurldialog.C:32
+msgid "Url :"
+msgstr "Url :"
 
-#: src/frontends/xforms/form_preferences.C:179
-msgid "collated"
-msgstr ""
+#: src/frontends/kde/formurldialog.C:44
+msgid "Generate hyperlink"
+msgstr "Generate hyperlink"
 
-#: src/frontends/xforms/form_preferences.C:183
-msgid "to file"
-msgstr "til fil"
+#: src/frontends/kde/formurldialog.C:63 src/frontends/kde/formurldialog.C:64
+msgid "Name associated with the URL"
+msgstr "Name associated with the URL"
 
-#: src/frontends/xforms/form_preferences.C:185
-msgid "extra options"
-msgstr ""
+#: src/frontends/kde/formurldialog.C:65
+msgid "Output as a hyperlink ?"
+msgstr "Output as a hyperlink ?"
 
-#: src/frontends/xforms/form_preferences.C:187
-msgid "spool printer prefix"
-msgstr ""
+#: src/frontends/xforms/FormCitation.C:40
+msgid "Citation"
+msgstr "Sitering"
 
-#: src/frontends/xforms/form_preferences.C:189
-msgid "paper size"
-msgstr ""
+#: src/frontends/xforms/form_citation.C:29
+msgid "Inset keys"
+msgstr "Inset keys"
 
-#: src/frontends/xforms/form_preferences.C:191
-msgid "name"
-msgstr "navn"
+#: src/frontends/xforms/form_citation.C:33
+msgid "Bibliography keys"
+msgstr "Bibliography keys"
 
-#: src/frontends/xforms/form_preferences.C:193
-msgid "adapt output"
-msgstr ""
+#: src/frontends/xforms/form_citation.C:37
+msgid "@4->"
+msgstr "@4->"
 
-#: src/frontends/xforms/form_preferences.C:211
-msgid "Default path"
-msgstr ""
+#: src/frontends/xforms/form_citation.C:40
+msgid "@9+"
+msgstr "@9+"
 
-#: src/frontends/xforms/form_preferences.C:215
-msgid "Last file count"
-msgstr ""
+#: src/frontends/xforms/form_citation.C:43
+msgid "@8->"
+msgstr "@8->"
 
-#: src/frontends/xforms/form_preferences.C:222
-msgid "Template path"
-msgstr ""
+#: src/frontends/xforms/form_citation.C:46
+msgid "@2->"
+msgstr "@2->"
 
-#: src/frontends/xforms/form_preferences.C:226
-msgid "Check last files"
-msgstr ""
+#: src/frontends/xforms/form_citation.C:49 src/lyxvc.C:111
+msgid "Info"
+msgstr "Info"
 
-#: src/frontends/xforms/form_preferences.C:229
-msgid "Temp dir"
-msgstr ""
+#: src/frontends/xforms/form_citation.C:52
+msgid "Citation style"
+msgstr "Citation style"
 
-#: src/frontends/xforms/form_preferences.C:233
-msgid "Lastfiles"
+#: src/frontends/xforms/form_citation.C:55
+msgid "Text before"
+msgstr "Text before"
+
+#: src/frontends/xforms/form_citation.C:63
+#: src/frontends/xforms/form_index.C:33 src/frontends/xforms/form_url.C:44
+msgid "^["
+msgstr "^["
+
+#: src/frontends/xforms/form_copyright.C:28
+msgid ""
+"LyX is Copyright (C) 1995 by Matthias Ettrich, \n"
+"1995-2000 LyX Team"
 msgstr ""
+"LyX is Copyright (C) 1995 by Matthias Ettrich, \n"
+"1995-2000 LyX Team"
 
-#: src/frontends/xforms/form_preferences.C:244
-msgid "Backup path"
+#: src/frontends/xforms/form_copyright.C:33
+msgid ""
+"This program is free software; you can redistribute it\n"
+"and/or modify it under the terms of the GNU General\n"
+"Public License as published by the Free Software\n"
+"Foundation; either version 2 of the License, or\n"
+"(at your option) any later version."
 msgstr ""
+"This program is free software; you can redistribute it\n"
+"and/or modify it under the terms of the GNU General\n"
+"Public License as published by the Free Software\n"
+"Foundation; either version 2 of the License, or\n"
+"(at your option) any later version."
 
-#: src/frontends/xforms/form_preferences.C:264
-msgid "Apply"
-msgstr "Bruk"
+#: src/frontends/xforms/form_copyright.C:42
+msgid ""
+"LyX is distributed in the hope that it will\n"
+"be useful, but WITHOUT ANY WARRANTY;\n"
+"without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"See the GNU General Public License for more details.\n"
+"You should have received a copy of\n"
+"the GNU General Public License\n"
+"along with this program; if not, write to\n"
+"the Free Software Foundation, Inc., \n"
+"675 Mass Ave, Cambridge, MA 02139, USA."
+msgstr ""
+"LyX is distributed in the hope that it will\n"
+"be useful, but WITHOUT ANY WARRANTY;\n"
+"without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"See the GNU General Public License for more details.\n"
+"You should have received a copy of\n"
+"the GNU General Public License\n"
+"along with this program; if not, write to\n"
+"the Free Software Foundation, Inc., \n"
+"675 Mass Ave, Cambridge, MA 02139, USA."
 
-#: src/frontends/xforms/form_preferences.C:270
-msgid "Ok"
-msgstr "Ok"
+#: src/frontends/xforms/FormDocument.C:48
+msgid "Document Layout"
+msgstr "Dokumentstil"
 
-#: src/LyXAction.C:137 src/LyXAction.C:145
-#: src/frontends/xforms/FormPrint.C:105 src/frontends/xforms/form_print.C:83
-msgid "Print"
-msgstr "Skriv ut"
+#: src/frontends/xforms/FormDocument.C:100
+msgid ""
+" Default | Custom | USletter | USlegal | USexecutive | A3 | A4 | A5 | B3 | "
+"B4 | B5 "
+msgstr ""
+" Standard | Egen Definert | USletter | USlegal | USexecutive | A3 | A4 | A5 "
+"| B3 | B4 | B5 "
 
-#: src/frontends/xforms/FormPrint.C:166
-msgid "Error:"
-msgstr "Feil:"
+#: src/frontends/xforms/FormDocument.C:103
+msgid ""
+" None | A4 small Margins (only portrait) | A4 very small Margins (only "
+"portrait) | A4 very wide margins (only portrait) "
+msgstr ""
+"Ingen | A4 smale marger (bare høydeformat) | A4 veldig smale marger (bare "
+"høydeformat) | A4 veldig vide marger (bare høydeformat) "
 
-#: src/frontends/xforms/FormPrint.C:167
-msgid "Unable to print"
-msgstr "Kan ikke lese skrive ut!"
+#: src/frontends/xforms/FormDocument.C:160
+msgid " Single | OneHalf | Double | Other "
+msgstr " Enkel | Halvannen | Dobbel | Annet "
 
-#: src/frontends/xforms/FormPrint.C:168
-msgid "Check that your parameters are correct"
-msgstr "Sjekk at parameterene er riktige"
+#: src/frontends/xforms/FormDocument.C:168
+msgid " Smallskip | Medskip | Bigskip | Length "
+msgstr " Smallskip | Medskip | Bigskip | Length "
 
-#: src/frontends/xforms/form_print.C:23
-msgid "Print to"
-msgstr "Skriv til"
+#: src/frontends/xforms/FormDocument.C:214
+msgid " ``text'' | ''text'' | ,,text`` | ,,text'' | «text» | »text« "
+msgstr " ``tekst'' | ''tekst'' | ,,tekst`` | ,,tekst'' | «tekst» | »tekst« "
 
-#: src/frontends/xforms/form_print.C:35
-msgid "Printer|#P"
-msgstr "Skriver"
-
-#: src/frontends/xforms/form_print.C:38 src/lyx.C:218
-msgid "File|#F"
-msgstr "Fil"
-
-#: src/frontends/xforms/form_print.C:58
-msgid "All Pages|#G"
-msgstr "Alle sidene"
-
-#: src/frontends/xforms/form_print.C:61
-msgid "Only Odd Pages|#O"
-msgstr "Bare odde sider"
+#: src/frontends/xforms/FormDocument.C:241
+msgid ""
+" default | tiny | script | footnote | small | normal | large | Large | LARGE "
+"| huge | Huge"
+msgstr ""
+"standad | bitteliten | minst | mindre | liten | normal | stor | større | "
+"størst | enorm | gigantisk"
 
-#: src/frontends/xforms/form_print.C:64
-msgid "Only Even Pages|#E"
-msgstr "Bare like sider"
+#: src/frontends/xforms/FormDocument.C:251 src/insets/figinset.C:1939
+#: src/insets/insetexternal.C:129 src/lyxfunc.C:3134 src/lyxfunc.C:3209
+#: src/lyxfunc.C:3413
+msgid "Document"
+msgstr "Dokumentet"
 
-#: src/frontends/xforms/form_print.C:71
-msgid "Normal Order|#N"
-msgstr "Normal rekkefølge"
+#: src/frontends/xforms/FormDocument.C:253
+msgid "Paper"
+msgstr "Ark"
 
-#: src/frontends/xforms/form_print.C:74
-msgid "Reverse Order|#R"
-msgstr "Omvent rekkefølge"
+#: src/frontends/xforms/FormDocument.C:257
+#: src/frontends/xforms/FormParagraph.C:127
+msgid "Extra"
+msgstr "Ekstra"
 
-#: src/frontends/xforms/form_print.C:79
-msgid "Order"
-msgstr "Rekkefølge"
+#: src/frontends/xforms/FormDocument.C:259
+msgid "Bullets"
+msgstr "Bomber"
 
-#: src/frontends/xforms/form_print.C:87
-msgid "Pages:"
-msgstr "Sider: "
+#: src/frontends/xforms/FormDocument.C:262
+msgid ""
+"Your version of libXpm is older than 4.7.\n"
+"The `bullet' tab of the document popup has been disabled"
+msgstr ""
+"Your version of libXpm is older than 4.7.\n"
+"The `bullet' tab of the document popup has been disabled"
 
-#: src/frontends/xforms/form_print.C:93
-msgid "Copies"
-msgstr "Kopier"
+#: src/frontends/xforms/FormDocument.C:286
+msgid "Document layout set"
+msgstr "Dokument stil satt"
 
-#: src/frontends/xforms/form_print.C:97
-msgid "Count:"
-msgstr "Antall:"
+#: src/frontends/xforms/FormDocument.C:403
+msgid "Converting document to new document class..."
+msgstr "Konverterer dokument til ny tekstklasse..."
 
-#: src/frontends/xforms/form_print.C:101
-msgid "Unsorted|#U"
-msgstr "Usortert|#U"
+#: src/frontends/xforms/FormDocument.C:411
+msgid "One paragraph couldn't be converted"
+msgstr "Ett avsnitt var umulig å konvertere"
 
-#: src/frontends/xforms/form_print.C:104
-msgid "to"
-msgstr "til"
+#: src/frontends/xforms/FormDocument.C:414
+msgid " paragraphs couldn't be converted"
+msgstr " avsnitt var umulig å konvertere"
 
-#: src/frontends/xforms/FormTabular.C:74
-msgid "Tabular"
-msgstr "Tabell"
+#. problem changing class -- warn user and retain old style
+#: src/frontends/xforms/FormDocument.C:416
+#: src/frontends/xforms/FormDocument.C:423
+#: src/frontends/xforms/FormDocument.C:1081
+msgid "Conversion Errors!"
+msgstr "Konverteringsfeil!"
 
-#: src/frontends/xforms/FormTabular.C:76
-msgid "Column/Row"
-msgstr ""
+#: src/frontends/xforms/FormDocument.C:417
+msgid "into chosen document class"
+msgstr "til valgete tekstklasse"
 
-#: src/frontends/xforms/FormTabular.C:78
-msgid "Cell"
-msgstr "Celle"
+#: src/frontends/xforms/FormDocument.C:424
+msgid "Errors loading new document class."
+msgstr "Feil under lesing av ny dokumentklasse."
 
-#: src/frontends/xforms/FormTabular.C:80
-msgid "LongTable"
-msgstr ""
+#: src/frontends/xforms/FormDocument.C:425
+#: src/frontends/xforms/FormDocument.C:1083
+msgid "Reverting to original document class."
+msgstr "Går tilbake til opprinnelig dokument klasse."
 
-#: src/frontends/xforms/FormTabular.C:110
-msgid "Tabular Layout"
-msgstr "Tabell stil"
+#: src/frontends/xforms/FormDocument.C:804
+msgid "Document is read-only. No changes to layout permitted."
+msgstr "Dokumentet er skrivebeskyttet. Stil endringer er ikke tillatt."
 
-#: src/TableLayout.C:280 src/frontends/xforms/FormTabular.C:531
-msgid "Warning: Wrong Cursor position, updated window"
-msgstr "Advarsel: Feil markør posisjon, oppdaterte vindu"
+#: src/frontends/xforms/FormDocument.C:1071
+msgid "Should I set some parameters to"
+msgstr "Skal jeg sette noen paramtere til"
 
-#: src/PaperLayout.C:274 src/ParagraphExtra.C:303 src/TableLayout.C:301
-#: src/TableLayout.C:475 src/frontends/xforms/FormTabular.C:547
-#: src/frontends/xforms/FormTabular.C:561
-#: src/frontends/xforms/FormTabular.C:573
-msgid "Warning: Invalid Length (valid example: 10mm)"
-msgstr "Advarsel: Ugyldig lengde (gyldig eksempel: 10mm)"
+#: src/frontends/xforms/FormDocument.C:1072
+msgid "the defaults of this document class?"
+msgstr "sette standardverdiene for denne tekstklassen?"
 
-#: src/frontends/xforms/FormTabular.C:723
-msgid "Insert Tabular"
-msgstr "Sett inn tabell"
+#: src/frontends/xforms/FormDocument.C:1082
+msgid "Unable to switch to new document class."
+msgstr "Kan ikke bytte til ny dokument klasse."
 
-#: src/frontends/xforms/form_tabular.C:21
+#: src/frontends/xforms/form_document.C:30
+#: src/frontends/xforms/form_paragraph.C:241
+#: src/frontends/xforms/form_tabular.C:28
 msgid "Tabbed folder"
-msgstr ""
+msgstr "Tabbed folder"
+
+#: src/frontends/xforms/form_document.C:45
+#: src/frontends/xforms/form_document.C:46
+#: src/frontends/xforms/form_paragraph.C:254
+#: src/frontends/xforms/form_paragraph.C:255
+#: src/frontends/xforms/form_preferences.C:356
+#: src/frontends/xforms/form_preferences.C:357
+msgid "Restore|#R"
+msgstr "Sett tilbake|#S"
+
+#: src/frontends/xforms/form_document.C:75
+#: src/frontends/xforms/form_document.C:76
+msgid "Special:|#S"
+msgstr "Spesiell:|#S"
 
-#: src/frontends/xforms/form_tabular.C:23
-msgid "Close|#C"
-msgstr "Lukk|#L"
+#: src/frontends/xforms/form_document.C:86
+msgid "Margins"
+msgstr "Tekstmarger"
 
-#: src/frontends/xforms/form_tabular.C:54 src/layout_forms.C:605
-msgid "Append Column|#A"
-msgstr "Legg til kolonne|#k"
+#: src/frontends/xforms/form_document.C:90
+msgid "Foot/Head Margins"
+msgstr "Topp og bunn marger"
 
-#: src/frontends/xforms/form_tabular.C:57 src/layout_forms.C:608
-msgid "Delete Column|#O"
-msgstr "Slett kolonne|#S"
+#: src/frontends/xforms/form_document.C:101
+msgid "Orientation"
+msgstr "Orientering"
 
-#: src/frontends/xforms/form_tabular.C:60 src/layout_forms.C:611
-msgid "Append Row|#p"
-msgstr "Legg til rad|#r"
+#: src/frontends/xforms/form_document.C:107
+#: src/frontends/xforms/form_document.C:108
+msgid "Portrait|#o"
+msgstr "Høydeformat|#H"
 
-#: src/frontends/xforms/form_tabular.C:63 src/layout_forms.C:614
-msgid "Delete Row|#w"
-msgstr "Slett rad|#l"
+#: src/frontends/xforms/form_document.C:111
+#: src/frontends/xforms/form_document.C:112
+msgid "Landscape|#L"
+msgstr "Breddeformat|#B"
 
-#: src/frontends/xforms/form_tabular.C:66 src/layout_forms.C:626
-msgid "Set Borders|#S"
-msgstr "Set kanter|#n"
+#: src/frontends/xforms/form_document.C:117
+#: src/frontends/xforms/form_document.C:118
+msgid "Papersize:|#P"
+msgstr "Papirstørrelse|#P"
 
-#: src/frontends/xforms/form_tabular.C:69 src/layout_forms.C:629
-msgid "Unset Borders|#U"
-msgstr "Slå av kanter|#v"
+#: src/frontends/xforms/form_document.C:122
+msgid "Custom Papersize"
+msgstr "Egen papirstørrelse"
 
-#: src/frontends/xforms/form_tabular.C:72 src/layout_forms.C:632
-#: src/layout_forms.C:646
-msgid "Longtable"
-msgstr "Lang tabell"
+#: src/frontends/xforms/form_document.C:126
+#: src/frontends/xforms/form_document.C:127
+msgid "Use Geometry Package|#U"
+msgstr "Bruk \"Geometry\" pakken|#B"
 
-#: src/frontends/xforms/form_tabular.C:74 src/layout_forms.C:637
-msgid "Rotate 90°|#9"
-msgstr "Roter 90°|#9"
+#: src/frontends/xforms/form_document.C:130
+#: src/frontends/xforms/form_document.C:131
+msgid "Width:|#W"
+msgstr "Bredde:|#B"
 
-#: src/frontends/xforms/form_tabular.C:76 src/layout_forms.C:641
-msgid "Spec. Table"
-msgstr "Spesielt: Tabell"
+#: src/frontends/xforms/form_document.C:134
+#: src/frontends/xforms/form_document.C:135
+msgid "Height:|#H"
+msgstr "Høyde:|#H"
 
-#: src/frontends/xforms/form_tabular.C:99
-#: src/frontends/xforms/form_tabular.C:182 src/layout_forms.C:573
-msgid "Borders"
-msgstr "Kanter"
+#: src/frontends/xforms/form_document.C:138
+#: src/frontends/xforms/form_document.C:139
+msgid "Top:|#T"
+msgstr "Topp:|#T"
 
-#: src/frontends/xforms/form_tabular.C:103
-#: src/frontends/xforms/form_tabular.C:220
-msgid "Top|#t"
-msgstr ""
+#: src/frontends/xforms/form_document.C:142
+#: src/frontends/xforms/form_document.C:143
+msgid "Bottom:|#B"
+msgstr "Bunn:|#B"
 
-#: src/frontends/xforms/form_tabular.C:107
-#: src/frontends/xforms/form_tabular.C:224
-msgid "Bottom|#b"
-msgstr ""
+#: src/frontends/xforms/form_document.C:146
+#: src/frontends/xforms/form_document.C:147
+msgid "Left:|#e"
+msgstr "Venstre:|#e"
 
-#: src/frontends/xforms/form_tabular.C:111
-#: src/frontends/xforms/form_tabular.C:228
-msgid "Left|#l"
-msgstr ""
+#: src/frontends/xforms/form_document.C:150
+#: src/frontends/xforms/form_document.C:151
+msgid "Right:|#R"
+msgstr "Høyre:|#H"
 
-#: src/frontends/xforms/form_tabular.C:115
-#: src/frontends/xforms/form_tabular.C:232
-msgid "Right|#r"
-msgstr ""
+#: src/frontends/xforms/form_document.C:154
+#: src/frontends/xforms/form_document.C:155
+msgid "Headheight:|#i"
+msgstr "Hodehøyde:|#o"
 
-#: src/frontends/xforms/form_tabular.C:121
-#: src/frontends/xforms/form_tabular.C:188
-msgid "H. Alignment"
-msgstr ""
+#: src/frontends/xforms/form_document.C:158
+#: src/frontends/xforms/form_document.C:159
+msgid "Headsep:|#d"
+msgstr "Hodeseparator:|#d"
 
-#: src/frontends/xforms/form_tabular.C:125
-#: src/frontends/xforms/form_tabular.C:236 src/layout_forms.C:665
-msgid "Left|#e"
-msgstr ""
+#: src/frontends/xforms/form_document.C:162
+#: src/frontends/xforms/form_document.C:163
+msgid "Footskip:|#F"
+msgstr "Bunnseparator:|#u"
 
-#: src/frontends/xforms/form_tabular.C:128
-#: src/frontends/xforms/form_tabular.C:239 src/layout_forms.C:668
-msgid "Right|#i"
-msgstr "Høyre|#y"
+#: src/frontends/xforms/form_document.C:193
+msgid "Separation"
+msgstr "Separasjon"
 
-#: src/frontends/xforms/form_tabular.C:131
-#: src/frontends/xforms/form_tabular.C:242
-msgid "Center|#c"
-msgstr ""
+#: src/frontends/xforms/form_document.C:196
+#: src/frontends/xforms/form_tabular.C:394
+msgid "Columns"
+msgstr "Kolonner"
 
-#: src/frontends/xforms/form_tabular.C:134
-msgid "Width of column:"
-msgstr ""
+#: src/frontends/xforms/form_document.C:199
+msgid "Sides"
+msgstr "Sider"
 
-#: src/frontends/xforms/form_tabular.C:139
-#: src/frontends/xforms/form_tabular.C:192
-msgid "V. Alignment"
-msgstr ""
+#: src/frontends/xforms/form_document.C:202
+#: src/frontends/xforms/form_document.C:203
+msgid "Fonts:|#F"
+msgstr "Fonter:"
 
-#: src/frontends/xforms/form_tabular.C:149 src/layout_forms.C:800
-msgid "Special Column Alignment"
-msgstr "Spesial Kolonne Justering"
+#: src/frontends/xforms/form_document.C:207
+#: src/frontends/xforms/form_document.C:208
+msgid "Font Size:|#O"
+msgstr "Font størrelse:|#O"
 
-#: src/frontends/xforms/form_tabular.C:153
-#: src/frontends/xforms/form_tabular.C:245
-msgid "Top|#p"
-msgstr ""
+#: src/frontends/xforms/form_document.C:212
+#: src/frontends/xforms/form_document.C:213
+msgid "Class:|#C"
+msgstr "Klasse:"
 
-#: src/frontends/xforms/form_tabular.C:156
-#: src/frontends/xforms/form_tabular.C:248 src/layout_forms.C:331
-msgid "Center|#n"
-msgstr "Sentrer|#n"
+#: src/frontends/xforms/form_document.C:217
+#: src/frontends/xforms/form_document.C:218
+msgid "Pagestyle:|#P"
+msgstr "Arkstil:"
 
-#: src/frontends/xforms/form_tabular.C:159
-#: src/frontends/xforms/form_tabular.C:251
-msgid "Bottom|#o"
-msgstr ""
+#: src/frontends/xforms/form_document.C:222
+#: src/frontends/xforms/form_document.C:223
+msgid "Spacing|#g"
+msgstr "Mellomrom|#M"
 
-#: src/frontends/xforms/form_tabular.C:197 src/layout_forms.C:599
-msgid "Special Cell"
-msgstr "Spesial Celle"
+#: src/frontends/xforms/form_document.C:227
+#: src/frontends/xforms/form_document.C:228
+msgid "Extra Options:|#X"
+msgstr "Ekstra Opsjoner:|#k"
 
-#: src/frontends/xforms/form_tabular.C:201 src/layout_forms.C:603
-msgid "Multicolumn|#M"
-msgstr "Multikolonne|#M"
+#: src/frontends/xforms/form_document.C:234
+#: src/frontends/xforms/form_document.C:235
+msgid "Default Skip:|#u"
+msgstr "Standard avstand:|#u"
 
-#: src/frontends/xforms/form_tabular.C:203 src/layout_forms.C:639
-msgid "Linebreaks|#N"
-msgstr "Linjebrekk|#n"
+# n
+#: src/frontends/xforms/form_document.C:241
+#: src/frontends/xforms/form_document.C:242
+msgid "One|#n"
+msgstr "En|#n"
 
-#: src/frontends/xforms/form_tabular.C:205 src/layout_forms.C:660
-msgid "Rotate 90°"
-msgstr "Roter 90°"
+#: src/frontends/xforms/form_document.C:245
+#: src/frontends/xforms/form_document.C:246
+msgid "Two|#T"
+msgstr "To|#T"
 
-#: src/frontends/xforms/form_tabular.C:213 src/layout_forms.C:780
-msgid "Special Multicolumn Alignment"
-msgstr "Spesial Multikolonne Justering"
+#: src/frontends/xforms/form_document.C:253
+#: src/frontends/xforms/form_document.C:254
+msgid "One|#e"
+msgstr "En|#E"
 
-#: src/frontends/xforms/form_tabular.C:217
-msgid "Width of multi-column:"
-msgstr ""
+#: src/frontends/xforms/form_document.C:257
+#: src/frontends/xforms/form_document.C:258
+msgid "Two|#w"
+msgstr "To|#o"
 
-#: src/frontends/xforms/form_tabular.C:271
-msgid "Header"
-msgstr ""
+#: src/frontends/xforms/form_document.C:265
+#: src/frontends/xforms/form_document.C:266
+msgid "Indent|#I"
+msgstr "Innrykk"
 
-#: src/frontends/xforms/form_tabular.C:275 src/layout_forms.C:650
-msgid "First Head"
-msgstr "Første hode"
+#: src/frontends/xforms/form_document.C:269
+#: src/frontends/xforms/form_document.C:270
+msgid "Skip|#K"
+msgstr "Hopp over"
 
-#: src/frontends/xforms/form_tabular.C:277 src/layout_forms.C:652
-msgid "Head"
-msgstr "Hode"
+#: src/frontends/xforms/form_document.C:302
+msgid "Quote Style    "
+msgstr "Sitatstil"
 
-#: src/frontends/xforms/form_tabular.C:280
-msgid "Footer"
-msgstr ""
+#: src/frontends/xforms/form_document.C:303
+#: src/frontends/xforms/form_document.C:304
+msgid "Encoding:|#D"
+msgstr "Enkoding:|#D"
 
-#: src/frontends/xforms/form_tabular.C:284 src/layout_forms.C:654
-msgid "Foot"
-msgstr "Bunn"
+#: src/frontends/xforms/form_document.C:308
+#: src/frontends/xforms/form_document.C:309
+msgid "Type:|#T"
+msgstr "Slag:|#l"
 
-#: src/frontends/xforms/form_tabular.C:286 src/layout_forms.C:656
-msgid "Last Foot"
-msgstr "Siste fot"
+#: src/frontends/xforms/form_document.C:314
+#: src/frontends/xforms/form_document.C:315
+msgid "Single|#S"
+msgstr "Enkel:|#E"
 
-#: src/frontends/xforms/form_tabular.C:289
-msgid "Special"
-msgstr ""
+#: src/frontends/xforms/form_document.C:318
+#: src/frontends/xforms/form_document.C:319
+msgid "Double|#D"
+msgstr "Dobbel|#D"
 
-#: src/frontends/xforms/form_tabular.C:293 src/layout_forms.C:658
-msgid "New Page"
-msgstr "Ny side"
+#: src/frontends/xforms/form_document.C:324
+#: src/frontends/xforms/form_document.C:325
+msgid "Language:|#L"
+msgstr "Språk:|#S"
 
-#: src/frontends/xforms/Menubar_pimpl.C:243
-#, c-format
-msgid "No Documents Open!%i"
-msgstr ""
+#: src/frontends/xforms/form_document.C:352
+#: src/frontends/xforms/form_document.C:353
+msgid "Float Placement:|#L"
+msgstr "Float plassering:|#L"
 
-#: src/insets/figinset.C:1065
-msgid "[render error]"
-msgstr "[rendre feil]"
+#: src/frontends/xforms/form_document.C:356
+msgid "Section number depth"
+msgstr "Avsnittsnummer dybde"
 
-#: src/insets/figinset.C:1066
-msgid "[rendering ... ]"
-msgstr "[rendrer ...]"
+#: src/frontends/xforms/form_document.C:360
+msgid "Table of contents depth"
+msgstr "Innholdsfortengnelsesdybde"
 
-#: src/insets/figinset.C:1069
-msgid "[no file]"
-msgstr "[ingen fil]"
+#: src/frontends/xforms/form_document.C:364
+#: src/frontends/xforms/form_document.C:365
+msgid "PS Driver:|#S"
+msgstr "PS driver:|#S"
 
-#: src/insets/figinset.C:1071
-msgid "[bad file name]"
-msgstr "[feil med filnavn]"
+#: src/frontends/xforms/form_document.C:369
+#: src/frontends/xforms/form_document.C:370
+msgid "Use AMS Math|#M"
+msgstr "Bruk AMS matte"
 
-#: src/insets/figinset.C:1073
-msgid "[not displayed]"
-msgstr "[ikke vist]"
+#: src/frontends/xforms/form_document.C:408
+#: src/frontends/xforms/form_document.C:409
+msgid "Size|#z"
+msgstr "Størrelse|#S"
 
-#: src/insets/figinset.C:1075
-msgid "[no ghostscript]"
-msgstr "[ingen ghostscript]"
+#: src/frontends/xforms/form_document.C:414
+#: src/frontends/xforms/form_document.C:415
+msgid "LaTeX|#L"
+msgstr "LaTeX|#L"
 
-#: src/insets/figinset.C:1077
-msgid "[unknown error]"
-msgstr "[ukjent feil]"
+#: src/frontends/xforms/form_document.C:421
+#: src/frontends/xforms/form_document.C:422
+msgid "1|#1"
+msgstr "1|#1"
 
-#: src/insets/figinset.C:1250
-msgid "Opened figure"
-msgstr "Åpnet figur"
+#: src/frontends/xforms/form_document.C:426
+#: src/frontends/xforms/form_document.C:427
+msgid "2|#2"
+msgstr "2|#2"
 
-#: src/insets/figinset.C:1277
-msgid "Figure"
-msgstr "Figur"
+#: src/frontends/xforms/form_document.C:430
+#: src/frontends/xforms/form_document.C:431
+msgid "3|#3"
+msgstr "3|#3"
 
-#: src/insets/figinset.C:1366 src/insets/figinset.C:1429
-msgid "empty figure path"
-msgstr "tom figur filsti"
+#: src/frontends/xforms/form_document.C:434
+#: src/frontends/xforms/form_document.C:435
+msgid "4|#4"
+msgstr "4|#4"
 
-#: src/insets/figinset.C:2005 src/insets/insetgraphics.C:84
-msgid "Clipart"
-msgstr "Utklippsbilder"
+#: src/frontends/xforms/form_document.C:440
+msgid "Bullet Depth"
+msgstr "Bombe dybde"
 
-#: src/insets/figinset.C:2006 src/insets/insetexternal.C:129
-#: src/lyxfunc.C:2939 src/lyxfunc.C:3002 src/lyxfunc.C:3206
-msgid "Document"
-msgstr "Dokumentet"
+#: src/frontends/xforms/form_document.C:445
+#: src/frontends/xforms/form_document.C:446
+msgid "Standard|#S"
+msgstr "Standard|#t"
 
-#: src/insets/figinset.C:2012 src/insets/figinset.C:2016
-msgid "EPS Figure"
-msgstr "EPS Figur"
+#: src/frontends/xforms/form_document.C:451
+#: src/frontends/xforms/form_document.C:452
+msgid "Maths|#M"
+msgstr "Matte|#M"
+
+#: src/frontends/xforms/form_document.C:456
+#: src/frontends/xforms/form_document.C:457
+msgid "Ding 2|#i"
+msgstr "Ding 2|#i"
+
+#: src/frontends/xforms/form_document.C:461
+#: src/frontends/xforms/form_document.C:462
+msgid "Ding 3|#n"
+msgstr "Ding 3|#n"
+
+#: src/frontends/xforms/form_document.C:466
+#: src/frontends/xforms/form_document.C:467
+msgid "Ding 4|#g"
+msgstr "Ding 4|#g"
+
+#: src/frontends/xforms/form_document.C:471
+#: src/frontends/xforms/form_document.C:472
+msgid "Ding 1|#D"
+msgstr "Ding 1|#D"
 
-#: src/insets/figinset.C:2029 src/insets/insetexternal.C:159
-#: src/insets/insetgraphics.C:98
+#: src/frontends/xforms/FormError.C:26
+msgid "LaTeX Error"
+msgstr "LaTeX Feil"
+
+#: src/frontends/xforms/FormGraphics.C:169
+#: src/frontends/xforms/FormGraphics.C:401
+msgid "Graphics"
+msgstr "Grafikk"
+
+#: src/frontends/xforms/FormGraphics.C:396 src/insets/figinset.C:1938
+msgid "Clipart"
+msgstr "Utklippsbilder"
+
+#: src/frontends/xforms/FormGraphics.C:410 src/insets/figinset.C:1962
+#: src/insets/insetexternal.C:157
 msgid "Filename can't contain any of these characters:"
 msgstr "Filnavn kan ikke inneholde noen av disse tegnene:"
 
-#: src/insets/figinset.C:2032 src/insets/insetgraphics.C:101
+#: src/frontends/xforms/FormGraphics.C:413 src/insets/figinset.C:1965
 #, no-c-format
 msgid "space, '#', '~', '$' or '%'."
 msgstr "mellomrom, '#', '~', '$' or '%'."
 
-#: src/insets/form_graphics.C:34 src/insets/form_graphics.C:35
-msgid "Graphics file|#G"
-msgstr "Grafikk fil|#G"
+#: src/frontends/xforms/form_graphics.C:32
+#: src/frontends/xforms/form_graphics.C:33
+msgid "Graphics File|F#F"
+msgstr "Grafikk fil|G#G"
 
-#: src/insets/form_url.C:19
-msgid "Url"
-msgstr "Url"
+#: src/frontends/xforms/form_graphics.C:35
+#: src/frontends/xforms/form_graphics.C:36
+msgid "Browse|B#B"
+msgstr "Se igjennom|S#S"
 
-#: src/insets/form_url.C:20
-msgid "Url|#U"
-msgstr "Url|#U"
+#: src/frontends/xforms/form_graphics.C:50
+msgid "Ok"
+msgstr "Ok"
 
-#: src/insets/form_url.C:24 src/lyx.C:175
-msgid "Name|#N"
-msgstr "Navn|#N"
+#: src/frontends/xforms/form_graphics.C:52
+#: src/frontends/xforms/form_graphics.C:53
+msgid "Apply|A#A"
+msgstr "Bruk|B#B"
 
-#: src/insets/form_url.C:27
-msgid "HTML type"
-msgstr "HTML type"
+#: src/frontends/xforms/form_graphics.C:55
+#: src/frontends/xforms/form_graphics.C:56
+msgid "Cancel|C#C^["
+msgstr "Avbryt|A#A^["
 
-#: src/insets/form_url.C:28
-msgid "HTML type|#H"
-msgstr "HTML type|#H"
+#: src/frontends/xforms/form_graphics.C:60
+#: src/frontends/xforms/form_graphics.C:75
+#, c-format
+msgid "% of Page"
+msgstr "% av siden"
 
-#: src/LyXAction.C:123 src/insets/form_url.C:31 src/insets/inseterror.C:182
-#: src/layout_forms.C:240 src/layout_forms.C:567 src/layout_forms.C:796
-#: src/log_form.C:21 src/lyx.C:125 src/lyx_sendfax.C:109 src/lyxvc.C:262
-#: src/mathed/math_forms.C:177
-msgid "Close"
-msgstr "Lukk"
+#: src/frontends/xforms/form_graphics.C:62
+#: src/frontends/xforms/form_graphics.C:81 src/lyxfont.C:406
+msgid "Default"
+msgstr "Standard"
 
-#. InsetBibtex uses the same form, with different labels
-#: src/insets/insetbib.C:54 src/insets/insetbib.C:55 src/insets/insetbib.C:188
-#: src/insets/insetbib.C:189
-msgid "Key:|#K"
-msgstr "Tast:|#T"
+#: src/frontends/xforms/form_graphics.C:65
+#: src/frontends/xforms/form_graphics.C:79
+msgid "cm"
+msgstr "cm"
 
-#: src/insets/insetbib.C:64 src/insets/insetbib.C:65 src/insets/insetbib.C:190
-#: src/insets/insetbib.C:191
-msgid "Label:|#L"
-msgstr "Merke:|#M"
+#: src/frontends/xforms/form_graphics.C:67
+#: src/frontends/xforms/form_graphics.C:77
+msgid "Inch"
+msgstr "Tomme"
 
-#: src/insets/insetbib.C:199
-msgid "Bibliography item"
-msgstr "Referanse del"
+#: src/frontends/xforms/form_graphics.C:69
+#, c-format
+msgid "% of Column"
+msgstr "% av kolonne"
 
-#: src/insets/insetbib.C:221
-msgid "BibTeX Generated References"
-msgstr "BibTeX genererte referanser"
+#: src/frontends/xforms/form_graphics.C:88
+msgid "in Monochrome"
+msgstr "i svarthvitt"
 
-#: src/insets/insetbib.C:337
-msgid "Database:"
-msgstr "Database:"
+#: src/frontends/xforms/form_graphics.C:90
+msgid "in Grayscale"
+msgstr "i gråtoner"
 
-#: src/insets/insetbib.C:338
-msgid "Style:  "
-msgstr "Stil:   "
+#: src/frontends/xforms/form_graphics.C:91
+msgid "in Color"
+msgstr "i farger"
 
-#: src/insets/insetbib.C:346
-msgid "BibTeX"
-msgstr "BibTeX"
+#: src/frontends/xforms/form_graphics.C:92
+msgid "Don't display"
+msgstr "Ikke vis"
 
-#: src/insets/inset.C:69
-msgid "Opened inset"
-msgstr "Åpnet inset"
+#: src/frontends/xforms/form_graphics.C:95
+msgid "Rotate"
+msgstr "Roter"
 
-#: src/insets/inseterror.C:71 src/insets/inseterror.C:93 src/lyx_cb.C:2937
-#: src/lyxfunc.C:1413
-msgid "Error"
-msgstr "Feil"
+#: src/frontends/xforms/form_graphics.C:96
+msgid "Angle"
+msgstr "Vinkel"
 
-#: src/insets/inseterror.C:167
-msgid "Opened error"
-msgstr "Åpnet feil"
+#: src/frontends/xforms/form_graphics.C:98
+msgid "Inline Figure"
+msgstr "Sett inn figur"
 
-#: src/insets/inseterror.C:195
-msgid "LaTeX Error"
-msgstr "LaTeX Feil"
+#: src/frontends/xforms/form_graphics.C:102
+#: src/frontends/xforms/form_graphics.C:103
+msgid "Subcaption|S#S"
+msgstr "Subcaption|S#S"
 
-#: src/insets/insetert.C:28
-msgid "ERT"
-msgstr "ERT"
+#: src/frontends/xforms/FormIndex.C:29 src/insets/insetindex.C:36
+msgid "Index"
+msgstr "Indeks"
 
-#: src/insets/insetert.C:59
-msgid "Opened ERT Inset"
-msgstr "Åpnet ERT inset"
+#: src/frontends/xforms/form_index.C:29
+msgid "Keyword|#K#k"
+msgstr "Keyword|#K#k"
 
-#: src/insets/insetert.C:66
-msgid "Not permitted to change font-types inside ERT-insets!"
-msgstr "Det er ikke tillatt å endre font i en ERT!"
+#: src/frontends/xforms/FormParagraph.C:89
+#: src/frontends/xforms/FormParagraph.C:92
+msgid " None | Defskip | Smallskip | Medskip | Bigskip | VFill | Length "
+msgstr " None | Defskip | Smallskip | Medskip | Bigskip | VFill | Length "
 
-#: src/insets/insetexternal.C:142 src/insets/insetexternal.C:146
-msgid "External inset file"
-msgstr ""
+#: src/frontends/xforms/FormParagraph.C:126
+#: src/frontends/xforms/FormPreferences.C:161
+msgid "General"
+msgstr "General"
 
-#: src/insets/insetexternal.C:162
-#, no-c-format
-msgid "'#', '~', '$' or '%'."
-msgstr ""
+#: src/frontends/xforms/FormParagraph.C:141
+msgid "Paragraph Layout"
+msgstr "Paragraph Layout"
 
-#: src/insets/insetexternal.C:297
-msgid "Insert external inset"
-msgstr ""
+#: src/frontends/xforms/FormParagraph.C:171
+msgid "Paragraph layout set"
+msgstr "Avsnittstil satt"
 
-#: src/insets/insetexternal.C:408
-msgid "External"
-msgstr ""
+#: src/frontends/xforms/FormParagraph.C:780
+#: src/frontends/xforms/FormParagraph.C:794
+#: src/frontends/xforms/FormParagraph.C:826
+#: src/frontends/xforms/FormTabular.C:520
+#: src/frontends/xforms/FormTabular.C:534
+#: src/frontends/xforms/FormTabular.C:546
+msgid "Warning: Invalid Length (valid example: 10mm)"
+msgstr "Advarsel: Ugyldig lengde (gyldig eksempel: 10mm)"
 
-#: src/insets/insetfloat.C:84 src/insets/insetfloat.C:207
-#: src/insets/insetfloat.C:212
-msgid "float:"
-msgstr ""
+#: src/frontends/xforms/FormParagraph.C:838
+msgid "Warning: Invalid percent value (0-100)"
+msgstr "Advarsel: Ugyldig prosent verdi (0-100)"
 
-#: src/insets/insetfloat.C:151
-msgid "Opened Float Inset"
-msgstr ""
+#: src/frontends/xforms/form_paragraph.C:39
+#: src/frontends/xforms/form_paragraph.C:40
+msgid "Label Width:|#d"
+msgstr "Merke bredde:|#b"
 
-#: src/insets/insetfoot.C:33
-msgid "foot"
-msgstr "fot"
+#: src/frontends/xforms/form_paragraph.C:45
+msgid "Indent"
+msgstr "Innrykk"
 
-#: src/insets/insetfoot.C:50
-msgid "Opened Footnote Inset"
-msgstr "Åpnet fotnote"
+#: src/frontends/xforms/form_paragraph.C:49
+#: src/frontends/xforms/form_paragraph.C:50
+msgid "Above|#b"
+msgstr "Over|#v"
 
-#: src/insets/insetgraphics.C:89 src/insets/insetgraphics.C:167
-msgid "Graphics"
-msgstr "Grafikk"
+#: src/frontends/xforms/form_paragraph.C:53
+#: src/frontends/xforms/form_paragraph.C:54
+msgid "Below|#E"
+msgstr "Under"
 
-#: src/insets/insetinclude.C:44 src/insets/insetinclude.C:45
-msgid "Browse|#B"
-msgstr "Se igjennom|#S"
+#: src/frontends/xforms/form_paragraph.C:57
+#: src/frontends/xforms/form_paragraph.C:58
+msgid "Above|#o"
+msgstr "Over|#O"
 
-#: src/insets/insetinclude.C:48 src/insets/insetinclude.C:49
-msgid "Don't typeset|#D"
-msgstr "Ikke typsett|#I"
+#: src/frontends/xforms/form_paragraph.C:61
+#: src/frontends/xforms/form_paragraph.C:62
+msgid "Below|#l"
+msgstr "Under|#U"
 
-#: src/insets/insetinclude.C:58 src/insets/insetinclude.C:59
-msgid "Load|#L"
-msgstr "Les inn|#L"
+#: src/frontends/xforms/form_paragraph.C:65
+#: src/frontends/xforms/form_paragraph.C:66
+msgid "No Indent|#I"
+msgstr "Ikke innrykk|#I"
 
-#: src/insets/insetinclude.C:62 src/insets/insetinclude.C:63
-msgid "File name:|#F"
-msgstr "Fil navn:|#F"
+#: src/frontends/xforms/form_paragraph.C:71
+#: src/frontends/xforms/form_paragraph.C:72 src/mathed/math_forms.C:92
+msgid "Right|#R"
+msgstr "Høyre"
 
-#: src/insets/insetinclude.C:66 src/insets/insetinclude.C:67
-msgid "Visible space|#s"
-msgstr "Synlig mellomrom|#S"
+#: src/frontends/xforms/form_paragraph.C:75
+#: src/frontends/xforms/form_paragraph.C:76
+msgid "Left|#f"
+msgstr "Venstre|#V"
 
-#: src/insets/insetinclude.C:71 src/insets/insetinclude.C:72
-msgid "Verbatim|#V"
-msgstr "Verbatim|#V"
+#: src/frontends/xforms/form_paragraph.C:79
+#: src/frontends/xforms/form_paragraph.C:80
+msgid "Block|#c"
+msgstr "Blokk|#B"
 
-#: src/insets/insetinclude.C:75 src/insets/insetinclude.C:76
-msgid "Use input|#i"
-msgstr "Bruk input|#B"
+#: src/frontends/xforms/form_paragraph.C:83
+#: src/frontends/xforms/form_paragraph.C:84
+#: src/frontends/xforms/form_tabular.C:193
+#: src/frontends/xforms/form_tabular.C:194
+#: src/frontends/xforms/form_tabular.C:301
+#: src/frontends/xforms/form_tabular.C:302
+msgid "Center|#n"
+msgstr "Sentrer|#n"
 
-#: src/insets/insetinclude.C:79 src/insets/insetinclude.C:80
-msgid "Use include|#U"
-msgstr "Bruk include|#c"
+#: src/frontends/xforms/form_paragraph.C:95
+#: src/frontends/xforms/form_paragraph.C:96
+msgid "Above:|#v"
+msgstr "Over|#e"
 
-#. launches dialog
-#: src/insets/insetinclude.C:116 src/lyx_cb.C:222 src/lyxfunc.C:2887
-#: src/lyxfunc.C:2977 src/lyxfunc.C:3037 src/lyxfunc.C:3181 src/menus.C:198
-#: src/menus.C:358 src/menus.C:359 src/menus.C:360
-msgid "Documents"
-msgstr "Dokumenter"
+#: src/frontends/xforms/form_paragraph.C:100
+#: src/frontends/xforms/form_paragraph.C:101
+msgid "Below:|#w"
+msgstr "Under|#r"
 
-#. Use by default the master's path
-#: src/insets/insetinclude.C:119
-msgid "Select Child Document"
-msgstr "Velg subdokument"
+#: src/frontends/xforms/form_paragraph.C:105
+msgid "Pagebreaks"
+msgstr "Sidebrekking"
 
-#: src/insets/insetinclude.C:284 src/insets/insetinclude.C:325
-msgid "Include"
-msgstr "Inkluder"
+#: src/frontends/xforms/form_paragraph.C:109
+msgid "Lines"
+msgstr "Linjer"
 
-#: src/insets/insetinclude.C:321
-msgid "Input"
-msgstr "Input"
+#: src/frontends/xforms/form_paragraph.C:113
+#: src/frontends/xforms/form_paragraph.C:174
+msgid "Alignment"
+msgstr "Justering"
 
-#: src/insets/insetinclude.C:323
-msgid "Verbatim Input"
-msgstr "Sett inn Verbatim"
+#: src/frontends/xforms/form_paragraph.C:117
+msgid "Vertical Spaces"
+msgstr "Vertikal avstand"
 
-#: src/insets/insetindex.C:40 src/insets/insetindex.C:41
-msgid "Keyword:|#K"
-msgstr "Nøkkelord:|#k"
+#: src/frontends/xforms/form_paragraph.C:121
+#: src/frontends/xforms/form_paragraph.C:122
+msgid "Keep|#K"
+msgstr "Hold|#H"
 
-#: src/insets/insetindex.C:117
-msgid "Index"
-msgstr "Indeks"
+#: src/frontends/xforms/form_paragraph.C:125
+#: src/frontends/xforms/form_paragraph.C:126
+msgid "Keep|#p"
+msgstr "Hold|#d"
 
-#: src/insets/insetindex.C:124
-msgid "Idx"
-msgstr "Ind"
+#: src/frontends/xforms/form_paragraph.C:158
+msgid "Extra Options"
+msgstr "Ekstra Opsjoner"
 
-#: src/insets/insetindex.C:155
-msgid "PrintIndex"
-msgstr "Skriv indeks"
+#: src/frontends/xforms/form_paragraph.C:162
+#: src/frontends/xforms/form_paragraph.C:163
+msgid "Length|#L"
+msgstr "Lengde|#L"
 
-#: src/insets/insetinfo.C:198
-msgid "Opened note"
-msgstr "Åpnet notis"
+#: src/frontends/xforms/form_paragraph.C:166
+#: src/frontends/xforms/form_paragraph.C:167
+msgid "or %|#o"
+msgstr "eller %|#e"
 
-#: src/insets/insetinfo.C:216 src/insets/insetinfo.C:221 src/lyx.C:159
-msgid "Close|#C^["
-msgstr "Lukk|#L^["
+#: src/frontends/xforms/form_paragraph.C:180
+#: src/frontends/xforms/form_paragraph.C:181
+msgid "Top|#T"
+msgstr "Topp|#T"
 
-#: src/insets/insetlabel.C:56
-msgid "Enter label:"
-msgstr "Sett inn referanse merke:"
+#: src/frontends/xforms/form_paragraph.C:184
+#: src/frontends/xforms/form_paragraph.C:185
+msgid "Middle|#d"
+msgstr "Midten|#d"
 
-#: src/insets/insetlist.C:42
-msgid "list"
-msgstr ""
+#: src/frontends/xforms/form_paragraph.C:188
+#: src/frontends/xforms/form_paragraph.C:189
+msgid "Bottom|#B"
+msgstr "Bunn|#B"
 
-#: src/insets/insetlist.C:72
-msgid "Opened List Inset"
-msgstr ""
+#: src/frontends/xforms/form_paragraph.C:194
+#: src/frontends/xforms/form_paragraph.C:195
+msgid "HFill between Minipage paragraphs|#H"
+msgstr "H-fyll mellom miniside-avsnitt|#H"
 
-#: src/insets/insetloa.C:36
-msgid "List of Algorithms"
-msgstr "Liste over algoritmer"
+#: src/frontends/xforms/form_paragraph.C:198
+#: src/frontends/xforms/form_paragraph.C:199
+msgid "Start new Minipage|#S"
+msgstr "Start ny Miniside|#S"
 
-#: src/insets/insetlof.C:16
-msgid "List of Figures"
-msgstr "Figurliste"
+#: src/frontends/xforms/form_paragraph.C:204
+#: src/frontends/xforms/form_paragraph.C:205
+msgid "Indented Paragraph|#I"
+msgstr "Innrykket avsnitt|#I"
 
-#: src/insets/insetlot.C:17
-msgid "List of Tables"
-msgstr "Liste over tabeller"
+#: src/frontends/xforms/form_paragraph.C:208
+#: src/frontends/xforms/form_paragraph.C:209
+msgid "Minipage|#M"
+msgstr "Miniside|#M"
 
-#: src/insets/insetmarginal.C:33
-msgid "margin"
-msgstr ""
+#: src/frontends/xforms/form_paragraph.C:212
+#: src/frontends/xforms/form_paragraph.C:213
+msgid "Floatflt|#F"
+msgstr "Floatflt|#F"
 
-#: src/insets/insetmarginal.C:50
-msgid "Opened Marginal Note Inset"
-msgstr ""
+#: src/frontends/xforms/FormPreferences.C:31
+msgid "Preferences"
+msgstr "Preferences"
 
-#: src/insets/insetminipage.C:60
-msgid "minipage"
-msgstr ""
+#: src/frontends/xforms/FormPreferences.C:143
+msgid "Look and Feel"
+msgstr "Look and Feel"
 
-#: src/insets/insetminipage.C:90
-msgid "Opened Minipage Inset"
-msgstr ""
+#: src/frontends/xforms/FormPreferences.C:146
+msgid "Inputs"
+msgstr "Inputs"
 
-#: src/insets/insetparent.C:43
-msgid "Parent:"
-msgstr "Hoveddokument:"
+#: src/frontends/xforms/FormPreferences.C:149
+msgid "Outputs"
+msgstr "Outputs"
 
-#: src/insets/insetref.C:86
-msgid "Ref: "
-msgstr "Ref: "
+#: src/frontends/xforms/FormPreferences.C:155
+msgid "Screen Fonts"
+msgstr "Skjermfonter"
 
-#: src/insets/insetref.C:86
-msgid "Page: "
-msgstr "Side: "
+#: src/frontends/xforms/FormPreferences.C:158
+msgid "Interface Fonts"
+msgstr "Interface Fonts"
 
-#: src/insets/insetref.C:86
-msgid "TextRef: "
-msgstr ""
+#: src/frontends/xforms/FormPreferences.C:167
+msgid "Paths"
+msgstr "Paths"
 
-#: src/insets/insetref.C:86
-msgid "TextPage: "
-msgstr ""
+#: src/frontends/xforms/FormPreferences.C:172
+msgid "Printer"
+msgstr "Skriver"
 
-#: src/insets/insetref.C:87
-msgid "PrettyRef: "
-msgstr "PrettyRef: "
+#: src/frontends/xforms/form_preferences.C:28
+msgid "Show banner"
+msgstr "Vis banner"
 
-#: src/insets/insettabular.C:315
-msgid "Opened Tabular Inset"
-msgstr "Åpnet tabellinset"
+#: src/frontends/xforms/form_preferences.C:32
+msgid "Auto region delete"
+msgstr "Auto region delete"
 
-#: src/insets/insettabular.C:1247 src/text.C:2411
-msgid "Multicolumns can only be horizontally."
-msgstr "Multikolonner kan bare være horisontale."
+#: src/frontends/xforms/form_preferences.C:36
+msgid "Exit confirmation"
+msgstr "Exit confirmation"
 
-#: src/insets/insettext.C:430
-msgid "Opened Text Inset"
-msgstr "Åpnet text inset"
+#: src/frontends/xforms/form_preferences.C:40
+msgid "Display keyboard shortcuts"
+msgstr "Display keyboard shortcuts"
 
-#: src/insets/insettext.C:835
-msgid "Cannot include more than one paragraph!"
-msgstr "Kan ikke inkludere mer enn ett avsnitt!"
+#: src/frontends/xforms/form_preferences.C:44
+msgid "Autosave interval"
+msgstr "Autosave interval"
 
-#: src/insets/insettext.C:894 src/lyxfunc.C:1239
-msgid "Layout "
-msgstr "Stil "
+#: src/frontends/xforms/form_preferences.C:52
+msgid "Ascii line length"
+msgstr "Ascii line length"
 
-#: src/insets/insettext.C:894 src/lyxfunc.C:1240
-msgid " not known"
-msgstr " ukjent"
+#: src/frontends/xforms/form_preferences.C:60
+msgid "Bind file"
+msgstr "Bind file"
+
+#: src/frontends/xforms/form_preferences.C:63
+#: src/frontends/xforms/form_preferences.C:277
+#: src/frontends/xforms/form_preferences.C:290
+#: src/frontends/xforms/form_preferences.C:299
+#: src/frontends/xforms/form_preferences.C:304
+#: src/frontends/xforms/form_preferences.C:318
+msgid "Browse..."
+msgstr "Se igjennom..."
 
-#: src/insets/insettext.C:948 src/lyxfunc.C:2051
-msgid "Unknown spacing argument: "
-msgstr "Ukjent argument til linjeavstand: "
+#: src/frontends/xforms/form_preferences.C:88 src/lyxfont.C:38
+msgid "Roman"
+msgstr "Roman"
 
-#: src/insets/insettheorem.C:39
-msgid "theorem"
-msgstr ""
+#: src/frontends/xforms/form_preferences.C:91
+msgid "Sans Serif"
+msgstr "Sans Serif"
 
-#: src/insets/insettheorem.C:68
-msgid "Opened Theorem Inset"
-msgstr ""
+#: src/frontends/xforms/form_preferences.C:94 src/lyxfont.C:38
+msgid "Typewriter"
+msgstr "Skrivemaskin"
 
-#: src/insets/insettoc.C:20 src/lyxfunc.C:863
-msgid "Table of Contents"
-msgstr "Innholdsfortegnelse"
+#: src/frontends/xforms/form_preferences.C:97
+#, c-format
+msgid "%"
+msgstr "%"
 
-#: src/insets/inseturl.C:118
-msgid "Opened Url"
-msgstr "Åpnet Url"
+#: src/frontends/xforms/form_preferences.C:105
+msgid "Allow scaling"
+msgstr "Tillat skalering"
 
-#: src/insets/inseturl.C:153
-msgid "Insert Url"
-msgstr "Sett inn Url"
+#: src/frontends/xforms/form_preferences.C:109
+#: src/frontends/xforms/form_preferences.C:171
+msgid "Encoding"
+msgstr "Enkoding"
 
-#: src/insets/inseturl.C:167
-msgid "HtmlUrl: "
-msgstr "HtmlUrl: "
+#: src/frontends/xforms/form_preferences.C:112
+msgid "tiny"
+msgstr "tiny"
 
-#: src/insets/inseturl.C:169
-msgid "Url: "
-msgstr "Url: "
+#: src/frontends/xforms/form_preferences.C:115
+msgid "script"
+msgstr "script"
 
-#: src/intl.C:289 src/intl.C:290
-msgid "other..."
-msgstr "Annet..."
+#: src/LColor.C:84 src/frontends/xforms/form_preferences.C:118
+msgid "footnote"
+msgstr "fotnote"
 
-#: src/intl.C:360
-msgid "Key Mappings"
-msgstr "Tastaturoppsett"
+#: src/frontends/xforms/form_preferences.C:121
+msgid "small"
+msgstr "small"
 
-#: src/kbsequence.C:213
-msgid "   options: "
-msgstr "   opsjoner: "
+#: src/frontends/xforms/form_preferences.C:124
+msgid "large"
+msgstr "large"
 
-#: src/language.C:56
-msgid "Afrikaans"
-msgstr "Afrikaans"
+#: src/frontends/xforms/form_preferences.C:127
+msgid "larger"
+msgstr "larger"
 
-#: src/language.C:57
-msgid "American"
-msgstr "Amerikansk"
+#: src/frontends/xforms/form_preferences.C:130
+msgid "largest"
+msgstr "largest"
 
-#: src/language.C:58
-msgid "Arabic"
-msgstr "Arabisk"
+#: src/frontends/xforms/form_preferences.C:133
+msgid "normal"
+msgstr "normal"
 
-#: src/language.C:59
-msgid "Austrian"
-msgstr "Østerisk"
+#: src/frontends/xforms/form_preferences.C:136
+msgid "huge"
+msgstr "huge"
 
-#: src/language.C:60
-msgid "Bahasa"
-msgstr "Bahasa"
+#: src/frontends/xforms/form_preferences.C:139
+msgid "huger"
+msgstr "huger"
 
-#: src/language.C:61
-msgid "Brazil"
-msgstr "Brasiliansk"
+#: src/frontends/xforms/form_preferences.C:165
+msgid "Popup"
+msgstr "Popup"
 
-#: src/language.C:62
-msgid "Breton"
-msgstr "Breton"
+#: src/frontends/xforms/form_preferences.C:168
+msgid "Menu"
+msgstr "Meny"
 
-#: src/language.C:63
-msgid "Catalan"
-msgstr "Catalansk"
+#: src/frontends/xforms/form_preferences.C:197
+msgid "command"
+msgstr "kommando"
 
-#: src/language.C:64
-msgid "Croatian"
-msgstr "Kroatisk"
+#: src/frontends/xforms/form_preferences.C:200
+msgid "page range"
+msgstr "page range"
 
-#: src/language.C:65
-msgid "Czech"
-msgstr "Tsjekkisk"
+#: src/frontends/xforms/form_preferences.C:203
+msgid "copies"
+msgstr "kopier"
 
-#: src/language.C:66
-msgid "Danish"
-msgstr "Dansk"
+#: src/frontends/xforms/form_preferences.C:206
+msgid "reverse"
+msgstr "reverse"
 
-#: src/language.C:67
-msgid "Dutch"
-msgstr "Nederlandsk"
+#: src/frontends/xforms/form_preferences.C:209
+msgid "to printer"
+msgstr "til skriver"
 
-#: src/language.C:68
-msgid "English"
-msgstr "Engelsk"
+#: src/frontends/xforms/form_preferences.C:212
+msgid "file extension"
+msgstr "filekstensjon"
 
-#: src/language.C:69
-msgid "Esperanto"
-msgstr "Esperanto"
+#: src/frontends/xforms/form_preferences.C:215
+msgid "spool command"
+msgstr "spool command"
 
-#: src/language.C:70
-msgid "Estonian"
-msgstr "Estonian"
+#: src/frontends/xforms/form_preferences.C:218
+msgid "paper type"
+msgstr "paper type"
 
-#: src/language.C:71
-msgid "Finnish"
-msgstr "Finsk"
+#: src/frontends/xforms/form_preferences.C:221
+msgid "even pages"
+msgstr "even pages"
 
-#: src/language.C:72
-msgid "Francais"
-msgstr "Fransk"
+#: src/frontends/xforms/form_preferences.C:224
+msgid "odd pages"
+msgstr "odd pages"
 
-#: src/language.C:73
-msgid "French"
-msgstr "Fransk"
+#: src/frontends/xforms/form_preferences.C:227
+msgid "collated"
+msgstr "collated"
 
-#: src/language.C:74
-msgid "Frenchb"
-msgstr "Fransk"
+#: src/frontends/xforms/form_preferences.C:233
+msgid "to file"
+msgstr "til fil"
 
-#: src/language.C:75
-msgid "Galician"
-msgstr "Galician"
+#: src/frontends/xforms/form_preferences.C:236
+msgid "extra options"
+msgstr "extra options"
 
-#: src/language.C:76
-msgid "German"
-msgstr "Tysk"
+#: src/frontends/xforms/form_preferences.C:239
+msgid "spool printer prefix"
+msgstr "spool printer prefix"
 
-#: src/language.C:77 src/mathed/math_forms.C:26
-msgid "Greek"
-msgstr "Gresk"
+#: src/frontends/xforms/form_preferences.C:242
+msgid "paper size"
+msgstr "paper size"
 
-#: src/language.C:78
-msgid "Hebrew"
-msgstr "Hebraisk"
+#: src/frontends/xforms/form_preferences.C:245
+msgid "name"
+msgstr "navn"
 
-#. According to Zrubecz Laszlo <zrubi@k2.jozsef.kando.hu>,
-#. "magyar" is better. I kept it here in case we want
-#. to  provide aliasing of languages. (JMarc)
-#.
-#. { "hungarian", N_("Hungarian"), false, &iso8859_2 },
-#: src/language.C:84
-msgid "Irish"
-msgstr "Irsk"
+#: src/frontends/xforms/form_preferences.C:248
+msgid "adapt output"
+msgstr "adapt output"
 
-#: src/language.C:85
-msgid "Italian"
-msgstr "Italiensk"
+#: src/frontends/xforms/form_preferences.C:274
+msgid "Default path"
+msgstr "Default path"
 
-#: src/language.C:86
-msgid "Lsorbian"
-msgstr "Lsorbian"
+#: src/frontends/xforms/form_preferences.C:279
+msgid "Last file count"
+msgstr "Last file count"
 
-#: src/language.C:87
-msgid "Magyar"
-msgstr "Magyar"
+#: src/frontends/xforms/form_preferences.C:287
+msgid "Template path"
+msgstr "Template path"
 
-#: src/language.C:88
-msgid "Norsk"
-msgstr "Norsk"
+#: src/frontends/xforms/form_preferences.C:292
+msgid "Check last files"
+msgstr "Check last files"
 
-#: src/language.C:89
-msgid "Polish"
-msgstr "Polsk"
+#: src/frontends/xforms/form_preferences.C:296
+msgid "Temp dir"
+msgstr "Temp dir"
 
-#: src/language.C:90
-msgid "Portuges"
-msgstr "Portugisisk"
+#: src/frontends/xforms/form_preferences.C:301
+msgid "Lastfiles"
+msgstr "Lastfiles"
 
-#: src/language.C:91
-msgid "Romanian"
-msgstr "Romansk"
+#: src/frontends/xforms/form_preferences.C:315
+msgid "Backup path"
+msgstr "Backup path"
 
-#: src/language.C:92
-msgid "Russian"
-msgstr "Russisk"
+#: src/LyXAction.C:152 src/frontends/xforms/form_preferences.C:351
+#: src/lyx_sendfax_main.C:268
+msgid "Save"
+msgstr "Lagre"
 
-#: src/language.C:93
-msgid "Scottish"
-msgstr "Skotsk"
+#: src/LyXAction.C:135 src/LyXAction.C:143 src/frontends/xforms/FormPrint.C:37
+#: src/frontends/xforms/form_print.C:99
+msgid "Print"
+msgstr "Skriv ut"
 
-#: src/language.C:94
-msgid "Spanish"
-msgstr "Spansk"
+#: src/frontends/xforms/form_print.C:42 src/frontends/xforms/form_print.C:43
+msgid "Printer|#P"
+msgstr "Skriver"
 
-#: src/language.C:95
-msgid "Slovak"
-msgstr "Slovakisk"
+#: src/frontends/xforms/form_print.C:46 src/frontends/xforms/form_print.C:47
+#: src/lyx.C:80
+msgid "File|#F"
+msgstr "Fil"
 
-#: src/language.C:96
-msgid "Slovene"
-msgstr "Slovensk"
+#: src/frontends/xforms/form_print.C:69 src/frontends/xforms/form_print.C:70
+msgid "All Pages|#G"
+msgstr "Alle sidene"
 
-#: src/language.C:97
-msgid "Swedish"
-msgstr "Svensk"
+#: src/frontends/xforms/form_print.C:73 src/frontends/xforms/form_print.C:74
+msgid "Only Odd Pages|#O"
+msgstr "Bare odde sider"
 
-#: src/language.C:98
-msgid "Turkish"
-msgstr "Tyrkisk"
+#: src/frontends/xforms/form_print.C:77 src/frontends/xforms/form_print.C:78
+msgid "Only Even Pages|#E"
+msgstr "Bare like sider"
 
-#: src/language.C:99
-msgid "Usorbian"
-msgstr "Usorbian"
+#: src/frontends/xforms/form_print.C:85 src/frontends/xforms/form_print.C:86
+msgid "Normal Order|#N"
+msgstr "Normal rekkefølge"
 
-#: src/language.C:100
-msgid "Welsh"
-msgstr "Walisisk"
+#: src/frontends/xforms/form_print.C:89 src/frontends/xforms/form_print.C:90
+msgid "Reverse Order|#R"
+msgstr "Omvent rekkefølge"
 
-#: src/LaTeX.C:153 src/LaTeX.C:178 src/LaTeX.C:243 src/LaTeX.C:293
-msgid "LaTeX run number "
-msgstr "LaTeX kjøring nummer "
+#: src/frontends/xforms/form_print.C:95
+msgid "Order"
+msgstr "Rekkefølge"
 
-#: src/LaTeX.C:204 src/LaTeX.C:271
-msgid "Running MakeIndex."
-msgstr "Kjører MakeIndex."
+#: src/frontends/xforms/form_print.C:103
+msgid "Pages:"
+msgstr "Sider: "
 
-#: src/LaTeX.C:218
-msgid "Running BibTeX."
-msgstr "Kjører BibTeX."
+#: src/frontends/xforms/form_print.C:113
+msgid "Count:"
+msgstr "Antall:"
 
-#: src/LaTeXLog.C:43
-msgid "Unable to show log file!"
-msgstr "Kan ikke vise log filen!"
+#: src/frontends/xforms/form_print.C:117 src/frontends/xforms/form_print.C:118
+msgid "Unsorted|#U"
+msgstr "Usortert|#U"
 
-#: src/LaTeXLog.C:46
-msgid "NO LATEX LOG FILE!"
-msgstr "INGEN LATEX LOGG FIL!"
+#: src/frontends/xforms/form_print.C:121
+msgid "to"
+msgstr "til"
 
-#: src/LaTeXLog.C:53
-msgid "Build Program Log"
-msgstr "Lag Programm Logg"
+#: src/frontends/xforms/FormRef.C:71
+msgid " Ref | Page | TextRef | TextPage | PrettyRef "
+msgstr " Ref | Page | TextRef | TextPage | PrettyRef "
 
-#: src/LaTeXLog.C:53
-msgid "LaTeX Log"
-msgstr "LaTeX Logg"
+#: src/frontends/xforms/FormRef.C:102 src/frontends/xforms/FormRef.C:275
+#: src/frontends/xforms/FormRef.C:297 src/frontends/xforms/form_ref.C:50
+msgid "Goto reference"
+msgstr "Goto reference"
 
-#: src/layout.C:1347
-msgid "LyX wasn't able to find its layout descriptions!"
-msgstr "LyX klarte ikke å finne sine stilbeskrivelser!"
+#: src/frontends/xforms/FormRef.C:128
+msgid "*** No labels found in document ***"
+msgstr "*** Ingen referansemerker funnet i dokumentet ***"
 
-#: src/layout.C:1348
-msgid "Check that the file \"textclass.lst\""
-msgstr "Undersøk om filen \"textclass.lst\""
+#: src/frontends/xforms/FormRef.C:268
+msgid "Go back"
+msgstr "Go back"
 
-#: src/layout.C:1349
-msgid "is installed correctly. Sorry, has to exit :-("
-msgstr "er installert korrekt. Beklager, må avslutte :-("
+#: src/frontends/xforms/form_ref.C:33 src/frontends/xforms/form_toc.C:36
+msgid "Update|#U#u"
+msgstr "Update|#U#u"
 
-#: src/layout.C:1411
-msgid "LyX wasn't able to find any layout description!"
-msgstr "LyX klarte ikke å finne sine stilbeskrivelser!"
+#: src/frontends/xforms/form_ref.C:40
+msgid "Name:"
+msgstr "Name:"
 
-#: src/layout.C:1412
-msgid "Check the contents of  the file \"textclass.lst\""
-msgstr "Undersøk hva filen \"textclass.lst\" inneholder"
+#: src/frontends/xforms/form_ref.C:42
+msgid "Reference:"
+msgstr "Reference:"
 
-#: src/layout.C:1413
-msgid "Sorry, has to exit :-("
-msgstr "Beklager, må avslutte :-("
+#: src/frontends/xforms/form_ref.C:44
+msgid "Reference type"
+msgstr "Reference type"
 
-#: src/layout_forms.C:25
-msgid "Separation"
-msgstr "Separasjon"
+#: src/frontends/xforms/form_ref.C:45
+msgid "Reference type|#t"
+msgstr "Reference type|#t"
 
-#: src/layout_forms.C:33
-msgid "Indent|#I"
-msgstr "Innrykk"
+#: src/frontends/xforms/form_ref.C:51
+msgid "Goto reference|#G"
+msgstr "Goto reference|#G"
 
-#: src/layout_forms.C:37
-msgid "Skip|#K"
-msgstr "Hopp over"
+#: src/frontends/xforms/FormTabular.C:83
+msgid "Column/Row"
+msgstr "Column/Row"
 
-#: src/layout_forms.C:43
-msgid "Class:|#C"
-msgstr "Klasse:"
+#: src/frontends/xforms/FormTabular.C:85
+msgid "Cell"
+msgstr "Celle"
 
-#: src/layout_forms.C:49
-msgid "Pagestyle:|#P"
-msgstr "Arkstil:"
+#: src/frontends/xforms/FormTabular.C:87
+msgid "LongTable"
+msgstr "LongTable"
 
-#: src/layout_forms.C:54
-msgid "Fonts:|#F"
-msgstr "Fonter:"
+#: src/frontends/xforms/FormTabular.C:117
+msgid "Tabular Layout"
+msgstr "Tabell stil"
 
-#: src/layout_forms.C:59
-msgid "Font Size:|#O"
-msgstr "Font størrelse:|#O"
+#: src/frontends/xforms/FormTabular.C:504
+msgid "Warning: Wrong Cursor position, updated window"
+msgstr "Advarsel: Feil markør posisjon, oppdaterte vindu"
 
-#: src/layout_forms.C:76
-msgid "Float Placement:|#L"
-msgstr "Float plassering:|#L"
+#: src/frontends/xforms/FormTabular.C:697
+msgid "Insert Tabular"
+msgstr "Sett inn tabell"
 
-#: src/layout_forms.C:80
-msgid "PS Driver:|#S"
-msgstr "PS driver:|#S"
+#: src/frontends/xforms/form_tabular.C:30
+#: src/frontends/xforms/form_tabular.C:31
+msgid "Close|#C"
+msgstr "Lukk|#L"
 
-#: src/layout_forms.C:85
-msgid "Encoding:|#D"
-msgstr "Enkoding:|#D"
+#: src/frontends/xforms/form_tabular.C:69
+#: src/frontends/xforms/form_tabular.C:70
+msgid "Append Column|#A"
+msgstr "Legg til kolonne|#k"
 
-# n
-#: src/layout_forms.C:103
-msgid "One|#n"
-msgstr "En|#n"
+#: src/frontends/xforms/form_tabular.C:73
+#: src/frontends/xforms/form_tabular.C:74
+msgid "Delete Column|#O"
+msgstr "Slett kolonne|#S"
 
-#: src/layout_forms.C:107
-msgid "Two|#T"
-msgstr "To|#T"
+#: src/frontends/xforms/form_tabular.C:77
+#: src/frontends/xforms/form_tabular.C:78
+msgid "Append Row|#p"
+msgstr "Legg til rad|#r"
 
-#: src/layout_forms.C:113
-msgid "Sides"
-msgstr "Sider"
+#: src/frontends/xforms/form_tabular.C:81
+#: src/frontends/xforms/form_tabular.C:82
+msgid "Delete Row|#w"
+msgstr "Slett rad|#l"
 
-#: src/layout_forms.C:127
-msgid "One|#e"
-msgstr "En|#E"
+#: src/frontends/xforms/form_tabular.C:85
+#: src/frontends/xforms/form_tabular.C:86
+msgid "Set Borders|#S"
+msgstr "Set kanter|#n"
 
-#: src/layout_forms.C:131
-msgid "Two|#w"
-msgstr "To|#o"
+#: src/frontends/xforms/form_tabular.C:89
+#: src/frontends/xforms/form_tabular.C:90
+msgid "Unset Borders|#U"
+msgstr "Slå av kanter|#v"
 
-#: src/layout_forms.C:137
-msgid "Extra Options:|#X"
-msgstr "Ekstra Opsjoner:|#k"
+#: src/frontends/xforms/form_tabular.C:93
+msgid "Longtable"
+msgstr "Lang tabell"
 
-#: src/layout_forms.C:141 src/layout_forms.C:262
-msgid "Language:"
-msgstr "Språk:"
+#: src/frontends/xforms/form_tabular.C:95
+#: src/frontends/xforms/form_tabular.C:96
+msgid "Rotate 90°|#9"
+msgstr "Roter 90°|#9"
 
-#: src/layout_forms.C:151
-msgid "Default Skip:|#u"
-msgstr "Standard avstand:|#u"
+#: src/frontends/xforms/form_tabular.C:98
+msgid "Spec. Table"
+msgstr "Spesielt: Tabell"
 
-#: src/layout_forms.C:157
-msgid "Section number depth"
-msgstr "Avsnittsnummer dybde"
+#: src/frontends/xforms/form_tabular.C:128
+#: src/frontends/xforms/form_tabular.C:228
+msgid "Borders"
+msgstr "Kanter"
 
-#: src/layout_forms.C:162
-msgid "Table of contents depth"
-msgstr "Innholdsfortengnelsesdybde"
+#: src/frontends/xforms/form_tabular.C:132
+#: src/frontends/xforms/form_tabular.C:133
+#: src/frontends/xforms/form_tabular.C:265
+#: src/frontends/xforms/form_tabular.C:266
+msgid "Top|#t"
+msgstr "Top|#t"
 
-#: src/layout_forms.C:167
-msgid "Spacing|#g"
-msgstr "Mellomrom|#M"
+#: src/frontends/xforms/form_tabular.C:137
+#: src/frontends/xforms/form_tabular.C:138
+#: src/frontends/xforms/form_tabular.C:270
+#: src/frontends/xforms/form_tabular.C:271
+msgid "Bottom|#b"
+msgstr "Bottom|#b"
 
-#: src/layout_forms.C:173
-msgid "Bullet Shapes|#B"
-msgstr "Bombe former"
+#: src/frontends/xforms/form_tabular.C:142
+#: src/frontends/xforms/form_tabular.C:143
+#: src/frontends/xforms/form_tabular.C:275
+#: src/frontends/xforms/form_tabular.C:276
+msgid "Left|#l"
+msgstr "Left|#l"
 
-#: src/layout_forms.C:178
-msgid "Use AMS Math|#M"
-msgstr "Bruk AMS matte"
+#: src/frontends/xforms/form_tabular.C:147
+#: src/frontends/xforms/form_tabular.C:148
+#: src/frontends/xforms/form_tabular.C:280
+#: src/frontends/xforms/form_tabular.C:281
+msgid "Right|#r"
+msgstr "Right|#r"
 
-#: src/layout_forms.C:211
-msgid "Family:|#F"
-msgstr "Familie:"
+#: src/frontends/xforms/form_tabular.C:154
+#: src/frontends/xforms/form_tabular.C:234
+msgid "H. Alignment"
+msgstr "H. Alignment"
 
-#: src/layout_forms.C:216
-msgid "Series:|#S"
-msgstr "Serie:"
+#: src/frontends/xforms/form_tabular.C:158
+#: src/frontends/xforms/form_tabular.C:159
+#: src/frontends/xforms/form_tabular.C:285
+#: src/frontends/xforms/form_tabular.C:286
+msgid "Left|#e"
+msgstr "Left|#e"
 
-#: src/layout_forms.C:221
-msgid "Shape:|#H"
-msgstr "Form:"
+#: src/frontends/xforms/form_tabular.C:162
+#: src/frontends/xforms/form_tabular.C:163
+#: src/frontends/xforms/form_tabular.C:289
+#: src/frontends/xforms/form_tabular.C:290
+msgid "Right|#i"
+msgstr "Høyre|#y"
 
-#: src/layout_forms.C:226
-msgid "Size:|#Z"
-msgstr "Størrelse|#S"
+#: src/frontends/xforms/form_tabular.C:166
+#: src/frontends/xforms/form_tabular.C:167
+#: src/frontends/xforms/form_tabular.C:293
+#: src/frontends/xforms/form_tabular.C:294
+msgid "Center|#c"
+msgstr "Center|#c"
 
-#: src/layout_forms.C:231
-msgid "Misc:|#M"
-msgstr "Misc:"
+#: src/frontends/xforms/form_tabular.C:170
+msgid "Width of column:"
+msgstr "Width of column:"
 
-#: src/layout_forms.C:244
-msgid "Color:|#C"
-msgstr "Farge:|#F"
+#: src/frontends/xforms/form_tabular.C:175
+#: src/frontends/xforms/form_tabular.C:238
+msgid "V. Alignment"
+msgstr "V. Alignment"
 
-#: src/layout_forms.C:249
-msgid "Toggle on all these|#T"
-msgstr "Av/På for alle disse|#A"
+#: src/frontends/xforms/form_tabular.C:185
+msgid "Special Column Alignment"
+msgstr "Spesial Kolonne Justering"
 
-#: src/layout_forms.C:252
-msgid "These are never toggled"
-msgstr "Disse vil veksle mellom av/på"
+#: src/frontends/xforms/form_tabular.C:189
+#: src/frontends/xforms/form_tabular.C:190
+#: src/frontends/xforms/form_tabular.C:297
+#: src/frontends/xforms/form_tabular.C:298
+msgid "Top|#p"
+msgstr "Top|#p"
 
-#: src/layout_forms.C:257
-msgid "These are always toggled"
-msgstr "Disse vil alltid veksle mellom av/på"
+#: src/frontends/xforms/form_tabular.C:197
+#: src/frontends/xforms/form_tabular.C:198
+#: src/frontends/xforms/form_tabular.C:305
+#: src/frontends/xforms/form_tabular.C:306
+msgid "Bottom|#o"
+msgstr "Bottom|#o"
 
-#: src/layout_forms.C:305
-msgid "Label Width:|#d"
-msgstr "Merke bredde:|#b"
+#: src/frontends/xforms/form_tabular.C:243
+msgid "Special Cell"
+msgstr "Spesial Celle"
 
-#: src/layout_forms.C:309
-msgid "Indent"
-msgstr "Innrykk"
+#: src/frontends/xforms/form_tabular.C:247
+#: src/frontends/xforms/form_tabular.C:248
+msgid "Multicolumn|#M"
+msgstr "Multikolonne|#M"
 
-#: src/layout_forms.C:313
-msgid "Above|#b"
-msgstr "Over|#v"
+#: src/frontends/xforms/form_tabular.C:250
+msgid "Rotate 90°"
+msgstr "Roter 90°"
 
-#: src/layout_forms.C:315
-msgid "Below|#E"
-msgstr "Under"
+#: src/frontends/xforms/form_tabular.C:258
+msgid "Special Multicolumn Alignment"
+msgstr "Spesial Multikolonne Justering"
 
-#: src/layout_forms.C:317
-msgid "Above|#o"
-msgstr "Over|#O"
+#: src/frontends/xforms/form_tabular.C:262
+msgid "Width of multi-column:"
+msgstr "Width of multi-column:"
 
-#: src/layout_forms.C:319
-msgid "Below|#l"
-msgstr "Under|#U"
+#: src/frontends/xforms/form_tabular.C:309
+#: src/frontends/xforms/form_tabular.C:310
+msgid "Use Minipage|#s"
+msgstr "Use Minipage|#s"
 
-#: src/layout_forms.C:321
-msgid "No Indent|#I"
-msgstr "Ikke innrykk|#I"
+#: src/frontends/xforms/form_tabular.C:336
+msgid "Header"
+msgstr "Header"
 
-#: src/layout_forms.C:325 src/layout_forms.C:589 src/mathed/math_forms.C:92
-msgid "Right|#R"
-msgstr "Høyre"
+#: src/frontends/xforms/form_tabular.C:340
+msgid "First Head"
+msgstr "Første hode"
 
-#: src/layout_forms.C:327
-msgid "Left|#f"
-msgstr "Venstre|#V"
+#: src/frontends/xforms/form_tabular.C:342
+msgid "Head"
+msgstr "Hode"
 
-#: src/layout_forms.C:329
-msgid "Block|#c"
-msgstr "Blokk|#B"
+#: src/frontends/xforms/form_tabular.C:345
+msgid "Footer"
+msgstr "Footer"
 
-#: src/layout_forms.C:341
-msgid "Above:|#v"
-msgstr "Over|#e"
+#: src/frontends/xforms/form_tabular.C:349
+msgid "Foot"
+msgstr "Bunn"
 
-#: src/layout_forms.C:345
-msgid "Below:|#w"
-msgstr "Under|#r"
+#: src/frontends/xforms/form_tabular.C:351
+msgid "Last Foot"
+msgstr "Siste fot"
 
-#: src/layout_forms.C:349
-msgid "Pagebreaks"
-msgstr "Sidebrekking"
+#: src/frontends/xforms/form_tabular.C:354
+msgid "Special"
+msgstr "Special"
 
-#: src/layout_forms.C:353
-msgid "Lines"
-msgstr "Linjer"
+#: src/frontends/xforms/form_tabular.C:358
+msgid "New Page"
+msgstr "Ny side"
 
-#: src/layout_forms.C:357 src/layout_forms.C:595 src/layout_forms.C:722
-msgid "Alignment"
-msgstr "Justering"
+#: src/frontends/xforms/form_tabular.C:398 src/mathed/math_forms.C:133
+msgid "Rows"
+msgstr "Rader"
 
-#: src/layout_forms.C:361
-msgid "Vertical Spaces"
-msgstr "Vertikal avstand"
+#: src/frontends/xforms/FormToc.C:64
+msgid " TOC | LOF | LOT | LOA "
+msgstr " TOC | LOF | LOT | LOA "
 
-#: src/layout_forms.C:365
-msgid "ExtraOpt|#X"
-msgstr "Ekstra opsjoner"
+#: src/frontends/xforms/form_toc.C:40 src/lyx.C:56
+msgid "Type"
+msgstr "Type"
 
-#: src/layout_forms.C:369
-msgid "Keep|#K"
-msgstr "Hold|#H"
+#: src/frontends/xforms/form_toc.C:41
+msgid "Type|#T#t"
+msgstr "Type|#T#t"
 
-#: src/layout_forms.C:371
-msgid "Keep|#p"
-msgstr "Hold|#d"
+#: src/frontends/xforms/FormUrl.C:29
+msgid "Url"
+msgstr "Url"
 
-#: src/layout_forms.C:388 src/lyx_gui_misc.C:427 src/lyx_sendfax.C:31
-msgid "OK|#O"
-msgstr "OK|#O"
+#: src/frontends/xforms/form_url.C:29
+msgid "Url|#U"
+msgstr "Url|#U"
 
-#: src/layout_forms.C:427
-msgid "Type:|#T"
-msgstr "Slag:|#l"
+#: src/frontends/xforms/form_url.C:34
+msgid "Name|#N"
+msgstr "Navn|#N"
 
-#: src/layout_forms.C:432
-msgid "Single|#S"
-msgstr "Enkel:|#E"
+#: src/frontends/xforms/form_url.C:39
+msgid "HTML type|#H"
+msgstr "HTML type|#H"
 
-#: src/layout_forms.C:434
-msgid "Double|#D"
-msgstr "Dobbel|#D"
+#: src/frontends/xforms/Menubar_pimpl.C:233
+msgid "More"
+msgstr "More"
 
-#: src/layout_forms.C:438
-msgid "Text"
-msgstr "Tekst"
+#: src/frontends/xforms/Menubar_pimpl.C:273
+#, no-c-format
+msgid "List of Figures%m"
+msgstr "Figurliste%m"
 
-#: src/layout_forms.C:458
-msgid "Special:|#S"
-msgstr "Spesiell:|#S"
+#: src/frontends/xforms/Menubar_pimpl.C:275
+#, no-c-format
+msgid "List of Tables%m"
+msgstr "Liste over tabeller%m"
 
-#: src/layout_forms.C:468
-msgid "Margins"
-msgstr "Tekstmarger"
+#: src/frontends/xforms/Menubar_pimpl.C:277
+#, no-c-format
+msgid "List of Algorithms%m"
+msgstr "Liste over algoritmer%m"
 
-#: src/layout_forms.C:472
-msgid "Foot/Head Margins"
-msgstr "Topp og bunn marger"
+#: src/frontends/xforms/Menubar_pimpl.C:314
+#, c-format
+msgid "No Table of Contents%i"
+msgstr "No Table of Contents%i"
 
-#: src/layout_forms.C:492
-msgid "Orientation"
-msgstr "Orientering"
+#: src/frontends/xforms/Menubar_pimpl.C:391
+#, no-c-format
+msgid "Insert Reference%m"
+msgstr "Sett inn referanse%m"
 
-#: src/layout_forms.C:498
-msgid "Portrait|#o"
-msgstr "Høydeformat|#H"
+#: src/frontends/xforms/Menubar_pimpl.C:393
+#, no-c-format
+msgid "Insert Page Number%m"
+msgstr "Sett inn sidetall%m"
 
-#: src/layout_forms.C:500
-msgid "Landscape|#L"
-msgstr "Breddeformat|#B"
+#: src/frontends/xforms/Menubar_pimpl.C:395
+#, no-c-format
+msgid "Insert vref%m"
+msgstr "Sett inn vref%m"
 
-#: src/layout_forms.C:504
-msgid "Papersize:|#P"
-msgstr "Papirstørrelse|#P"
+#: src/frontends/xforms/Menubar_pimpl.C:397
+#, no-c-format
+msgid "Insert vpageref%m"
+msgstr "Sett inn vpageref%m"
 
-#: src/layout_forms.C:508
-msgid "Custom Papersize"
-msgstr "Egen papirstørrelse"
+#: src/frontends/xforms/Menubar_pimpl.C:399
+#, no-c-format
+msgid "Insert Pretty Ref%m"
+msgstr "Sett inn pretty ref%m"
 
-#: src/layout_forms.C:512
-msgid "Use Geometry Package|#U"
-msgstr "Bruk \"Geometry\" pakken|#B"
+#: src/frontends/xforms/Menubar_pimpl.C:401
+#, no-c-format
+msgid "Goto Reference%m"
+msgstr "Gå til kryssreferansse%m"
 
-#: src/layout_forms.C:514
-msgid "Width:|#W"
-msgstr "Bredde:|#B"
+#: src/insets/figinset.C:1005
+msgid "[render error]"
+msgstr "[rendre feil]"
 
-#: src/layout_forms.C:517
-msgid "Height:|#H"
-msgstr "Høyde:|#H"
+#: src/insets/figinset.C:1006
+msgid "[rendering ... ]"
+msgstr "[rendrer ...]"
 
-#: src/layout_forms.C:520
-msgid "Top:|#T"
-msgstr "Topp:|#T"
+#: src/insets/figinset.C:1009
+msgid "[no file]"
+msgstr "[ingen fil]"
 
-#: src/layout_forms.C:523
-msgid "Bottom:|#B"
-msgstr "Bunn:|#B"
+#: src/insets/figinset.C:1011
+msgid "[bad file name]"
+msgstr "[feil med filnavn]"
 
-#: src/layout_forms.C:526
-msgid "Left:|#e"
-msgstr "Venstre:|#e"
+#: src/insets/figinset.C:1013
+msgid "[not displayed]"
+msgstr "[ikke vist]"
 
-#: src/layout_forms.C:529
-msgid "Right:|#R"
-msgstr "Høyre:|#H"
+#: src/insets/figinset.C:1015
+msgid "[no ghostscript]"
+msgstr "[ingen ghostscript]"
 
-#: src/layout_forms.C:532
-msgid "Headheight:|#i"
-msgstr "Hodehøyde:|#o"
+#: src/insets/figinset.C:1017
+msgid "[unknown error]"
+msgstr "[ukjent feil]"
 
-#: src/layout_forms.C:535
-msgid "Headsep:|#d"
-msgstr "Hodeseparator:|#d"
+#: src/insets/figinset.C:1190
+msgid "Opened figure"
+msgstr "Åpnet figur"
 
-#: src/layout_forms.C:538
-msgid "Footskip:|#F"
-msgstr "Bunnseparator:|#u"
+#: src/insets/figinset.C:1217
+msgid "Figure"
+msgstr "Figur"
 
-#: src/layout_forms.C:577 src/layout_forms.C:728
-msgid "Top|#T"
-msgstr "Topp|#T"
+#: src/insets/figinset.C:1306 src/insets/figinset.C:1369
+#: src/insets/insetgraphics.C:417
+msgid "empty figure path"
+msgstr "tom figur filsti"
 
-#: src/layout_forms.C:581 src/layout_forms.C:734
-msgid "Bottom|#B"
-msgstr "Bunn|#B"
+#: src/insets/figinset.C:1945 src/insets/figinset.C:1949
+msgid "EPS Figure"
+msgstr "EPS Figur"
 
-#: src/layout_forms.C:585 src/mathed/math_forms.C:95
-msgid "Left|#L"
-msgstr "Venstre|#V"
+#: src/insets/form_graphics.C:34 src/insets/form_graphics.C:35
+msgid "Graphics file|#G"
+msgstr "Grafikk fil|#G"
 
-#: src/layout_forms.C:617
-msgid "Delete Table|#D"
-msgstr "Slett tabell|#t"
+#. InsetBibtex uses the same form, with different labels
+#: src/insets/insetbib.C:53 src/insets/insetbib.C:54 src/insets/insetbib.C:186
+#: src/insets/insetbib.C:187
+msgid "Key:|#K"
+msgstr "Tast:|#T"
 
-#: src/layout_forms.C:620
-msgid "Column"
-msgstr "Kolonne"
+#: src/insets/insetbib.C:63 src/insets/insetbib.C:64 src/insets/insetbib.C:188
+#: src/insets/insetbib.C:189
+msgid "Label:|#L"
+msgstr "Merke:|#M"
 
-#: src/layout_forms.C:623
-msgid "Row"
-msgstr "Rad"
+#: src/insets/insetbib.C:197
+msgid "Bibliography item"
+msgstr "Referanse del"
 
-#: src/layout_forms.C:662
-msgid "Extra|#X"
-msgstr "Ekstra|#t"
+#: src/insets/insetbib.C:218
+msgid "BibTeX Generated References"
+msgstr "BibTeX genererte referanser"
 
-#: src/layout_forms.C:671
-msgid "Center|#C"
-msgstr "Sentrer"
+#: src/insets/insetbib.C:317
+msgid "Database:"
+msgstr "Database:"
 
-#: src/layout_forms.C:695
-msgid "Extra Options"
-msgstr "Ekstra Opsjoner"
+#: src/insets/insetbib.C:318
+msgid "Style:  "
+msgstr "Stil:   "
 
-#: src/layout_forms.C:699
-msgid "Length|#L"
-msgstr "Lengde|#L"
+#: src/insets/insetbib.C:326
+msgid "BibTeX"
+msgstr "BibTeX"
 
-#: src/layout_forms.C:715
-#, no-c-format
-msgid "or %|#o"
-msgstr "eller %|#e"
+#: src/insets/inset.C:75
+msgid "Opened inset"
+msgstr "Åpnet inset"
 
-#: src/layout_forms.C:731
-msgid "Middle|#d"
-msgstr "Midten|#d"
+#: src/insets/inseterror.C:54 src/insets/inseterror.C:76 src/lyxfunc.C:1528
+msgid "Error"
+msgstr "Feil"
 
-#: src/layout_forms.C:743
-msgid "HFill between Minipage paragraphs|#H"
-msgstr "H-fyll mellom miniside-avsnitt|#H"
+#: src/insets/inseterror.C:84
+msgid "Opened error"
+msgstr "Åpnet feil"
 
-#: src/layout_forms.C:745
-msgid "Start new Minipage|#S"
-msgstr "Start ny Miniside|#S"
+#: src/insets/insetert.C:28
+msgid "ERT"
+msgstr "ERT"
 
-#: src/layout_forms.C:749
-msgid "Indented Paragraph|#I"
-msgstr "Innrykket avsnitt|#I"
+#: src/insets/insetert.C:59
+msgid "Opened ERT Inset"
+msgstr "Åpnet ERT inset"
 
-#: src/layout_forms.C:752
-msgid "Minipage|#M"
-msgstr "Miniside|#M"
+#: src/insets/insetert.C:65 src/insets/insettabular.C:1476
+msgid "Impossible Operation!"
+msgstr "Umulig operasjon!"
 
-#: src/layout_forms.C:755
-msgid "Floatflt|#F"
-msgstr "Floatflt|#F"
+#: src/insets/insetert.C:66
+msgid "Not permitted to change font-types inside ERT-insets!"
+msgstr "Det er ikke tillatt å endre font i en ERT!"
 
-#: src/LColor.C:52
-msgid "none"
-msgstr "ingen"
+#: src/insets/insetexternal.C:141 src/insets/insetexternal.C:145
+msgid "External inset file"
+msgstr "External inset file"
 
-#: src/LColor.C:53
-msgid "black"
-msgstr "sort"
+#: src/insets/insetexternal.C:160
+#, no-c-format
+msgid "'#', '~', '$' or '%'."
+msgstr "'#', '~', '$' or '%'."
 
-#: src/LColor.C:54
-msgid "white"
-msgstr "hvit"
+#: src/insets/insetexternal.C:295
+msgid "Insert external inset"
+msgstr "Insert external inset"
 
-#: src/LColor.C:55
-msgid "red"
-msgstr "rød"
+#: src/insets/insetexternal.C:406
+msgid "External"
+msgstr "External"
 
-#: src/LColor.C:56
-msgid "green"
-msgstr "grønn"
+#: src/insets/insetfloat.C:84 src/insets/insetfloat.C:206
+#: src/insets/insetfloat.C:211
+msgid "float:"
+msgstr "float:"
 
-#: src/LColor.C:57
-msgid "blue"
-msgstr "blå"
+#: src/insets/insetfloat.C:150
+msgid "Opened Float Inset"
+msgstr "Opened Float Inset"
 
-#: src/LColor.C:58
-msgid "cyan"
-msgstr "cyan"
+#: src/insets/insetfoot.C:32
+msgid "foot"
+msgstr "fot"
 
-#: src/LColor.C:59
-msgid "magenta"
-msgstr "magenta"
+#: src/insets/insetfoot.C:49
+msgid "Opened Footnote Inset"
+msgstr "Åpnet fotnote"
 
-#: src/LColor.C:60
-msgid "yellow"
-msgstr "gul"
+#: src/insets/insetinclude.C:45 src/insets/insetinclude.C:46
+msgid "Browse|#B"
+msgstr "Se igjennom|#S"
 
-#: src/LColor.C:61
-msgid "background"
-msgstr "bakgrunn"
+#: src/insets/insetinclude.C:49 src/insets/insetinclude.C:50
+msgid "Don't typeset|#D"
+msgstr "Ikke typsett|#I"
 
-#: src/LColor.C:62
-msgid "foreground"
-msgstr "forgrunn"
+#: src/insets/insetinclude.C:59 src/insets/insetinclude.C:60
+msgid "Load|#L"
+msgstr "Les inn|#L"
 
-#: src/LColor.C:63
-msgid "selection"
-msgstr "merket"
+#: src/insets/insetinclude.C:63 src/insets/insetinclude.C:64
+msgid "File name:|#F"
+msgstr "Fil navn:|#F"
 
-#: src/LColor.C:64
-msgid "latex"
-msgstr "latex"
+#: src/insets/insetinclude.C:67 src/insets/insetinclude.C:68
+msgid "Visible space|#s"
+msgstr "Synlig mellomrom|#S"
 
-#: src/LColor.C:65
-msgid "floats"
-msgstr "floats"
+#: src/insets/insetinclude.C:72 src/insets/insetinclude.C:73
+msgid "Verbatim|#V"
+msgstr "Verbatim|#V"
 
-#: src/LColor.C:66
-msgid "note"
-msgstr "notis"
+#: src/insets/insetinclude.C:76 src/insets/insetinclude.C:77
+msgid "Use input|#i"
+msgstr "Bruk input|#B"
 
-#: src/LColor.C:67
-msgid "note background"
-msgstr "notis bakgrunn"
+#: src/insets/insetinclude.C:80 src/insets/insetinclude.C:81
+msgid "Use include|#U"
+msgstr "Bruk include|#c"
 
-#: src/LColor.C:68
-msgid "note frame"
-msgstr "notis ramme"
+#. launches dialog
+#: src/insets/insetinclude.C:117 src/lyx_cb.C:213 src/lyxfunc.C:3083
+#: src/lyxfunc.C:3184 src/lyxfunc.C:3244 src/lyxfunc.C:3388
+msgid "Documents"
+msgstr "Dokumenter"
 
-#: src/LColor.C:69
-msgid "depth bar"
-msgstr "dybdemarkør"
+#: src/insets/insetinclude.C:121
+msgid "Select Child Document"
+msgstr "Velg subdokument"
 
-#: src/LColor.C:70
-msgid "language"
-msgstr "språk"
+#: src/insets/insetinclude.C:276 src/insets/insetinclude.C:317
+msgid "Include"
+msgstr "Inkluder"
 
-#: src/LColor.C:71
-msgid "command-inset"
-msgstr "kommando-inset"
+#: src/insets/insetinclude.C:313
+msgid "Input"
+msgstr "Input"
 
-#: src/LColor.C:72
-msgid "command-inset background"
-msgstr "kommando-inset bakgrunn"
+#: src/insets/insetinclude.C:315
+msgid "Verbatim Input"
+msgstr "Sett inn Verbatim"
 
-#: src/LColor.C:73 src/LColor.C:90
-msgid "inset frame"
-msgstr "inset rammet"
+#: src/insets/insetindex.C:20
+msgid "Idx"
+msgstr "Ind"
 
-#: src/LColor.C:74
-msgid "accent"
-msgstr "akksent"
+#: src/insets/insetinfo.C:198
+msgid "Opened note"
+msgstr "Åpnet notis"
 
-#: src/LColor.C:75
-msgid "accent background"
-msgstr "akksent bakgrunn"
+#: src/insets/insetinfo.C:216 src/insets/insetinfo.C:221
+msgid "Close|#C^["
+msgstr "Lukk|#L^["
 
-#: src/LColor.C:76
-msgid "accent frame"
-msgstr "akksent ramme"
+#: src/insets/insetlabel.C:49
+msgid "Enter label:"
+msgstr "Sett inn referanse merke:"
 
-#: src/LColor.C:77
-msgid "minipage line"
-msgstr "minipage linje"
+#: src/insets/insetlist.C:42
+msgid "list"
+msgstr "list"
 
-#: src/LColor.C:78
-msgid "special char"
-msgstr "spesialtegn"
-
-#: src/LColor.C:79
-msgid "math"
-msgstr "matte"
-
-#: src/LColor.C:80
-msgid "math background"
-msgstr "matte bakgrunn"
-
-#: src/LColor.C:81
-msgid "math frame"
-msgstr "matte ramme"
-
-#: src/LColor.C:82
-msgid "math cursor"
-msgstr "matte markør"
-
-#: src/LColor.C:83
-msgid "math line"
-msgstr "matte linje"
-
-#: src/LColor.C:85
-msgid "footnote background"
-msgstr "fotnote bakgrunn"
-
-#: src/LColor.C:86
-msgid "footnote frame"
-msgstr "fotnote ramme"
-
-#: src/LColor.C:87
-msgid "ert"
-msgstr "ert"
-
-#: src/LColor.C:88
-msgid "inset"
-msgstr "inset"
-
-#: src/LColor.C:89
-msgid "inset background"
-msgstr "inset bakgrunn"
-
-#: src/LColor.C:91
-msgid "error"
-msgstr "feil"
-
-#: src/LColor.C:92
-msgid "end-of-line marker"
-msgstr "linjesluttmerke"
-
-#: src/LColor.C:93
-msgid "appendix line"
-msgstr "appendikslinje"
-
-#: src/LColor.C:94
-msgid "vfill line"
-msgstr "vfill linje"
-
-#: src/LColor.C:95
-msgid "top/bottom line"
-msgstr "topp/bunn linje"
-
-#: src/LColor.C:96
-msgid "table line"
-msgstr "tabell linje"
-
-#: src/LColor.C:97
-msgid "tabular line"
-msgstr "tabell-linje"
-
-#: src/LColor.C:99
-msgid "tabularonoff line"
-msgstr "stiplet tabell-linje"
-
-#: src/LColor.C:101
-msgid "bottom area"
-msgstr "bunnområde"
-
-#: src/LColor.C:102
-msgid "page break"
-msgstr "sidebrekk"
-
-#: src/LColor.C:103
-msgid "top of button"
-msgstr "knapptopp"
-
-#: src/LColor.C:104
-msgid "bottom of button"
-msgstr "knappbunn"
-
-#: src/LColor.C:105
-msgid "left of button"
-msgstr "knappvenstre"
-
-#: src/LColor.C:106
-msgid "right of button"
-msgstr "knapphøyre"
-
-#: src/LColor.C:107
-msgid "button background"
-msgstr "knappbakgrunn"
-
-#: src/LColor.C:108
-msgid "inherit"
-msgstr "arv"
-
-#: src/LColor.C:109
-msgid "ignore"
-msgstr "ignorer"
-
-#: src/Literate.C:60
-msgid "Weaving document"
-msgstr "Vever dokument"
-
-#: src/Literate.C:93
-msgid "Building program"
-msgstr "Lag programm"
-
-#: src/log_form.C:25 src/lyxvc.C:266 src/lyxvc.C:267
-msgid "Update|#Uu"
-msgstr "Oppdater"
-
-#: src/LyXAction.C:98
-msgid "Insert appendix"
-msgstr "Sett inn appendiks"
-
-#: src/LyXAction.C:99
-msgid "Describe command"
-msgstr "Beskriv kommando"
-
-#: src/LyXAction.C:102
-msgid "Select previous char"
-msgstr "Merk forrige bokstav"
-
-#: src/LyXAction.C:105
-msgid "Insert bibtex"
-msgstr "Sett inn BibTeX"
-
-#: src/LyXAction.C:114
-msgid "Build program"
-msgstr "Lag programm"
-
-#: src/LyXAction.C:115
-msgid "Autosave"
-msgstr "Auto lagrer"
-
-#: src/LyXAction.C:117
-msgid "Go to beginning of document"
-msgstr "Gå til begynnelsen av dokumentet"
-
-#: src/LyXAction.C:119
-msgid "Select to beginning of document"
-msgstr "Merk til begynnelsen av dokumentet"
-
-#: src/LyXAction.C:122
-msgid "Check TeX"
-msgstr "Sjekk TeX"
-
-#: src/LyXAction.C:125
-msgid "Go to end of document"
-msgstr "Gå til slutten av dokumentet"
-
-#: src/LyXAction.C:127
-msgid "Select to end of document"
-msgstr "Merk til slutten av dokumentet"
-
-#: src/LyXAction.C:128
-msgid "Export to"
-msgstr "Eksporter til"
-
-#: src/LyXAction.C:129
-msgid "Fax"
-msgstr "Faks"
-
-#: src/LyXAction.C:134
-msgid "Import document"
-msgstr "Importer dokument"
-
-#: src/LyXAction.C:140
-msgid "Get the printer parameters"
-msgstr ""
-
-#: src/LyXAction.C:141
-msgid "New document"
-msgstr "Nytt dokument"
-
-#: src/LyXAction.C:143
-msgid "New document from template"
-msgstr "Nytt dokument med mal"
-
-#: src/LyXAction.C:144
-msgid "Open"
-msgstr "Åpne"
-
-#: src/LyXAction.C:147
-msgid "Revert to saved"
-msgstr "Tilbake til sist lagret"
-
-#: src/LyXAction.C:149
-msgid "Switch to an open document"
-msgstr ""
-
-#: src/LyXAction.C:151
-msgid "Toggle read-only"
-msgstr "Skrivebeskyttet av/på"
-
-#: src/LyXAction.C:152
-msgid "Update DVI"
-msgstr "Oppdater DVI"
-
-#: src/LyXAction.C:155
-msgid "Update PostScript"
-msgstr "Oppdater PostScript"
-
-#: src/LyXAction.C:156
-msgid "View DVI"
-msgstr "Se på DVI"
-
-#: src/LyXAction.C:158
-msgid "View PostScript"
-msgstr "Se på PostScript"
-
-#: src/LyXAction.C:159 src/lyx_sendfax_main.C:280
-msgid "Save"
-msgstr "Lagre"
-
-#: src/LyXAction.C:160
-msgid "Save As"
-msgstr "Lagre som"
-
-#: src/LyXAction.C:163
-msgid "Go one char back"
-msgstr "Gå en bokstav tilbake"
-
-#: src/LyXAction.C:165
-msgid "Go one char forward"
-msgstr "Gå en bokstav fremover"
-
-#: src/LyXAction.C:168
-msgid "Insert citation"
-msgstr "Sett inn sitat"
-
-#: src/LyXAction.C:171
-msgid "Execute command"
-msgstr "Utfør kommando"
-
-#: src/LyXAction.C:180
-msgid "Decrement environment depth"
-msgstr "Minsk omgivelsedybde"
-
-#: src/LyXAction.C:182
-msgid "Increment environment depth"
-msgstr "Øk omgivelsedybde"
-
-#: src/LyXAction.C:184
-msgid "Change environment depth"
-msgstr "Forandre omgivelsedybde"
-
-#: src/LyXAction.C:185
-msgid "Insert ... dots"
-msgstr "Sett inn ellipsis"
-
-#: src/LyXAction.C:186
-msgid "Go down"
-msgstr "Gå ned"
-
-#: src/LyXAction.C:188
-msgid "Select next line"
-msgstr "Merk neste linje"
-
-#: src/LyXAction.C:190
-msgid "Choose Paragraph Environment"
-msgstr "Velg avsnitt omgivelse"
-
-#: src/LyXAction.C:192
-msgid "Insert end of sentence period"
-msgstr "Sett inn setningsslutt punktum"
-
-#: src/LyXAction.C:193
-msgid "Go to next error"
-msgstr "Gå til neste feil"
-
-#: src/LyXAction.C:195
-msgid "Remove all error boxes"
-msgstr "Fjern alle feilbokser"
-
-#: src/LyXAction.C:197
-msgid "Insert a new ERT Inset"
-msgstr "Sett inn ERT"
-
-#: src/LyXAction.C:199
-msgid "Insert a new external inset"
-msgstr ""
-
-#: src/LyXAction.C:200 src/lyx_cb.C:2749
-msgid "Insert Figure"
-msgstr "Sett inn figur"
-
-#: src/LyXAction.C:202
-msgid "Insert Graphics"
-msgstr "Sett inn grafikk"
-
-#: src/LyXAction.C:207 src/lyxfr0.C:94
-msgid "Find & Replace"
-msgstr "Finn & Erstatt"
-
-#: src/LyXAction.C:209
-msgid "Toggle bold"
-msgstr "Fet av/på"
-
-#: src/LyXAction.C:210
-msgid "Toggle code style"
-msgstr "Kode stil av/på"
-
-#: src/LyXAction.C:211
-msgid "Default font style"
-msgstr "Standard font stil"
-
-#: src/LyXAction.C:213
-msgid "Toggle emphasize"
-msgstr "Uthevet av/på"
-
-#: src/LyXAction.C:214
-msgid "Toggle user defined style"
-msgstr "Bruker definert stil av/på"
-
-#: src/LyXAction.C:216
-msgid "Toggle noun style"
-msgstr "Substantiv stil av/på"
-
-#: src/LyXAction.C:217
-msgid "Toggle roman font style"
-msgstr "Roman font stil av/på"
-
-#: src/LyXAction.C:219
-msgid "Toggle sans font style"
-msgstr "Sans serif font stil av/på"
-
-#: src/LyXAction.C:220
-msgid "Set font size"
-msgstr "Sett font størrelse"
-
-#: src/LyXAction.C:221
-msgid "Show font state"
-msgstr "Vis font status"
-
-#: src/LyXAction.C:224
-msgid "Toggle font underline"
-msgstr "Understreking av/på"
-
-#: src/LyXAction.C:226 src/LyXAction.C:230
-msgid "Insert Footnote"
-msgstr "Sett inn fotnote"
-
-#: src/LyXAction.C:233
-msgid "Insert Marginalnote"
-msgstr ""
-
-#: src/LyXAction.C:234
-msgid "Select next char"
-msgstr "Merk neste bokstav"
-
-#: src/LyXAction.C:237
-msgid "Insert horizontal fill"
-msgstr "Sett inn horisontalt fyll"
-
-#: src/LyXAction.C:239
-msgid "Display copyright information"
-msgstr ""
-
-#: src/LyXAction.C:241
-msgid "Show the list of people who helped writing LyX"
-msgstr ""
-
-#: src/LyXAction.C:243
-msgid "Open a Help file"
-msgstr ""
-
-#: src/LyXAction.C:246
-msgid "Show the actual LyX version"
-msgstr ""
-
-#: src/LyXAction.C:249
-msgid "Insert hyphenation point"
-msgstr "Sett inn orddelingspunkt"
-
-#: src/LyXAction.C:251
-msgid "Insert index item"
-msgstr "Sett inn indeks"
-
-#: src/LyXAction.C:253
-msgid "Insert last index item"
-msgstr "Sett inn siste som indeks"
-
-#: src/LyXAction.C:254
-msgid "Insert index list"
-msgstr "Sett inn indeksliste"
-
-#: src/LyXAction.C:256
-msgid "Turn off keymap"
-msgstr "Slå av keymap"
-
-#: src/LyXAction.C:259
-msgid "Use primary keymap"
-msgstr "Bruk primær keymap"
-
-#: src/LyXAction.C:261
-msgid "Use secondary keymap"
-msgstr "Bruk sekundær keymap"
-
-#: src/LyXAction.C:262
-msgid "Toggle keymap"
-msgstr "Keymap av/på"
-
-#: src/LyXAction.C:264
-msgid "Insert Label"
-msgstr "Sett inn referanse merke"
-
-#: src/LyXAction.C:266
-msgid "Change language"
-msgstr "Bytt språk"
-
-#: src/LyXAction.C:267
-msgid "View LaTeX log"
-msgstr "Vis LaTeX Logg"
-
-#: src/LyXAction.C:272
-msgid "Copy paragraph environment type"
-msgstr "Kopier avsnittsomgivelse"
-
-#: src/LyXAction.C:278
-msgid "Paste paragraph environment type"
-msgstr "Lim inn avsnittsomgivelse"
-
-#: src/LyXAction.C:285
-msgid "Go to beginning of line"
-msgstr "Gå til begynnelsen av linjen"
-
-#: src/LyXAction.C:287
-msgid "Select to beginning of line"
-msgstr "Merk til begynnelsen av linjen"
-
-#: src/LyXAction.C:289
-msgid "Go to end of line"
-msgstr "Gå til slutten av linjen"
-
-#: src/LyXAction.C:291
-msgid "Select to end of line"
-msgstr "Merk til slutten av linjen"
-
-#: src/LyXAction.C:293
-msgid "Insert list of algorithms"
-msgstr "Sett in liste over algoritmer"
-
-#: src/LyXAction.C:295
-msgid "View list of algorithms"
-msgstr "Se på liste over algoritmer"
-
-#: src/LyXAction.C:297
-msgid "Insert list of figures"
-msgstr "Sett inn figurliste"
-
-#: src/LyXAction.C:299
-msgid "View list of figures"
-msgstr "Se på figurliste"
-
-#: src/LyXAction.C:301
-msgid "Insert list of tables"
-msgstr "Sett inn liste over tabeller"
-
-#: src/LyXAction.C:303
-msgid "View list of tables"
-msgstr "Se på liste over tabeller"
-
-#: src/LyXAction.C:304
-msgid "Exit"
-msgstr "Avslutt"
-
-#: src/LyXAction.C:307
-msgid "Insert Margin note"
-msgstr "Sett inn margnotat"
-
-#: src/LyXAction.C:314
-msgid "Math Greek"
-msgstr "Greske bokstaver"
-
-#: src/LyXAction.C:317
-msgid "Insert math symbol"
-msgstr "Sett inn mattesymbol"
-
-#: src/LyXAction.C:322
-msgid "Math mode"
-msgstr "Matte modus"
-
-#: src/LyXAction.C:335
-msgid "Go one paragraph down"
-msgstr "Gå ett avsnitt ned"
-
-#: src/LyXAction.C:337
-msgid "Select next paragraph"
-msgstr "Merk neste avsnitt"
-
-#: src/LyXAction.C:339
-msgid "Go one paragraph up"
-msgstr "Gå ett avsnitt opp"
-
-#: src/LyXAction.C:341
-msgid "Select previous paragraph"
-msgstr "Merk forrige avsnitt"
-
-#: src/LyXAction.C:345
-msgid "Save Preferences"
-msgstr ""
-
-#: src/LyXAction.C:348
-msgid "Insert protected space"
-msgstr "Sett inn hardt mellomrom"
-
-#: src/LyXAction.C:349
-msgid "Insert quote"
-msgstr "Sett inn sitattegn"
-
-#: src/LyXAction.C:351
-msgid "Reconfigure"
-msgstr "Rekonfigurer"
-
-#: src/LyXAction.C:356
-msgid "Insert cross reference"
-msgstr "Sett inn kryssreferanse"
-
-#: src/LyXAction.C:380 src/lyx_cb.C:2761
-msgid "Insert Table"
-msgstr "Sett inn tabell"
-
-#: src/LyXAction.C:383
-msgid "Insert a new Tabular Inset"
-msgstr "Sett inn Tabell"
-
-#: src/LyXAction.C:384
-msgid "Toggle TeX style"
-msgstr "TeX stil av/på"
-
-#: src/LyXAction.C:386
-msgid "Insert a new Text Inset"
-msgstr "Sett inn ny tekstinset"
-
-#: src/LyXAction.C:388
-msgid "Insert table of contents"
-msgstr "Sett inn innholdsfortegnelse"
-
-#: src/LyXAction.C:390
-msgid "View table of contents"
-msgstr "Vis innholdsfortegnelse"
-
-#: src/LyXAction.C:392
-msgid "Toggle cursor does/doesn't follow the scrollbar"
-msgstr "Markør følger/følger ikke scrollbar"
-
-#: src/LyXAction.C:404
-msgid "Register document under version control"
-msgstr "Registrer dokumentet i versionskontroll"
-
-#: src/LyXAction.C:648
-msgid "No description available!"
-msgstr "Ingen beskrivelse tilgjengelig!"
-
-#: src/lyx.C:41
-msgid "Encapsulated Postscript (*.eps, *.ps)|#E"
-msgstr "Enkapsulert Postscript (*.eps, *.ps)"
-
-#: src/lyx.C:43
-msgid "Inlined EPS (*.eps, *.ps)|#I"
-msgstr "Inlined EPS (*.eps, *.ps)"
-
-#: src/lyx.C:56
-msgid "Type"
-msgstr "Type"
-
-#: src/lyx.C:75
-msgid "Roman font|#R"
-msgstr ""
-
-#: src/lyx.C:79
-msgid "Sans serif font|#S"
-msgstr ""
-
-#: src/lyx.C:83
-msgid "Typewriter font|#T"
-msgstr ""
-
-#: src/lyx.C:87
-msgid "Font norm|#N"
-msgstr ""
-
-#: src/lyx.C:91
-msgid "Font zoom|#Z"
-msgstr ""
-
-#: src/lyx.C:129
-msgid "Update|Uu#u"
-msgstr "Oppdater"
-
-#: src/lyx.C:133
-msgid "Type|Tt#t"
-msgstr "Slag:|#l"
-
-#: src/lyx.C:155
-msgid "Update|#U"
-msgstr "Oppdater"
-
-#: src/lyx.C:163
-msgid "Insert reference|#I^M"
-msgstr ""
-
-#: src/lyx.C:167
-msgid "Insert page number|#P"
-msgstr ""
-
-#: src/lyx.C:171
-msgid "Go to reference|#G"
-msgstr ""
-
-#: src/lyx.C:177
-msgid "Sort keys|#S"
-msgstr "Sorter nøkler|#S"
-
-#: src/lyx.C:182
-msgid "Insert text reference|#V"
-msgstr ""
-
-#: src/lyx.C:186
-msgid "Insert text page number|#N"
-msgstr ""
-
-#: src/lyx.C:190
-msgid "Insert pretty reference|#T"
-msgstr ""
-
-#: src/lyx.C:194
-msgid "Go back|#B"
-msgstr ""
-
-#: src/lyx.C:213
-msgid "Template|#t"
-msgstr ""
-
-#: src/lyx.C:225
-msgid "Parameters|#P"
-msgstr ""
-
-#: src/lyx.C:228
-msgid "Edit file|#E"
-msgstr ""
-
-#: src/lyx.C:233
-msgid "View result|#V"
-msgstr ""
-
-#: src/lyx.C:238
-msgid "Update result|#U"
-msgstr ""
-
-#: src/lyx.C:248
-msgid "Cancel|#C^["
-msgstr ""
-
-#: src/lyx_cb.C:198
-msgid "Save failed. Rename and try again?"
-msgstr "Lagring feilet. Gi nytt navn og prøv igjen?"
-
-#: src/lyx_cb.C:200
-msgid "(If not, document is not saved.)"
-msgstr "(Hvis ikke blir ikke dokumentet lagret)"
-
-#: src/lyx_cb.C:223 src/lyxfunc.C:2888
-msgid "Templates"
-msgstr "Maler"
-
-#: src/lyx_cb.C:228
-msgid "Enter Filename to Save Document as"
-msgstr "Skriv inn filnavnet som dokumentet skal lagres som"
-
-#: src/lyx_cb.C:244
-msgid "Same name as document already has:"
-msgstr "Samme navn som dokumentet allerede har:"
-
-#: src/lyx_cb.C:246
-msgid "Save anyway?"
-msgstr "Lagre likevel?"
-
-#: src/lyx_cb.C:252
-msgid "Another document with same name open!"
-msgstr "Ett annet dokument med samme navn er åpent!"
-
-#: src/lyx_cb.C:254
-msgid "Replace with current document?"
-msgstr "Erstatt med gjelende dokument?"
-
-#: src/lyx_cb.C:262
-msgid "Document renamed to '"
-msgstr "Dokument gitt nytt navn: '"
-
-#: src/lyx_cb.C:263
-msgid "', but not saved..."
-msgstr "', men ikke lagret..."
-
-#: src/lyx_cb.C:269
-msgid "Document already exists:"
-msgstr "Dokumentet finnes allerede."
-
-#: src/lyx_cb.C:271
-msgid "Replace file?"
-msgstr "Erstatt fil?"
-
-#: src/lyx_cb.C:302 src/lyx_cb.C:332
-msgid "One error detected"
-msgstr "En feil oppdaget"
-
-#: src/lyx_cb.C:303 src/lyx_cb.C:333
-msgid "You should try to fix it."
-msgstr "Du burde forsøke å fikse den."
-
-#: src/lyx_cb.C:306 src/lyx_cb.C:336
-msgid " errors detected."
-msgstr " feil oppdaget."
+#: src/insets/insetlist.C:72
+msgid "Opened List Inset"
+msgstr "Opened List Inset"
 
-#: src/lyx_cb.C:307 src/lyx_cb.C:337
-msgid "You should try to fix them."
-msgstr "Du burde forsøke å fikse dem."
+#: src/insets/insetmarginal.C:33
+msgid "margin"
+msgstr "margin"
 
-#: src/lyx_cb.C:309
-msgid "There were errors during the LaTeX run."
-msgstr "Det ble rapportert feil under kjøring av LaTeX."
+#: src/insets/insetmarginal.C:50
+msgid "Opened Marginal Note Inset"
+msgstr "Opened Marginal Note Inset"
 
-#: src/lyx_cb.C:322
-msgid "Wrong type of document"
-msgstr "Feil type dokument"
+#: src/insets/insetminipage.C:60
+msgid "minipage"
+msgstr "minipage"
 
-#: src/lyx_cb.C:323
-msgid "The Build operation is not allowed in this document"
-msgstr "Det er ikke mulig e lage programm fra dette dokumentet"
+#: src/insets/insetminipage.C:90
+msgid "Opened Minipage Inset"
+msgstr "Opened Minipage Inset"
 
-#: src/lyx_cb.C:324 src/lyx_cb.C:339
-msgid "There were errors during the Build process."
-msgstr "Det ble rapportert feil under kjøring av 'Build' prosessen."
+#: src/insets/insetparent.C:45
+msgid "Parent:"
+msgstr "Hoveddokument:"
 
-#: src/lyx_cb.C:350
-msgid "Chktex does not work with SGML derived documents."
-msgstr "Chktex fungerer ikke for SGML dokumenter."
+#: src/insets/insettabular.C:425
+msgid "Opened Tabular Inset"
+msgstr "Åpnet tabellinset"
 
-#: src/lyx_cb.C:359
-msgid "No warnings found."
-msgstr "Ingen advarsler funnet."
+#: src/insets/insettabular.C:1477
+msgid "Multicolumns can only be horizontally."
+msgstr "Multikolonner kan bare være horisontale."
 
-#: src/lyx_cb.C:361
-msgid "One warning found."
-msgstr "En advarsel funnet."
+#: src/insets/insettext.C:449
+msgid "Opened Text Inset"
+msgstr "Åpnet text inset"
 
-#: src/lyx_cb.C:362
-msgid "Use 'Edit->Go to Error' to find it."
-msgstr "Bruk 'Rediger->Gå til feil' for å finne dem."
+#: src/insets/insettext.C:910
+msgid "Cannot include more than one paragraph!"
+msgstr "Kan ikke inkludere mer enn ett avsnitt!"
 
-#: src/lyx_cb.C:365
-msgid " warnings found."
-msgstr " advarsler funnet."
+#: src/insets/insettext.C:970 src/lyxfunc.C:1348
+msgid "Layout "
+msgstr "Stil "
 
-#: src/lyx_cb.C:366
-msgid "Use 'Edit->Go to Error' to find them."
-msgstr "Bruk 'Rediger->Gå til feil' for a finne dem."
+#: src/insets/insettext.C:970 src/lyxfunc.C:1349
+msgid " not known"
+msgstr " ukjent"
 
-#: src/lyx_cb.C:368
-msgid "Chktex run successfully"
-msgstr "Chktex kjørt med sukssess"
+#: src/insets/insettext.C:1023 src/lyxfunc.C:2176
+msgid "Unknown spacing argument: "
+msgstr "Ukjent argument til linjeavstand: "
 
-#: src/lyx_cb.C:370
-msgid "It seems chktex does not work."
-msgstr "Det virker som om chktex ikke fungerte."
+#: src/insets/insettheorem.C:39
+msgid "theorem"
+msgstr "theorem"
 
-#. It seems that, if wait is false, we never get back
-#. the return code of the command. This means that all
-#. the code I added in PrintApplyCB is currently
-#. useless...
-#. CHECK What should we do here?
-#: src/lyx_cb.C:462 src/lyx_cb.C:465
-msgid "Executing command:"
-msgstr "Eksekverer kommando:"
+#: src/insets/insettheorem.C:68
+msgid "Opened Theorem Inset"
+msgstr "Opened Theorem Inset"
 
-#: src/lyx_cb.C:690 src/lyxfunc.C:2930
-msgid "File already exists:"
-msgstr "Filen finnes allerede:"
+#: src/insets/inseturl.C:32
+msgid "Url: "
+msgstr "Url: "
 
-#: src/lyx_cb.C:692
-msgid "Do you want to overwrite the file?"
-msgstr "Ønsker du Å skrive over filen?"
+#: src/insets/inseturl.C:34
+msgid "HtmlUrl: "
+msgstr "HtmlUrl: "
 
-#: src/lyx_cb.C:693
-msgid "Canceled"
-msgstr "Avbrutt."
+#: src/intl.C:290 src/intl.C:291
+msgid "other..."
+msgstr "Annet..."
 
-#: src/lyx_cb.C:714
-msgid "DocBook does not have a latex backend"
-msgstr "DocBook har ikke en latex motor"
+#: src/intl.C:361
+msgid "Key Mappings"
+msgstr "Tastaturoppsett"
 
-#: src/lyx_cb.C:720
-msgid "Nice LaTeX file saved as"
-msgstr "Pen LaTeX fil lagret som"
+#: src/kbsequence.C:213
+msgid "   options: "
+msgstr "   opsjoner: "
 
-#: src/lyx_cb.C:732
-msgid "Document class must be linuxdoc."
-msgstr "Tekstklassen må være linuxdoc."
+#: src/language.C:60
+msgid "Afrikaans"
+msgstr "Afrikaans"
 
-#: src/lyx_cb.C:742
-msgid "Building LinuxDoc SGML file `"
-msgstr "Lager LinuxDoc SGML fil `"
+#: src/language.C:61
+msgid "American"
+msgstr "Amerikansk"
 
-#: src/lyx_cb.C:747
-msgid "LinuxDoc SGML file save as"
-msgstr "LinuxDoc SGML fil lagre som"
+#: src/language.C:62
+msgid "Arabic"
+msgstr "Arabisk"
 
-#: src/lyx_cb.C:759
-msgid "Document class must be docbook."
-msgstr "Tekstklassen må være docbook."
+#: src/language.C:63
+msgid "Austrian"
+msgstr "Østerisk"
 
-#: src/lyx_cb.C:769
-msgid "Building DocBook SGML file `"
-msgstr "Lager DocBook SGML fil `"
+#: src/language.C:64
+msgid "Bahasa"
+msgstr "Bahasa"
 
-#: src/lyx_cb.C:774
-msgid "DocBook SGML file save as"
-msgstr "DocBook SGML fil lagre som"
+#: src/language.C:65
+msgid "Brazil"
+msgstr "Brasiliansk"
 
-#: src/lyx_cb.C:793
-msgid "Ascii file saved as"
-msgstr "Ascii fil lagret som"
+#: src/language.C:66
+msgid "Breton"
+msgstr "Breton"
 
-#: src/lyx_cb.C:816 src/lyx_cb.C:843 src/lyx_cb.C:868
-msgid "Document exported as HTML to file `"
-msgstr "Dokumentet eksportert som HTML til fil `"
+#: src/language.C:67
+msgid "British"
+msgstr "British"
 
-#: src/lyx_cb.C:819 src/lyx_cb.C:846 src/lyx_cb.C:871
-msgid "Unable to convert to HTML the file `"
-msgstr "Kan ikke konvertere til HTML. `"
+#: src/language.C:68
+msgid "Canadian"
+msgstr "Canadian"
 
-#: src/lyx_cb.C:939
-msgid "Unknown export type: "
-msgstr "Ukjent eksport type: "
+#: src/language.C:69
+msgid "French Canadian"
+msgstr "French Canadian"
 
-#: src/lyx_cb.C:984
-msgid "Autosaving current document..."
-msgstr "Autolagrer gjelende dokument..."
+#: src/language.C:70
+msgid "Catalan"
+msgstr "Catalansk"
 
-#: src/lyx_cb.C:1024
-msgid "Autosave Failed!"
-msgstr "Autolagring feilet!"
+#: src/language.C:71
+msgid "Croatian"
+msgstr "Kroatisk"
 
-#: src/lyx_cb.C:1080
-msgid "File to Insert"
-msgstr "Fil som skal settes inn"
+#: src/language.C:72
+msgid "Czech"
+msgstr "Tsjekkisk"
 
-#: src/lyx_cb.C:1090
-msgid "Error! Specified file is unreadable: "
-msgstr "Feil! Den spesifiserte filen kan ikke åpnes: "
+#: src/language.C:73
+msgid "Danish"
+msgstr "Dansk"
 
-#: src/lyx_cb.C:1097
-msgid "Error! Cannot open specified file: "
-msgstr "Feil! Kan ikke åpne spesifisert fil: "
+#: src/language.C:75
+msgid "Document wide language"
+msgstr "Document wide language"
 
-#: src/lyx_cb.C:1141
-msgid "Table Of Contents"
-msgstr "Innholdsfortegnelse"
+#: src/language.C:77
+msgid "Dutch"
+msgstr "Nederlandsk"
 
-#: src/lyx_cb.C:1157 src/mathed/formula.C:1042
-msgid "Enter new label to insert:"
-msgstr "Skriv inn referansemerke som skal settes inn:"
+#: src/language.C:78
+msgid "English"
+msgstr "Engelsk"
 
-#: src/lyx_cb.C:1181
-msgid "Insert Reference"
-msgstr "Sett inn referanse"
+#: src/language.C:79
+msgid "Esperanto"
+msgstr "Esperanto"
 
-#. TeX output asked
-#: src/lyx_cb.C:1244
-msgid "Converting LinuxDoc SGML to TeX file..."
-msgstr "Konverterer LinuxDox SGML fil til TeX fil..."
+#. and what country code should esperanto have?? (Garst)
+#: src/language.C:81
+msgid "Estonian"
+msgstr "Estonian"
 
-#. dvi output asked
-#: src/lyx_cb.C:1250
-msgid "Converting LinuxDoc SGML to dvi file..."
-msgstr "Konverterer LinuxDoc SGML fil til dvi fil..."
+#: src/language.C:82
+msgid "Finnish"
+msgstr "Finsk"
 
-#: src/lyx_cb.C:1302
-msgid "Converting DocBook SGML to dvi file..."
-msgstr "Konverterer DocBook SGML til DVI..."
+#: src/language.C:83
+msgid "French"
+msgstr "Fransk"
 
-#: src/lyx_cb.C:1329
-msgid "Character Style"
-msgstr "Tegn stil"
+#: src/language.C:84
+msgid "French (GUTenberg)"
+msgstr "French (GUTenberg)"
 
-#: src/lyx_cb.C:1588
-msgid "Paragraph Environment"
-msgstr "Avsnittsomgivelse"
+#: src/language.C:85
+msgid "Galician"
+msgstr "Galician"
 
-#: src/lyx_cb.C:1858
-msgid "Document Layout"
-msgstr "Dokumentstil"
+#. There are two Galicia's, one in Spain, one in E.Europe. Because of
+#. the font encoding, I am assuming this is the one in Spain. (Garst)
+#.
+#: src/language.C:89
+msgid "German"
+msgstr "Tysk"
 
-#: src/lyx_cb.C:1896
-msgid "Quotes"
-msgstr "Sitattegn"
+#: src/language.C:90 src/mathed/math_forms.C:26
+msgid "Greek"
+msgstr "Gresk"
 
-#: src/lyx_cb.C:1944
-msgid "LaTeX Preamble"
-msgstr "LaTeX Preamble"
+#: src/language.C:91
+msgid "Hebrew"
+msgstr "Hebraisk"
 
-#: src/lyx_cb.C:1961
-msgid "Do you want to save the current settings"
-msgstr "Ønsker du å lagre de nåværende innstillingene?"
+#. According to Zrubecz Laszlo <zrubi@k2.jozsef.kando.hu>,
+#. "magyar" is better. I kept it here in case we want
+#. to  provide aliasing of languages. (JMarc)
+#.
+#. { "hungarian", "hungarian", N_("Hungarian"), false, &iso8859_2, "" },
+#: src/language.C:97
+msgid "Irish"
+msgstr "Irsk"
 
-#: src/lyx_cb.C:1962
-msgid "for Character, Document, Paper and Quotes"
-msgstr "for Fonter, Document, Ark og Sitering"
+#: src/language.C:98
+msgid "Italian"
+msgstr "Italiensk"
 
-#: src/lyx_cb.C:1963
-msgid "as default for new documents?"
-msgstr "som standardverdier for nye dokumenter?"
+#: src/language.C:99
+msgid "Lsorbian"
+msgstr "Lsorbian"
 
-#: src/lyx_cb.C:2207
-msgid "Paragraph layout set"
-msgstr "Avsnittstil satt"
+#. no ISO listing for lsorbian (Garst)
+#: src/language.C:101
+msgid "Magyar"
+msgstr "Magyar"
 
-#: src/lyx_cb.C:2282
-msgid "Should I set some parameters to"
-msgstr "Skal jeg sette noen paramtere til"
+#: src/language.C:102
+msgid "Norsk"
+msgstr "Norsk"
 
-#: src/lyx_cb.C:2284
-msgid "the defaults of this document class?"
-msgstr "sette standardverdiene for denne tekstklassen?"
+#: src/language.C:103
+msgid "Polish"
+msgstr "Polsk"
 
-#. unable to load new style
-#: src/lyx_cb.C:2293 src/lyx_cb.C:2439 src/lyx_cb.C:2446
-msgid "Conversion Errors!"
-msgstr "Konverteringsfeil!"
+#: src/language.C:104
+msgid "Portuges"
+msgstr "Portugisisk"
 
-#: src/lyx_cb.C:2294 src/lyx_cb.C:2447
-msgid "Unable to switch to new document class."
-msgstr "Kan ikke bytte til ny dokument klasse."
+#: src/language.C:105
+msgid "Romanian"
+msgstr "Romansk"
 
-#: src/lyx_cb.C:2295 src/lyx_cb.C:2448
-msgid "Reverting to original document class."
-msgstr "Går tilbake til opprinnelig dokument klasse."
+#: src/language.C:106
+msgid "Russian"
+msgstr "Russisk"
 
-#: src/lyx_cb.C:2424
-msgid "Converting document to new document class..."
-msgstr "Konverterer dokument til ny tekstklasse..."
+#: src/language.C:107
+msgid "Scottish"
+msgstr "Skotsk"
 
-#: src/lyx_cb.C:2434
-msgid "One paragraph couldn't be converted"
-msgstr "Ett avsnitt var umulig å konvertere"
+#: src/language.C:108
+msgid "Spanish"
+msgstr "Spansk"
 
-#: src/lyx_cb.C:2437
-msgid " paragraphs couldn't be converted"
-msgstr " avsnitt var umulig å konvertere"
+#: src/language.C:109
+msgid "Slovak"
+msgstr "Slovakisk"
 
-#: src/lyx_cb.C:2440
-msgid "into chosen document class"
-msgstr "til valgete tekstklasse"
+#: src/language.C:110
+msgid "Slovene"
+msgstr "Slovensk"
 
-#: src/lyx_cb.C:2526
-msgid "Document layout set"
-msgstr "Dokument stil satt"
+#: src/language.C:111
+msgid "Swedish"
+msgstr "Svensk"
 
-#: src/lyx_cb.C:2561
-msgid "Quotes type set"
-msgstr "Sitattegn stil satt"
+#: src/language.C:112
+msgid "Turkish"
+msgstr "Tyrkisk"
 
-#: src/lyx_cb.C:2623
-msgid "LaTeX preamble set"
-msgstr "LaTeX preamble satt"
+#: src/language.C:113
+msgid "Usorbian"
+msgstr "Usorbian"
 
-#: src/lyx_cb.C:2646
-msgid "Cannot insert table in table."
-msgstr "Kan ikke sette inn tabell i tabell."
+#. no ISO listing for usorbian (Garst)
+#: src/language.C:115
+msgid "Welsh"
+msgstr "Walisisk"
 
-#: src/lyx_cb.C:2651
-msgid "Inserting table..."
-msgstr "Setter inn tabell..."
+#: src/language.C:131
+msgid "Default language \""
+msgstr "Default language \""
 
-#: src/lyx_cb.C:2722
-msgid "Table inserted"
-msgstr "Tabell satt inn"
+#: src/language.C:132
+msgid "\" not found!"
+msgstr "\" not found!"
 
-#: src/lyx_cb.C:2777
-msgid "Inserting figure..."
-msgstr "Setter inn figur..."
+#: src/language.C:133
+msgid "Using \"english\" instead!"
+msgstr "Using \"english\" instead!"
 
-#: src/lyx_cb.C:2785 src/lyx_cb.C:2841
-msgid "Figure inserted"
-msgstr "Figur satt inn"
+#: src/LaTeX.C:157 src/LaTeX.C:182 src/LaTeX.C:245 src/LaTeX.C:293
+msgid "LaTeX run number "
+msgstr "LaTeX kjøring nummer "
 
-#: src/lyx_cb.C:2880
-msgid "Screen options set"
-msgstr "Skjemrm opsjoner satt"
+#: src/LaTeX.C:207 src/LaTeX.C:272
+msgid "Running MakeIndex."
+msgstr "Kjører MakeIndex."
 
-#: src/lyx_cb.C:2901
-msgid "Running configure..."
-msgstr "Kjører \"configure\"..."
+#: src/LaTeX.C:220
+msgid "Running BibTeX."
+msgstr "Kjører BibTeX."
 
-#: src/lyx_cb.C:2908
-msgid "Reloading configuration..."
-msgstr "Leser konfigurasjon om igjen..."
+#: src/LaTeXLog.C:43
+msgid "Unable to show log file!"
+msgstr "Kan ikke vise log filen!"
 
-#: src/lyx_cb.C:2910
-msgid "The system has been reconfigured."
-msgstr "Systemed har blitt rekonfigurert."
+#: src/LaTeXLog.C:46
+msgid "NO LATEX LOG FILE!"
+msgstr "INGEN LATEX LOGG FIL!"
 
-#: src/lyx_cb.C:2911
-msgid "You need to restart LyX to make use of any"
-msgstr "Du må restarte LyX for å kunne bruke de"
+#: src/LaTeXLog.C:53
+msgid "Build Program Log"
+msgstr "Lag Programm Logg"
 
-#: src/lyx_cb.C:2912
-msgid "updated document class specifications."
-msgstr "oppdaterte textklasse spesifikasjonene."
+#: src/LaTeXLog.C:53
+msgid "LaTeX Log"
+msgstr "LaTeX Logg"
 
-#: src/lyx_cb.C:2938 src/lyxfunc.C:1414
-msgid "Couldn't find this label"
-msgstr "Klarte ikke å finne dette referansemerket"
+#: src/layout.C:1341
+msgid "LyX wasn't able to find its layout descriptions!"
+msgstr "LyX klarte ikke å finne sine stilbeskrivelser!"
 
-#: src/lyx_cb.C:2939 src/lyxfunc.C:1415
-msgid "in current document."
-msgstr "i gjeldende dokument."
+#: src/layout.C:1342
+msgid "Check that the file \"textclass.lst\""
+msgstr "Undersøk om filen \"textclass.lst\""
 
-#: src/lyx_cb.C:2957
-msgid "*** No Document ***"
-msgstr "*** Intet Dokument ***"
+#: src/layout.C:1343
+msgid "is installed correctly. Sorry, has to exit :-("
+msgstr "er installert korrekt. Beklager, må avslutte :-("
 
-#: src/lyx_cb.C:3096
-msgid "*** No labels found in document ***"
-msgstr "*** Ingen referansemerker funnet i dokumentet ***"
+#: src/layout.C:1405
+msgid "LyX wasn't able to find any layout description!"
+msgstr "LyX klarte ikke å finne sine stilbeskrivelser!"
 
-#: src/lyxfont.C:38
-msgid "Sans serif"
-msgstr "Sans serif"
+#: src/layout.C:1406
+msgid "Check the contents of  the file \"textclass.lst\""
+msgstr "Undersøk hva filen \"textclass.lst\" inneholder"
 
-#: src/lyxfont.C:38
-msgid "Symbol"
-msgstr "Symbol"
+#: src/layout.C:1407
+msgid "Sorry, has to exit :-("
+msgstr "Beklager, må avslutte :-("
 
-#: src/lyxfont.C:38 src/lyxfont.C:43 src/lyxfont.C:47 src/lyxfont.C:54
-#: src/lyxfont.C:58
-msgid "Inherit"
-msgstr "Arv"
+#: src/layout_forms.C:29
+msgid "Family:|#F"
+msgstr "Familie:"
 
-#: src/lyxfont.C:39 src/lyxfont.C:43 src/lyxfont.C:48 src/lyxfont.C:54
-#: src/lyxfont.C:58
-msgid "Ignore"
-msgstr "Ignorer"
+#: src/layout_forms.C:34
+msgid "Series:|#S"
+msgstr "Serie:"
 
-#: src/lyxfont.C:43
-msgid "Medium"
-msgstr "Medium"
+#: src/layout_forms.C:39
+msgid "Shape:|#H"
+msgstr "Form:"
 
-#: src/lyxfont.C:43
-msgid "Bold"
-msgstr "Fet"
+#: src/layout_forms.C:44
+msgid "Size:|#Z"
+msgstr "Størrelse|#S"
 
-#: src/lyxfont.C:47
-msgid "Upright"
-msgstr "Stående"
+#: src/layout_forms.C:49
+msgid "Misc:|#M"
+msgstr "Misc:"
 
-#: src/lyxfont.C:47
-msgid "Italic"
-msgstr "Kursiv"
+#: src/layout_forms.C:62
+msgid "Color:|#C"
+msgstr "Farge:|#F"
 
-#: src/lyxfont.C:47
-msgid "Slanted"
-msgstr "Skråstilt"
+#: src/layout_forms.C:67
+msgid "Toggle on all these|#T"
+msgstr "Av/På for alle disse|#A"
 
-#: src/lyxfont.C:47
-msgid "Smallcaps"
-msgstr "Kapiteler"
+#: src/layout_forms.C:70
+msgid "These are never toggled"
+msgstr "Disse vil veksle mellom av/på"
 
-#: src/lyxfont.C:52
-msgid "Tiny"
-msgstr "Bitteliten"
+#: src/layout_forms.C:75
+msgid "These are always toggled"
+msgstr "Disse vil alltid veksle mellom av/på"
 
-#: src/lyxfont.C:52
-msgid "Smallest"
-msgstr "Minst"
+#: src/layout_forms.C:80
+msgid "Language:"
+msgstr "Språk:"
 
-#: src/lyxfont.C:52
-msgid "Smaller"
-msgstr "Mindre"
+#: src/layout_forms.C:100 src/lyx_gui_misc.C:378 src/lyx_sendfax.C:31
+msgid "OK|#O"
+msgstr "OK|#O"
 
-#: src/lyxfont.C:52
-msgid "Small"
-msgstr "Liten"
+#: src/LColor.C:52
+msgid "none"
+msgstr "ingen"
 
-#: src/lyxfont.C:52
-msgid "Normal"
-msgstr "Normal"
+#: src/LColor.C:53
+msgid "black"
+msgstr "sort"
 
-#: src/lyxfont.C:52
-msgid "Large"
-msgstr "Stor"
+#: src/LColor.C:54
+msgid "white"
+msgstr "hvit"
 
-#: src/lyxfont.C:53
-msgid "Larger"
-msgstr "Større"
+#: src/LColor.C:55
+msgid "red"
+msgstr "rød"
 
-#: src/lyxfont.C:53
-msgid "Largest"
-msgstr "Størst"
+#: src/LColor.C:56
+msgid "green"
+msgstr "grønn"
 
-#: src/lyxfont.C:53
-msgid "Huge"
-msgstr "Enorm"
+#: src/LColor.C:57
+msgid "blue"
+msgstr "blå"
 
-#: src/lyxfont.C:53
-msgid "Huger"
-msgstr "Gigantisk"
+#: src/LColor.C:58
+msgid "cyan"
+msgstr "cyan"
 
-#: src/lyxfont.C:53
-msgid "Increase"
-msgstr "Øk"
+#: src/LColor.C:59
+msgid "magenta"
+msgstr "magenta"
 
-#: src/lyxfont.C:53
-msgid "Decrease"
-msgstr "Minsk"
+#: src/LColor.C:60
+msgid "yellow"
+msgstr "gul"
 
-#: src/lyxfont.C:58
-msgid "Off"
-msgstr "Av"
+#: src/LColor.C:61
+msgid "background"
+msgstr "bakgrunn"
 
-#: src/lyxfont.C:58
-msgid "On"
-msgstr ""
+#: src/LColor.C:62
+msgid "foreground"
+msgstr "forgrunn"
 
-#: src/lyxfont.C:58
-msgid "Toggle"
-msgstr "Bytt"
+#: src/LColor.C:63
+msgid "selection"
+msgstr "merket"
 
-#: src/lyxfont.C:403
-msgid "Emphasis "
-msgstr "Uthevet "
+#: src/LColor.C:64
+msgid "latex"
+msgstr "latex"
 
-#: src/lyxfont.C:406
-msgid "Underline "
-msgstr "Understreket "
+#: src/LColor.C:65
+msgid "floats"
+msgstr "floats"
 
-#: src/lyxfont.C:409
-msgid "Noun "
-msgstr "Substantiv "
+#: src/LColor.C:66
+msgid "note"
+msgstr "notis"
 
-#: src/lyxfont.C:411
-msgid "Latex "
-msgstr "LaTeX "
+#: src/LColor.C:67
+msgid "note background"
+msgstr "notis bakgrunn"
 
-#: src/lyxfont.C:413
-msgid "Default"
-msgstr "Standard"
+#: src/LColor.C:68
+msgid "note frame"
+msgstr "notis ramme"
 
-#: src/lyxfont.C:415
-msgid "Language: "
-msgstr "Språk: "
+#: src/LColor.C:69
+msgid "depth bar"
+msgstr "dybdemarkør"
 
-#: src/lyxfr1.C:124 src/lyxfr1.C:161
-msgid "Sorry!"
-msgstr "Beklager!"
+#: src/LColor.C:70
+msgid "language"
+msgstr "språk"
 
-#: src/lyxfr1.C:124 src/lyxfr1.C:161
-msgid "You cannot replace a single space, nor an empty character."
-msgstr "Du kan ikke erstatte et enkelt mellomrom, heller ikke et tomt tegn."
+#: src/LColor.C:71
+msgid "command-inset"
+msgstr "kommando-inset"
 
-#: src/lyxfr1.C:192 src/lyxfr1.C:239
-msgid "String not found!"
-msgstr "Streng ikke funnet!"
+#: src/LColor.C:72
+msgid "command-inset background"
+msgstr "kommando-inset bakgrunn"
 
-#: src/lyxfr1.C:196
-msgid "1 string has been replaced."
-msgstr "1 streng har blitt erstattet."
+#: src/LColor.C:73 src/LColor.C:90
+msgid "inset frame"
+msgstr "inset rammet"
 
-#: src/lyxfr1.C:199
-msgid " strings have been replaced."
-msgstr " strenger har blitt erstattet."
+#: src/LColor.C:74
+msgid "accent"
+msgstr "akksent"
 
-#: src/lyxfr1.C:235
-msgid "Found."
-msgstr "Funnet."
+#: src/LColor.C:75
+msgid "accent background"
+msgstr "akksent bakgrunn"
 
-#: src/lyxfunc.C:293
-msgid "Unknown sequence:"
-msgstr "Ukent sekvens:"
+#: src/LColor.C:76
+msgid "accent frame"
+msgstr "akksent ramme"
 
-#: src/lyxfunc.C:336 src/lyxfunc.C:2837
-msgid "Unknown action"
-msgstr "Ukjent operasjon"
+#: src/LColor.C:77
+msgid "minipage line"
+msgstr "minipage linje"
 
-#. no
-#: src/lyxfunc.C:350
-msgid "Document is read-only"
-msgstr "Dokumentet er ikke skrivbart."
+#: src/LColor.C:78
+msgid "special char"
+msgstr "spesialtegn"
 
-#. no
-#: src/lyxfunc.C:356
-msgid "Command not allowed without any document open"
-msgstr "Kommandoen er ikke lov uten åpne dokumenter"
+#: src/LColor.C:79
+msgid "math"
+msgstr "matte"
 
-#: src/lyxfunc.C:623
-msgid "Text mode"
-msgstr "Tekst modus"
+#: src/LColor.C:80
+msgid "math background"
+msgstr "matte bakgrunn"
 
-#: src/lyxfunc.C:778
-msgid "Saving document"
-msgstr "Lagrer dokument"
+#: src/LColor.C:81
+msgid "math frame"
+msgstr "matte ramme"
 
-#: src/lyxfunc.C:1088 src/lyxfunc.C:2453
-msgid "Missing argument"
-msgstr "Mangler argument"
+#: src/LColor.C:82
+msgid "math cursor"
+msgstr "matte markør"
 
-#: src/lyxfunc.C:1099 src/menus.C:2182
-msgid "Opening help file"
-msgstr "Åpner hjelpe fil"
+#: src/LColor.C:83
+msgid "math line"
+msgstr "matte linje"
 
-#: src/lyxfunc.C:1108 src/menus.C:2160
-msgid "LyX Version "
-msgstr "LyX Versjon "
+#: src/LColor.C:85
+msgid "footnote background"
+msgstr "fotnote bakgrunn"
 
-#: src/lyxfunc.C:1109 src/menus.C:2161
-msgid " of "
-msgstr " av "
+#: src/LColor.C:86
+msgid "footnote frame"
+msgstr "fotnote ramme"
 
-#: src/lyxfunc.C:1110 src/menus.C:2162
-msgid "Library directory: "
-msgstr "Bibliotek folder: "
+#: src/LColor.C:87
+msgid "ert"
+msgstr "ert"
 
-#: src/lyxfunc.C:1112 src/menus.C:2164
-msgid "User directory: "
-msgstr "Bruker folder: "
+#: src/LColor.C:88
+msgid "inset"
+msgstr "inset"
 
-#: src/lyxfunc.C:1389
-msgid "No cross-reference to toggle"
-msgstr "Ingen kryssreferanse å endre!"
+#: src/LColor.C:89
+msgid "inset background"
+msgstr "inset bakgrunn"
 
-#: src/lyxfunc.C:1787
-msgid "Mark removed"
-msgstr "Fjernet merke"
+#: src/LColor.C:91
+msgid "error"
+msgstr "feil"
 
-#: src/lyxfunc.C:1792
-msgid "Mark set"
-msgstr "Merke satt"
+#: src/LColor.C:92
+msgid "end-of-line marker"
+msgstr "linjesluttmerke"
 
-#: src/lyxfunc.C:1891
-msgid "Mark off"
-msgstr "Merke slått av"
+#: src/LColor.C:93
+msgid "appendix line"
+msgstr "appendikslinje"
 
-#: src/lyxfunc.C:1901
-msgid "Mark on"
-msgstr "Merke på"
+#: src/LColor.C:94
+msgid "vfill line"
+msgstr "vfill linje"
 
-#: src/lyxfunc.C:2368
-msgid "Push-toolbar needs argument > 0"
-msgstr "\"push-toolbar\" trenger argument > 0"
+#: src/LColor.C:95
+msgid "top/bottom line"
+msgstr "topp/bunn linje"
 
-#: src/lyxfunc.C:2385
-msgid "Usage: toolbar-add-to <LyX command>"
-msgstr "Bruk: toolbar-add-to <LyX kommando> <argument>"
+#: src/LColor.C:96
+msgid "table line"
+msgstr "tabell linje"
 
-#: src/lyxfunc.C:2402 src/mathed/formula.C:864
-msgid "Math greek mode on"
-msgstr "Gresk matte modus på"
+#: src/LColor.C:97
+msgid "tabular line"
+msgstr "tabell-linje"
 
-#: src/lyxfunc.C:2413 src/mathed/formula.C:875
-msgid "Math greek keyboard on"
-msgstr "Gresk matte keyboard på"
+#: src/LColor.C:99
+msgid "tabularonoff line"
+msgstr "stiplet tabell-linje"
 
-#: src/lyxfunc.C:2415 src/mathed/formula.C:877
-msgid "Math greek keyboard off"
-msgstr "Gresk matte keyboard av"
+#: src/LColor.C:101
+msgid "bottom area"
+msgstr "bunnområde"
 
-#: src/lyxfunc.C:2468 src/mathed/formula.C:472
-msgid "Math editor mode"
-msgstr "Matte editerings modus"
+#: src/LColor.C:102
+msgid "page break"
+msgstr "sidebrekk"
 
-#: src/lyxfunc.C:2475
-msgid "This is only allowed in math mode!"
-msgstr "Dette er bare tillatt i mattemodus!"
+#: src/LColor.C:103
+msgid "top of button"
+msgstr "knapptopp"
 
-#: src/lyxfunc.C:2641
-msgid "Opening child document "
-msgstr "Åpner subdokument "
+#: src/LColor.C:104
+msgid "bottom of button"
+msgstr "knappbunn"
 
-#: src/lyxfunc.C:2673
-msgid "Unknown kind of footnote"
-msgstr "Ukjent fotnote slag"
+#: src/LColor.C:105
+msgid "left of button"
+msgstr "knappvenstre"
 
-#: src/lyxfunc.C:2768
-msgid "Syntax: set-color <lyx_name> <x11_name>"
-msgstr ""
+#: src/LColor.C:106
+msgid "right of button"
+msgstr "knapphøyre"
 
-#: src/lyxfunc.C:2774
-msgid "Set-color \""
-msgstr ""
+#: src/LColor.C:107
+msgid "button background"
+msgstr "knappbakgrunn"
 
-#: src/lyxfunc.C:2775
-msgid "\" failed - color is undefined or may not be redefined"
-msgstr ""
+#: src/LColor.C:108
+msgid "inherit"
+msgstr "arv"
 
-#: src/lyxfunc.C:2790
-msgid "No document open"
-msgstr "Ingen dokumeter åpne"
+#: src/LColor.C:109
+msgid "ignore"
+msgstr "ignorer"
 
-#: src/lyxfunc.C:2796
-msgid "Document is read only"
-msgstr "Dokumentet er ikke skrivbart:"
+#: src/log_form.C:25 src/lyxvc.C:266 src/lyxvc.C:267
+msgid "Update|#Uu"
+msgstr "Oppdater"
 
-#: src/lyxfunc.C:2889
-msgid "Enter Filename for new document"
-msgstr "Skriv inn filnavn for nytt dokument"
+#: src/LyXAction.C:98
+msgid "Insert appendix"
+msgstr "Sett inn appendiks"
 
-#: src/lyxfunc.C:2890
-msgid "newfile"
-msgstr "nyfil"
+#: src/LyXAction.C:99
+msgid "Describe command"
+msgstr "Beskriv kommando"
 
-#. Cancel: Do nothing
-#: src/lyxfunc.C:2894 src/lyxfunc.C:2921 src/lyxfunc.C:2986 src/lyxfunc.C:3045
-#: src/lyxfunc.C:3073 src/lyxfunc.C:3083 src/lyxfunc.C:3190
-msgid "Canceled."
-msgstr "Avbrutt."
+#: src/LyXAction.C:102
+msgid "Select previous char"
+msgstr "Merk forrige bokstav"
 
-#: src/lyxfunc.C:2909 src/lyxfunc.C:3061
-msgid ""
-"Do you want to close that document now?\n"
-"('No' will just switch to the open version)"
-msgstr ""
-"Ønsker du å lukke det dokumentet nå?\n"
-"('Nei' vil bare bytte til den versjonen som er åpnet)"
+#: src/LyXAction.C:105
+msgid "Insert bibtex"
+msgstr "Sett inn BibTeX"
 
-#: src/lyxfunc.C:2932
-msgid "Do you want to open the document?"
-msgstr "Ønsker du å åpne dokumentet?"
+#: src/LyXAction.C:114
+msgid "Build program"
+msgstr "Lag programm"
 
-#. loads document
-#: src/lyxfunc.C:2934 src/lyxfunc.C:2997
-msgid "Opening document"
-msgstr "Ønsker du å åpne dokumentet?"
+#: src/LyXAction.C:115
+msgid "Autosave"
+msgstr "Auto lagrer"
 
-#: src/lyxfunc.C:2941 src/lyxfunc.C:3004
-msgid "opened."
-msgstr "åpnet"
+#: src/LyXAction.C:117
+msgid "Go to beginning of document"
+msgstr "Gå til begynnelsen av dokumentet"
 
-#: src/lyxfunc.C:2950
-msgid "Choose template"
-msgstr "Velg mal"
+#: src/LyXAction.C:119
+msgid "Select to beginning of document"
+msgstr "Merk til begynnelsen av dokumentet"
 
-#: src/lyxfunc.C:2978 src/lyxfunc.C:3038 src/lyxfunc.C:3182
-msgid "Examples"
-msgstr "Eksempler"
+#: src/LyXAction.C:122
+msgid "Check TeX"
+msgstr "Sjekk TeX"
 
-#: src/lyxfunc.C:2980
-msgid "Select Document to Open"
-msgstr "Vel dokument som skal åpnes"
+#: src/LyXAction.C:125
+msgid "Go to end of document"
+msgstr "Gå til slutten av dokumentet"
 
-#: src/lyxfunc.C:3006
-msgid "Could not open document"
-msgstr "Kunne ikke åpne dokumentet"
+#: src/LyXAction.C:127
+msgid "Select to end of document"
+msgstr "Merk til slutten av dokumentet"
 
-#: src/lyxfunc.C:3080
-msgid "A document by the name"
-msgstr "Ett annet dokument med navnet"
+#: src/LyXAction.C:128
+msgid "Export to"
+msgstr "Eksporter til"
 
-#: src/lyxfunc.C:3082
-msgid "already exists. Overwrite?"
-msgstr "finnes allerede. Overskrive?"
+#: src/LyXAction.C:129
+msgid "Fax"
+msgstr "Faks"
 
-#: src/lyxfunc.C:3090
-msgid "Importing"
-msgstr "Importerer"
+#: src/LyXAction.C:134
+msgid "Import document"
+msgstr "Importer dokument"
 
-#: src/lyxfunc.C:3097
-msgid "imported."
-msgstr "importert."
+#: src/LyXAction.C:138
+msgid "Get the printer parameters"
+msgstr "Get the printer parameters"
 
-#: src/lyxfunc.C:3099
-msgid ": import failed."
-msgstr ": importering feilet."
+#: src/LyXAction.C:139
+msgid "New document"
+msgstr "Nytt dokument"
 
-#: src/lyxfunc.C:3184
-msgid "Select Document to Insert"
-msgstr "Velg dokument som skal settes inn"
+#: src/LyXAction.C:141
+msgid "New document from template"
+msgstr "Nytt dokument med mal"
 
-#. Inserts document
-#: src/lyxfunc.C:3202
-msgid "Inserting document"
-msgstr "Setter inn dokumentet"
+#: src/LyXAction.C:142
+msgid "Open"
+msgstr "Åpne"
 
-#: src/lyxfunc.C:3208
-msgid "inserted."
-msgstr "satt inn."
+#: src/LyXAction.C:145
+msgid "Revert to saved"
+msgstr "Tilbake til sist lagret"
 
-#: src/lyxfunc.C:3210
-msgid "Could not insert document"
-msgstr "Kunne ikke sette inn dokumentet"
+#: src/LyXAction.C:147
+msgid "Switch to an open document"
+msgstr "Switch to an open document"
 
-#: src/lyxfunc.C:3224
-msgid "Select LaTeX file to import"
-msgstr "Velg LaTeX fil som skal importeres"
+#: src/LyXAction.C:149
+msgid "Toggle read-only"
+msgstr "Skrivebeskyttet av/på"
 
-#: src/lyxfunc.C:3228 src/lyxfunc.C:3232
-msgid "Select ASCII file to import"
-msgstr "Velg ASCII fil som skal importeres"
+#: src/LyXAction.C:153
+msgid "Save As"
+msgstr "Lagre som"
 
-#: src/lyxfunc.C:3236
-msgid "Select NoWeb file to import"
-msgstr "Velg Noweb fil som skal importeres"
+#: src/LyXAction.C:156
+msgid "Go one char back"
+msgstr "Gå en bokstav tilbake"
 
-#: src/lyxfunc.C:3240
-msgid "Select LinuxDoc file to import"
-msgstr "Velg LinuxDoc fil som skal importeres"
+#: src/LyXAction.C:158
+msgid "Go one char forward"
+msgstr "Gå en bokstav fremover"
 
-#: src/lyxfunc.C:3243
-msgid "Unknown import type: "
-msgstr "Ukjent import type: "
+#: src/LyXAction.C:161
+msgid "Insert citation"
+msgstr "Sett inn sitat"
 
-#: src/lyx_gui.C:334 src/lyx_gui.C:337
-msgid " None | Defskip | Smallskip | Medskip | Bigskip | VFill | Length "
-msgstr " None | Defskip | Smallskip | Medskip | Bigskip | VFill | Length "
+#: src/LyXAction.C:164
+msgid "Execute command"
+msgstr "Utfør kommando"
 
-#: src/lyx_gui.C:359
-msgid " No change %l| Roman | Sans Serif | Typewriter %l| Reset "
-msgstr " Ingen endring %l| Roman | Sans Serif | Skrivemaskin %l| Reset "
+#: src/LyXAction.C:173
+msgid "Decrement environment depth"
+msgstr "Minsk omgivelsedybde"
 
-#: src/lyx_gui.C:361
-msgid " No change %l| Medium | Bold %l| Reset "
-msgstr " Ingen Endring %l| Medium | Fet %l| Reset "
+#: src/LyXAction.C:175
+msgid "Increment environment depth"
+msgstr "Øk omgivelsedybde"
 
-#: src/lyx_gui.C:363
-msgid " No change %l| Upright | Italic | Slanted | Small Caps %l| Reset "
-msgstr " Ingen endring %l| Stående | Skråstilt | Skjev | Small Caps %l| Reset "
+#: src/LyXAction.C:177
+msgid "Change environment depth"
+msgstr "Forandre omgivelsedybde"
 
-#: src/lyx_gui.C:366
-msgid ""
-" No change %l| Tiny | Smallest | Smaller | Small | Normal | Large | Larger | "
-"Largest | Huge | Huger %l| Increase | Decrease | Reset "
-msgstr ""
-" Ingen Endring %l| Bitteliten | Minst | Mindre | Liten | Normal | Stor | "
-"Større | Størst | Enda større | Kjempestor %l| Øk | Minsk | Reset "
+#: src/LyXAction.C:178
+msgid "Insert ... dots"
+msgstr "Sett inn ellipsis"
 
-#: src/lyx_gui.C:370
-msgid " No change %l| Emph | Underbar | Noun | LaTeX mode %l| Reset "
-msgstr ""
-"Ingen Endring %l| Uthevet | Understreket | Substantiv | LaTeX modus %l| "
-"Reset "
+#: src/LyXAction.C:179
+msgid "Go down"
+msgstr "Gå ned"
 
-#: src/lyx_gui.C:372
-msgid ""
-" No change %l| No color | Black | White | Red | Green | Blue | Cyan | "
-"Magenta | Yellow %l| Reset "
-msgstr ""
-"Ingen endring %l| Ingen farge | Sort | Hvit | Rød | Grønn | Blå | Cyan | "
-"Magenta | Gul%l | Resett "
+#: src/LyXAction.C:181
+msgid "Select next line"
+msgstr "Merk neste linje"
 
-#: src/lyx_gui.C:391
-msgid " Single | OneHalf | Double | Other "
-msgstr " Enkel | Halvannen | Dobbel | Annet "
+#: src/LyXAction.C:183
+msgid "Choose Paragraph Environment"
+msgstr "Velg avsnitt omgivelse"
 
-#: src/lyx_gui.C:408
-msgid "No change"
-msgstr "Ingen endring"
+#: src/LyXAction.C:185
+msgid "Insert end of sentence period"
+msgstr "Sett inn setningsslutt punktum"
 
-#: src/lyx_gui.C:409
-msgid "Reset"
-msgstr "Tilbakestill"
+#: src/LyXAction.C:186
+msgid "Go to next error"
+msgstr "Gå til neste feil"
 
-#: src/lyx_gui.C:436
-msgid " Smallskip | Medskip | Bigskip | Length "
-msgstr " Smallskip | Medskip | Bigskip | Length "
+#: src/LyXAction.C:188
+msgid "Remove all error boxes"
+msgstr "Fjern alle feilbokser"
 
-#: src/lyx_gui.C:449
-msgid ""
-" Default | Custom | USletter | USlegal | USexecutive | A3 | A4 | A5 | B3 | "
-"B4 | B5 "
-msgstr ""
-" Standard | Egen Definert | USletter | USlegal | USexecutive | A3 | A4 | A5 "
-"| B3 | B4 | B5 "
+#: src/LyXAction.C:190
+msgid "Insert a new ERT Inset"
+msgstr "Sett inn ERT"
 
-#: src/lyx_gui.C:452
-msgid ""
-" None | A4 small Margins (only portrait) | A4 very small Margins (only "
-"portrait) | A4 very wide margins (only portrait) "
-msgstr ""
-"Ingen | A4 smale marger (bare høydeformat) | A4 veldig smale marger (bare "
-"høydeformat) | A4 veldig vide marger (bare høydeformat) "
+#: src/LyXAction.C:192
+msgid "Insert a new external inset"
+msgstr "Insert a new external inset"
 
-#: src/lyx_gui.C:500
-msgid " ``text'' | ''text'' | ,,text`` | ,,text'' | «text» | »text« "
-msgstr " ``tekst'' | ,,tekst`` | ,,tekst'' | «tekst» | »tekst« | ''tekst'' "
+#: src/LyXAction.C:193 src/lyx_cb.C:821
+msgid "Insert Figure"
+msgstr "Sett inn figur"
 
-#: src/lyx_gui.C:538
-msgid " TOC | LOF | LOT | LOA "
-msgstr " TOC | LOF | LOT | LOA "
+#: src/LyXAction.C:195
+msgid "Insert Graphics"
+msgstr "Sett inn grafikk"
 
-#: src/lyx_gui.C:573
-msgid "LyX Banner"
-msgstr "LyX Banner"
+#: src/LyXAction.C:200 src/lyxfr0.C:94
+msgid "Find & Replace"
+msgstr "Finn & Erstatt"
 
-#: src/lyx_gui_misc.C:387
-msgid "Dismiss"
-msgstr "Lukk"
+#: src/LyXAction.C:202
+msgid "Toggle bold"
+msgstr "Fet av/på"
 
-#: src/lyx_gui_misc.C:404 src/lyx_gui_misc.C:413 src/lyx_gui_misc.C:417
-msgid "Yes|Yy#y"
-msgstr "Ja|Jj#j#y"
+#: src/LyXAction.C:203
+msgid "Toggle code style"
+msgstr "Kode stil av/på"
 
-#: src/lyx_gui_misc.C:405 src/lyx_gui_misc.C:414 src/lyx_gui_misc.C:418
-msgid "No|Nn#n"
-msgstr "Nei|Nn#n"
+#: src/LyXAction.C:204
+msgid "Default font style"
+msgstr "Standard font stil"
 
-#: src/lyx_gui_misc.C:428
-msgid "Clear|#e"
-msgstr "Blank ut|#l"
+#: src/LyXAction.C:206
+msgid "Toggle emphasize"
+msgstr "Uthevet av/på"
 
-#: src/lyx_gui_misc.C:441
-msgid "Any changes will be ignored"
-msgstr "Endringer vil bli ignorert"
+#: src/LyXAction.C:207
+msgid "Toggle user defined style"
+msgstr "Bruker definert stil av/på"
 
-#: src/lyx_gui_misc.C:442
-msgid "The document is read-only:"
-msgstr "Dokumentet er skrivebeskyttet:"
+#: src/LyXAction.C:209
+msgid "Toggle noun style"
+msgstr "Substantiv stil av/på"
 
-#: src/lyx_main.C:94
-msgid "Wrong command line option `"
-msgstr "Fail argument på kommandoline `"
+#: src/LyXAction.C:210
+msgid "Toggle roman font style"
+msgstr "Roman font stil av/på"
 
-#: src/lyx_main.C:96
-msgid "'. Exiting."
-msgstr "'. Avslutter."
+#: src/LyXAction.C:212
+msgid "Toggle sans font style"
+msgstr "Sans serif font stil av/på"
 
-#: src/lyx_main.C:216
-msgid "Warning: could not determine path of binary."
-msgstr "Advarsel: Fant ikke sti til binærfilen."
+#: src/LyXAction.C:213
+msgid "Set font size"
+msgstr "Sett font størrelse"
 
-#: src/lyx_main.C:218
-msgid "If you have problems, try starting LyX with an absolute path."
-msgstr "Hvis du har problemer prøv å start LyX med absolutt filsti."
+#: src/LyXAction.C:214
+msgid "Show font state"
+msgstr "Vis font status"
 
-#: src/lyx_main.C:308
-msgid "LYX_DIR_11x environment variable no good."
-msgstr "LYX_DIR_11x miljøvariabel er ikke god."
+#: src/LyXAction.C:217
+msgid "Toggle font underline"
+msgstr "Understreking av/på"
 
-#: src/lyx_main.C:310
-msgid "System directory set to: "
-msgstr "System folder satt til: "
+#: src/LyXAction.C:219 src/LyXAction.C:223
+msgid "Insert Footnote"
+msgstr "Sett inn fotnote"
 
-#: src/lyx_main.C:318
-msgid "LyX Warning! Couldn't determine system directory."
-msgstr "LyX Advarsel! Fant ikke system folder."
+#: src/LyXAction.C:226
+msgid "Insert Marginalnote"
+msgstr "Insert Marginalnote"
 
-#: src/lyx_main.C:319
-msgid "Try the '-sysdir' command line parameter or"
-msgstr "Forsøk '-sysdir' som parameter eller"
+#: src/LyXAction.C:227
+msgid "Select next char"
+msgstr "Merk neste bokstav"
 
-#: src/lyx_main.C:320
-msgid "set the environment variable LYX_DIR_11x to the LyX system directory"
-msgstr "sett miljøvariablen LYX_DIR_11x til å peke på LyX' systemfolder som"
+#: src/LyXAction.C:230
+msgid "Insert horizontal fill"
+msgstr "Sett inn horisontalt fyll"
 
-#: src/lyx_main.C:322
-msgid "containing the file `chkconfig.ltx'."
-msgstr "inneholder filen `chkconfig.ltx'."
+#: src/LyXAction.C:232
+msgid "Display copyright information"
+msgstr "Display copyright information"
 
-#: src/lyx_main.C:324
-msgid "Using built-in default "
-msgstr "Bruker innebygd standard "
+#: src/LyXAction.C:234
+msgid "Show the list of people who helped writing LyX"
+msgstr "Show the list of people who helped writing LyX"
 
-#: src/lyx_main.C:325
-msgid " but expect problems."
-msgstr " men forvent problemer."
+#: src/LyXAction.C:236
+msgid "Open a Help file"
+msgstr "Open a Help file"
 
-#: src/lyx_main.C:328
-msgid "Expect problems."
-msgstr "Forvent problemer."
+#: src/LyXAction.C:239
+msgid "Show the actual LyX version"
+msgstr "Show the actual LyX version"
 
-#: src/lyx_main.C:540
-msgid "You have specified an invalid LyX directory."
-msgstr "Du har spesifisert en ugyldig LyX folder."
+#: src/LyXAction.C:242
+msgid "Insert hyphenation point"
+msgstr "Sett inn orddelingspunkt"
 
-#: src/lyx_main.C:541
-msgid "You don't have a personal LyX directory."
-msgstr "Du har ikke en personlig LyX folder."
+#: src/LyXAction.C:244
+msgid "Insert index item"
+msgstr "Sett inn indeks"
 
-#: src/lyx_main.C:543
-msgid "It is needed to keep your own configuration."
-msgstr "Den trengs for å ta vare på din egen konfigurasjon."
+#: src/LyXAction.C:246
+msgid "Insert last index item"
+msgstr "Sett inn siste som indeks"
 
-#: src/lyx_main.C:544
-msgid "Should I try to set it up for you (recommended)?"
-msgstr "Skal jeg prøve å sette den opp for deg (anbefalt)?"
+#: src/LyXAction.C:247
+msgid "Insert index list"
+msgstr "Sett inn indeksliste"
 
-#: src/lyx_main.C:545
-msgid "Running without personal LyX directory."
-msgstr "Kjører uten personlig LyX folder."
+#: src/LyXAction.C:249
+msgid "Turn off keymap"
+msgstr "Slå av keymap"
 
-#. Tell the user what is going on
-#: src/lyx_main.C:552
-msgid "LyX: Creating directory "
-msgstr "LyX: Lager folder "
+#: src/LyXAction.C:252
+msgid "Use primary keymap"
+msgstr "Bruk primær keymap"
 
-#: src/lyx_main.C:553
-msgid " and running configure..."
-msgstr " og kjører \"configure\"..."
+#: src/LyXAction.C:254
+msgid "Use secondary keymap"
+msgstr "Bruk sekundær keymap"
 
-#: src/lyx_main.C:559
-msgid "Failed. Will use "
-msgstr "Feilet. Bruker "
+#: src/LyXAction.C:255
+msgid "Toggle keymap"
+msgstr "Keymap av/på"
 
-#: src/lyx_main.C:560
-msgid " instead."
-msgstr " isteden."
+#: src/LyXAction.C:257
+msgid "Insert Label"
+msgstr "Sett inn referanse merke"
 
-#: src/lyx_main.C:567
-msgid "Done!"
-msgstr "Ferdig!"
+#: src/LyXAction.C:259
+msgid "Change language"
+msgstr "Bytt språk"
 
-#: src/lyx_main.C:581
-msgid "LyX Warning!"
-msgstr "LyX Advarsel!"
+#: src/LyXAction.C:260
+msgid "View LaTeX log"
+msgstr "Vis LaTeX Logg"
 
-#: src/lyx_main.C:582
-msgid "Error while reading "
-msgstr "Feil under lesing "
+#: src/LyXAction.C:265
+msgid "Copy paragraph environment type"
+msgstr "Kopier avsnittsomgivelse"
 
-#: src/lyx_main.C:583
-msgid "Using built-in defaults."
-msgstr "Bruker innebygde standarer."
+#: src/LyXAction.C:270
+msgid "Paste paragraph environment type"
+msgstr "Lim inn avsnittsomgivelse"
 
-#: src/lyx_main.C:660
-msgid "Setting debug level to "
-msgstr "Setter debug nivå til "
+#: src/LyXAction.C:275
+msgid "Open the tabular layout"
+msgstr "Open the tabular layout"
 
-#: src/lyx_main.C:671
-msgid ""
-"Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
-"Command line switches (case sensitive):\n"
-"\t-help              summarize LyX usage\n"
-"\t-userdir dir       try to set user directory to dir\n"
-"\t-sysdir dir        try to set system directory to dir\n"
-"\t-geometry WxH+X+Y  set geometry of the main window\n"
-"\t-dbg feature[,feature]...\n"
-"                  select the features to debug.\n"
-"                  Type `lyx -dbg' to see the list of features\n"
-"Check the LyX man page for more options."
-msgstr ""
+#: src/LyXAction.C:277
+msgid "Go to beginning of line"
+msgstr "Gå til begynnelsen av linjen"
 
-#: src/lyx_main.C:696
-msgid "List of supported debug flags:"
-msgstr "Liste over debug flagg some støttes:"
+#: src/LyXAction.C:279
+msgid "Select to beginning of line"
+msgstr "Merk til begynnelsen av linjen"
 
-#: src/lyx_main.C:708
-msgid "Missing directory for -sysdir switch!"
-msgstr "Mangler folder for -sysdir parameter!"
+#: src/LyXAction.C:281
+msgid "Go to end of line"
+msgstr "Gå til slutten av linjen"
 
-#: src/lyx_main.C:719
-msgid "Missing directory for -userdir switch!"
-msgstr "Mangler folder for -userdir parameter!"
+#: src/LyXAction.C:283
+msgid "Select to end of line"
+msgstr "Merk til slutten av linjen"
 
-#: src/lyx_main.C:742
-msgid "Missing command string after  -x switch!"
-msgstr "Mangler kommando streng etter -x switch!"
+#: src/LyXAction.C:285
+msgid "Insert list of algorithms"
+msgstr "Sett in liste over algoritmer"
 
-#: src/lyx_main.C:765
-msgid "Unknown file type '"
-msgstr "Ukjent fil type '"
+#: src/LyXAction.C:287
+msgid "View list of algorithms"
+msgstr "Se på liste over algoritmer"
 
-#: src/lyx_main.C:766
-msgid "' after "
-msgstr "' etter "
+#: src/LyXAction.C:289
+msgid "Insert list of figures"
+msgstr "Sett inn figurliste"
 
-#: src/lyx_main.C:767 src/lyx_main.C:771 src/lyx_main.C:786
-msgid " switch!"
-msgstr " endring!"
+#: src/LyXAction.C:291
+msgid "View list of figures"
+msgstr "Se på figurliste"
 
-#: src/lyx_main.C:769
-msgid "Missing file type [eg latex, ps...] after "
-msgstr "Mangler fil type [eks. latex, ps...] etter "
+#: src/LyXAction.C:293
+msgid "Insert list of tables"
+msgstr "Sett inn liste over tabeller"
 
-#: src/lyx_main.C:784
-msgid "Missing type [eg latex, ps...] after "
-msgstr "Mangler fil type [eks. latex, ps...] etter "
+#: src/LyXAction.C:295
+msgid "View list of tables"
+msgstr "Se på liste over tabeller"
 
-#: src/lyx_sendfax.C:21
-msgid "Fax no.:|#F"
-msgstr "Faks no.:|#F"
+#: src/LyXAction.C:296
+msgid "Exit"
+msgstr "Avslutt"
 
-#: src/lyx_sendfax.C:23
-msgid "Dest. Name:|#N"
-msgstr "Mott. Navn:|#N"
+#: src/LyXAction.C:299
+msgid "Insert Margin note"
+msgstr "Sett inn margnotat"
 
-#: src/lyx_sendfax.C:25
-msgid "Enterprise:|#E"
-msgstr "Foretak:|#F"
+#: src/LyXAction.C:306
+msgid "Math Greek"
+msgstr "Greske bokstaver"
 
-#: src/lyx_sendfax.C:45
-msgid "Phone Book"
-msgstr "Telefon liste"
+#: src/LyXAction.C:309
+msgid "Insert math symbol"
+msgstr "Sett inn mattesymbol"
 
-#: src/lyx_sendfax.C:49
-msgid "Select from|#S"
-msgstr "Velg fra"
+#: src/LyXAction.C:314
+msgid "Math mode"
+msgstr "Matte modus"
 
-#: src/lyx_sendfax.C:53
-msgid "Add to|#t"
-msgstr "Legg til"
+#: src/LyXAction.C:327
+msgid "Go one paragraph down"
+msgstr "Gå ett avsnitt ned"
 
-#: src/lyx_sendfax.C:57
-msgid "Delete from|#D"
-msgstr "Slett fra"
+#: src/LyXAction.C:329
+msgid "Select next paragraph"
+msgstr "Merk neste avsnitt"
 
-#: src/lyx_sendfax.C:61
-msgid "Save|#V"
-msgstr "Lagre"
+#: src/LyXAction.C:331
+msgid "Go to paragraph"
+msgstr "Go to paragraph"
 
-#: src/lyx_sendfax.C:65
-msgid "Destination:"
-msgstr "Mottager:"
+#: src/LyXAction.C:333
+msgid "Go one paragraph up"
+msgstr "Gå ett avsnitt opp"
 
-#: src/lyx_sendfax.C:71
-msgid "Comment:"
-msgstr "Kommentar:"
+#: src/LyXAction.C:335
+msgid "Select previous paragraph"
+msgstr "Merk forrige avsnitt"
 
-#: src/lyx_sendfax_main.C:40
-msgid "Fax File: "
-msgstr "Faksfil: "
+#: src/LyXAction.C:339
+msgid "Edit Preferences"
+msgstr "Edit Preferences"
 
-#: src/lyx_sendfax_main.C:150 src/lyx_sendfax_main.C:197
-#: src/lyx_sendfax_main.C:236 src/lyx_sendfax_main.C:270
-msgid "Empty Phonebook"
-msgstr "Tom telefonliste"
+#: src/LyXAction.C:341
+msgid "Save Preferences"
+msgstr "Save Preferences"
 
-#: src/lyx_sendfax_main.C:209 src/lyx_sendfax_main.C:248
-msgid "Save (needed)"
-msgstr "Lagring (trengs)"
+#: src/LyXAction.C:344
+msgid "Insert protected space"
+msgstr "Sett inn hardt mellomrom"
 
-#: src/lyx_sendfax_main.C:264
-msgid "Cannot open phone book: "
-msgstr "Kan ikke åpne telefonbok: "
+#: src/LyXAction.C:345
+msgid "Insert quote"
+msgstr "Sett inn sitattegn"
 
-#: src/lyx_sendfax_main.C:292
-msgid "NO OR EMPTY LOGFILE!"
-msgstr "INGEN ELLER TOM LOGGFIL!"
+#: src/LyXAction.C:347
+msgid "Reconfigure"
+msgstr "Rekonfigurer"
 
-#: src/lyx_sendfax_main.C:299
-msgid "Message-Window"
-msgstr "Meldingsvindu"
+#: src/LyXAction.C:352
+msgid "Insert cross reference"
+msgstr "Sett inn kryssreferanse"
 
-#: src/lyx_sendfax_main.C:330
-msgid "@L@b@cEmpty Phonebook"
-msgstr "@L@b@cTom telefonliste"
+#: src/LyXAction.C:358
+msgid "Scroll inset"
+msgstr "Scroll inset"
 
-#: src/lyx_sendfax_main.C:332
-msgid "Phonebook"
-msgstr "Telefonliste"
+#: src/LyXAction.C:377
+msgid "Open Insert Tabular Dialog"
+msgstr "Open Insert Tabular Dialog"
 
-#: src/LyXSendto.C:39
-msgid "Send Document to Command"
-msgstr "Send dokumentet til kommando"
+#: src/LyXAction.C:379
+msgid "Tabular Features"
+msgstr "Tabular Features"
 
-#: src/lyxvc.C:93 src/lyxvc.C:126
-msgid "Save document and proceed?"
-msgstr "Lagre dokument og fortsette?"
+#: src/LyXAction.C:381
+msgid "Insert a new Tabular Inset"
+msgstr "Sett inn Tabell"
 
-#: src/lyxvc.C:106
-msgid "LyX VC: Initial description"
-msgstr "LyX VC: Initiell beskrivelse"
+#: src/LyXAction.C:382
+msgid "Toggle TeX style"
+msgstr "TeX stil av/på"
 
-#: src/lyxvc.C:107
-msgid "(no initial description)"
-msgstr "(ingen beskrivelse)"
+#: src/LyXAction.C:384
+msgid "Insert a new Text Inset"
+msgstr "Sett inn ny tekstinset"
 
-#: src/lyxvc.C:112
-msgid "This document has NOT been registered."
-msgstr "Dette dokumentet ble IKKE registrert."
+#: src/LyXAction.C:386
+msgid "Insert table of contents"
+msgstr "Sett inn innholdsfortegnelse"
 
-#: src/lyxvc.C:138
-msgid "LyX VC: Log Message"
-msgstr "LyX VC: Logg melding"
+#: src/LyXAction.C:388
+msgid "View table of contents"
+msgstr "Vis innholdsfortegnelse"
 
-#: src/lyxvc.C:141
-msgid "(no log message)"
-msgstr "(ingen logg melding)"
+#: src/LyXAction.C:390
+msgid "Toggle cursor does/doesn't follow the scrollbar"
+msgstr "Markør følger/følger ikke scrollbar"
 
-#: src/lyxvc.C:156
-msgid "Ignore changes and proceed with check out?"
-msgstr "Ignorer endringer, og fortsett med utsjekk?"
+#: src/LyXAction.C:403
+msgid "Register document under version control"
+msgstr "Registrer dokumentet i versionskontroll"
 
-#. Here we should check if the buffer is dirty. And if it is
-#. we should warn the user that reverting will discard all
-#. changes made since the last check in.
-#: src/lyxvc.C:171
-msgid "When you revert, you will loose all changes made"
-msgstr "Når du revertere vil du miste alle endringer som"
+#: src/LyXAction.C:650
+msgid "No description available!"
+msgstr "Ingen beskrivelse tilgjengelig!"
 
-#: src/lyxvc.C:172
-msgid "to the document since the last check in."
-msgstr "er gjort i dokumentet siden siste innsjekking."
+#: src/lyx.C:41
+msgid "Encapsulated Postscript (*.eps, *.ps)|#E"
+msgstr "Enkapsulert Postscript (*.eps, *.ps)"
 
-#: src/lyxvc.C:173
-msgid "Do you still want to do it?"
-msgstr "Ønsker du fortsatt å gjøre det?"
+#: src/lyx.C:43
+msgid "Inlined EPS (*.eps, *.ps)|#I"
+msgstr "Inlined EPS (*.eps, *.ps)"
 
-#: src/lyxvc.C:276
-msgid "No VC History!"
-msgstr "Ingen VC historie!"
+#: src/lyx.C:75
+msgid "Template|#t"
+msgstr "Template|#t"
 
-#: src/lyxvc.C:283
-msgid "VC History"
-msgstr "VC historie"
+#: src/lyx.C:87
+msgid "Parameters|#P"
+msgstr "Parameters|#P"
 
-#: src/LyXView.C:470 src/minibuffer.C:231
-msgid " (Changed)"
-msgstr " (Endret)"
+#: src/lyx.C:90
+msgid "Edit file|#E"
+msgstr "Edit file|#E"
 
-#: src/LyXView.C:472
-msgid " (read only)"
-msgstr " (skrivebeskyttet)"
+#: src/lyx.C:95
+msgid "View result|#V"
+msgstr "View result|#V"
 
-#: src/mathed/formula.C:892 src/mathed/formula.C:1203
-msgid "TeX mode"
-msgstr "TeX modus"
+#: src/lyx.C:100
+msgid "Update result|#U"
+msgstr "Update result|#U"
 
-#: src/mathed/formula.C:907
-msgid "No number"
-msgstr "Inget tall"
+#: src/lyx.C:110
+msgid "Cancel|#C^["
+msgstr "Cancel|#C^["
 
-#: src/mathed/formula.C:910
-msgid "Number"
-msgstr "Tall"
+#: src/lyx_cb.C:187
+msgid "Save failed. Rename and try again?"
+msgstr "Lagring feilet. Gi nytt navn og prøv igjen?"
 
-#: src/mathed/formula.C:1074
-msgid "math text mode"
-msgstr "Matte tekstmodus"
+#: src/lyx_cb.C:189
+msgid "(If not, document is not saved.)"
+msgstr "(Hvis ikke blir ikke dokumentet lagret)"
 
-#: src/mathed/formula.C:1083
-msgid "Invalid action in math mode!"
-msgstr "Ugyldig operasjon i matte modus!"
+#: src/lyx_cb.C:214 src/lyxfunc.C:3084
+msgid "Templates"
+msgstr "Maler"
 
-#: src/mathed/formulamacro.C:143 src/mathed/formulamacro.C:170
-msgid "Macro: "
-msgstr "Makro: "
+#: src/lyx_cb.C:220 src/lyx_cb.C:225
+msgid "Enter Filename to Save Document as"
+msgstr "Skriv inn filnavnet som dokumentet skal lagres som"
 
-#: src/mathed/formulamacro.C:180
-msgid "Math macro editor mode"
-msgstr "Mattemakro editerings modus"
+#: src/lyx_cb.C:242
+msgid "Same name as document already has:"
+msgstr "Samme navn som dokumentet allerede har:"
 
-#: src/mathed/math_forms.C:19
-msgid "Close "
-msgstr "Lukk"
+#: src/lyx_cb.C:244
+msgid "Save anyway?"
+msgstr "Lagre likevel?"
 
-#: src/mathed/math_forms.C:22
-msgid "Functions"
-msgstr "Funksjoner"
+#: src/lyx_cb.C:250
+msgid "Another document with same name open!"
+msgstr "Ett annet dokument med samme navn er åpent!"
 
-#: src/mathed/math_forms.C:30
-msgid "­ Û"
-msgstr "­ Û"
+#: src/lyx_cb.C:252
+msgid "Replace with current document?"
+msgstr "Erstatt med gjelende dokument?"
 
-#: src/mathed/math_forms.C:34
-msgid "± ´"
-msgstr "± ´"
+#: src/lyx_cb.C:260
+msgid "Document renamed to '"
+msgstr "Dokument gitt nytt navn: '"
 
-#: src/mathed/math_forms.C:38
-msgid "£ @"
-msgstr "£ @"
+#: src/lyx_cb.C:261
+msgid "', but not saved..."
+msgstr "', men ikke lagret..."
+
+#: src/lyx_cb.C:267
+msgid "Document already exists:"
+msgstr "Dokumentet finnes allerede."
+
+#: src/lyx_cb.C:269
+msgid "Replace file?"
+msgstr "Erstatt fil?"
 
-#: src/mathed/math_forms.C:42
-msgid "S  ò"
-msgstr "S  ò"
+#: src/lyx_cb.C:285
+msgid "Document could not be saved!"
+msgstr "Document could not be saved!"
 
-#: src/mathed/math_forms.C:46
-msgid "Misc"
-msgstr "Misc"
+#: src/lyx_cb.C:286
+msgid "Holding the old name."
+msgstr "Holding the old name."
 
-#: src/mathed/math_forms.C:127
-msgid "OK  "
-msgstr "Ok  "
+#: src/lyx_cb.C:300
+msgid "Chktex does not work with SGML derived documents."
+msgstr "Chktex fungerer ikke for SGML dokumenter."
 
-#: src/mathed/math_forms.C:140
-msgid "Columns "
-msgstr "Kolonner"
+#: src/lyx_cb.C:309
+msgid "No warnings found."
+msgstr "Ingen advarsler funnet."
 
-#: src/mathed/math_forms.C:147
-msgid "Vertical align|#V"
-msgstr "Juster vertikalt|#v"
+#: src/lyx_cb.C:311
+msgid "One warning found."
+msgstr "En advarsel funnet."
 
-#: src/mathed/math_forms.C:152
-msgid "Horizontal align|#H"
-msgstr "Juster horisontalt|#h"
+#: src/lyx_cb.C:312
+msgid "Use 'Edit->Go to Error' to find it."
+msgstr "Bruk 'Rediger->Gå til feil' for å finne dem."
 
-#: src/mathed/math_forms.C:195
-msgid "OK "
-msgstr "OK "
+#: src/lyx_cb.C:315
+msgid " warnings found."
+msgstr " advarsler funnet."
 
-#: src/mathed/math_forms.C:206
-msgid "Thin|#T"
-msgstr "Smal"
+#: src/lyx_cb.C:316
+msgid "Use 'Edit->Go to Error' to find them."
+msgstr "Bruk 'Rediger->Gå til feil' for a finne dem."
 
-#: src/mathed/math_forms.C:210
-msgid "Medium|#M"
-msgstr "Medium"
+#: src/lyx_cb.C:318
+msgid "Chktex run successfully"
+msgstr "Chktex kjørt med sukssess"
 
-#: src/mathed/math_forms.C:214
-msgid "Thick|#H"
-msgstr "Bred"
+#: src/lyx_cb.C:320
+msgid "It seems chktex does not work."
+msgstr "Det virker som om chktex ikke fungerte."
 
-#: src/mathed/math_forms.C:218
-msgid "Negative|#N"
-msgstr "Negativ"
+#: src/lyx_cb.C:389
+msgid "Autosaving current document..."
+msgstr "Autolagrer gjelende dokument..."
 
-#: src/mathed/math_forms.C:222
-msgid "Quadratin|#Q"
-msgstr "Firdobbel"
+#: src/lyx_cb.C:429
+msgid "Autosave Failed!"
+msgstr "Autolagring feilet!"
 
-#: src/mathed/math_forms.C:226
-msgid "2Quadratin|#2"
-msgstr "2Firdobbel"
+#: src/lyx_cb.C:485
+msgid "File to Insert"
+msgstr "Fil som skal settes inn"
 
-#: src/mathed/math_panel.C:114
-msgid "Delimiter"
-msgstr "Skille"
+#: src/lyx_cb.C:495
+msgid "Error! Specified file is unreadable: "
+msgstr "Feil! Den spesifiserte filen kan ikke åpnes: "
 
-#: src/mathed/math_panel.C:118
-msgid "Decoration"
-msgstr "Dekorering"
+#: src/lyx_cb.C:502
+msgid "Error! Cannot open specified file: "
+msgstr "Feil! Kan ikke åpne spesifisert fil: "
 
-#: src/mathed/math_panel.C:122
-msgid "Spacing"
-msgstr "Mellomrom"
+#: src/lyx_cb.C:542 src/mathed/formula.C:1048
+msgid "Enter new label to insert:"
+msgstr "Skriv inn referansemerke som skal settes inn:"
 
-#: src/mathed/math_panel.C:126
-msgid "Matrix"
-msgstr "Matrise"
+#: src/lyx_cb.C:575
+msgid "Character Style"
+msgstr "Tegn stil"
 
-#: src/mathed/math_panel.C:330
-msgid "Top | Center | Bottom"
-msgstr "Topp | Senter | Bunn"
+#: src/lyx_cb.C:627
+msgid "LaTeX Preamble"
+msgstr "LaTeX Preamble"
 
-#: src/mathed/math_panel.C:382
-msgid "Math Panel"
-msgstr "Matte panel"
+#: src/lyx_cb.C:644
+msgid "Do you want to save the current settings"
+msgstr "Ønsker du å lagre de nåværende innstillingene?"
 
-#: src/MenuBackend.C:215
-msgid "Quit|Q"
-msgstr ""
+#: src/lyx_cb.C:645
+msgid "for Character, Document, Paper and Quotes"
+msgstr "for Fonter, Document, Ark og Sitering"
 
-#: src/MenuBackend.C:223
-msgid "LaTeX...|L"
-msgstr "LaTeX...|L"
+#: src/lyx_cb.C:646
+msgid "as default for new documents?"
+msgstr "som standardverdier for nye dokumenter?"
 
-#: src/MenuBackend.C:225
-msgid "LinuxDoc...|L"
-msgstr "LinuxDoc...|L"
+#: src/lyx_cb.C:803
+msgid "LaTeX preamble set"
+msgstr "LaTeX preamble satt"
 
-#: src/MenuBackend.C:233
-msgid "Emphasize"
-msgstr "Uthevet"
+#: src/lyx_cb.C:837
+msgid "Inserting figure..."
+msgstr "Setter inn figur..."
 
-#: src/menus.C:182 src/menus.C:205 src/menus.C:246 src/menus.C:247
-#: src/menus.C:248 src/menus.C:405 src/menus.C:406 src/menus.C:407
-msgid "File"
-msgstr "Fil"
+#: src/lyx_cb.C:841 src/lyx_cb.C:897
+msgid "Figure inserted"
+msgstr "Figur satt inn"
 
-#: src/menus.C:184 src/menus.C:260 src/menus.C:261 src/menus.C:262
-msgid "Edit"
-msgstr "Rediger"
+#: src/lyx_cb.C:920
+msgid "Running configure..."
+msgstr "Kjører \"configure\"..."
 
-#: src/menus.C:186 src/menus.C:274 src/menus.C:275 src/menus.C:276
-msgid "TOC"
-msgstr "TOC"
+#: src/lyx_cb.C:927
+msgid "Reloading configuration..."
+msgstr "Leser konfigurasjon om igjen..."
 
-#: src/menus.C:188 src/menus.C:288 src/menus.C:289 src/menus.C:290
-msgid "Refs"
-msgstr "Refs"
+#: src/lyx_cb.C:929
+msgid "The system has been reconfigured."
+msgstr "Systemed har blitt rekonfigurert."
 
-#: src/menus.C:190 src/menus.C:302 src/menus.C:303 src/menus.C:304
-msgid "Layout"
-msgstr "Stil"
+#: src/lyx_cb.C:930
+msgid "You need to restart LyX to make use of any"
+msgstr "Du må restarte LyX for å kunne bruke de"
 
-#: src/menus.C:192 src/menus.C:316 src/menus.C:317 src/menus.C:318
-msgid "Insert"
-msgstr "Sett inn"
+#: src/lyx_cb.C:931
+msgid "updated document class specifications."
+msgstr "oppdaterte textklasse spesifikasjonene."
 
-#: src/menus.C:194 src/menus.C:330 src/menus.C:331 src/menus.C:332
-msgid "Math"
-msgstr "Matte"
+#: src/lyxfont.C:38
+msgid "Sans serif"
+msgstr "Sans serif"
 
-#: src/menus.C:200 src/menus.C:209 src/menus.C:372 src/menus.C:373
-#: src/menus.C:374 src/menus.C:433 src/menus.C:434 src/menus.C:435
-msgid "Help"
-msgstr "Hjelp"
+#: src/lyxfont.C:38
+msgid "Symbol"
+msgstr "Symbol"
 
-#: src/menus.C:250 src/menus.C:409
-msgid "MB|#F"
-msgstr "MB|#F"
+#: src/lyxfont.C:38 src/lyxfont.C:43 src/lyxfont.C:47 src/lyxfont.C:54
+#: src/lyxfont.C:58
+msgid "Inherit"
+msgstr "Arv"
 
-#: src/menus.C:264
-msgid "MB|#E"
-msgstr "MB|#R"
+#: src/lyxfont.C:39 src/lyxfont.C:43 src/lyxfont.C:48 src/lyxfont.C:54
+#: src/lyxfont.C:58
+msgid "Ignore"
+msgstr "Ignorer"
 
-#: src/menus.C:278
-msgid "MB|#T"
-msgstr "MB|#T"
+#: src/lyxfont.C:43
+msgid "Medium"
+msgstr "Medium"
 
-#: src/menus.C:292
-msgid "MB|#R"
-msgstr "MB|#R"
+#: src/lyxfont.C:43
+msgid "Bold"
+msgstr "Fet"
 
-#: src/menus.C:306
-msgid "MB|#L"
-msgstr "MB|#S"
+#: src/lyxfont.C:47
+msgid "Upright"
+msgstr "Stående"
 
-#: src/menus.C:320
-msgid "MB|#I"
-msgstr "MB|#I"
+#: src/lyxfont.C:47
+msgid "Italic"
+msgstr "Kursiv"
 
-#: src/menus.C:334
-msgid "MB|#M"
-msgstr "MB|#M"
+#: src/lyxfont.C:47
+msgid "Slanted"
+msgstr "Skråstilt"
 
-#: src/menus.C:348 src/menus.C:423
-msgid "MB|#O"
-msgstr "MB|#O"
+#: src/lyxfont.C:47
+msgid "Smallcaps"
+msgstr "Kapiteler"
 
-#: src/menus.C:362
-msgid "MB|#D"
-msgstr "MB|#D"
+#: src/lyxfont.C:52
+msgid "Tiny"
+msgstr "Bitteliten"
 
-#: src/menus.C:376 src/menus.C:437
-msgid "MB|#H"
-msgstr "MB|#H"
+#: src/lyxfont.C:52
+msgid "Smallest"
+msgstr "Minst"
 
-#: src/menus.C:479
-msgid "Screen Options"
-msgstr "Skjerm Opsjoner"
+#: src/lyxfont.C:52
+msgid "Smaller"
+msgstr "Mindre"
 
-#: src/menus.C:520
-msgid ""
-"Import%t|LaTeX...%x30|Ascii Text as Lines...%x31|Ascii Text as "
-"Paragraphs%x32|Noweb%x33|LinuxDoc%x34"
-msgstr ""
-"Import%t|LaTeX...%x30|Ascii tekst as Lines...%x31|Ascii Text as "
-"Paragraphs%x32|Noweb%x33|LinuxDoc%x34"
+#: src/lyxfont.C:52
+msgid "Small"
+msgstr "Liten"
 
-#: src/menus.C:527 src/menus.C:784
-msgid "FIM|Ll#l#L"
-msgstr "FIM|Ll#l#L"
+#: src/lyxfont.C:52
+msgid "Normal"
+msgstr "Normal"
 
-#: src/menus.C:528 src/menus.C:785
-msgid "FIM|Aa#a#A"
-msgstr "FIM|Aa#a#A"
+#: src/lyxfont.C:52
+msgid "Large"
+msgstr "Stor"
 
-#: src/menus.C:529 src/menus.C:786
-msgid "FIM|Pp#p#P"
-msgstr "FIM|Pp#p#P"
+#: src/lyxfont.C:53
+msgid "Larger"
+msgstr "Større"
 
-#: src/menus.C:530 src/menus.C:787
-msgid "FIM|Nn#n#N"
-msgstr "FIM|Nn#n#N"
+#: src/lyxfont.C:53
+msgid "Largest"
+msgstr "Størst"
 
-#: src/menus.C:531 src/menus.C:788
-msgid "FIM|Dd#d#D"
-msgstr "FIM|Dd#d#D"
+#: src/lyxfont.C:53
+msgid "Huge"
+msgstr "Enorm"
 
-#: src/menus.C:540
-msgid ""
-"Export%t|as LaTeX...%x40|as DVI...%x41|as PostScript...%x42|as Ascii "
-"Text...%x43|as HTML...%x44|Custom...%x45"
-msgstr ""
-"Eksporter%t|som LaTeX...%x40|som DVI...%x41|som PostScript...%x42|som ren "
-"tekst...%x43|som HTML...%x44|Egen definert...%x45"
+#: src/lyxfont.C:53
+msgid "Huger"
+msgstr "Gigantisk"
 
-#: src/menus.C:549
-msgid ""
-"Export%t|as LinuxDoc...%x40|as DVI...%x41|as PostScript...%x42|as Ascii "
-"Text...%x43|as HTML...%x44"
-msgstr ""
-"Eksporter%t|som LinuxDoc...%x40|som DVI...%x41|som PostScript...%x42|som ren "
-"tekst...%x43|som HTML...%x44"
+#: src/lyxfont.C:53
+msgid "Increase"
+msgstr "Øk"
 
-#: src/menus.C:557
-msgid ""
-"Export%t|as DocBook...%x40|as DVI...%x41|as PostScript...%x42|as Ascii "
-"Text...%x43|as HTML...%x44"
-msgstr ""
-"Eksporter%t|som DocBook...%x40|som DVI...%x41|som PostScript...%x42|som ren "
-"tekst...%x43|som HTML...%x44"
+#: src/lyxfont.C:53
+msgid "Decrease"
+msgstr "Minsk"
 
-#: src/menus.C:564
-msgid "FEX|Ll#l#L"
-msgstr "FEX|Ll#l#L"
+#: src/lyxfont.C:58
+msgid "Off"
+msgstr "Av"
 
-#: src/menus.C:565
-msgid "FEX|Dd#d#D"
-msgstr "FEX|Dd#d#D"
+#: src/lyxfont.C:58
+msgid "On"
+msgstr ""
 
-#: src/menus.C:566
-msgid "FEX|Pp#p#P"
-msgstr "FEX|Pp#p#P"
+#: src/lyxfont.C:58
+msgid "Toggle"
+msgstr "Bytt"
 
-#: src/menus.C:567
-msgid "FEX|Tt#t#T"
-msgstr "FEX|tT#t#T"
+#: src/lyxfont.C:396
+msgid "Emphasis "
+msgstr "Uthevet "
 
-#: src/menus.C:568
-msgid "FEX|Hh#h#H"
-msgstr "FEX|Hh#h#H"
+#: src/lyxfont.C:399
+msgid "Underline "
+msgstr "Understreket "
 
-#: src/menus.C:571
-msgid "FEX|mM#m#M"
-msgstr "FEX|Ee#E#e"
+#: src/lyxfont.C:402
+msgid "Noun "
+msgstr "Substantiv "
 
-#: src/menus.C:575
-msgid ""
-"New...|New from template...|Open...%l|Close|Save|Save As...|Revert to "
-"saved%l|View dvi|View PostScript|Update dvi|Update PostScript|Build "
-"program%l|Print...|Fax..."
-msgstr ""
-"Ny fil...|Ny fil med mal...|Åpne...%l|Lukk|Lagre|Lagre som...|Tilbake til "
-"lagret%l|Se dvi|Se PostScript|Oppdater dvi|Oppdater PostScript|'Build' "
-"program%l|Skriv ut...|Faks..."
+#: src/lyxfont.C:404
+msgid "Latex "
+msgstr "LaTeX "
 
-#: src/menus.C:590 src/menus.C:808
-msgid "FM|Nn#n#N"
-msgstr "FM|Nn#n#N"
+#: src/lyxfont.C:408
+msgid "Language: "
+msgstr "Språk: "
 
-#: src/menus.C:591 src/menus.C:809
-msgid "FM|tT#t#T"
-msgstr "FM|mM#m#M"
+#: src/lyxfont.C:410
+msgid "  Number "
+msgstr "  Number "
 
-#: src/menus.C:592 src/menus.C:810
-msgid "FM|Oo#o#O"
-msgstr "FM|pP#p#P"
+#: src/lyxfr1.C:124 src/lyxfr1.C:161
+msgid "Sorry!"
+msgstr "Beklager!"
 
-#: src/menus.C:593
-msgid "FM|Cc#c#C"
-msgstr "FM|uU#u#U"
+#: src/lyxfr1.C:124 src/lyxfr1.C:161
+msgid "You cannot replace a single space, nor an empty character."
+msgstr "Du kan ikke erstatte et enkelt mellomrom, heller ikke et tomt tegn."
 
-#: src/menus.C:594
-msgid "FM|Ss#s#S"
-msgstr "FM|Ll#l#L"
+#: src/lyxfr1.C:192 src/lyxfr1.C:239
+msgid "String not found!"
+msgstr "Streng ikke funnet!"
 
-#: src/menus.C:595
-msgid "FM|Aa#a#A"
-msgstr "FM|gG#g#G"
+#: src/lyxfr1.C:196
+msgid "1 string has been replaced."
+msgstr "1 streng har blitt erstattet."
 
-#: src/menus.C:596
-msgid "FM|Rr#r#R"
-msgstr "FM|Tt#T#t"
+#: src/lyxfr1.C:199
+msgid " strings have been replaced."
+msgstr " strenger har blitt erstattet."
 
-#: src/menus.C:597
-msgid "FM|dD#d#D"
-msgstr "FM|dD#d#D"
+#: src/lyxfr1.C:235
+msgid "Found."
+msgstr "Funnet."
 
-#: src/menus.C:598
-msgid "FM|wW#w#W"
-msgstr "FM|wW#w#W"
+#: src/lyxfunc.C:267 src/lyxfunc.C:397
+msgid "Unknown sequence:"
+msgstr "Ukent sekvens:"
 
-#: src/menus.C:599
-msgid "FM|vV#v#V"
-msgstr "FM|Oo#O#o"
+#: src/lyxfunc.C:442 src/lyxfunc.C:3025
+msgid "Unknown action"
+msgstr "Ukjent operasjon"
 
-#: src/menus.C:600
-msgid "FM|Uu#u#U"
-msgstr "FM|cC#c#C"
+#. no
+#: src/lyxfunc.C:456
+msgid "Document is read-only"
+msgstr "Dokumentet er ikke skrivbart."
 
-#: src/menus.C:601
-msgid "FM|Bb#b#B"
-msgstr "FM|Bb#b#B"
+#. no
+#: src/lyxfunc.C:461
+msgid "Command not allowed without any document open"
+msgstr "Kommandoen er ikke lov uten åpne dokumenter"
 
-#: src/menus.C:602
-msgid "FM|Pp#p#P"
-msgstr "FM|Ss#s#S"
+#: src/lyxfunc.C:742
+msgid "Text mode"
+msgstr "Tekst modus"
 
-#: src/menus.C:603
-msgid "FM|Ff#f#F"
-msgstr "FM|Ff#f#F"
+#: src/lyxfunc.C:901
+msgid "Saving document"
+msgstr "Lagrer dokument"
 
-#: src/menus.C:654
-#, no-c-format
-msgid "|Import%m"
-msgstr "|Importer%m"
+#: src/lyxfunc.C:1193 src/lyxfunc.C:2606
+msgid "Missing argument"
+msgstr "Mangler argument"
 
-#: src/menus.C:656
-#, no-c-format
-msgid "|Export%m%l"
-msgstr "Eksporter%m%l"
+#: src/lyxfunc.C:1204
+msgid "Opening help file"
+msgstr "Åpner hjelpe fil"
 
-#: src/menus.C:658
-#, no-c-format
-msgid "|Exit%l"
-msgstr "|Avslutt%l"
+#: src/lyxfunc.C:1213
+msgid "LyX Version "
+msgstr "LyX Versjon "
 
-#: src/menus.C:659 src/menus.C:811
-msgid "FM|Ii#i#I"
-msgstr "FM|Ii#i#I"
+#: src/lyxfunc.C:1218
+msgid "Library directory: "
+msgstr "Bibliotek folder: "
 
-#: src/menus.C:660
-msgid "FM|Ee#e#E"
-msgstr "FM|Ee#e#E"
+#: src/lyxfunc.C:1220
+msgid "User directory: "
+msgstr "Bruker folder: "
 
-#: src/menus.C:661 src/menus.C:812
-msgid "FM|xX#x#X"
-msgstr "FM|Aa#A#a"
+#: src/lyxfunc.C:1529
+msgid "Couldn't find this label"
+msgstr "Klarte ikke å finne dette referansemerket"
 
-#: src/menus.C:777
-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 as Lines...%x16|Ascii Text as "
-"Paragraphs...%x17|Noweb...%x18|Linuxdoc...%x19"
+#: src/lyxfunc.C:1530
+msgid "in current document."
+msgstr "i gjeldende dokument."
 
-#: src/menus.C:802
-msgid "New...|New from template...|Open...%l|Import%m%l|Exit%l"
-msgstr "Ny fil...|Ny fil med mal...|Åpne...%l|Importer%m%l|Avslutt%l"
+#: src/lyxfunc.C:1906
+msgid "Mark removed"
+msgstr "Fjernet merke"
 
-#: src/menus.C:892
-msgid ""
-"Floats & Insets%t|Open/Close%x21|Melt%x22|Open All Footnotes/Margin "
-"Notes%x23|Close All Footnotes/Margin Notes%x24|Open All "
-"Figures/Tables%x25|Close All Figures/Tables%x26%l|Remove all Error Boxes%x27"
-msgstr ""
-"Floats & Insets%t|Åpne/Lukk%x21|Smelt%x22|Åpne alle "
-"fotnoter/marknotiser%x23|Lukk alle fotnoter/margnotiser%x24|Åpne alle "
-"figurer/tabeller%x25|Lukk alle figurer tabeller%x26%l|Fjern alle feil "
-"bokser%x27"
+#: src/lyxfunc.C:1911
+msgid "Mark set"
+msgstr "Merke satt"
 
-#: src/menus.C:901
-msgid "EMF|Oo#o#O"
-msgstr "EMF|pP#p#P"
+#: src/lyxfunc.C:2016
+msgid "Mark off"
+msgstr "Merke slått av"
 
-#: src/menus.C:902
-msgid "EMF|Mm#m#M"
-msgstr "EMF|Ss#S#s"
+#: src/lyxfunc.C:2029
+msgid "Mark on"
+msgstr "Merke på"
 
-#: src/menus.C:903
-msgid "EMF|Aa#a#A"
-msgstr "EMF|aA#a#A"
+#: src/lyxfunc.C:2521
+msgid "Push-toolbar needs argument > 0"
+msgstr "\"push-toolbar\" trenger argument > 0"
 
-#: src/menus.C:904
-msgid "EMF|Cc#c#C"
-msgstr "EMF|Ll#L#l"
+#: src/lyxfunc.C:2538
+msgid "Usage: toolbar-add-to <LyX command>"
+msgstr "Bruk: toolbar-add-to <LyX kommando> <argument>"
 
-#: src/menus.C:905
-msgid "EMF|Ff#f#F"
-msgstr "EMF|fF#f#F"
+#: src/lyxfunc.C:2555 src/mathed/formula.C:870
+msgid "Math greek mode on"
+msgstr "Gresk matte modus på"
 
-#: src/menus.C:906
-msgid "EMF|Tt#t#T"
-msgstr "EMF|tT#t#T"
+#: src/lyxfunc.C:2566 src/mathed/formula.C:881
+msgid "Math greek keyboard on"
+msgstr "Gresk matte keyboard på"
 
-#: src/menus.C:907
-msgid "EMF|Rr#r#R"
-msgstr "EMF|bB#b#B"
+#: src/lyxfunc.C:2568 src/mathed/formula.C:883
+msgid "Math greek keyboard off"
+msgstr "Gresk matte keyboard av"
 
-#: src/menus.C:917 src/menus.C:1017 src/menus.C:1084
-msgid "Table%t"
-msgstr "Tabell%t"
+#: src/lyxfunc.C:2621 src/mathed/formula.C:479
+msgid "Math editor mode"
+msgstr "Matte editerings modus"
 
-#: src/menus.C:924 src/menus.C:1020
-msgid "|Multicolumn%B%x44%l"
-msgstr "Multikolonne%B%x44%l"
+#: src/lyxfunc.C:2628
+msgid "This is only allowed in math mode!"
+msgstr "Dette er bare tillatt i mattemodus!"
 
-#: src/menus.C:926 src/menus.C:1022
-msgid "|Multicolumn%b%x44%l"
-msgstr "Multikolonne%b%x44%l"
+#: src/lyxfunc.C:2812
+msgid "Opening child document "
+msgstr "Åpner subdokument "
 
-#: src/menus.C:927 src/menus.C:1023
-msgid "EMT|Mm#m#M"
-msgstr "EMT|Mm#M#m"
+#: src/lyxfunc.C:2844
+msgid "Unknown kind of footnote"
+msgstr "Ukjent fotnote slag"
 
-#: src/menus.C:934 src/menus.C:1026
-msgid "|Line Top%B%x36"
-msgstr "|Topp linje%B%x36"
+#: src/lyxfunc.C:2956
+msgid "Syntax: set-color <lyx_name> <x11_name>"
+msgstr "Syntax: set-color <lyx_name> <x11_name>"
 
-#: src/menus.C:936 src/menus.C:1028
-msgid "|Line Top%b%x36"
-msgstr "|Topp linje%b%x36"
+#: src/lyxfunc.C:2962
+msgid "Set-color \""
+msgstr "Set-color \""
 
-#: src/menus.C:937 src/menus.C:1029
-msgid "EMT|Tt#t#T"
-msgstr "EMT|Tt#T#t"
+#: src/lyxfunc.C:2963
+msgid "\" failed - color is undefined or may not be redefined"
+msgstr "\" failed - color is undefined or may not be redefined"
 
-#: src/menus.C:944 src/menus.C:1032
-msgid "|Line Bottom%B%x37"
-msgstr "|Bunn linje%B%x37"
+#: src/lyxfunc.C:2978
+msgid "No document open"
+msgstr "Ingen dokumeter åpne"
 
-#: src/menus.C:946 src/menus.C:1034
-msgid "|Line Bottom%b%x37"
-msgstr "|Bunn linje%b%x37"
+#: src/lyxfunc.C:2984
+msgid "Document is read only"
+msgstr "Dokumentet er ikke skrivbart:"
 
-#: src/menus.C:947 src/menus.C:1035
-msgid "EMT|Bb#b#B"
-msgstr "EMT|Bb#B#b"
+#: src/lyxfunc.C:3085
+msgid "Enter Filename for new document"
+msgstr "Skriv inn filnavn for nytt dokument"
 
-#: src/menus.C:954 src/menus.C:1038
-msgid "|Line Left%B%x38"
-msgstr "|Venstre linje%B%x38"
+#: src/lyxfunc.C:3086
+msgid "newfile"
+msgstr "nyfil"
 
-#: src/menus.C:956 src/menus.C:1040
-msgid "|Line Left%b%x38"
-msgstr "|Venstre linje%b%x38"
+#. Cancel: Do nothing
+#: src/lyxfunc.C:3090 src/lyxfunc.C:3117 src/lyxfunc.C:3193 src/lyxfunc.C:3252
+#: src/lyxfunc.C:3280 src/lyxfunc.C:3290 src/lyxfunc.C:3397
+msgid "Canceled."
+msgstr "Avbrutt."
 
-#: src/menus.C:957 src/menus.C:1041
-msgid "EMT|Ll#l#L"
-msgstr "EMT|Vv#V#V"
+#: src/lyxfunc.C:3105 src/lyxfunc.C:3268
+msgid ""
+"Do you want to close that document now?\n"
+"('No' will just switch to the open version)"
+msgstr ""
+"Ønsker du å lukke det dokumentet nå?\n"
+"('Nei' vil bare bytte til den versjonen som er åpnet)"
 
-#: src/menus.C:964 src/menus.C:1044
-msgid "|Line Right%B%x39%l"
-msgstr "|Høyre linje%B%x39%l"
+#: src/lyxfunc.C:3125
+msgid "File already exists:"
+msgstr "Filen finnes allerede:"
 
-#: src/menus.C:966 src/menus.C:1046
-msgid "|Line Right%b%x39%l"
-msgstr "|Høyre linje%b%x39%l"
+#: src/lyxfunc.C:3127
+msgid "Do you want to open the document?"
+msgstr "Ønsker du å åpne dokumentet?"
 
-#: src/menus.C:967 src/menus.C:1047
-msgid "EMT|Rr#r#R"
-msgstr "EMT|Hh#H#h"
+#. loads document
+#: src/lyxfunc.C:3129 src/lyxfunc.C:3204
+msgid "Opening document"
+msgstr "Ønsker du å åpne dokumentet?"
 
-#: src/menus.C:976 src/menus.C:1051
-msgid "|Align Left%R%x40"
-msgstr "|Juster venstre%R%x40"
+#: src/lyxfunc.C:3136 src/lyxfunc.C:3211
+msgid "opened."
+msgstr "åpnet"
 
-#: src/menus.C:978 src/menus.C:1053
-msgid "|Align Left%r%x40"
-msgstr "|Juster venstre%r%x40"
+#: src/lyxfunc.C:3157
+msgid "Choose template"
+msgstr "Velg mal"
 
-#: src/menus.C:979 src/menus.C:1054
-msgid "EMT|eE#e#E"
-msgstr "EMT|eE#e#E"
+#: src/lyxfunc.C:3185 src/lyxfunc.C:3245 src/lyxfunc.C:3389
+msgid "Examples"
+msgstr "Eksempler"
 
-#: src/menus.C:982 src/menus.C:1057
-msgid "|Align Right%R%x41"
-msgstr "|Juster Høyre%R%x41"
+#: src/lyxfunc.C:3187
+msgid "Select Document to Open"
+msgstr "Vel dokument som skal åpnes"
 
-#: src/menus.C:984 src/menus.C:1059
-msgid "|Align Right%r%x41"
-msgstr "|Juster Høyre%r%x41"
+#: src/lyxfunc.C:3213
+msgid "Could not open document"
+msgstr "Kunne ikke åpne dokumentet"
 
-#: src/menus.C:985 src/menus.C:1060
-msgid "EMT|iI#i#I"
-msgstr "EMT|yY#y#Y"
+#: src/lyxfunc.C:3287
+msgid "A document by the name"
+msgstr "Ett annet dokument med navnet"
 
-#: src/menus.C:988 src/menus.C:1063
-msgid "|Align Center%R%x42%l"
-msgstr "|Sentrer%R%x42%l"
+#: src/lyxfunc.C:3289
+msgid "already exists. Overwrite?"
+msgstr "finnes allerede. Overskrive?"
 
-#: src/menus.C:990 src/menus.C:1065
-msgid "|Align Center%r%x42%l"
-msgstr "Sentrer%r%x42%l"
+#: src/lyxfunc.C:3297
+msgid "Importing"
+msgstr "Importerer"
 
-#: src/menus.C:991 src/menus.C:1066
-msgid "EMT|Cc#c#C"
-msgstr "EMT|Ss#S#s"
+#: src/lyxfunc.C:3304
+msgid "imported."
+msgstr "importert."
 
-#: src/menus.C:994 src/menus.C:1069
-#, no-c-format
-msgid "|Append Row%x32"
-msgstr "|Legg til rad%x32"
+#: src/lyxfunc.C:3306
+msgid ": import failed."
+msgstr ": importering feilet."
 
-#: src/menus.C:995 src/menus.C:1070
-msgid "EMT|oO#o#O"
-msgstr "EMT|rR#r#R"
+#: src/lyxfunc.C:3391
+msgid "Select Document to Insert"
+msgstr "Velg dokument som skal settes inn"
 
-#: src/menus.C:997 src/menus.C:1072
-#, no-c-format
-msgid "|Append Column%x33%l"
-msgstr "|Legg til kolonne%x33%l"
+#. Inserts document
+#: src/lyxfunc.C:3409
+msgid "Inserting document"
+msgstr "Setter inn dokumentet"
 
-#: src/menus.C:998 src/menus.C:1073
-msgid "EMT|uU#u#U"
-msgstr "EMT|kK#k#K"
+#: src/lyxfunc.C:3415
+msgid "inserted."
+msgstr "satt inn."
 
-#: src/menus.C:1000 src/menus.C:1075
-#, no-c-format
-msgid "|Delete Row%x34"
-msgstr "|Slett rad%x34"
+#: src/lyxfunc.C:3417
+msgid "Could not insert document"
+msgstr "Kunne ikke sette inn dokumentet"
 
-#: src/menus.C:1001 src/menus.C:1076
-msgid "EMT|wW#w#W"
-msgstr "EMT|dD#d#D"
+#: src/lyxfunc.C:3431
+msgid "Select LaTeX file to import"
+msgstr "Velg LaTeX fil som skal importeres"
 
-#: src/menus.C:1003 src/menus.C:1078
-#, no-c-format
-msgid "|Delete Column%x35%l"
-msgstr "|Slett kolonne%x35%l"
+#: src/lyxfunc.C:3435 src/lyxfunc.C:3439
+msgid "Select ASCII file to import"
+msgstr "Velg ASCII fil som skal importeres"
 
-#: src/menus.C:1004 src/menus.C:1079
-msgid "EMT|nN#n#N"
-msgstr "EMT|nN#n#N"
+#: src/lyxfunc.C:3443
+msgid "Select NoWeb file to import"
+msgstr "Velg Noweb fil som skal importeres"
 
-#: src/menus.C:1006 src/menus.C:1081
-#, no-c-format
-msgid "|Delete Table%x43"
-msgstr "|Slett tabell%x43"
+#: src/lyxfunc.C:3447
+msgid "Select LinuxDoc file to import"
+msgstr "Velg LinuxDoc fil som skal importeres"
 
-#: src/menus.C:1007 src/menus.C:1082
-msgid "EMT|Dd#d#D"
-msgstr "EMT|Ss#S#s"
+#: src/lyxfunc.C:3450
+msgid "Unknown import type: "
+msgstr "Ukjent import type: "
 
-#: src/menus.C:1086
-#, no-c-format
-msgid "|Insert table%x31"
-msgstr "|Sett inn tabell%x31"
+#: src/lyx_gui.C:302
+msgid " No change %l| Roman | Sans Serif | Typewriter %l| Reset "
+msgstr " Ingen endring %l| Roman | Sans Serif | Skrivemaskin %l| Reset "
 
-#: src/menus.C:1087
-msgid "EMT|Ii#i#I"
-msgstr "EMT|Ss#S#s"
+#: src/lyx_gui.C:304
+msgid " No change %l| Medium | Bold %l| Reset "
+msgstr " Ingen Endring %l| Medium | Fet %l| Reset "
 
-#: src/menus.C:1091
-msgid "Version Control%t"
-msgstr "Versjons kontroll%t"
+#: src/lyx_gui.C:306
+msgid " No change %l| Upright | Italic | Slanted | Small Caps %l| Reset "
+msgstr " Ingen endring %l| Stående | Skråstilt | Skjev | Small Caps %l| Reset "
 
-#: src/menus.C:1094
-#, no-c-format
-msgid "|Register%d%x51"
-msgstr "|Registrer%d%x51"
+#: src/lyx_gui.C:309
+msgid ""
+" No change %l| Tiny | Smallest | Smaller | Small | Normal | Large | Larger | "
+"Largest | Huge | Huger %l| Increase | Decrease | Reset "
+msgstr ""
+" Ingen Endring %l| Bitteliten | Minst | Mindre | Liten | Normal | Stor | "
+"Større | Størst | Enda større | Kjempestor %l| Øk | Minsk | Reset "
 
-#. signifies that the file is not checked out
-#: src/menus.C:1098
-#, no-c-format
-msgid "|Check In Changes%d%x52"
-msgstr "|Sjekk inn endringer%d%x52"
+#: src/lyx_gui.C:313
+msgid " No change %l| Emph | Underbar | Noun | LaTeX mode %l| Reset "
+msgstr ""
+"Ingen Endring %l| Uthevet | Understreket | Substantiv | LaTeX modus %l| "
+"Reset "
 
-#: src/menus.C:1100
-#, no-c-format
-msgid "|Check Out for Edit%x53"
-msgstr "|Sjekk ut for endring%x53"
+#: src/lyx_gui.C:315
+msgid ""
+" No change %l| No color | Black | White | Red | Green | Blue | Cyan | "
+"Magenta | Yellow %l| Reset "
+msgstr ""
+"Ingen endring %l| Ingen farge | Sort | Hvit | Rød | Grønn | Blå | Cyan | "
+"Magenta | Gul%l | Resett "
 
-#. signifies that the file is checked out
-#: src/menus.C:1104
-#, no-c-format
-msgid "|Check In Changes%x52"
-msgstr "|Sjekk inn endringer%x52"
+#. build up the combox entries
+#: src/lyx_gui.C:330 src/lyx_gui.C:339
+msgid "No change"
+msgstr "Ingen endring"
 
-#: src/menus.C:1106
-#, no-c-format
-msgid "|Check Out for Edit%d%x53"
-msgstr "|Sjekk ut for endringer%d%x53"
+#: src/lyx_gui.C:331
+msgid "Reset"
+msgstr "Tilbakestill"
 
-#: src/menus.C:1109
-#, no-c-format
-msgid "|Revert to last version%x54"
-msgstr "|Tilbake til siste versjon%x54"
+#: src/lyx_gui.C:382
+msgid "LyX Banner"
+msgstr "LyX Banner"
 
-#: src/menus.C:1111
-#, no-c-format
-msgid "|Undo last check in%x55"
-msgstr "|Angre siste innsjekking%x55"
+#: src/lyx_gui_misc.C:290
+msgid "Dismiss"
+msgstr "Lukk"
 
-#: src/menus.C:1113
-#, no-c-format
-msgid "|Show History%x56"
-msgstr "|Vis Historie%x56"
+#: src/lyx_gui_misc.C:326 src/lyx_gui_misc.C:355 src/lyx_gui_misc.C:359
+msgid "Yes|Yy#y"
+msgstr "Ja|Jj#j#y"
 
-#: src/menus.C:1116
-#, no-c-format
-msgid "|Register%x51"
-msgstr "|Registrer%x51"
+#: src/lyx_gui_misc.C:327 src/lyx_gui_misc.C:356 src/lyx_gui_misc.C:360
+msgid "No|Nn#n"
+msgstr "Nei|Nn#n"
 
-#. the shortcuts are not good.
-#: src/menus.C:1119
-msgid "EMV|Rr#r#R"
-msgstr "EMV|Rr#R#r"
+#: src/lyx_gui_misc.C:379
+msgid "Clear|#e"
+msgstr "Blank ut|#l"
 
-#: src/menus.C:1120
-msgid "EMV|Ii#i#I"
-msgstr "EMV|iI#i#I"
+#: src/lyx_gui_misc.C:392
+msgid "Any changes will be ignored"
+msgstr "Endringer vil bli ignorert"
 
-#: src/menus.C:1121
-msgid "EMV|Oo#o#O"
-msgstr "EMV|uU#u#U"
+#: src/lyx_gui_misc.C:393
+msgid "The document is read-only:"
+msgstr "Dokumentet er skrivebeskyttet:"
 
-#: src/menus.C:1122
-msgid "EMV|lL#l#l"
-msgstr "EMV|Tt#T#t"
+#: src/lyx_main.C:93
+msgid "Wrong command line option `"
+msgstr "Fail argument på kommandoline `"
 
-#: src/menus.C:1123
-msgid "EMV|Uu#u#U"
-msgstr "EMV|Aa#A#a"
+#: src/lyx_main.C:95
+msgid "'. Exiting."
+msgstr "'. Avslutter."
 
-#: src/menus.C:1124
-msgid "EMV|Hh#h#H"
-msgstr "EMV|Hh#H#h"
+#: src/lyx_main.C:217
+msgid "Warning: could not determine path of binary."
+msgstr "Advarsel: Fant ikke sti til binærfilen."
 
-#: src/menus.C:1127
-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 "
-"Contents...|List of Figures...|List of Tables...|List of "
-"Algorithms...%l|Version Control%m%l|View LaTeX log file%l|Paste Primary "
-"Selection as Lines|Paste Primary Selection as Paragraphs"
-msgstr ""
-"Angre|Gjør om%l|Klipp|Kopier|Lim inn%l|Find & Erstatt...|Gå til Feil|Gå til "
-"Notis|Floats & Insets%m|Tabell%m|Stavekontroll...|Sjekk "
-"TeX||Innholdsfortegnelse...|Liste over figurer...|Liste over "
-"tabeller...|Liste over algoritmer...%l|Versjons Kontroll%m%l|Se på LaTeX' "
-"logg fil%l|Lim inn primær seleksjon som linjer|Lim inn primær seleksjon som "
-"avsnitt"
-
-#: src/menus.C:1149
-msgid "EM|Uu#u#U"
-msgstr "EM|Aa#a#A"
-
-#: src/menus.C:1150
-msgid "EM|Rr#r#R"
-msgstr "EM|Gg#g#G"
-
-#: src/menus.C:1151
-msgid "EM|Cc#c#C"
-msgstr "EM|Kk#K#k"
-
-#: src/menus.C:1152
-msgid "EM|oO#o#O"
-msgstr "EM|oO#o#O"
-
-#: src/menus.C:1153
-msgid "EM|Pp#p#P"
-msgstr "EM|Ll#L#l"
-
-#: src/menus.C:1154
-msgid "EM|Ff#f#F"
-msgstr "EM|Ee#E#e"
-
-#: src/menus.C:1155
-msgid "EM|Ee#e#E"
-msgstr "EM|Ff#F#f"
-
-#: src/menus.C:1156
-msgid "EM|Nn#n#N"
-msgstr "EM|Nn#N#n"
-
-#: src/menus.C:1157
-msgid "EM|Ii#i#I"
-msgstr "EM|Ii#I#i"
-
-#. fl_setpup_shortcut(EditMenu, 10, scex(_("EM|Tt#t#T")));
-#: src/menus.C:1159
-msgid "EM|Ss#s#S"
-msgstr "EM|Ss#S#s"
-
-#: src/menus.C:1160
-msgid "EM|hH#h#H"
-msgstr "EM|Xx#X#x"
-
-#: src/menus.C:1161
-msgid "EM|Tt#t#T"
-msgstr "EM|Tt#T#t"
-
-#. fl_setpup_shortcut(EditMenu, 14, scex(_("EM|Ff#f#F")));
-#. fl_setpup_shortcut(EditMenu, 15, scex(_("EM|bB#b#B")));
-#. fl_setpup_shortcut(EditMenu, 16, scex(_("EM|mM#m#M")));
-#: src/menus.C:1165
-msgid "EM|Vv#v#V"
-msgstr "EM|Vv#V#v"
-
-#: src/menus.C:1166
-msgid "EM|wW#w#W"
-msgstr "EM|pP#p#P"
-
-#: src/menus.C:1167
-msgid "EM|Ll#l#L"
-msgstr "EM|Ll#l#L"
-
-#: src/menus.C:1168
-msgid "EM|gG#g#G"
-msgstr "EM|gG#g#G"
-
-#: src/menus.C:1372
-#, no-c-format
-msgid "List of Figures%m"
-msgstr "Figurliste%m"
+#: src/lyx_main.C:219
+msgid "If you have problems, try starting LyX with an absolute path."
+msgstr "Hvis du har problemer prøv å start LyX med absolutt filsti."
 
-#: src/menus.C:1374
-#, no-c-format
-msgid "List of Tables%m"
-msgstr "Liste over tabeller%m"
+#: src/lyx_main.C:309
+msgid "LYX_DIR_11x environment variable no good."
+msgstr "LYX_DIR_11x miljøvariabel er ikke god."
 
-#: src/menus.C:1376
-#, no-c-format
-msgid "List of Algorithms%m"
-msgstr "Liste over algoritmer%m"
+#: src/lyx_main.C:311
+msgid "System directory set to: "
+msgstr "System folder satt til: "
 
-#: src/menus.C:1509
-#, no-c-format
-msgid "Insert Reference%m"
-msgstr "Sett inn referanse%m"
+#: src/lyx_main.C:319
+msgid "LyX Warning! Couldn't determine system directory."
+msgstr "LyX Advarsel! Fant ikke system folder."
 
-#: src/menus.C:1511
-#, no-c-format
-msgid "Insert Page Number%m"
-msgstr "Sett inn sidetall%m"
+#: src/lyx_main.C:320
+msgid "Try the '-sysdir' command line parameter or"
+msgstr "Forsøk '-sysdir' som parameter eller"
 
-#: src/menus.C:1513
-#, no-c-format
-msgid "Insert vref%m"
-msgstr "Sett inn vref%m"
+#: src/lyx_main.C:321
+msgid "set the environment variable LYX_DIR_11x to the LyX system directory"
+msgstr "sett miljøvariablen LYX_DIR_11x til å peke på LyX' systemfolder som"
 
-#: src/menus.C:1515
-#, no-c-format
-msgid "Insert vpageref%m"
-msgstr "Sett inn vpageref%m"
+#: src/lyx_main.C:323
+msgid "containing the file `chkconfig.ltx'."
+msgstr "inneholder filen `chkconfig.ltx'."
 
-#: src/menus.C:1517
-#, no-c-format
-msgid "Insert Pretty Ref%m"
-msgstr "Sett inn pretty ref%m"
+#: src/lyx_main.C:325
+msgid "Using built-in default "
+msgstr "Bruker innebygd standard "
 
-#: src/menus.C:1519
-#, no-c-format
-msgid "Goto Reference%m"
-msgstr "Gå til kryssreferansse%m"
+#: src/lyx_main.C:326
+msgid " but expect problems."
+msgstr " men forvent problemer."
 
-#: src/menus.C:1533
-msgid "Go Back"
-msgstr "Tilbake"
+#: src/lyx_main.C:329
+msgid "Expect problems."
+msgstr "Forvent problemer."
 
-#: src/menus.C:1601
-msgid ""
-"Character...|Paragraph...|Document...|Paper...|Table...|Quotes...%l|Emphasize"
-" Style%b|Noun Style%b|Bold Style%b|TeX Style%b%l|Change Environment "
-"Depth|LaTeX Preamble...|Start of Appendix%l|Save layout as default"
-msgstr ""
-"Bokstav...|Avsnitt...|Dokument...|Ark...|Tabell...|Sitattegn...%l|Uthevet "
-"stil%b|Substantiv stil%b|Fet stil%b|TeX stil%b|Endre omgivelsesdybde|LaTeX "
-"preamble...|Lagre stil som standard"
+#: src/lyx_main.C:542
+msgid "You have specified an invalid LyX directory."
+msgstr "Du har spesifisert en ugyldig LyX folder."
 
-#: src/menus.C:1615
-msgid "LM|Cc#c#C"
-msgstr "LM|Bb#B#b"
+#: src/lyx_main.C:543
+msgid "You don't have a personal LyX directory."
+msgstr "Du har ikke en personlig LyX folder."
 
-#: src/menus.C:1616
-msgid "LM|Pp#p#P"
-msgstr "LM|Aa#A#a"
+#: src/lyx_main.C:545
+msgid "It is needed to keep your own configuration."
+msgstr "Den trengs for å ta vare på din egen konfigurasjon."
 
-#: src/menus.C:1617
-msgid "LM|Dd#d#D"
-msgstr "LM|Dd#D#d"
+#: src/lyx_main.C:546
+msgid "Should I try to set it up for you (recommended)?"
+msgstr "Skal jeg prøve å sette den opp for deg (anbefalt)?"
 
-#: src/menus.C:1618
-msgid "LM|aA#a#A"
-msgstr "LM|rR#r#R"
+#: src/lyx_main.C:547
+msgid "Running without personal LyX directory."
+msgstr "Kjører uten personlig LyX folder."
 
-#: src/menus.C:1619
-msgid "LM|eE#e#E"
-msgstr "LM|Tt#T#t"
+#. Tell the user what is going on
+#: src/lyx_main.C:554
+msgid "LyX: Creating directory "
+msgstr "LyX: Lager folder "
 
-#: src/menus.C:1620
-msgid "LM|Qq#q#Q"
-msgstr "LM|Ss#S#s"
+#: src/lyx_main.C:555
+msgid " and running configure..."
+msgstr " og kjører \"configure\"..."
 
-#: src/menus.C:1621
-msgid "LM|mM#m#M"
-msgstr "LM|Uu#U#u"
+#: src/lyx_main.C:561
+msgid "Failed. Will use "
+msgstr "Feilet. Bruker "
 
-#: src/menus.C:1622
-msgid "LM|Nn#n#N"
-msgstr "LM|nN#n#N"
+#: src/lyx_main.C:562
+msgid " instead."
+msgstr " isteden."
 
-#: src/menus.C:1623
-msgid "LM|Bb#b#B"
-msgstr "LM|Ff#F#f"
+#: src/lyx_main.C:569
+msgid "Done!"
+msgstr "Ferdig!"
 
-#: src/menus.C:1624
-msgid "LM|Tt#t#T"
-msgstr "LM|Xx#X#x"
+#: src/lyx_main.C:583
+msgid "LyX Warning!"
+msgstr "LyX Advarsel!"
 
-#: src/menus.C:1625
-msgid "LM|vV#v#V"
-msgstr "LM§Ee#E#e"
+#: src/lyx_main.C:584
+msgid "Error while reading "
+msgstr "Feil under lesing "
 
-#: src/menus.C:1626
-msgid "LM|Ll#l#L"
-msgstr "LM|Ll#L#l"
+#: src/lyx_main.C:585
+msgid "Using built-in defaults."
+msgstr "Bruker innebygde standarer."
 
-#: src/menus.C:1627
-msgid "LM|xX#x#X"
-msgstr "LM|xX#x#X"
+#: src/lyx_main.C:652
+msgid "Setting debug level to "
+msgstr "Setter debug nivå til "
 
-#: src/menus.C:1628
-msgid "LM|Ss#s#S"
-msgstr "LM|gG#g#G"
+#: src/lyx_main.C:663
+msgid ""
+"Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
+"Command line switches (case sensitive):\n"
+"\t-help              summarize LyX usage\n"
+"\t-userdir dir       try to set user directory to dir\n"
+"\t-sysdir dir        try to set system directory to dir\n"
+"\t-geometry WxH+X+Y  set geometry of the main window\n"
+"\t-dbg feature[,feature]...\n"
+"                  select the features to debug.\n"
+"                  Type `lyx -dbg' to see the list of features\n"
+"Check the LyX man page for more options."
+msgstr ""
+"Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
+"Command line switches (case sensitive):\n"
+"\t-help              summarize LyX usage\n"
+"\t-userdir dir       try to set user directory to dir\n"
+"\t-sysdir dir        try to set system directory to dir\n"
+"\t-geometry WxH+X+Y  set geometry of the main window\n"
+"\t-dbg feature[,feature]...\n"
+"                  select the features to debug.\n"
+"                  Type `lyx -dbg' to see the list of features\n"
+"Check the LyX man page for more options."
 
-#: src/menus.C:1695
-msgid "Import ASCII file%t|As Lines%x41|As Paragraphs%x42"
-msgstr "Importer ASCII fil%t|Som linjer%x41|Som avsnitt%x42"
+#: src/lyx_main.C:688
+msgid "List of supported debug flags:"
+msgstr "Liste over debug flagg some støttes:"
 
-#: src/menus.C:1699
-msgid "IMA|Ll#l#L"
-msgstr "IMA|lL#l#L"
+#: src/lyx_main.C:700
+msgid "Missing directory for -sysdir switch!"
+msgstr "Mangler folder for -sysdir parameter!"
 
-#: src/menus.C:1700
-msgid "IMA|Pp#p#P"
-msgstr "IMA|aA#a#A"
+#: src/lyx_main.C:711
+msgid "Missing directory for -userdir switch!"
+msgstr "Mangler folder for -userdir parameter!"
 
-#: src/menus.C:1703
-msgid ""
-"Lists & TOC%t|Table of Contents%x21|List of Figures%x22|List of "
-"Tables%x23|List of Algorithms%x24|Index List%x25|BibTeX Reference%x26"
-msgstr ""
-"Lister & Innholdsfortegnelse%t|Innholdsfortegnelse%x21|Liste over "
-"figurer%x22|Liste over Tabeller%x23|Liste over "
-"algoritmer%x24|Register%x25|Referanseliste%x26"
+#: src/lyx_main.C:734
+msgid "Missing command string after  -x switch!"
+msgstr "Mangler kommando streng etter -x switch!"
 
-#: src/menus.C:1711
-msgid "IMT|Cc#c#C"
-msgstr "IMT|Ii#I#i"
+#: src/lyx_main.C:747
+msgid "Missing file type [eg latex, ps...] after "
+msgstr "Mangler fil type [eks. latex, ps...] etter "
 
-#: src/menus.C:1712
-msgid "IMT|Ff#f#F"
-msgstr "IMT|fF#f#F"
+#: src/lyx_main.C:749 src/lyx_main.C:764
+msgid " switch!"
+msgstr " endring!"
 
-#: src/menus.C:1713
-msgid "IMT|Tt#t#T"
-msgstr "IMT|Tt#T#t"
+#: src/lyx_main.C:762
+msgid "Missing type [eg latex, ps...] after "
+msgstr "Mangler fil type [eks. latex, ps...] etter "
 
-#: src/menus.C:1714
-msgid "IMT|Aa#a#A"
-msgstr "IMT|aA#a#A"
+#: src/lyx_sendfax.C:21
+msgid "Fax no.:|#F"
+msgstr "Faks no.:|#F"
 
-#: src/menus.C:1715
-msgid "IMT|Ii#i#I"
-msgstr "IMT|Rr#R#r"
+#: src/lyx_sendfax.C:23
+msgid "Dest. Name:|#N"
+msgstr "Mott. Navn:|#N"
 
-#: src/menus.C:1716
-msgid "IMT|Bb#b#B"
-msgstr "IMT|fF#f#F"
+#: src/lyx_sendfax.C:25
+msgid "Enterprise:|#E"
+msgstr "Foretak:|#F"
 
-#: src/menus.C:1719
-msgid ""
-"Floats%t|Figure Float%x71|Table Float%x72|Wide Figure Float%x73|Wide Table "
-"Float%l%x74|Algorithm Float%x75"
-msgstr ""
-"Floats%t|Figur float%x71|Tabell float%l%x72|Vid Figur float%x73|Vid Tabell "
-"float%l%x74|Algoritme float%x75"
+#: src/lyx_sendfax.C:45
+msgid "Phone Book"
+msgstr "Telefon liste"
 
-#: src/menus.C:1726
-msgid "IMF|gG#g#G"
-msgstr "IMF|gG#g#G"
+#: src/lyx_sendfax.C:49
+msgid "Select from|#S"
+msgstr "Velg fra"
 
-#: src/menus.C:1727
-msgid "IMF|Tt#t#T"
-msgstr "IMF|Tt#T#t"
+#: src/lyx_sendfax.C:53
+msgid "Add to|#t"
+msgstr "Legg til"
 
-#: src/menus.C:1728
-msgid "IMF|Ww#w#W"
-msgstr "IMF|bB#b#B"
+#: src/lyx_sendfax.C:57
+msgid "Delete from|#D"
+msgstr "Slett fra"
 
-#: src/menus.C:1729
-msgid "IMF|iI#i#I"
-msgstr "IM|fF#f#F"
+#: src/lyx_sendfax.C:61
+msgid "Save|#V"
+msgstr "Lagre"
 
-#: src/menus.C:1730
-msgid "IMF|Aa#a#A"
-msgstr "IMF|gG#g#G"
+#: src/lyx_sendfax.C:65
+msgid "Destination:"
+msgstr "Mottager:"
 
-#: src/menus.C:1733
-msgid ""
-"Special Character%t|HFill%x31|Hyphenation Point%x32|Protected "
-"Blank%x33|Linebreak%x34|Ellipsis (...)%x35|End of sentence "
-"period%x36|Ordinary Quote (\")%x37|Menu Separator %x38"
-msgstr ""
-"Spesial tegn%t|HFill%x31|Orddelingspunkt%x32|Hardt "
-"mellomrom%x33|Linjeskift%x34|Ellipsis "
-"(...)%x35|Avsnittssluttpunktum%x36|Vanlige gåseøyne "
-"(\")%x37|Menyseparator%x38"
+#: src/lyx_sendfax.C:71
+msgid "Comment:"
+msgstr "Kommentar:"
 
-#: src/menus.C:1743
-msgid "IMS|Hh#h#H"
-msgstr "IMS|Hh#H#h"
+#: src/lyx_sendfax_main.C:43
+msgid "Fax File: "
+msgstr "Faksfil: "
 
-#: src/menus.C:1744
-msgid "IMS|Pp#p#P"
-msgstr "IMS|Oo#O#o"
+#: src/lyx_sendfax_main.C:147 src/lyx_sendfax_main.C:190
+#: src/lyx_sendfax_main.C:228 src/lyx_sendfax_main.C:257
+msgid "Empty Phonebook"
+msgstr "Tom telefonliste"
 
-#: src/menus.C:1745
-msgid "IMS|Bb#b#B"
-msgstr "IMS|mM#m#M"
+#: src/lyx_sendfax_main.C:203 src/lyx_sendfax_main.C:241
+msgid "Save (needed)"
+msgstr "Lagring (trengs)"
 
-#: src/menus.C:1746
-msgid "IMS|Ll#l#L"
-msgstr "IMS|Ll#L#l"
+#: src/lyx_sendfax_main.C:251
+msgid "Cannot open phone book: "
+msgstr "Kan ikke åpne telefonbok: "
 
-#: src/menus.C:1747
-msgid "IMS|iI#i#I"
-msgstr "IMS|Ee#E#e"
+#: src/lyx_sendfax_main.C:282
+msgid "NO OR EMPTY LOGFILE!"
+msgstr "INGEN ELLER TOM LOGGFIL!"
 
-#: src/menus.C:1748
-msgid "IMS|Ee#e#E"
-msgstr "IMS|Aa#A#a"
+#: src/lyx_sendfax_main.C:289
+msgid "Message-Window"
+msgstr "Meldingsvindu"
 
-#: src/menus.C:1749
-msgid "IMS|Qq#q#Q"
-msgstr "IMS|Vv#V#v"
+#: src/lyx_sendfax_main.C:324
+msgid "@L@b@cEmpty Phonebook"
+msgstr "@L@b@cTom telefonliste"
 
-#: src/menus.C:1750
-msgid "IMS|Mm#m#M"
-msgstr "IMS|Mm#m#M"
+#: src/lyx_sendfax_main.C:326
+msgid "Phonebook"
+msgstr "Telefonliste"
 
-#: src/menus.C:1753
-msgid ""
-"Figure...|Table...%l|Include File...|Import ASCII File%m|Insert LyX "
-"File...|Insert external material...%l|Footnote|Margin Note|Floats%m%l|Lists "
-"& TOC%m%l|Special Character%m%l|Note...|Label...|Cross-Reference...|Citation "
-"Reference...|Index entry...|Index entry of last word"
-msgstr ""
+#: src/LyXSendto.C:40
+msgid "Send Document to Command"
+msgstr "Send dokumentet til kommando"
 
-#: src/menus.C:1775
-msgid "IM|gG#g#G"
-msgstr "IM|Ff#F#f"
+#: src/lyxvc.C:93 src/lyxvc.C:126
+msgid "Save document and proceed?"
+msgstr "Lagre dokument og fortsette?"
 
-#: src/menus.C:1776
-msgid "IM|bB#b#B"
-msgstr "IM|Tt#T#t"
+#: src/lyxvc.C:106
+msgid "LyX VC: Initial description"
+msgstr "LyX VC: Initiell beskrivelse"
 
-#: src/menus.C:1777
-msgid "IM|cC#c#C"
-msgstr "IM|Ii#I#i"
+#: src/lyxvc.C:107
+msgid "(no initial description)"
+msgstr "(ingen beskrivelse)"
 
-#: src/menus.C:1778
-msgid "IM|Aa#a#A"
-msgstr "IM|Aa#A#a"
+#: src/lyxvc.C:112
+msgid "This document has NOT been registered."
+msgstr "Dette dokumentet ble IKKE registrert."
 
-#: src/menus.C:1779
-msgid "IM|Xx#x#X"
-msgstr "IM|Xx#X#x"
+#: src/lyxvc.C:138
+msgid "LyX VC: Log Message"
+msgstr "LyX VC: Logg melding"
 
-#: src/menus.C:1780
-msgid "IM|Ee#e#E"
-msgstr "IM|Ee#e#E"
+#: src/lyxvc.C:141
+msgid "(no log message)"
+msgstr "(ingen logg melding)"
 
-#: src/menus.C:1781
-msgid "IM|Ff#f#F"
-msgstr "IM|nN#n#N"
+#: src/lyxvc.C:156
+msgid "Ignore changes and proceed with check out?"
+msgstr "Ignorer endringer, og fortsett med utsjekk?"
 
-#: src/menus.C:1782
-msgid "IM|Mm#m#M"
-msgstr "IM|Mm#M#m"
+#. Here we should check if the buffer is dirty. And if it is
+#. we should warn the user that reverting will discard all
+#. changes made since the last check in.
+#: src/lyxvc.C:171
+msgid "When you revert, you will loose all changes made"
+msgstr "Når du revertere vil du miste alle endringer som"
 
-#: src/menus.C:1783
-msgid "IM|oO#o#O"
-msgstr "IM|oO#o#O"
+#: src/lyxvc.C:172
+msgid "to the document since the last check in."
+msgstr "er gjort i dokumentet siden siste innsjekking."
 
-#: src/menus.C:1784
-msgid "IM|Tt#t#T"
-msgstr "IM|Ll#L#l"
+#: src/lyxvc.C:173
+msgid "Do you still want to do it?"
+msgstr "Ønsker du fortsatt å gjøre det?"
 
-#: src/menus.C:1785
-msgid "IM|Ss#s#S"
-msgstr "IM|Ss#S#s"
+#: src/lyxvc.C:276
+msgid "No VC History!"
+msgstr "Ingen VC historie!"
 
-#: src/menus.C:1786
-msgid "IM|Nn#n#N"
-msgstr "IM|eE#e#E"
+#: src/lyxvc.C:283
+msgid "VC History"
+msgstr "VC historie"
 
-#: src/menus.C:1787
-msgid "IM|Ll#l#L"
-msgstr "IM|Rr#r#R"
+#: src/LyXView.C:441 src/minibuffer.C:231
+msgid " (Changed)"
+msgstr " (Endret)"
 
-#: src/menus.C:1788
-msgid "IM|rR#r#R"
-msgstr "IM|Kk#K#k"
+#: src/LyXView.C:443
+msgid " (read only)"
+msgstr " (skrivebeskyttet)"
 
-#: src/menus.C:1789
-msgid "IM|iI#i#I"
-msgstr "IM|fF#f#F"
+#: src/mathed/formula.C:898 src/mathed/formula.C:1208
+msgid "TeX mode"
+msgstr "TeX modus"
 
-#: src/menus.C:1790
-msgid "IM|dD#d#D"
-msgstr "IM|dD#d#D"
+#: src/mathed/formula.C:913
+msgid "No number"
+msgstr "Inget tall"
 
-#: src/menus.C:1791
-msgid "IM|wW#w#W"
-msgstr "IM|wW#w#W"
+#: src/mathed/formula.C:916
+msgid "Number"
+msgstr "Tall"
 
-#: src/menus.C:1793
-msgid "|URL..."
-msgstr "|URL..."
+#: src/mathed/formula.C:1079
+msgid "math text mode"
+msgstr "Matte tekstmodus"
 
-#: src/menus.C:1794
-msgid "IM|Uu#u#U"
-msgstr "IM|Uu#U#u"
+#: src/mathed/formula.C:1088
+msgid "Invalid action in math mode!"
+msgstr "Ugyldig operasjon i matte modus!"
 
-#: src/menus.C:1937
-msgid ""
-"Fraction|Square root|Exponent|Index|Sum|Integral%l|Math mode|Display%l|Math "
-"Panel..."
-msgstr ""
-"Brøk|Kvadratrot|Eksponent|Indeks|Sum|Integral%l|Matte modus|Display%l|Matte "
-"panel..."
+#: src/mathed/formulamacro.C:144 src/mathed/formulamacro.C:171
+msgid "Macro: "
+msgstr "Makro: "
 
-#: src/menus.C:1947
-msgid "MM|Ff#f#F"
-msgstr "MM|Bb#B#b"
+#: src/mathed/formulamacro.C:181
+msgid "Math macro editor mode"
+msgstr "Mattemakro editerings modus"
 
-#: src/menus.C:1948
-msgid "MM|Ss#s#S"
-msgstr "MM|Kk#K#k"
+#: src/mathed/math_forms.C:19
+msgid "Close "
+msgstr "Lukk"
 
-#: src/menus.C:1949
-msgid "MM|Ee#e#E"
-msgstr "MM|Ee#E#e"
+#: src/mathed/math_forms.C:22
+msgid "Functions"
+msgstr "Funksjoner"
 
-#: src/menus.C:1950
-msgid "MM|xX#x#X"
-msgstr "MM|nN#n#N"
+#: src/mathed/math_forms.C:30
+msgid "­ Û"
+msgstr "­ Û"
 
-#: src/menus.C:1951
-msgid "MM|uU#u#U"
-msgstr "MM|Ss#S#s"
+#: src/mathed/math_forms.C:34
+msgid "± ´"
+msgstr "± ´"
 
-#: src/menus.C:1952
-msgid "MM|Ii#i#I"
-msgstr "MM|Ii#I#i"
+#: src/mathed/math_forms.C:38
+msgid "£ @"
+msgstr "£ @"
 
-#: src/menus.C:1953
-msgid "MM|Mm#m#M"
-msgstr "MM|Mm#M#m"
+#: src/mathed/math_forms.C:42
+msgid "S  ò"
+msgstr "S  ò"
 
-#: src/menus.C:1954
-msgid "MM|Dd#d#D"
-msgstr "MM|Dd#D#d"
+#: src/mathed/math_forms.C:46
+msgid "Misc"
+msgstr "Misc"
 
-#: src/menus.C:1955
-msgid "MM|Pp#p#P"
-msgstr "MM|pP#p#P"
+#: src/mathed/math_forms.C:95
+msgid "Left|#L"
+msgstr "Venstre|#V"
 
-#: src/menus.C:2021
-msgid ""
-"Screen Fonts...|Spellchecker Options...|Keyboard...%l|Reconfigure|Preferences"
-msgstr ""
+#: src/mathed/math_forms.C:127
+msgid "OK  "
+msgstr "Ok  "
 
-#: src/menus.C:2027
-msgid "OM|Ff#f#F"
-msgstr "OM|Ss#S#s"
+#: src/mathed/math_forms.C:140
+msgid "Columns "
+msgstr "Kolonner"
 
-#: src/menus.C:2028
-msgid "OM|Ss#s#S"
-msgstr "OM|Oo#O#o"
+#: src/mathed/math_forms.C:147
+msgid "Vertical align|#V"
+msgstr "Juster vertikalt|#v"
 
-#: src/menus.C:2029
-msgid "OM|Kk#k#K"
-msgstr "OM|Tt#T#t"
+#: src/mathed/math_forms.C:152
+msgid "Horizontal align|#H"
+msgstr "Juster horisontalt|#h"
 
-#: src/menus.C:2030
-msgid "OM|Rr#r#R"
-msgstr "OM|Rr#R#r"
+#: src/mathed/math_forms.C:195
+msgid "O"
+msgstr "O"
 
-#: src/menus.C:2031
-msgid "OM|Pp#p#P"
-msgstr "OM|Pp#p#P"
+#: src/mathed/math_forms.C:206
+msgid "Thin|#T"
+msgstr "Smal"
 
-#: src/menus.C:2075
-msgid "No Documents Open!%t"
-msgstr "Ingen dokumeter åpne!%t"
+#: src/mathed/math_forms.C:210
+msgid "Medium|#M"
+msgstr "Medium"
 
-#: src/menus.C:2111
-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 ""
-"Introduction|Tutorial|User's Guide|Extended Features|Customization|Reference "
-"Manual|FAQ|Table of Contents|Known Bugs|LaTeX Configuration%l|Copyright and "
-"Warranty...|Credits...|Version..."
+#: src/mathed/math_forms.C:214
+msgid "Thick|#H"
+msgstr "Bred"
 
-#: src/menus.C:2125
-msgid "HM|Ii#I#i"
-msgstr "HM|Ii#I#i"
+#: src/mathed/math_forms.C:218
+msgid "Negative|#N"
+msgstr "Negativ"
 
-#: src/menus.C:2126
-msgid "HM|Tt#T#t"
-msgstr "HM|Tt#T#t"
+#: src/mathed/math_forms.C:222
+msgid "Quadratin|#Q"
+msgstr "Firdobbel"
 
-#: src/menus.C:2127
-msgid "HM|Uu#U#u"
-msgstr "HM|Uu#U#u"
+#: src/mathed/math_forms.C:226
+msgid "2Quadratin|#2"
+msgstr "2Firdobbel"
 
-#: src/menus.C:2128
-msgid "HM|xX#x#X"
-msgstr "HM|xX#x#X"
+#: src/mathed/math_panel.C:110
+msgid "Delimiter"
+msgstr "Skille"
 
-#: src/menus.C:2129
-msgid "HM|Cc#C#c"
-msgstr "HM|Cc#C#c"
+#: src/mathed/math_panel.C:114
+msgid "Decoration"
+msgstr "Dekorering"
 
-#: src/menus.C:2130
-msgid "HM|Rr#R#r"
-msgstr "HM|Rr#R#r"
+#: src/mathed/math_panel.C:118
+msgid "Spacing"
+msgstr "Mellomrom"
 
-#: src/menus.C:2131
-msgid "HM|Ff#F#f"
-msgstr "HM|Ff#F#f"
+#: src/mathed/math_panel.C:122
+msgid "Matrix"
+msgstr "Matrise"
 
-#: src/menus.C:2132
-msgid "HM|aA#a#A"
-msgstr "HM|aH#a#H"
+#: src/mathed/math_panel.C:312
+msgid "Top | Center | Bottom"
+msgstr "Topp | Senter | Bunn"
 
-#: src/menus.C:2133
-msgid "HM|Kk#K#k"
-msgstr "HM|Kk#K#k"
+#: src/mathed/math_panel.C:364
+msgid "Math Panel"
+msgstr "Mattepanel"
 
-#: src/menus.C:2134
-msgid "HM|Ll#L#l"
-msgstr "HM|Ll#L#l"
+#: src/MenuBackend.C:220
+msgid "No Documents Open!"
+msgstr "Ingen åpne dokumenter!"
 
-#: src/menus.C:2135
-msgid "HM|oO#o#O"
-msgstr "HM|oO#o#O"
+#: src/MenuBackend.C:347
+msgid "Quit|Q"
+msgstr "Avslutt|A"
 
-#: src/menus.C:2136
-msgid "HM|eE#e#E"
-msgstr "HM|eE#e#E"
+#: src/MenuBackend.C:355
+msgid "LaTeX...|L"
+msgstr "LaTeX...|L"
 
-#: src/menus.C:2137
-msgid "HM|Vv#v#V"
-msgstr "HM|Vv#v#V"
+#: src/MenuBackend.C:357
+msgid "LinuxDoc...|L"
+msgstr "LinuxDoc...|L"
 
-#: src/menus.C:2178
-msgid "Could not find requested Documentation file"
-msgstr "Kunne ikke finne ønsket dokumentasjonsfil"
+#: src/MenuBackend.C:365
+msgid "Emphasize"
+msgstr "Uthevet"
 
 #: src/minibuffer.C:42 src/minibuffer.C:233
 msgid "Welcome to LyX!"
@@ -7589,38 +7087,10 @@ msgstr "Eksekverer:"
 msgid "* No document open *"
 msgstr "* Ingen dokumeter åpne *"
 
-#: src/PaperLayout.C:158
-msgid "Document is read-only.  No changes to layout permitted."
-msgstr "Dokumnentet er skrivebeskyttet. Endringer til stil er ikke tillatt."
-
-#: src/PaperLayout.C:180
-msgid "Paper Layout"
-msgstr "Arkinnstillinger"
-
-#: src/PaperLayout.C:212
-msgid "Paper layout set"
-msgstr "Arkinnstillinger satt"
-
-#: src/paragraph.C:1934
+#: src/paragraph.C:1893
 msgid "Senseless with this layout!"
 msgstr "Uten mening for denne stilen!"
 
-#: src/ParagraphExtra.C:147
-msgid "Document is read-only. No changes to layout permitted."
-msgstr "Dokumentet er skrivebeskyttet. Stil endringer er ikke tillatt."
-
-#: src/ParagraphExtra.C:166
-msgid "ParagraphExtra Layout"
-msgstr "Ekstra Avsnittsinnstillinger"
-
-#: src/ParagraphExtra.C:206
-msgid "ParagraphExtra layout set"
-msgstr "Ekstra Avsnittsinnstillinger satt"
-
-#: src/ParagraphExtra.C:313
-msgid "Warning: Invalid percent value (0-100)"
-msgstr "Advarsel: Ugyldig prosent verdi (0-100)"
-
 #: src/print_form.C:21
 msgid "File Type"
 msgstr "Fil type"
@@ -7649,51 +7119,33 @@ msgstr "LyX|#L"
 msgid "Ascii|#s"
 msgstr "Ascii|#s"
 
-#: src/spellchecker.C:228
+#: src/spellchecker.C:284
 msgid "Spellchecker Options"
 msgstr "Opsjoner til stavekontroll"
 
-#: src/spellchecker.C:567
+#: src/spellchecker.C:713
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: src/spellchecker.C:672
-msgid ""
-"\n"
-"\n"
-"The ispell-process has died for some reason. *One* possible reason\n"
-"could be that you do not have a dictionary file\n"
-"for the language of this document installed.\n"
-"Check /usr/lib/ispell or set another\n"
-"dictionary in the Spellchecker Options menu."
-msgstr ""
-"\n"
-"\n"
-"Ispell prosessen er død av en eller annen grunn. *En* mulig grunn\n"
-"kan være at du ikke har en ordlistefil\n"
-"for dokumentetsspråk installert.\n"
-"Undersøk /usr/lib/ispell eller sett en annen\n"
-"ordliste i Stavekontroll Opsjoner menyen."
-
-#: src/spellchecker.C:808
+#: src/spellchecker.C:955
 msgid " words checked."
 msgstr " ord sjekket."
 
-#: src/spellchecker.C:810
+#: src/spellchecker.C:957
 msgid " word checked."
 msgstr " ord sjekket."
 
-#: src/spellchecker.C:812
+#: src/spellchecker.C:959
 msgid "Spellchecking completed!"
 msgstr "Stavekontroll fullført"
 
-#: src/spellchecker.C:816
+#: src/spellchecker.C:963
 msgid ""
-"The ispell-process has died for some reason.\n"
+"The spell checker has died for some reason.\n"
 "Maybe it has been killed."
 msgstr ""
-"Ispell prosessen er død av en eller annen grunn.\n"
-"Kanskje har den blitt drept."
+"The spell checker has died for some reason.\n"
+"Maybe it has been killed."
 
 #: src/sp_form.C:26
 msgid "Use language of document|#D"
@@ -7717,7 +7169,7 @@ msgstr "Bruk alternativ personlig ordliste:"
 
 #: src/sp_form.C:48
 msgid "Extra special chars allowed in words:|#E"
-msgstr "Ekstra spesial tegn tillatt i ord:"
+msgstr "Ekstra spesialtegn tillatt i ord:"
 
 #: src/sp_form.C:54
 msgid "Dictionary"
@@ -7777,11 +7229,11 @@ msgstr "100 %"
 msgid "Replace word|#R"
 msgstr "Erstatt ord?"
 
-#: src/support/filetools.C:176
+#: src/support/filetools.C:173
 msgid "LyX Internal Error!"
 msgstr "LyX intern feil!"
 
-#: src/support/filetools.C:177
+#: src/support/filetools.C:174
 msgid "Could not test if directory is writeable"
 msgstr "Kunne ikke avgjøre om foldern er skrivebeskyttet"
 
@@ -7789,71 +7241,63 @@ msgstr "Kunne ikke avgj
 msgid "Error! Cannot open directory:"
 msgstr "Feil! Kan ikke åpne folder:"
 
-#: src/support/filetools.C:395
+#: src/support/filetools.C:400
 msgid "Error! Could not remove file:"
 msgstr "Feil: Klarte ikke å fjerne fil:"
 
-#: src/support/filetools.C:409
+#: src/support/filetools.C:416
 msgid "Error! Couldn't create temporary directory:"
 msgstr "Feil: Klarte ikke å lage temporær folder:"
 
-#: src/support/filetools.C:425
+#: src/support/filetools.C:432
 msgid "Error! Couldn't delete temporary directory:"
 msgstr "Feil: Klarte ikke å slette temporær folder:"
 
-#: src/support/filetools.C:478
+#: src/support/filetools.C:485
 msgid "Internal error!"
 msgstr "Intern feil!"
 
-#: src/support/filetools.C:479
+#: src/support/filetools.C:486
 msgid "Call to createDirectory with invalid name"
 msgstr "Kall til createDirectory men ugyldig navn"
 
-#: src/support/filetools.C:484
+#: src/support/filetools.C:491
 msgid "Error! Couldn't create directory:"
 msgstr "Feil! Kunne ikke lage folder:"
 
+#: src/support/filetools.C:1108
+msgid "Could not delete auto-save file!"
+msgstr "Kunne ikke slette autolagre fil!"
+
 #: src/support/getUserName.C:13
 msgid "unknown"
 msgstr "ukjent"
 
-#: src/table.C:990 src/tabular.C:1177
+#: src/tabular.C:1256
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: src/table.C:991 src/tabular.C:1178
+#: src/tabular.C:1257
 msgid "Tabular format < 5 is not supported anymore\n"
 msgstr "Tabell format < 5 er ikke lenger støttet\n"
 
-#: src/table.C:992 src/tabular.C:1179
+#: src/tabular.C:1258
 msgid "Get an older version of LyX (< 1.1.x) for conversion!"
 msgstr "Bruk en eldre versjon av LyX (< 1.1.x) til konvertering!"
 
-#: src/TableLayout.C:237
-msgid "Table Extra Form"
-msgstr "Ekstra tabell skjema"
-
-#: src/TableLayout.C:256
-msgid "Table Layout"
-msgstr "Tabell stil"
-
-#: src/TableLayout.C:336
-msgid "Confirm: press Delete-Button again"
-msgstr "Bekreft: trykk sletteknapp igjen"
-
-#: src/text2.C:407
+#: src/text2.C:411
 msgid "Opened float"
 msgstr "Åpnet float"
 
-#: src/text2.C:409
+#: src/text2.C:413
 msgid "Closed float"
 msgstr "Lukket float"
 
-#: src/text2.C:452
+#: src/text2.C:456
 msgid "Nothing to do"
 msgstr "Ingenting å gjøre"
 
-#: src/text2.C:1287
+#: src/text2.C:1273
 msgid ""
 "No font change defined. Use Character under the Layout menu to define font "
 "change."
@@ -7861,19 +7305,15 @@ msgstr ""
 "Ingen font endring definert. Bruk Tegn under Stil menyen to å definere font "
 "endring."
 
-#: src/text2.C:2211 src/text2.C:2336
+#: src/text2.C:2199 src/text2.C:2312
 msgid "Don't know what to do with half floats."
 msgstr "Vet ikke hva som skal gjøres med halve floater."
 
-#: src/text2.C:2212 src/text2.C:2225 src/text2.C:2338 src/text2.C:2351
+#: src/text2.C:2200 src/text2.C:2314
 msgid "sorry."
 msgstr "beklager."
 
-#: src/text2.C:2224 src/text2.C:2350
-msgid "Don't know what to do with half tables."
-msgstr "Vet ikke hva som skal gjøres med halve tabeller."
-
-#: src/text.C:2787
+#: src/text.C:1984
 msgid ""
 "You cannot insert a space at the beginning of a paragraph.  Please read the "
 "Tutorial."
@@ -7881,30 +7321,26 @@ msgstr ""
 "Du kan ikke sette inn et mellomrom i begynnelsen av et avsnitt. Les "
 "'Tutorial'."
 
-#: src/text.C:2789
+#: src/text.C:1986
 msgid "You cannot type two spaces this way.  Please read the Tutorial."
-msgstr "Det er ikke mulig e bruke to mellomrom pe denne meten. Les 'Tutorial.'"
+msgstr "Det er ikke mulig å bruke to mellomrom pe denne meten. Les 'Tutorial.'"
 
-#: src/text.C:4336 src/text.C:4342
+#: src/text.C:3406 src/text.C:3412
 msgid "Page Break (top)"
 msgstr "Ny side (topp)"
 
-#: src/text.C:4532 src/text.C:4538
+#: src/text.C:3603 src/text.C:3609
 msgid "Page Break (bottom)"
 msgstr "Ny side (bunn)"
 
-#: src/text.C:5003
+#: src/text.C:3899
 msgid "You can't insert a float in a float!"
-msgstr "Do kan ikke sette inn en float i en float!"
+msgstr "Du kan ikke sette inn en float i en float!"
 
-#: src/text.C:5011
+#: src/text.C:3907
 msgid "You can't insert a marginpar in a minipage!"
 msgstr "Do kan ikke sette inn et marknotat i en minipage!"
 
-#: src/text.C:5028
-msgid "Cannot cut table."
-msgstr "Kan ikke klippe tabell."
-
-#: src/text.C:5044
+#: src/text.C:3934
 msgid "Float would include float!"
-msgstr "Float ville inkludert float!"
+msgstr "Float would include float!"
index 6a1f4f6b8cb5c7baef829ca7bb827d6fddf951a9..993db847162302b2fd132335453cbb49a34305d4 100644 (file)
@@ -61,12 +61,12 @@ void SetXtermCursor(Window win)
        static Cursor cursor;
        static bool cursor_undefined = true;
        if (cursor_undefined){
-               cursor = XCreateFontCursor(fl_display, XC_xterm);
-               XFlush(fl_display);
+               cursor = XCreateFontCursor(fl_get_display(), XC_xterm);
+               XFlush(fl_get_display());
                cursor_undefined = false;
        }
-       XDefineCursor(fl_display, win, cursor);
-       XFlush(fl_display);
+       XDefineCursor(fl_get_display(), win, cursor);
+       XFlush(fl_get_display());
 }
 
 
@@ -704,7 +704,7 @@ void BufferView::Pimpl::enterView()
 void BufferView::Pimpl::leaveView()
 {
        if (using_xterm_cursor) {
-               XUndefineCursor(fl_display, workarea_->getWin());
+               XUndefineCursor(fl_get_display(), workarea_->getWin());
                using_xterm_cursor = false;
        }
 }
index ce6410a5b0ab7c172f0353ca40e8b36db2e2a259..f3be43ba7dd8ad73df94330956667c169b9d8be0 100644 (file)
@@ -26,7 +26,7 @@ using std::endl;
 
 LyXColorHandler::LyXColorHandler() 
 {
-       display = fl_display;
+       display = fl_get_display();
        drawable = XCreatePixmap(display, fl_root, 10, 10,
                                 fl_get_visual_depth());
        
index 95a936142f5600cdff673f1e3ce6968ca045665a..406c8859027b721c1f36357dd5dd6693f7b6d5eb 100644 (file)
@@ -116,7 +116,7 @@ void FontInfo::query()
 
        char ** list = 0;
        if (lyxrc.use_gui)
-               list = XListFonts(fl_display, pattern.c_str(), 100, &matches);
+               list = XListFonts(fl_get_display(), pattern.c_str(), 100, &matches);
 
        if (list == 0) {
                // No fonts matched
index 0785ba31bb05ea59ec25b7b7a7154b1a77410e08..2ad5688af0f8f6a99518acfcdadc5cab48419a1d 100644 (file)
@@ -81,7 +81,7 @@ void FontLoader::unload()
                                }
                                for (int i4 = 0; i4<10; i4++) {
                                        if (fontstruct[i1][i2][i3][i4]) {
-                                               XFreeFont(fl_display, fontstruct[i1][i2][i3][i4]);
+                                               XFreeFont(fl_get_display(), fontstruct[i1][i2][i3][i4]);
                                                fontstruct[i1][i2][i3][i4] = 0;
                                        }
                                }
@@ -244,14 +244,14 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
 
        current_view->owner()->getMiniBuffer()->Store();
        current_view->owner()->getMiniBuffer()->Set(_("Loading font into X-Server..."));
-       fs = XLoadQueryFont(fl_display, font.c_str());
+       fs = XLoadQueryFont(fl_get_display(), font.c_str());
        
        if (fs == 0) {
                if (font == "fixed") {
                        lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
                } else {
                        lyxerr << "Could not get font. Using 'fixed'." << endl;
-                       fs = XLoadQueryFont(fl_display, "fixed");
+                       fs = XLoadQueryFont(fl_get_display(), "fixed");
                }
        } else if (lyxerr.debugging(Debug::FONT)) {
                // Tell user the font matching
index adf5c73e42c325294656e3c103b8811bbb41223f..4a6e32da4e4736833db019bdfc64b079aed32bcc 100644 (file)
@@ -123,7 +123,7 @@ string const LColor::getGUIName(LColor::color c) const
 {
        InfoTab::const_iterator ici = infotab.find(c);
        if (ici != infotab.end())
-               return _((*ici).second.guiname.c_str());
+               return _((*ici).second.guiname);
 
        return "none";
 }
index 239f4bf5dcc70a8f5fbe60b5b1f52524ce70eed4..a50eac97fce2d897ad32b9f5eed9514c2310cd98 100644 (file)
@@ -342,7 +342,8 @@ string const LaTeXFeatures::getIncludedFiles()
 {
        string sgmlpreamble;
        FileMap::const_iterator end = IncludedFiles.end();
-       for(FileMap::const_iterator fi=IncludedFiles.begin(); fi != end; ++fi)
+       for (FileMap::const_iterator fi = IncludedFiles.begin();
+            fi != end; ++fi)
                sgmlpreamble += "\n<!entity " + fi->first
                        + " system \"" + fi->second + "\">";
 
index c081a0eb1a708ffddc7f10b136ee19a8235de2f4..9d7c99e2b356d1ab067dbc463f4ec17e6c5d8e4d 100644 (file)
@@ -514,6 +514,8 @@ int LyXAction::getPseudoAction(kb_action action, string const & arg) const
 // perhaps a pair<kb_action, string> should be returned?
 kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const
 {
+       arg.erase(); // clear it to be sure.
+       
        pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
 
        if (pit != lyx_pseudo_map.end()) {
@@ -601,16 +603,17 @@ string const LyXAction::getActionName(int action) const
        string arg;
        if (isPseudoAction(action)) {
                ac = retrieveActionArg(action, arg);
-               arg = " " +arg;
-       } 
-       else
+               arg.insert(0, " ");
+       } else
                ac = static_cast<kb_action>(action);
 
        info_map::const_iterator iit = lyx_info_map.find(ac);
 
-       if (iit != lyx_info_map.end())
-               return (*iit).second.name + arg;
-       else 
+       if (iit != lyx_info_map.end()) {
+               string ret((*iit).second.name);
+               ret += arg;
+               return ret;
+       } else 
                return string();
 }
 
index 1691e71457ee2168c2b70c0134e5382f53d2b73c..100eb409d634ad0b1a9275c8ee8fff3d8459d6fb 100644 (file)
@@ -210,7 +210,7 @@ void LyXView::show(int place, int border, string const & title)
 {
        fl_show_form(form_, place, border, title.c_str());
        minibuffer->Init();
-       InitLyXLookup(fl_display, form_->window);
+       InitLyXLookup(fl_get_display(), form_->window);
 }
 
 
index 8ebfe5038df40f22d80af8a3c583d172fb77f771..162053e1eaf6aaf5fe4280a1f748b554820b598f 100644 (file)
@@ -125,6 +125,7 @@ lyx_SOURCES = \
        font.h \
        form1.C \
        form1.h \
+       gettext.C \
        gettext.h \
        include_form.h \
        intl.C \
index 5fedfbbdbcb11703e5a67289097074dce4114503..0777155d022f2d8ce8606a93027787c71e967383 100644 (file)
@@ -25,6 +25,7 @@
 #include "bufferlist.h"
 #include "exporter.h"
 #include "support/filetools.h"
+#include "support/lyxfunctional.h"
 
 extern LyXAction lyxaction;
 extern LastFiles * lastfiles; 
@@ -95,7 +96,7 @@ Menu & Menu::read(LyXLex & lex)
                md_last
        };
 
-       struct keyword_item menutags[md_last-1] = {
+       struct keyword_item menutags[md_last - 1] = {
                { "documents", md_documents },
                { "end", md_endmenu },
                { "exportformats", md_exportformats },
@@ -124,11 +125,9 @@ Menu & Menu::read(LyXLex & lex)
                        // fallback to md_item
                case md_item: {
                        lex.next();
-                       char * tmp = ::strdup(lex.GetString().c_str());
-                       string name = _(tmp);
-                       free(tmp);
+                       string name = _(lex.GetString());
                        lex.next();
-                       string command = lex.GetString();
+                       string const command = lex.GetString();
                        add(MenuItem(MenuItem::Command, name, 
                                     command, optional));
                        optional = false;
@@ -169,9 +168,7 @@ Menu & Menu::read(LyXLex & lex)
 
                case md_submenu: {
                        lex.next();
-                       char * tmp = ::strdup(lex.GetString().c_str());
-                       string mlabel = _(tmp);
-                       free(tmp);
+                       string mlabel = _(lex.GetString());
                        lex.next();
                        string mname = lex.GetString();
                        add(MenuItem(MenuItem::Submenu, mlabel, mname));
@@ -192,7 +189,8 @@ Menu & Menu::read(LyXLex & lex)
        return *this;
 }
 
-void Menu::expand(Menu & tomenu, Buffer *buf) const
+
+void Menu::expand(Menu & tomenu, Buffer * buf) const
 {
        for (const_iterator cit = begin();
             cit != end() ; ++cit) {
@@ -270,6 +268,7 @@ void Menu::expand(Menu & tomenu, Buffer *buf) const
        }
 }
 
+
 void MenuBackend::read(LyXLex & lex)
 {
        enum Menutags {
@@ -400,36 +399,24 @@ void MenuBackend::add(Menu const & menu)
 
 bool MenuBackend::hasMenu(string const & name) const
 {
-       const_iterator mend = end();
-       for (const_iterator cit = begin(); cit != mend; ++cit) {
-               if ((*cit).name() == name)
-                       return true;
-       }
-       return false;
+       return find_if(begin(), end(),
+                      compare_memfun(&Menu::name, name)) != end();
 }
 
 
 Menu const & MenuBackend::getMenu(string const & name) const
 {
-       const_iterator mend = end();
-       for (const_iterator cit = begin(); cit != mend; ++cit) {
-               if ((*cit).name() == name)
-                       return (*cit);
-       }
-       Assert(false); // we actually require the name to exist.
-       return menulist_.front();
+       const_iterator cit = find_if(begin(), end(),
+                                    compare_memfun(&Menu::name, name));
+       Assert(cit != end());
+       return (*cit);
 }
 
 
 Menu & MenuBackend::getMenu(string const & name)
 {
-       MenuList::iterator end = menulist_.end();
-       for (MenuList::iterator cit = menulist_.begin(); 
-            cit != end; ++cit) {
-               if ((*cit).name() == name)
-                       return (*cit);
-       }
-       Assert(false); // we actually require the name to exist.
-       return menulist_.front();
+       MenuList::iterator it = find_if(menulist_.begin(), menulist_.end(),
+                                       compare_memfun(&Menu::name, name));
+       Assert(it != menulist_.end());
+       return (*it);
 }
-
index 8b0e3e679c7cc7002247c4d923da8f5e466665df..5836bf50ac244ebe210ae754eadb8efc0933306a 100644 (file)
@@ -39,7 +39,7 @@ using std::max;
 Painter::Painter(WorkArea & wa)
        : PainterBase(wa)
 {
-       display = fl_display;
+       display = fl_get_display();
 }
 
 
@@ -275,13 +275,14 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
                XChar2b * xs = new XChar2b[ls];
                Encoding const * encoding = f.language()->encoding();
-               LyXFont const * font = &f; 
+               //LyXFont const * font = &f;
+               LyXFont font(f);
                if (f.family() == LyXFont::SYMBOL_FAMILY) {
 #ifdef USE_UNICODE_FOR_SYMBOLS
-                       LyXFont font2 = f;
-                       font2.setFamily(LyXFont::ROMAN_FAMILY);
-                       font2.setShape(LyXFont::UP_SHAPE);
-                       font = &font2;
+                       //LyXFont font2 = f;
+                       font.setFamily(LyXFont::ROMAN_FAMILY);
+                       font.setShape(LyXFont::UP_SHAPE);
+                       //font = &font2;
 #endif
                        encoding = encodings.symbol_encoding();
                }
@@ -290,7 +291,7 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
                        xs[i].byte1 = c >> 8;
                        xs[i].byte2 = c & 0xff;
                }
-               text(x , y, xs, ls, *font);
+               text(x , y, xs, ls, font);
                delete[] xs;
                return *this;
        }
index 0bb29e960b8cf675b860683ae3e3601dd31054e1..13d557e65bdd95e38811e0e5072a56ae64fdf231 100644 (file)
@@ -140,7 +140,7 @@ WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
 WorkArea::~WorkArea()
 {
        if (workareapixmap)
-               XFreePixmap(fl_display, workareapixmap);
+               XFreePixmap(fl_get_display(), workareapixmap);
 }
 
 
@@ -205,14 +205,14 @@ void WorkArea::createPixmap(int width, int height)
        cur_height = height;
 
        if (workareapixmap)
-               XFreePixmap(fl_display, workareapixmap);
+               XFreePixmap(fl_get_display(), workareapixmap);
 
        if (lyxerr.debugging(Debug::GUI))
                lyxerr << "Creating pixmap ("
                       << width << 'x' << height << ")" << endl;
        
-       workareapixmap = XCreatePixmap(fl_display,
-                                      RootWindow(fl_display, 0),
+       workareapixmap = XCreatePixmap(fl_get_display(),
+                                      RootWindow(fl_get_display(), 0),
                                       width,
                                       height, 
                                       fl_get_visual_depth());
index e8fca4b31e079ca2fde3fe3f5ce10815b432f14f..60fba834d3450ca21779bef1880bfb807c8d3379 100644 (file)
@@ -98,12 +98,12 @@ void draw_bitmaptable(FL_OBJECT *ob)
        /* draw the background bitmap */
        if (sp->bdata)  {
                if (!sp->pix) {
-                       sp->pix = XCreatePixmapFromBitmapData(fl_display, fl_winget(), 
+                       sp->pix = XCreatePixmapFromBitmapData(fl_get_display(), fl_winget(), 
                                                              (char*)sp->bdata,
                                                               sp->bw, sp->bh,
                                        fl_get_flcolor(ob->lcol), fl_get_flcolor(ob->col1),
-                                                              /*DefaultDepth(fl_display, DefaultScreen(fl_display))*/ fl_state[fl_get_vclass()].depth);
-                       XFlush(fl_display);
+                                                              /*DefaultDepth(fl_get_display(), DefaultScreen(fl_get_display()))*/ fl_state[fl_get_vclass()].depth);
+                       XFlush(fl_get_display());
                }
        }
        if (sp->pix) {
@@ -129,12 +129,12 @@ void draw_bitmaptable(FL_OBJECT *ob)
       
                i = FL_abs(ob->bw);
                j = hh - ((lx) ? sp->dy+2*i: 0);
-               XCopyArea(fl_display, sp->pix, fl_winget(), gc, xx, yy, ww, j, mx, my);
-               XFlush(fl_display);
+               XCopyArea(fl_get_display(), sp->pix, fl_winget(), gc, xx, yy, ww, j, mx, my);
+               XFlush(fl_get_display());
                if (lx) {
-                       XCopyArea(fl_display, sp->pix, fl_winget(), gc, xx,
+                       XCopyArea(fl_get_display(), sp->pix, fl_winget(), gc, xx,
                                          yy+j, lx*sp->dx-2*i, hh-j, mx, my+j);
-                       XFlush(fl_display);
+                       XFlush(fl_get_display());
                }
        }
    
@@ -216,8 +216,8 @@ int handle_bitmaptable(FL_OBJECT * ob, int event, FL_Coord mx,
                return 1;
     case FL_FREEMEM:
            if (sp->pix) {
-                   XFreePixmap(fl_display, sp->pix);
-                   XFlush(fl_display);
+                   XFreePixmap(fl_get_display(), sp->pix);
+                   XFlush(fl_get_display());
            }
                fl_free(((BMTABLE_SPEC*)ob->spec));      
                break;
@@ -273,14 +273,14 @@ void fl_set_bmtable_pixmap_data(FL_OBJECT * ob, int nx, int ny,
                dumb_attributes.colormap = fl_state[fl_get_vclass()].colormap;
                dumb_attributes.closeness = 30000;
                dumb_attributes.valuemask = XpmColormap | XpmCloseness;
-               if (XCreatePixmapFromData(fl_display, fl_winget(), pdata,
+               if (XCreatePixmapFromData(fl_get_display(), fl_winget(), pdata,
                                          &(sp->pix), &dummy_shapemask,
                                          &dumb_attributes) == XpmSuccess) {
                        sp->bw = dumb_attributes.width;
                        sp->bh = dumb_attributes.height;
                        XpmFreeAttributes(&dumb_attributes);
                        if (dummy_shapemask) {
-                               XFreePixmap(fl_display, dummy_shapemask);
+                               XFreePixmap(fl_get_display(), dummy_shapemask);
                        }
                }
        }
@@ -301,7 +301,7 @@ void fl_set_bmtable_file(FL_OBJECT * ob, int nx, int ny, char const * filename)
    if(XReadBitmapFileData(filename, &bw, &bh,
                          &bdata, &xh, &yh) == BitmapSuccess)
      fl_set_bmtable_data(ob, nx, ny, bw, bh, bdata);
-   XFlush(fl_display);
+   XFlush(fl_get_display());
 }
 
 #else
@@ -337,17 +337,17 @@ void fl_set_bmtable_pixmap_file(FL_OBJECT *ob, int nx, int ny, char const *filen
                dumb_attributes.closeness = 30000;
                dumb_attributes.valuemask = XpmColormap | XpmCloseness;
    
-               if (XReadPixmapFile(fl_display, fl_winget(), (char *)filename,
+               if (XReadPixmapFile(fl_get_display(), fl_winget(), (char *)filename,
                                    &(sp->pix), &dummy_shapemask,
                                    &dumb_attributes) == XpmSuccess) {
                        sp->bw = dumb_attributes.width;
                        sp->bh = dumb_attributes.height;
                        XpmFreeAttributes(&dumb_attributes);
                        if (dummy_shapemask) {
-                               XFreePixmap(fl_display, dummy_shapemask);
+                               XFreePixmap(fl_get_display(), dummy_shapemask);
                        }
                }
-               /* XFlush(fl_display); */
+               /* XFlush(fl_get_display()); */
        }
 }
 
@@ -445,8 +445,8 @@ void fl_draw_bmtable_item(FL_OBJECT * ob, int i, Drawable d, int xx, int yy)
       y = (i/sp->nx)*sp->dy + FL_abs(ob->bw);
       w = sp->dx-2*FL_abs(ob->bw);
       h = sp->dy-2*FL_abs(ob->bw);      
-      XCopyArea(fl_display, sp->pix, d, gc, x, y, w, h, xx, yy);
-      XFlush(fl_display);
+      XCopyArea(fl_get_display(), sp->pix, d, gc, x, y, w, h, xx, yy);
+      XFlush(fl_get_display());
    }
 }
 
@@ -457,8 +457,8 @@ void fl_free_bmtable_bitmap(FL_OBJECT * ob)
 
   /* dump the temporary pixmap */
   if (sp && sp->pix) { 
-    XFreePixmap(fl_display, sp->pix);
-    XFlush(fl_display);
+    XFreePixmap(fl_get_display(), sp->pix);
+    XFlush(fl_get_display());
     sp->pix = 0;
   }
 
@@ -477,8 +477,8 @@ void fl_free_bmtable_pixmap(FL_OBJECT *ob)
 
   /* dump the temporary pixmap */
   if (sp && sp->pix) { 
-    XFreePixmap(fl_display, sp->pix);
-    XFlush(fl_display);
+    XFreePixmap(fl_get_display(), sp->pix);
+    XFlush(fl_get_display());
     sp->pix = 0;
   }
 }
index 4caaed8059bb4a2b0ed262f78085932e8fb6d236..02e54b679439afaa60ca6a904e06f42d8a9a7da0 100644 (file)
@@ -84,6 +84,7 @@
 #include "support/syscall.h"
 #include "support/lyxlib.h"
 #include "support/FileInfo.h"
+#include "support/lyxmanip.h"
 #include "lyxtext.h"
 #include "gettext.h"
 #include "language.h"
@@ -1047,13 +1048,12 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par)
                        format = lex.GetFloat();
                        if (format > 1) {
                                if (LYX_FORMAT - format > 0.05) {
-                                       
-                                       printf(_("Warning: need lyxformat %.2f but found %.2f\n"),
-                                              LYX_FORMAT, format);
+                                       lyxerr << fmt(_("Warning: need lyxformat %.2f but found %.2f"),
+                                                     LYX_FORMAT, format) << endl;
                                }
                                if (format - LYX_FORMAT > 0.05) {
-                                       printf(_("ERROR: need lyxformat %.2f but found %.2f\n"),
-                                              LYX_FORMAT, format);
+                                       lyxerr << fmt(_("ERROR: need lyxformat %.2f but found %.2f"),
+                                                     LYX_FORMAT, format) << endl;
                                }
                                bool the_end = readLyXformat2(lex, par);
                                // Formats >= 2.13 support "\the_end" marker
@@ -1889,9 +1889,8 @@ void Buffer::makeLaTeXFile(string const & fname,
                                        encodings.insert((*it)->encoding()->LatexName());
 
                        ofs << "\\usepackage[";
-                       for (set<string>::const_iterator it = encodings.begin();
-                            it != encodings.end(); ++it)
-                               ofs << *it << ",";
+                       copy(encodings.begin(), encodings.end(),
+                            ostream_iterator<string>(ofs, ","));
                        ofs << doc_encoding << "]{inputenc}\n";
                        texrow.newline();
                } else if (params.inputenc != "default") {
@@ -2669,7 +2668,9 @@ void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par,
 void Buffer::push_tag(ostream & os, string const & tag,
                      int & pos, char stack[5][3])
 {
+#ifdef WITH_WARNINGS
 #warning Use a real stack! (Lgb)
+#endif
        // pop all previous tags
        for (int j = pos; j >= 0; --j)
                os << "</" << stack[j] << ">";
index 106ed852be78cc4766b5cd32415d1cc3d76460a4..95fbc22d4985fd980a0c3d23dc0cbfe61757cf86 100644 (file)
@@ -413,6 +413,13 @@ public:
        ///
        class inset_iterator {
        public:
+               typedef input_iterator_tag iterator_category;
+               typedef Inset value_type;
+               typedef ptrdiff_t difference_type;
+               typedef Inset * pointer;
+               typedef Inset & reference;
+               
+               
                ///
                inset_iterator() : par(0) /*, it(0)*/ {}
                //
@@ -423,7 +430,7 @@ public:
                inset_iterator(LyXParagraph * paragraph,
                               LyXParagraph::size_type pos);
                ///
-               inset_iterator & operator++() {
+               inset_iterator & operator++() { // prefix ++
                        if (par) {
                                ++it;
                                if (it == par->inset_iterator_end()) {
@@ -434,11 +441,24 @@ public:
                        return *this;
                }
                ///
-               Inset * operator*() {return *it; }
+               inset_iterator operator++(int) { // postfix ++
+                       inset_iterator tmp(par, it.getPos());
+                       if (par) {
+                               ++it;
+                               if (it == par->inset_iterator_end()) {
+                                       par = par->next;
+                                       SetParagraph();
+                               }
+                       }
+                       return tmp;
+               }
+               ///
+               Inset * operator*() { return *it; }
+               
                ///
                LyXParagraph * getPar() { return par; }
                ///
-               LyXParagraph::size_type getPos() {return it.getPos(); }
+               LyXParagraph::size_type getPos() const { return it.getPos(); }
                ///
                friend
                bool operator==(inset_iterator const & iter1,
index 92019c0de45440d00fe1f9a1069cf389eb9b81ae..08173d2c81ecc548923c4d69b6d3b38c8e184c7e 100644 (file)
 #include <config.h>
 
 #include <algorithm>
+#include <functional>
 
 #include "bufferlist.h"
 #include "lyx_main.h"
 #include "minibuffer.h"
 #include "support/FileInfo.h"
 #include "support/filetools.h"
+#include "support/lyxmanip.h"
+#include "support/lyxfunctional.h"
 #include "lyx_gui_misc.h"
 #include "lastfiles.h"
 #include "debug.h"
@@ -37,8 +40,6 @@
 #include "vc-backend.h"
 #include "TextCache.h"
 
-extern BufferView * current_view; // called too many times in this file...
-
 using std::vector;
 using std::find;
 using std::endl;
@@ -95,7 +96,7 @@ bool BufferList::QwriteAll()
 {
         bool askMoreConfirmation = false;
         string unsaved;
-       for(BufferStorage::iterator it = bstore.begin();
+       for (BufferStorage::iterator it = bstore.begin();
            it != bstore.end(); ++it) {
                if (!(*it)->isLyxClean()) {
                        string fname;
@@ -160,10 +161,7 @@ void BufferList::closeAll()
 
 void BufferList::resize()
 {
-       for(BufferStorage::iterator it = bstore.begin();
-           it != bstore.end(); ++it) {
-               (*it)->resize();
-       }
+       for_each(bstore.begin(), bstore.end(), mem_fun(&Buffer::resize));
 }
 
 
@@ -223,10 +221,8 @@ bool BufferList::close(Buffer * buf)
 vector<string> const BufferList::getFileNames() const
 {
        vector<string> nvec;
-       for(BufferStorage::const_iterator cit = bstore.begin();
-           cit != bstore.end(); ++cit) {
-               nvec.push_back((*cit)->fileName());
-       }
+       std::copy(bstore.begin(), bstore.end(),
+                 back_inserter_fun(nvec, &Buffer::fileName));
        return nvec;
 }
 
@@ -238,7 +234,7 @@ Buffer * BufferList::first()
 }
 
 
-Buffer * BufferList::getBuffer(int choice)
+Buffer * BufferList::getBuffer(unsigned int choice)
 {
        if (choice >= bstore.size()) return 0;
        return bstore[choice];
@@ -248,8 +244,8 @@ Buffer * BufferList::getBuffer(int choice)
 int BufferList::unlockInset(UpdatableInset * inset)
 {
        if (!inset) return 1;
-       for(BufferStorage::iterator it = bstore.begin();
-           it != bstore.end(); ++it) {
+       for (BufferStorage::iterator it = bstore.begin();
+            it != bstore.end(); ++it) {
                if ((*it)->getUser()
                    && (*it)->getUser()->theLockingInset() == inset) {
                        (*it)->getUser()->insetUnlock();
@@ -262,8 +258,8 @@ int BufferList::unlockInset(UpdatableInset * inset)
 
 void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 {
-       for(BufferStorage::iterator it = bstore.begin();
-           it != bstore.end(); ++it) {
+       for (BufferStorage::iterator it = bstore.begin();
+            it != bstore.end(); ++it) {
                if (!(*it)->isDepClean(mastertmpdir)) {
                        string writefile = mastertmpdir;
                        writefile += '/';
@@ -278,62 +274,109 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 
 void BufferList::emergencyWriteAll()
 {
-       for (BufferStorage::iterator it = bstore.begin();
-            it != bstore.end(); ++it) {
-               if (!(*it)->isLyxClean()) {
-                       bool madeit = false;
-                       
-                       lyxerr <<_("lyx: Attempting to save"
-                                  " document ");
-                       if ((*it)->isUnnamed())
-                           lyxerr << OnlyFilename((*it)->fileName());
-                       else
-                           lyxerr << (*it)->fileName();
-                       lyxerr << _(" as...") << endl;
-                       
-                       for (int i = 0; i < 3 && !madeit; ++i) {
-                               string s;
-                               
-                               // We try to save three places:
-                               // 1) Same place as document.
-                               // 2) In HOME directory.
-                               // 3) In "/tmp" directory.
-                               if (i == 0) {
-                                       if ((*it)->isUnnamed())
-                                               continue;
-                                       s = (*it)->fileName();
-                               } else if (i == 1) {
-                                       s = AddName(GetEnvPath("HOME"),
-                                                   (*it)->fileName());
-                               } else {
-                                       // MakeAbsPath to prepend the current
-                                       // drive letter on OS/2
-                                       s = AddName(MakeAbsPath("/tmp/"),
-                                                   (*it)->fileName());
-                               }
-                               s += ".emergency";
-                               
-                               lyxerr << "  " << i + 1 << ") " << s << endl;
-                               
-                               if ((*it)->writeFile(s, true)) {
-                                       (*it)->markLyxClean();
-                                       lyxerr << _("  Save seems successful. "
-                                                   "Phew.") << endl;
-                                       madeit = true;
-                               } else if (i != 2) {
-                                       lyxerr << _("  Save failed! Trying...")
-                                              << endl;
-                               } else {
-                                       lyxerr << _("  Save failed! Bummer. "
-                                                   "Document is lost.")
-                                              << endl;
-                               }
-                       }
+       for_each(bstore.begin(), bstore.end(),
+                class_fun(*this, &BufferList::emergencyWrite));
+}
+
+
+void BufferList::emergencyWrite(Buffer * buf) 
+{
+       // No need to save if the buffer has not changed.
+       if (buf->isLyxClean()) return;
+       
+       lyxerr << fmt(_("lyx: Attempting to save document %s as..."),
+                     buf->isUnnamed() ? OnlyFilename(buf->fileName()).c_str()
+                     : buf->fileName().c_str()) << endl;
+       
+       //if (buf->isUnnamed())
+       //      lyxerr << OnlyFilename(buf->fileName());
+       //else
+       //      lyxerr << buf->fileName();
+       //lyxerr << _(" as...") << endl;
+       
+       // Let's unroll this loop (Lgb)
+#if 0
+       bool madeit = false;
+       
+       for (int i = 0; i < 3 && !madeit; ++i) {
+               string s;
+               
+               // We try to save three places:
+               // 1) Same place as document.
+               // 2) In HOME directory.
+               // 3) In "/tmp" directory.
+               if (i == 0) {
+                       if (buf->isUnnamed())
+                               continue;
+                       s = buf->fileName();
+               } else if (i == 1) {
+                       s = AddName(GetEnvPath("HOME"), buf->fileName());
+               } else {
+                       // MakeAbsPath to prepend the current
+                       // drive letter on OS/2
+                       s = AddName(MakeAbsPath("/tmp/"), buf->fileName());
+               }
+               s += ".emergency";
+               
+               lyxerr << "  " << i + 1 << ") " << s << endl;
+               
+               if (buf->writeFile(s, true)) {
+                       buf->markLyxClean();
+                       lyxerr << _("  Save seems successful. Phew.") << endl;
+                       madeit = true;
+               } else if (i != 2) {
+                       lyxerr << _("  Save failed! Trying...") << endl;
+               } else {
+                       lyxerr << _("  Save failed! Bummer. Document is lost.")
+                              << endl;
                }
        }
+#else
+       // We try to save three places:
+
+       // 1) Same place as document. Unless it is an unnamed doc.
+       if (!buf->isUnnamed()) {
+               string s = buf->fileName();
+               s += ".emergency";
+               lyxerr << "  " << s << endl;
+               if (buf->writeFile(s, true)) {
+                       buf->markLyxClean();
+                       lyxerr << _("  Save seems successful. Phew.") << endl;
+                       return;
+               } else {
+                       lyxerr << _("  Save failed! Trying...") << endl;
+               }
+       }
+       
+       // 2) In HOME directory.
+       string s = AddName(GetEnvPath("HOME"), buf->fileName());
+       s += ".emergency";
+       lyxerr << " " << s << endl;
+       if (buf->writeFile(s, true)) {
+               buf->markLyxClean();
+               lyxerr << _("  Save seems successful. Phew.") << endl;
+               return;
+       }
+       
+       lyxerr << _("  Save failed! Trying...") << endl;
+       
+       // 3) In "/tmp" directory.
+       // MakeAbsPath to prepend the current
+       // drive letter on OS/2
+       s = AddName(MakeAbsPath("/tmp/"), buf->fileName());
+       s += ".emergency";
+       lyxerr << " " << s << endl;
+       if (buf->writeFile(s, true)) {
+               buf->markLyxClean();
+               lyxerr << _("  Save seems successful. Phew.") << endl;
+               return;
+       }
+       lyxerr << _("  Save failed! Bummer. Document is lost.") << endl;
+#endif
 }
 
 
+
 Buffer * BufferList::readFile(string const & s, bool ronly)
 {
        Buffer * b = bstore.newBuffer(s, ronly);
@@ -405,12 +448,8 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
 
 bool BufferList::exists(string const & s) const
 {
-       for (BufferStorage::const_iterator cit = bstore.begin();
-            cit != bstore.end(); ++cit) {
-               if ((*cit)->fileName() == s)
-                       return true;
-       }
-       return false;
+       return find_if(bstore.begin(), bstore.end(),
+                      compare_memfun(&Buffer::fileName, s)) != bstore.end();
 }
 
 
@@ -424,12 +463,10 @@ bool BufferList::isLoaded(Buffer const * b) const
 
 Buffer * BufferList::getBuffer(string const & s)
 {
-       for(BufferStorage::iterator it = bstore.begin();
-           it != bstore.end(); ++it) {
-               if ((*it)->fileName() == s)
-                       return (*it);
-       }
-       return 0;
+       BufferStorage::iterator it =
+               find_if(bstore.begin(), bstore.end(),
+                       compare_memfun(&Buffer::fileName, s));
+       return it != bstore.end() ? (*it) : 0;
 }
 
 
index f186b84e0b135267dfbc7ee9f1690bbebb62ed3d..0b4efadfae45bc043d75968d3b4b03c2dbdfc1bb 100644 (file)
@@ -120,7 +120,7 @@ public:
 
        ///
        void emergencyWriteAll();
-
+       
        /** Close buffer.
            @param buf the buffer that should be closed
            @return #false# if operation was canceled
@@ -139,7 +139,7 @@ public:
        /// returns a pointer to the buffer with the given name.
        Buffer * getBuffer(string const &);
        /// returns a pointer to the buffer with the given number.
-       Buffer * getBuffer(int);
+       Buffer * getBuffer(unsigned int);
 
 private:
        ///
@@ -147,6 +147,8 @@ private:
        
        ///
        list_state state_;
+       ///
+       void emergencyWrite(Buffer * buf);
 };
 
 #endif
index 2888c2a573970c4a55503476774273fa5ddabc25..80146c4483ff39ac64eb046f5cf7b227118e6429 100644 (file)
@@ -165,21 +165,21 @@ void ProhibitInput(BufferView * bv)
        static bool cursor_undefined = true;
    
        if (cursor_undefined){
-               cursor = XCreateFontCursor(fl_display, XC_watch);
-               XFlush(fl_display);
+               cursor = XCreateFontCursor(fl_get_display(), XC_watch);
+               XFlush(fl_get_display());
                cursor_undefined = false;
        }
    
        /* set the cursor to the watch for all forms and the canvas */ 
-       XDefineCursor(fl_display, bv->owner()->getForm()->window, 
+       XDefineCursor(fl_get_display(), bv->owner()->getForm()->window, 
                      cursor);
 
        if (fd_form_character->form_character->visible)
-               XDefineCursor(fl_display,
+               XDefineCursor(fl_get_display(),
                              fd_form_character->form_character->window,
                              cursor);
 
-       XFlush(fl_display);
+       XFlush(fl_get_display());
        fl_deactivate_all_forms();
 }
 
@@ -188,13 +188,13 @@ void AllowInput(BufferView * bv)
 {
        /* reset the cursor from the watch for all forms and the canvas */
    
-       XUndefineCursor(fl_display, bv->owner()->getForm()->window);
+       XUndefineCursor(fl_get_display(), bv->owner()->getForm()->window);
 
        if (fd_form_character->form_character->visible)
-               XUndefineCursor(fl_display,
+               XUndefineCursor(fl_get_display(),
                                fd_form_character->form_character->window);
 
-       XFlush(fl_display);
+       XFlush(fl_get_display());
        fl_activate_all_forms();
 }
 
index d44545c4f5fcd369f215c0369d640b3946514741..0720ec8219d835503ba36ebec8d0ff3fdd44f6a2 100644 (file)
@@ -48,7 +48,8 @@ extern "C" void C_Combox_input_cb(FL_OBJECT *ob, long);
 extern "C" void C_Combox_combo_cb(FL_OBJECT *ob, long data) ;
 extern "C" int C_Combox_peek_event(FL_FORM * form, void *xev);
 
-Combox::Combox(combox_type t): type(t)
+Combox::Combox(combox_type t)
+       : type(t)
 {
    browser = button = 0;
    callback = 0;
@@ -246,8 +247,8 @@ void Combox::Show()
        if (_pre) _pre();
        
        int tmp;
-       XGetInputFocus(fl_display, &save_window, &tmp); //BUG-Fix Dietmar
-       XFlush(fl_display);
+       XGetInputFocus(fl_get_display(), &save_window, &tmp); //BUG-Fix Dietmar
+       XFlush(fl_get_display());
        if (button && type != FL_COMBOX_NORMAL) {
                fl_set_object_label(button, "@2<-");          
                fl_redraw_object(button);
@@ -259,11 +260,11 @@ void Combox::Show()
                fl_set_browser_topline(browser, sel);
                fl_select_browser_line(browser, sel);
        }
-       XGrabPointer(fl_display, form->window, false,
+       XGrabPointer(fl_get_display(), form->window, false,
                     ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
                     GrabModeAsync, GrabModeAsync,
                     0, 0, 0);
-       XFlush(fl_display);
+       XFlush(fl_get_display());
 }
 
 void Combox::Hide(int who)
@@ -278,15 +279,15 @@ void Combox::Hide(int who)
                                            fl_get_browser_line(browser, sel));         
 //             if (callback) callback(sel, cb_arg);
        }
-        XUngrabPointer(fl_display, 0);
-       XFlush(fl_display);
+        XUngrabPointer(fl_get_display(), 0);
+       XFlush(fl_get_display());
        if (!who && browser && label && callback)
            callback(sel, cb_arg, this);
         if (form) {
                fl_hide_form(form);
-               XSetInputFocus(fl_display, save_window,
+               XSetInputFocus(fl_get_display(), save_window,
                               RevertToParent, CurrentTime); // BUG-FIX-Dietmar
-               XFlush(fl_display);
+               XFlush(fl_get_display());
         }
        if (button) {
                if (type != FL_COMBOX_NORMAL){
@@ -313,16 +314,18 @@ void Combox::deactivate()
        if (label) fl_deactivate_object(label);
 }
 
+
 void Combox::input_cb(FL_OBJECT * ob, long)
 {
        Combox * combo = static_cast<Combox*>(ob->u_vdata);
 
        char const * text = fl_get_input(ob);
 
-       combo->addto(text);
+       combo->addto(text ? text : string());
        combo->is_empty = false;
 }
 
+
 extern "C" void C_Combox_input_cb(FL_OBJECT * ob, long data)
 {
   Combox::input_cb(ob, data);
@@ -335,11 +338,11 @@ void Combox::combo_cb(FL_OBJECT * ob, long data)
        switch (data) {
        case 0:
        {  
-               int i = combo->get();
+               int const i = combo->get();
                switch (fl_get_button_numb(ob)) {
                case 2: 
                {
-                       combo->select(--i); 
+                       combo->select(i - 1); 
                        if (combo->callback)
                                combo->callback(combo->sel,
                                                combo->cb_arg, combo);
@@ -347,7 +350,7 @@ void Combox::combo_cb(FL_OBJECT * ob, long data)
                }
                case 3: 
                {
-                       combo->select(++i);  
+                       combo->select(i + 1);  
                        if (combo->callback)
                                combo->callback(combo->sel,
                                                combo->cb_arg, combo);
@@ -392,7 +395,7 @@ int Combox::peek_event(FL_FORM * form, void * xev)
        KeySym keysym_return;
        num_bytes = XLookupString(&static_cast<XEvent*>(xev)->xkey, s_r, 10, 
                                  &keysym_return, 0);
-       XFlush(fl_display);
+       XFlush(fl_get_display());
        switch (keysym_return) {
        case XK_Down:
                if (fl_get_browser(combo->browser) <
index 32a0aa334a9923dd0ed09e7c27237dcb403f40a8..b4f78df680adec285769c81fbde463e649fb0131 100644 (file)
@@ -69,10 +69,10 @@ public:
        void addto(string const &);
        
        /// Returns the selected item
-       int get();
+       int get() const;
    
        /// Returns a pointer to the selected line of text
-       string const getline();
+       string const getline() const;
    
        ///  Select an arbitrary item
        void select(int);
@@ -83,7 +83,7 @@ public:
        void clear();
 
        /// Is the combox cleared (empty)
-       bool empty() { return is_empty; }
+       bool empty() const { return is_empty; }
        
        /// Remove the objects from the form they are in. 
        void remove();
@@ -209,14 +209,14 @@ void Combox::setpost(FL_COMBO_PRE_POST cb)
 
 
 inline
-int Combox::get()
+int Combox::get() const
 {
    return sel;
 }
 
 
 inline
-string const Combox::getline()
+string const Combox::getline() const
 {
     if (type == FL_COMBOX_INPUT) 
       return fl_get_input(label);
index 19c8c8d2879707ea38931fda2065064fe7c36727..a6dc131acb8b4bc24f002cc721dd1655d6ed4848 100644 (file)
@@ -27,8 +27,8 @@ enum kb_action {
        LFUN_MENUWRITEAS,
        LFUN_MENUPRINT,
        LFUN_MENUSENDTO,
-        LFUN_BUILDPROG, // 10
-       LFUN_TOCVIEW,
+        LFUN_BUILDPROG,
+       LFUN_TOCVIEW, // 10
        LFUN_PREVIEW,
        LFUN_CLOSEBUFFER,
        LFUN_BUFFER_PRINT,              // ARRae 20000313
@@ -36,9 +36,9 @@ enum kb_action {
        LFUN_QUIT,
        LFUN_AUTOSAVE,
        LFUN_UNDO,
-       LFUN_REDO,     // 20
+       LFUN_REDO,
        LFUN_MENUSEARCH,
-       LFUN_PASTE,
+       LFUN_PASTE,     // 20
        LFUN_PASTESELECTION,
        LFUN_CUT,
        LFUN_COPY,
@@ -46,9 +46,9 @@ enum kb_action {
        LFUN_GOTONOTE,
        LFUN_OPENSTUFF,
        LFUN_HYPHENATION,
-       LFUN_HFILL,     // 30
+       LFUN_HFILL,
        LFUN_DEPTH,
-       LFUN_FREE,
+       LFUN_FREE,     // 30
        LFUN_TEX,
        LFUN_FOOTMELT, // schedule for deletion
        LFUN_MARGINMELT, // schedule for deletion
@@ -56,9 +56,9 @@ enum kb_action {
        LFUN_BOLD,
        LFUN_ROMAN,
        LFUN_NOUN,
-       LFUN_RIGHT,    // 40
+       LFUN_RIGHT,
        LFUN_LEFT,
-       LFUN_UP,
+       LFUN_UP,    // 40
        LFUN_DOWN,
        LFUN_PRIOR,
        LFUN_NEXT,
@@ -66,9 +66,9 @@ enum kb_action {
        LFUN_END,
        LFUN_TAB,
        LFUN_SHIFT_TAB, // Jug 20000522
-       LFUN_WORDRIGHT,   // 50
+       LFUN_WORDRIGHT,
        LFUN_WORDLEFT,
-       LFUN_BEGINNINGBUF,
+       LFUN_BEGINNINGBUF,   // 50
        LFUN_ENDBUF,
        LFUN_RIGHTSEL,
        LFUN_LEFTSEL,
@@ -76,9 +76,9 @@ enum kb_action {
        LFUN_DOWNSEL,
        LFUN_PRIORSEL,
        LFUN_NEXTSEL,
-       LFUN_HOMESEL, // 60
+       LFUN_HOMESEL,
        LFUN_ENDSEL,
-       LFUN_WORDRIGHTSEL,
+       LFUN_WORDRIGHTSEL, // 60
        LFUN_WORDLEFTSEL,
        LFUN_BEGINNINGBUFSEL,
        LFUN_ENDBUFSEL,
@@ -86,9 +86,9 @@ enum kb_action {
        LFUN_SETMARK,
        LFUN_DELETE,
        LFUN_BACKSPACE,
-       LFUN_BREAKLINE, // 70
+       LFUN_BREAKLINE,
        LFUN_BREAKPARAGRAPH,
-       LFUN_BREAKPARAGRAPHKEEPLAYOUT,
+       LFUN_BREAKPARAGRAPHKEEPLAYOUT, // 70
        LFUN_QUOTE,
        LFUN_CIRCUMFLEX,
        LFUN_GRAVE,
@@ -96,9 +96,9 @@ enum kb_action {
        LFUN_TILDE,
        LFUN_CEDILLA,
        LFUN_MACRON,
-       LFUN_UNDERBAR,  // 80
+       LFUN_UNDERBAR,
        LFUN_UNDERDOT,
-       LFUN_CIRCLE,
+       LFUN_CIRCLE,  // 80
        LFUN_TIE,
        LFUN_BREVE,
        LFUN_CARON,
@@ -106,9 +106,9 @@ enum kb_action {
        LFUN_HUNG_UMLAUT,
        LFUN_UMLAUT,
        LFUN_DOT,
-       LFUN_OGONEK,  // 90
+       LFUN_OGONEK,
        LFUN_VECTOR,        //  Alejandro 040696
-       LFUN_SELFINSERT,
+       LFUN_SELFINSERT,  // 90
        LFUN_GETBUFNAME,
        LFUN_GETXY,
        LFUN_SETXY,
@@ -116,9 +116,9 @@ enum kb_action {
        LFUN_LINEATCURSOR,
        LFUN_GETLAYOUT,
        LFUN_GETFONT,
-       LFUN_GETLATEX,  // 100
+       LFUN_GETLATEX,
        LFUN_GETNAME,
-       LFUN_NOTIFY,
+       LFUN_NOTIFY,  // 100
         LFUN_GOTOFILEROW,   // Edmar 12/23/98
        LFUN_INSERT_NOTE,
        LFUN_KMAP_OFF,
@@ -126,9 +126,9 @@ enum kb_action {
        LFUN_KMAP_SEC,
        LFUN_KMAP_TOGGLE,
        LFUN_INSERT_MATH,
-       LFUN_INSERT_MATRIX, // 110
+       LFUN_INSERT_MATRIX,
        LFUN_GREEK,
-       LFUN_MATH_LIMITS,  
+       LFUN_MATH_LIMITS, // 110  
        LFUN_GREEK_TOGGLE,
        LFUN_MATH_DELIM,    //  Alejandro 180696
        LFUN_MATH_DISPLAY,  // was INSERT_EQUATION  Alejandro 180696
@@ -136,9 +136,9 @@ enum kb_action {
        LFUN_MATH_NUMBER,   //  Alejandro 040696
        LFUN_MATH_NONUMBER,   //  Alejandro 180696
        LFUN_MATH_SIZE,   //  Alejandro 150896
-       LFUN_MATH_MACRO,  // 120 // ale970510
+       LFUN_MATH_MACRO, // ale970510
        LFUN_MATH_MACROARG,  // ale970510
-       LFUN_MATH_PANEL,
+       LFUN_MATH_PANEL, // 120
        LFUN_FIGURE,
        LFUN_MELT,
        LFUN_DELETE_WORD_FORWARD,
@@ -146,91 +146,91 @@ enum kb_action {
        LFUN_DELETE_LINE_FORWARD,
        LFUN_MARK_OFF,
        LFUN_MARK_ON,
-       LFUN_LAYOUT,  // 130
+       LFUN_LAYOUT,
        LFUN_LAYOUTNO,    // Lgb 97-06-10
-       LFUN_LAYOUT_CHARACTER,
+       LFUN_LAYOUT_CHARACTER,  // 130
        LFUN_LAYOUT_PARAGRAPH,
        LFUN_LAYOUT_DOCUMENT,
        LFUN_LAYOUT_PREAMBLE,
         LFUN_LAYOUT_SAVE_DEFAULT,
-       LFUN_DROP_LAYOUTS_CHOICE, // 140
+       LFUN_DROP_LAYOUTS_CHOICE,
        LFUN_CODE,
        LFUN_SANS,
        LFUN_DEFAULT,
        LFUN_UNDERLINE,
-       LFUN_FONT_SIZE,
+       LFUN_FONT_SIZE, // 140
        LFUN_FONT_STATE,
        LFUN_UPCASE_WORD,
        LFUN_LOWCASE_WORD,
        LFUN_CAPITALIZE_WORD,
-       LFUN_INSERT_LABEL,  // 150
+       LFUN_INSERT_LABEL,
        LFUN_REF_INSERT,
        LFUN_PUSH_TOOLBAR,
        LFUN_ADD_TO_TOOLBAR,
        LFUN_DEPTH_MIN,                // RVDK_PATCH_5
-       LFUN_DEPTH_PLUS,                     // RVDK_PATCH_5
+       LFUN_DEPTH_PLUS,  // 150             // RVDK_PATCH_5
        LFUN_MENU_OPEN_BY_NAME,              // RVDK_PATCH_5
        LFUN_SPELLCHECK,                     // RVDK_PATCH_5
        LFUN_CANCEL,                         // RVDK_PATCH_5
        LFUN_META_FAKE,                      // RVDK_PATCH_5
-       LFUN_EXEC_COMMAND,  // 160
+       LFUN_EXEC_COMMAND,
        LFUN_FILE_INSERT,
        LFUN_FILE_INSERT_ASCII,         // CFO-G 1997-11-19
        LFUN_FILE_NEW,
        LFUN_FILE_OPEN,
-       LFUN_UP_PARAGRAPH,              // Asger 1996-10-01
+       LFUN_UP_PARAGRAPH,  // 160     // Asger 1996-10-01
        LFUN_UP_PARAGRAPHSEL,           // Asger 1996-10-01
        LFUN_DOWN_PARAGRAPH,            // Asger 1996-10-01
        LFUN_DOWN_PARAGRAPHSEL,         // Asger 1996-10-01
        LFUN_BREAKPARAGRAPH_SKIP,
-       LFUN_BACKSPACE_SKIP, // 170
+       LFUN_BACKSPACE_SKIP,
        LFUN_DELETE_SKIP,
        LFUN_MENUNEWTMPLT,              // Asger 1997-02-02
        LFUN_MENURELOAD,                // Asger 1997-02-02
        LFUN_FAX,                       // Asger 1997-02-10
-       LFUN_RECONFIGURE,               // Asger 1997-02-14
+       LFUN_RECONFIGURE, // 170        // Asger 1997-02-14
        LFUN_CITATION_INSERT,           // AAS 97-02-23
        LFUN_INSERT_BIBTEX,             // AAS 97-02-23
        LFUN_INDEX_CREATE,              // Lgb 97-02-27
-       LFUN_INDEX_INSERT_LAST, // 180  // Reh 98-09-17
+       LFUN_INDEX_INSERT_LAST,   // Reh 98-09-17
        LFUN_INDEX_PRINT,               // Lgb 97-02-27
        LFUN_APROPOS,                   // Asger 1997-02-27
        LFUN_LATEX_LOG,                 // Lgb 97-04-05
        LFUN_LAYOUT_COPY,               // Asger 1997-05-04
        LFUN_LAYOUT_PASTE,              // Asger 1997-05-04
-       LFUN_TABINSERT,                 // Ale 970515
+       LFUN_TABINSERT, // 180          // Ale 970515
        LFUN_CHILDINSERT,               // Ale 970521
        LFUN_CHILDOPEN,                 // Ale 970528
        LFUN_TOC_INSERT,                // Lgb 97-05-27
-       LFUN_LOA_INSERT, // 190         // Bernhard 97-08-07
+       LFUN_LOA_INSERT,                // Bernhard 97-08-07
        LFUN_LOF_INSERT,                // Lgb 97-05-27
        LFUN_LOT_INSERT,                // Lgb 97-05-27
        LFUN_READ_ONLY_TOGGLE,          // Lgb 97-05-27    
        LFUN_BIBDB_ADD,                 // Ale 970530   
        LFUN_BIBDB_DEL,                 // Ale 970530
-       LFUN_BIBTEX_STYLE,              // Ale 970530
+       LFUN_BIBTEX_STYLE, // 190       // Ale 970530
        LFUN_GETTIP,                    // Ale 970603
        LFUN_VC_REGISTER,               // Lgb 97-07-01
        LFUN_VC_CHECKIN,                // Lgb 97-07-01
-       LFUN_VC_CHECKOUT, // 200        // Lgb 97-07-01
+       LFUN_VC_CHECKOUT,               // Lgb 97-07-01
        LFUN_VC_REVERT,                 // Lgb 97-07-01
        LFUN_VC_UNDO,                   // Lgb 97-07-01
        LFUN_VC_HISTORY,                // Lgb 97-07-01
        LFUN_EXPORT,                    // Lgb 97-07-29
        LFUN_INSERTFOOTNOTE,            // Bernhard 97-08-07
-       LFUN_REF_GOTO,                  // Ale 970806
+       LFUN_REF_GOTO, // 200           // Ale 970806
        LFUN_REF_BACK,                  // Ale 970806
        LFUN_PARENTINSERT,              // Ale 970813
-       LFUN_REMOVEERRORS, // 210       // Asger 970906
+       LFUN_REMOVEERRORS,              // Asger 970906
        LFUN_LDOTS,                     // Asger 970929
        LFUN_END_OF_SENTENCE,           // Asger 970929
        LFUN_RUNCHKTEX,                 // Asger 971030
        LFUN_TOGGLECURSORFOLLOW,        // ARRae 971202
        LFUN_HTMLURL,                   // CFO-G 971121
        LFUN_URL,                       // CFO-G 971121
-       LFUN_WORDFINDFORWARD,           // Etienne 980216
+       LFUN_WORDFINDFORWARD, // 210    // Etienne 980216
        LFUN_WORDFINDBACKWARD,          // Etienne 980220
-       LFUN_APPENDIX, // 220           // ettrich 980505
+       LFUN_APPENDIX,                  // ettrich 980505
        LFUN_IMPORT,                    // Asger 980724
        LFUN_MENU_SEPARATOR,            // Asger 990220
        LFUN_SEQUENCE,                  // Andre' 991111
@@ -238,27 +238,27 @@ enum kb_action {
        LFUN_SAVEPREFERENCES,           // Lgb 991127
        LFUN_HELP_COPYRIGHT,            // ARRae 20000129
        LFUN_HELP_CREDITS,              // ARRae 981017
-        LFUN_HELP_OPEN,                        // Jug 990627
+        LFUN_HELP_OPEN,        // 220          // Jug 990627
         LFUN_HELP_VERSION,             // Jug 990627
        LFUN_DATE_INSERT,               // jdblair 20000131
        LFUN_LANGUAGE,                  // Dekel 20000203
        LFUN_INSET_TEXT,                // Jug 20000214
        LFUN_INSET_ERT,                 // Jug 20000218
-       LFUN_INSET_GRAPHICS, // 230     // Lgb 20000226
+       LFUN_INSET_GRAPHICS,            // Lgb 20000226
        LFUN_INSET_FOOTNOTE,            // Jug 20000307
        LFUN_PARAGRAPH_SPACING,         // Lgb 20000411
        LFUN_INSET_TABULAR,             // Jug 20000412
-       LFUN_LOFVIEW,                   // Dekel 20000519       
+       LFUN_LOFVIEW, // 230            // Dekel 20000519       
        LFUN_LOTVIEW,                   // Dekel 20000519
        LFUN_LOAVIEW,                   // Dekel 20000519
        LFUN_SET_COLOR,                 // SLior 20000611
        LFUN_INSET_EXTERNAL,            // Alstrup 20000609
        LFUN_INSET_MARGINAL,            // Lgb 20000626
-       LFUN_INSET_MINIPAGE, // 240     // Lgb 20000627
+       LFUN_INSET_MINIPAGE,            // Lgb 20000627
        LFUN_INSET_FLOAT,               // Lgb 20000627
        LFUN_INSET_LIST,                // Lgb 20000627
        LFUN_INSET_THEOREM,             // Lgb 20000630
-       LFUN_CITATION_CREATE,           // Angus 20000705
+       LFUN_CITATION_CREATE, // 240    // Angus 20000705
        LFUN_INSET_CAPTION,             // Lgb 20000718
        LFUN_SWITCHBUFFER,  // and where is this comming from?
        LFUN_INSERT_URL,                // Angus 20000726
@@ -268,7 +268,7 @@ enum kb_action {
        LFUN_UPDATE,                    // Dekel 20000805
        LFUN_INDEX_INSERT,              // Angus 20000803
        LFUN_SCREEN_FONT_UPDATE,        // ARRae 20000813
-       LFUN_DIALOG_TABULAR_INSERT,     // Jug 20000825 (old table-insert)
+       LFUN_DIALOG_TABULAR_INSERT, // 250 // Jug 20000825 (old table-insert)
        LFUN_GOTO_PARAGRAPH,             // Dekel 20000826
        LFUN_LASTACTION  /* this marks the end of the table */
 };
index 46b6a39e36c59215e7660f4deedd2e3912081110..ff4bdc7c48b4af01ea8525293e0798bcfcabf113 100644 (file)
@@ -52,6 +52,14 @@ static error_item errorTags[] = {
 
 static const int numErrorTags = sizeof(errorTags)/sizeof(error_item);
 
+       
+Debug::type const Debug::ANY = Debug::type(
+       Debug::INFO | Debug::INIT | Debug::KEY | Debug::GUI |
+       Debug::PARSER | Debug::LYXRC | Debug::KBMAP | Debug::LATEX |
+       Debug::MATHED | Debug::FONT | Debug::TCLASS | Debug::LYXVC |
+       Debug::LYXSERVER | Debug::ROFF | Debug::ACTION | Debug::LYXLEX |
+       Debug::DEPEND | Debug::INSETS);
+
 
 Debug::type Debug::value(string const & val) 
 {
index 4df1f6e0a813e4a81ab100271a0984d9132dc6ec..2da53c16ba2346373cfc4b03dacb73ed51799fb6 100644 (file)
@@ -68,13 +68,16 @@ struct Debug {
                INSETS     = (1 << 17)
        };
        ///
-       static const type ANY = type(INFO | INIT | KEY | GUI |
-                                    PARSER | LYXRC | KBMAP | LATEX |
-                                    MATHED | FONT | TCLASS | LYXVC |
-                                    LYXSERVER | ROFF | ACTION | LYXLEX |
-                                    DEPEND | INSETS);
+//     static const type ANY = type(INFO | INIT | KEY | GUI |
+//                                  PARSER | LYXRC | KBMAP | LATEX |
+//                                  MATHED | FONT | TCLASS | LYXVC |
+//                                  LYXSERVER | ROFF | ACTION | LYXLEX |
+//                                  DEPEND | INSETS);
        ///
-       friend inline void operator|=(Debug::type & d1, Debug::type d2);
+       static type const ANY;
+
+       ///
+//     friend inline void operator|=(Debug::type & d1, Debug::type d2);
        
        /** A function to convert symbolic string names on debug levels
            to their numerical value.
@@ -94,7 +97,7 @@ struct Debug {
 
 
 inline
-void operator|= (Debug::type & d1, Debug::type d2)
+void operator|=(Debug::type & d1, Debug::type d2)
 {
        d1 = static_cast<Debug::type>(d1 | d2);
 }
index a906389e2e18f3e9f63c95427429711ec910ebc1..e2c4c37e7cd0e37be538b86a2b5da00563cc2453 100644 (file)
@@ -84,7 +84,7 @@ bool Exporter::Preview(Buffer * buffer, string const & format0)
 
 bool Exporter::IsExportable(Buffer const * buffer, string const & format)
 {
-#warning This is not efficient (Dekel)
+       // This is not efficient (Dekel)
        vector<pair<string, string> > const v = GetExportableFormats(buffer);
        for (vector<pair<string, string> >::const_iterator it = v.begin();
             it != v.end(); ++it) {
@@ -96,6 +96,7 @@ bool Exporter::IsExportable(Buffer const * buffer, string const & format)
        return false;
 }
 
+
 vector<pair<string, string> > const
 Exporter::GetExportableFormats(Buffer const * buffer)
 {
index a66b9ebafd55f2cddc0ddaa02ce7044cc5a7208b..0ae9286b2bde5001029ae940b1ebb1bdc6cfa03d 100644 (file)
@@ -109,13 +109,14 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
                XChar2b * xs = new XChar2b[n];
                Encoding const * encoding = f.language()->encoding();
-               LyXFont const * font = &f; 
+               //LyXFont const * font = &f;
+               LyXFont font(f);
                if (f.family() == LyXFont::SYMBOL_FAMILY) {
 #ifdef USE_UNICODE_FOR_SYMBOLS
-                       LyXFont font2 = f;
-                       font2.setFamily(LyXFont::ROMAN_FAMILY);
-                       font2.setShape(LyXFont::UP_SHAPE);
-                       font = &font2;
+                       //LyXFont font2 = f;
+                       font.setFamily(LyXFont::ROMAN_FAMILY);
+                       font.setShape(LyXFont::UP_SHAPE);
+                       //font = &font2;
 #endif
                        encoding = encodings.symbol_encoding();
                }
@@ -124,7 +125,7 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
                        xs[i].byte1 = c >> 8;
                        xs[i].byte2 = c & 0xff;
                 }
-               int result = width(xs, n, *font);
+               int result = width(xs, n, font);
                delete[] xs;
                return result;
        }
index 8a52b4e9bef4dc2c7ec6ef844f3f2da3ce3a4c57..c3a0ab4b62bc911870754cd651c0e23c1d8d91ac 100644 (file)
@@ -115,7 +115,7 @@ void FormCitation::update()
        bool bibPresent = ( bibkeys.size() > 0 );
        setSize( size, bibPresent );
 
-       fl_set_input( dialog_->textAftr, params.getOptions().c_str() );
+       fl_set_input( dialog_->textAftr, params.getOptions().c_str());
 }
 
 
@@ -125,7 +125,7 @@ void FormCitation::updateBrowser( FL_OBJECT * browser,
        fl_clear_browser( browser );
 
        for( unsigned int i = 0; i < keys.size(); ++i )
-               fl_add_browser_line( browser, keys[i].c_str() );
+               fl_add_browser_line( browser, keys[i].c_str());
 }
 
 
@@ -305,7 +305,7 @@ bool FormCitation::input( FL_OBJECT *, long data )
                // the selected bibBrsr key
                fl_clear_browser( dialog_->infoBrsr );
                fl_add_browser_line( dialog_->infoBrsr,
-                                    bibkeysInfo[sel-1].c_str() );
+                                    bibkeysInfo[sel - 1].c_str() );
 
                // Highlight the selected bibBrsr key in citeBrsr if present
                vector<string>::iterator it =
index c7e32b1ae68f361aabe5ace68b05ecb42c04a24b..4d3ee7412d708599c3bddc29196fcd9d6b22f4ab 100644 (file)
@@ -146,7 +146,7 @@ void FormDocument::build()
     for (LyXTextClassList::const_iterator cit = textclasslist.begin();
         cit != textclasslist.end(); ++cit)
     {
-       combo_doc_class->addto((*cit).description().c_str());
+       combo_doc_class->addto((*cit).description());
     }
 #else
     fl_clear_choice(class_->choice_doc_class);
@@ -207,7 +207,7 @@ void FormDocument::build()
 #endif
     for(Languages::const_iterator cit = languages.begin();
        cit != languages.end(); ++cit) {
-       combo_language->addto((*cit).second.lang().c_str());
+       combo_language->addto((*cit).second.lang());
     }
 
     fl_addto_choice(language_->choice_quotes_language,
@@ -391,9 +391,9 @@ bool FormDocument::class_apply()
        params.pagestyle = fl_get_choice_text(class_->choice_doc_pagestyle);
 
 #ifdef USE_CLASS_COMBO   
-       unsigned int new_class = combo_doc_class->get() - 1;
+       unsigned int const new_class = combo_doc_class->get() - 1;
 #else
-       unsigned int new_class = fl_get_choice(class_->choice_doc_class) - 1;
+       unsigned int const new_class = fl_get_choice(class_->choice_doc_class) - 1;
 #endif
        if (params.textclass != new_class) {
                // try to load new_class
@@ -621,7 +621,7 @@ void FormDocument::class_update(BufferParams const & params)
 
 #ifdef USE_CLASS_COMBO
     combo_doc_class->select_text(
-       textclasslist.DescOfClass(params.textclass).c_str());
+       textclasslist.DescOfClass(params.textclass));
 #else  
     fl_set_choice_text(class_->choice_doc_class, 
                       textclasslist.DescOfClass(params.textclass).c_str());
@@ -712,7 +712,7 @@ void FormDocument::language_update(BufferParams const & params)
     if (!language_)
         return;
 
-    combo_language->select_text(params.language->lang().c_str());
+    combo_language->select_text(params.language->lang());
     fl_set_choice_text(language_->choice_inputenc, params.inputenc.c_str());
     fl_set_choice(language_->choice_quotes_language, params.quotes_language + 1);
     fl_set_button(language_->radio_single, 0);
@@ -1024,7 +1024,7 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb)
        }
        new_panel += ".xpm";
        fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
-                                  LibFileSearch("images", new_panel.c_str()).c_str());
+                                  LibFileSearch("images", new_panel).c_str());
        fl_redraw_object(bullets_->bmtable_bullet_panel);
        fl_unfreeze_form(bullets_->form);
     }
@@ -1055,15 +1055,13 @@ void FormDocument::CheckChoiceClass(FL_OBJECT * ob, long)
        ob = class_->choice_doc_class;
 
     ProhibitInput(lv_->view());
-    int tc;
-    string tct;
 
 #ifdef USE_CLASS_COMBO
-    tc = combo_doc_class->get() - 1;
-    tct = combo_doc_class->getline();
+    int tc = combo_doc_class->get() - 1;
+    string tct = combo_doc_class->getline();
 #else
-    tc = fl_get_choice(ob) - 1;
-    tct = fl_get_choice_text(ob);
+    int tc = fl_get_choice(ob) - 1;
+    string tct = fl_get_choice_text(ob);
 #endif
     if (textclasslist.Load(tc)) {
        if (AskQuestion(_("Should I set some parameters to"), tct,
index 4c34b0ea535a9583935b0d92b22fd0126f4add64..e76c5d923a01116d51e3f898191d112ddc0a6f2a 100644 (file)
@@ -424,10 +424,10 @@ string FormGraphics::browseFile(string const & filename)
 void FormGraphics::browse()
 {
        // Get the filename from the dialog
-       string filename = fl_get_input(dialog_->input_filename);
+       string const filename = fl_get_input(dialog_->input_filename);
 
        // Show the file browser dialog
-       string new_filename = browseFile(filename);
+       string const new_filename = browseFile(filename);
 
        // Save the filename to the dialog
        if (new_filename != filename && ! new_filename.empty()) {
index b1597edcfebaa44ce919f7f8149763e39a606b7c..1adfec0e3f2bf1e870c54ee2bb0c851d335870dc 100644 (file)
@@ -364,12 +364,12 @@ void FormParagraph::general_update()
     case VSpace::LENGTH:
        fl_set_choice (general_->choice_space_above, 7);
 #ifndef NEW_INSETS
-       fl_set_input  (general_->input_space_above, 
-                      text->cursor.par()->FirstPhysicalPar()->
-                      added_space_top.length().asString().c_str());
+       fl_set_input(general_->input_space_above, 
+                    text->cursor.par()->FirstPhysicalPar()->
+                    added_space_top.length().asString().c_str());
 #else
-       fl_set_input  (general_->input_space_above, text->cursor.par()->
-                      added_space_top.length().asString().c_str());
+       fl_set_input(general_->input_space_above, text->cursor.par()->
+                    added_space_top.length().asString().c_str());
 #endif
        break;
     }
@@ -407,9 +407,9 @@ void FormParagraph::general_update()
     case VSpace::LENGTH:
        fl_set_choice (general_->choice_space_below, 7);
 #ifndef NEW_INSETS
-       fl_set_input  (general_->input_space_below, 
-                      text->cursor.par()->FirstPhysicalPar()->
-                      added_space_bottom.length().asString().c_str());
+       fl_set_input(general_->input_space_below, 
+                    text->cursor.par()->FirstPhysicalPar()->
+                    added_space_bottom.length().asString().c_str());
        break;
     }
     fl_set_button(general_->check_space_below,
@@ -703,7 +703,7 @@ bool FormParagraph::input(FL_OBJECT * ob, long)
        fl_set_object_lcol(extra_->input_pextra_width, FL_INACTIVE);
        fl_activate_object(extra_->input_pextra_widthp);
        fl_set_object_lcol(extra_->input_pextra_widthp, FL_BLACK);
-       if ((atoi(s2.c_str()) < 0 ) || (atoi(s2.c_str()) > 100)) {
+       if ((lyx::atoi(s2) < 0 ) || (lyx::atoi(s2) > 100)) {
            ret = false;
            fl_set_object_label(dialog_->text_warning,
                        _("Warning: Invalid percent value (0-100)"));
index 1955069e781bdb2a7cb143029a5d2b6be5d84f61..1fb78230bd5e1c21ca278b73d045290675fc24e5 100644 (file)
@@ -14,7 +14,6 @@
 #include <config.h>
 
 #include <algorithm>
-//#include <cctype>
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 #include "debug.h"
@@ -37,16 +36,16 @@ extern kb_keymap * toplevel_keymap;
 extern LyXAction lyxaction;
 
 // Some constants
-const int MENU_LABEL_SIZE = FL_NORMAL_SIZE;
-const int mheight = 30;
-const int mbheight= 22;
+static const int MENU_LABEL_SIZE = FL_NORMAL_SIZE;
+static const int mheight = 30;
+static const int mbheight= 22;
 // where to place the menubar?
-const int yloc = (mheight - mbheight)/2; //air + bw;
-const int mbadd = 20; // menu button add (to width)
+static const int yloc = (mheight - mbheight)/2; //air + bw;
+static const int mbadd = 20; // menu button add (to width)
 // Some space between buttons on the menubar 
-const int air = 2;
-char const * menu_tabstop = "aa";
-char const * default_tabstop = "aaaaaaaa";
+static const int air = 2;
+static char const * menu_tabstop = "aa";
+static char const * default_tabstop = "aaaaaaaa";
 
 //Defined later, used in makeMenubar().
 extern "C"
@@ -186,7 +185,7 @@ 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) + "...";
+               return str.substr(0, max_item_length - 3) + "...";
        else
                return str;
 }
@@ -303,11 +302,11 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label,
                                fl_addtopup(menu2, label.c_str());
                        }
                        if (j == max_nonempty) {
-                               string label = _(MenuNames[j-1]);
+                               string label = _(MenuNames[j - 1]);
                                label += "%l";
                                fl_addtopup(menu, label.c_str(), menu2);
                        } else
-                               fl_addtopup(menu, _(MenuNames[j-1]), menu2);
+                               fl_addtopup(menu, _(MenuNames[j - 1]), menu2);
                }
 
        // Handle normal TOC
@@ -569,7 +568,8 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view,
                        string shortcut = item.shortcut();
                        if (!shortcut.empty()) {
                                shortcut += lowercase(shortcut[0]);
-                               fl_addtopup(menu, (label + "%h").c_str(),
+                               label += "%h";
+                               fl_addtopup(menu, label.c_str(),
                                            submenu, shortcut.c_str());
                        }
                        else {
index 4492fafb75f238fdaa7d867cf6fc3b149e5a5171..b13eea114ec8e6f182d6d692aa5175d11c726c4d 100644 (file)
@@ -220,15 +220,16 @@ void Toolbar::Pimpl::updateLayoutList(bool force)
                for (LyXTextClass::const_iterator cit = tc.begin();
                     cit != end; ++cit) {
                        if ((*cit).obsoleted_by().empty())
-                               combox->addline(_((*cit).name().c_str()));
+                               combox->addline(_((*cit).name()));
                        else
-                               combox->addline(("@N" + string(_((*cit).name().c_str()))).c_str());
+                               combox->addline("@N" + _((*cit).name()));
                }
        }
        // we need to do this.
        combox->Redraw();
 }
 
+
 void Toolbar::Pimpl::clearLayoutList()
 {
        if (combox) {
@@ -237,12 +238,14 @@ void Toolbar::Pimpl::clearLayoutList()
        }
 }
 
+
 void Toolbar::Pimpl::openLayoutList()
 {
        if (combox)
                combox->Show();
 }
 
+
 static
 void ToolbarCB(FL_OBJECT * ob, long ac)
 {
@@ -260,6 +263,7 @@ extern "C" void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data)
        ToolbarCB(ob, data);
 }
 
+
 #if 0
 // What are we supposed to do with that??
 int Toolbar::get_toolbar_func(string const & func)
diff --git a/src/gettext.C b/src/gettext.C
new file mode 100644 (file)
index 0000000..1bed23d
--- /dev/null
@@ -0,0 +1,22 @@
+#include <config.h>
+
+#include "LString.h"
+#include "gettext.h"
+
+
+char const * _(char const * str)
+{
+       return gettext(str);
+}
+
+
+string const _(string const & str) 
+{
+       int const s = str.length();
+       char * tmp = new char[s + 1];
+       str.copy(tmp, s);
+       tmp[s] = '\0';
+       string ret(_(tmp));
+       delete [] tmp;
+       return ret;
+}
index a8908d1a2ee535f7cedc043fb2739ecc05e1de7a..a60e5c52f9e345e2d716ddee34cac5b05ded6d9e 100644 (file)
@@ -32,6 +32,8 @@
 
 #ifdef ENABLE_NLS
 
+#include "LString.h"
+
 #  if HAVE_GETTEXT
 #    include <libintl.h>      // use the header already in the system *EK*
 #    ifdef HAVE_LOCALE_H
 #    include "../intl/libintl.h"
 #  endif
 
-#  define _(str) gettext(str)
+char const * _(char const *);
+
+string const _(string const &);
+
+//#  define _(str) gettext(str)
 #  define N_(str) (str)              // for detecting static strings
 
 #  ifdef HAVE_LC_MESSAGES
@@ -56,6 +62,8 @@
 ///
 #  define _(str) (str)
 ///
+#  define S_(str) (str)
+///
 #  define N_(str) (str)
 ///
 #  define locale_init()
index 293cf2f9adea2cd204b3a457e2c050069efe1eb4..dddc50da9121fbec012782c492585209ffde6df8 100644 (file)
@@ -41,7 +41,7 @@ GraphicsCacheItem_pimpl::GraphicsCacheItem_pimpl()
 GraphicsCacheItem_pimpl::~GraphicsCacheItem_pimpl()
 {
        if (imageStatus_ == GraphicsCacheItem::Loaded) {
-               XFreePixmap(fl_display, pixmap_);
+               XFreePixmap(fl_get_display(), pixmap_);
        }
 
        delete renderer;
index bd56495a2c242f5134b50a883d26aeb461d4b465..dcaa821944461659475d40134f096dd1169f5b93 100644 (file)
@@ -99,5 +99,5 @@ string const & Renderer::getFilename() const
 void Renderer::freePixmap()
 {
        if (pixmapLoaded_)
-               XFreePixmap(fl_display, pixmap_);
+               XFreePixmap(fl_get_display(), pixmap_);
 }
index 93284b6644bd68608b07a61ae55128f5e23122b5..87075eabc67d0e51e0e30de3bc501ca94b918ee9 100644 (file)
@@ -44,7 +44,7 @@ bool XPM_Renderer::renderImage()
 
 //(BE 2000-08-05)
 #warning This might be a dirty thing, but I dont know any other solution.
-       Screen * screen = DefaultScreenOfDisplay(display);
+       Screen * screen = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(display);
 
        int status = XpmReadFileToPixmap(
                        display, 
index 490a520fad862ed4b20322ec12832ae1efa65d58..297a4de03e88814d2880895b86e37c2bb24d9b5f 100644 (file)
@@ -74,6 +74,7 @@ using std::find;
 using std::flush;
 using std::endl;
 using std::ostringstream;
+using std::copy;
 
 extern BufferView * current_view;
 extern FL_OBJECT * figinset_canvas;
@@ -113,14 +114,14 @@ static
 GC createGC()
 {
        XGCValues val;
-       val.foreground = BlackPixel(fl_display
-                                   DefaultScreen(fl_display));
+       val.foreground = BlackPixel(fl_get_display()
+                                   DefaultScreen(fl_get_display()));
        
        val.function=GXcopy;
        val.graphics_exposures = false;
        val.line_style = LineSolid;
        val.line_width = 0;
-       return XCreateGC(fl_display, RootWindow(fl_display, 0), 
+       return XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0), 
                         GCForeground | GCFunction | GCGraphicsExposures
                         | GCLineWidth | GCLineStyle , &val);
 }
@@ -137,10 +138,8 @@ void addpidwait(int pid)
 
        if (lyxerr.debugging()) {
                lyxerr << "Pids to wait for: \n";
-               for (list<int>::const_iterator cit = pidwaitlist.begin();
-                    cit != pidwaitlist.end(); ++cit) {
-                       lyxerr << (*cit) << '\n';
-               }
+               copy(pidwaitlist.begin(), pidwaitlist.end(),
+                    ostream_iterator<int>(lyxerr, "\n"));
                lyxerr << flush;
        }
 }
@@ -200,11 +199,11 @@ int GhostscriptMsg(FL_OBJECT *, Window, int, int,
                                Display * tmpdisp;
                                GC gc = local_gc_copy;
 
-                               XGetWindowAttributes(fl_display,
+                               XGetWindowAttributes(fl_get_display(),
                                                     fl_get_canvas_id(
                                                             figinset_canvas),
                                                     &wa);
-                               XFlush(fl_display);
+                               XFlush(fl_get_display());
                                if (lyxerr.debugging()) {
                                        lyxerr << "Starting image translation "
                                               << p->bitmap << " "
@@ -219,7 +218,7 @@ int GhostscriptMsg(FL_OBJECT *, Window, int, int,
                                        lyxerr.debug()
                                                << "Cannot fork, using slow "
                                                "method for pixmap translation." << endl;
-                                       tmpdisp = fl_display;
+                                       tmpdisp = fl_get_display();
                                } else if (forkstat > 0) { // parent
                                        // register child
                                        if (lyxerr.debugging()) {
@@ -318,9 +317,9 @@ void AllocColors(int num)
                xcol.green = short(65535 * ((i / num) % num) / (num - 1));
                xcol.blue = short(65535 * (i % num) / (num - 1));
                xcol.flags = DoRed | DoGreen | DoBlue;
-               if (!XAllocColor(fl_display,
+               if (!XAllocColor(fl_get_display(),
                                 fl_state[fl_get_vclass()].colormap, &xcol)) {
-                       if (i) XFreeColors(fl_display,
+                       if (i) XFreeColors(fl_get_display(),
                                           fl_state[fl_get_vclass()].colormap,
                                           gs_pixels, i, 0);
                        if(lyxerr.debugging()) {
@@ -356,9 +355,9 @@ void AllocGrays(int num)
        for (int i = 0; i < num; ++i) {
                xcol.red = xcol.green = xcol.blue = short(65535 * i / (num - 1));
                xcol.flags = DoRed | DoGreen | DoBlue;
-               if (!XAllocColor(fl_display,
+               if (!XAllocColor(fl_get_display(),
                                 fl_state[fl_get_vclass()].colormap, &xcol)) {
-                       if (i) XFreeColors(fl_display,
+                       if (i) XFreeColors(fl_get_display(),
                                           fl_state[fl_get_vclass()].colormap,
                                           gs_pixels, i, 0);
                        if (lyxerr.debugging()) {
@@ -391,8 +390,8 @@ void InitFigures()
 
                local_gc_copy = createGC();
 
-               Visual * vi = DefaultVisual(fl_display,
-                                           DefaultScreen(fl_display));
+               Visual * vi = DefaultVisual(fl_get_display(),
+                                           DefaultScreen(fl_get_display()));
                if (lyxerr.debugging()) {
                        printf("Visual ID: %ld, class: %d, bprgb: %d, mapsz: %d\n", 
                               vi->visualid, vi->c_class, 
@@ -445,7 +444,7 @@ void freefigdata(figdata * tmpdata)
                kill_gs(pid, SIGKILL);
        }
 
-       if (tmpdata->bitmap) XFreePixmap(fl_display, tmpdata->bitmap);
+       if (tmpdata->bitmap) XFreePixmap(fl_get_display(), tmpdata->bitmap);
        bitmaps.erase(find(bitmaps.begin(), bitmaps.end(), tmpdata));
        delete tmpdata;
 }
@@ -732,12 +731,12 @@ figdata * getfigdata(int wid, int hgh, string const & fname,
        p->flags = flags;
        bitmaps.push_back(p);
        XWindowAttributes wa;
-       XGetWindowAttributes(fl_display, fl_get_canvas_id(
+       XGetWindowAttributes(fl_get_display(), fl_get_canvas_id(
                figinset_canvas), &wa);
 
        if (lyxerr.debugging()) {
-               lyxerr << "Create pixmap disp:" << fl_display
-                      << " scr:" << DefaultScreen(fl_display)
+               lyxerr << "Create pixmap disp:" << fl_get_display()
+                      << " scr:" << DefaultScreen(fl_get_display())
                       << " w:" << wid
                       << " h:" << hgh
                       << " depth:" << wa.depth << endl;
@@ -748,7 +747,7 @@ figdata * getfigdata(int wid, int hgh, string const & fname,
        p->broken = false;
        p->gspid = -1;
        if (flags) {
-               p->bitmap = XCreatePixmap(fl_display, fl_get_canvas_id(
+               p->bitmap = XCreatePixmap(fl_get_display(), fl_get_canvas_id(
                        figinset_canvas), wid, hgh, wa.depth);
                p->gsdone = false;
                // initialize reading of .eps file with correct sizes and stuff
@@ -995,7 +994,7 @@ void InsetFig::draw(BufferView * bv, LyXFont const & f,
                                       wid + 1, hgh + 1);
                
        } else {
-               char * msg = 0;
+               char const * msg = 0;
                string lfname = fname;
                if (!fname.empty() && GetExtension(fname).empty())
                    lfname += ".eps";
index ad95586f74a4216e6324cf466a5dd19e9d0d4355..1d0590da69effe6453f1a481810c55821b6b680a 100644 (file)
@@ -137,7 +137,6 @@ void InsetExternal::browseCB(FL_OBJECT * ob, long)
 
        bool error = false;
        do {
-               //      ProhibitInput(current_view);
                if (once) {
                        p = fileDlg.Select(_("External inset file"),
                                           current_path,
@@ -146,7 +145,6 @@ void InsetExternal::browseCB(FL_OBJECT * ob, long)
                        p = fileDlg.Select(_("External inset file"), buf,
                                           regexp, string());
                }
-               //      AllowInput(current_view);
 
                if (p.empty()) return;
 
index 2f9fcf9ca02a62954b0342ab658b6a609ef899a0..37ed5dec7b6f7e5d0c94126d551dbdca3f447d03 100644 (file)
@@ -112,7 +112,7 @@ void InsetText::init(InsetText const * ins)
 
 InsetText::~InsetText()
 {
-    for(Cache::const_iterator cit=cache.begin(); cit != cache.end(); ++cit)
+    for(Cache::const_iterator cit = cache.begin(); cit != cache.end(); ++cit)
        delete (*cit).second;
 //     deleteLyXText((*cit).first);
     LyXParagraph * p = par->next;
index 0f33480ee6a6db0af4ee3610db7a0c6b5181e405..c25e33b5a0133c759900cec153305736d877c979 100644 (file)
@@ -135,7 +135,7 @@ void Intl::KeyMapPrim()
        fl_set_button(fd_form_keymap->KeyOnBtn2, 0);
 
        /* read text from choice */
-       int i = Language->get();
+       int const i = Language->get();
 
        string p;
        if (i == otherkeymap)
@@ -166,7 +166,7 @@ void Intl::KeyMapSec()
        fl_set_button(fd_form_keymap->KeyOnBtn2, 1);
 
        /* read text from choice */
-       int i = Language2->get();
+       int const i = Language2->get();
 
        string p;
        if (i == otherkeymap)
@@ -291,7 +291,7 @@ void Intl::InitKeyMapper(bool on)
        Language2->addto(_("other..."));
        otherkeymap = n + 1;
        if (!Language->select_text(prim_lang)) {
-               Language->select(n+1);
+               Language->select(n + 1);
                fl_set_input(fd_form_keymap->OtherKeymap, prim_lang.c_str());
        }
        else 
index 1d76704a9169994fde54fed9d4ca4ea785694e63..bbdc5e5d7798e336756bb02688fd03afee48b606 100644 (file)
@@ -232,7 +232,7 @@ kb_keymap::~kb_keymap()
 {
        // This could be done by a destructor in kb_key.
        Table::iterator end = table.end();
-       for(Table::iterator it = table.begin(); it != end; ++it) {
+       for (Table::iterator it = table.begin(); it != end; ++it) {
                delete (*it).table;
        }
 }
@@ -253,7 +253,7 @@ string const kb_keymap::findbinding(int act) const
        if (table.empty()) return res;
 
        Table::const_iterator end = table.end();
-       for(Table::const_iterator cit = table.begin();
+       for (Table::const_iterator cit = table.begin();
            cit != end; ++cit) {
                if ((*cit).table) {
                        string suffix = (*cit).table->findbinding(act);
@@ -265,7 +265,9 @@ string const kb_keymap::findbinding(int act) const
                                        + suffix + "] ";
                        }
                } else if ((*cit).action == act) {
-                       res += "[" + keyname((*cit)) + "] ";
+                       res += "[";
+                       res += keyname((*cit));
+                       res += "] ";
                }
        }
        return res;
index 1cbb0501c209d766cc4f640f48ed986ce4b9f12f..4fd40f1107958343bae5326f750c61e2b8437445 100644 (file)
@@ -24,6 +24,7 @@
 #include "debug.h"
 #include "gettext.h"
 #include "support/LAssert.h"
+#include "support/lyxfunctional.h"
 
 using std::pair;
 using std::make_pair;
@@ -1142,49 +1143,43 @@ void LyXTextClass::readClassOptions(LyXLex & lexrc)
 
 bool LyXTextClass::hasLayout(string const & name) const
 {
-       for (LayoutList::const_iterator cit = layoutlist.begin();
-            cit != layoutlist.end(); ++cit) {
-               if ((*cit).name() == name)
-                       return true;
-       }
-       return false;
+       return find_if(layoutlist.begin(), layoutlist.end(),
+                      compare_memfun(&LyXLayout::name, name))
+               != layoutlist.end();
 }
 
 
 LyXLayout const & LyXTextClass::GetLayout (string const & name) const
 {
-       for (LayoutList::const_iterator cit = layoutlist.begin();
-            cit != layoutlist.end(); ++cit) {
-               if ((*cit).name() == name)
-                       return (*cit);
-       }
-       Assert(false); // we actually require the name to exist.
-       return layoutlist.front();
+       LayoutList::const_iterator cit =
+               find_if(layoutlist.begin(),
+                       layoutlist.end(),
+                       compare_memfun(&LyXLayout::name, name));
+       Assert(cit != layoutlist.end()); // we require the name to exist
+       return (*cit);
 }
 
 
 LyXLayout & LyXTextClass::GetLayout(string const & name)
 {
-       for (LayoutList::iterator it = layoutlist.begin();
-            it != layoutlist.end(); ++it) {
-               if ((*it).name() == name)
-                       return (*it);
-       }
-       Assert(false); // we actually require the name to exist.
-       return layoutlist.front();
+       LayoutList::iterator it =
+               find_if(layoutlist.begin(),
+                       layoutlist.end(),
+                       compare_memfun(&LyXLayout::name, name));
+       Assert(it != layoutlist.end()); // we require the name to exist
+       return (*it);
 }
 
 
-bool LyXTextClass::delete_layout (string const & name)
+bool LyXTextClass::delete_layout(string const & name)
 {
-       for(LayoutList::iterator it = layoutlist.begin();
-           it != layoutlist.end(); ++it) {
-               if ((*it).name() == name) {
-                       layoutlist.erase(it);
-                       return true;
-               }
-       }
-       return false;
+       LayoutList::iterator it =
+               remove_if(layoutlist.begin(), layoutlist.end(),
+                         compare_memfun(&LyXLayout::name, name));
+       LayoutList::iterator end = layoutlist.end();
+       bool const ret = (it != end);
+       layoutlist.erase(it, end);
+       return ret;
 }
 
 
@@ -1194,7 +1189,7 @@ void LyXTextClass::load()
        if (loaded) return;
 
        // Read style-file
-       string real_file = LibFileSearch("layouts", name_, "layout");
+       string const real_file = LibFileSearch("layouts", name_, "layout");
 
        if (Read(real_file)) {
                lyxerr << "Error reading `"
@@ -1213,13 +1208,12 @@ void LyXTextClass::load()
 pair<bool, LyXTextClassList::size_type> const
 LyXTextClassList::NumberOfClass(string const & textclass) const
 {
-       for (ClassList::const_iterator cit = classlist.begin();
-            cit != classlist.end(); ++cit) {
-               if ((*cit).name() == textclass)
-                       return make_pair(true,
-                                        size_type(cit - classlist.begin()));
-       }
-       return make_pair(false, size_type(0));
+       ClassList::const_iterator cit =
+               find_if(classlist.begin(), classlist.end(),
+                       compare_memfun(&LyXTextClass::name, textclass));
+       return cit != classlist.end() ?
+               make_pair(true, size_type(cit - classlist.begin())) :
+               make_pair(false, size_type(0));
 }
 
 
index 2433f49267471a1da13bc539f53af38a214ebc8b..853d2b4f692ca59c7e0d391e00b9cc1f65ef18f3 100644 (file)
@@ -180,7 +180,7 @@ void ShowMessage(Buffer const * buf,
 // should be moved to lyxfunc.C
 bool MenuWrite(Buffer * buffer)
 {
-       XFlush(fl_display);
+       XFlush(fl_get_display());
        if (!buffer->save()) {
                string fname = buffer->fileName();
                string s = MakeAbsPath(fname);
@@ -732,7 +732,7 @@ LyXFont const UserFreeFont(BufferParams const & params)
        case 11: font.setColor(LColor::inherit); break;
        }
 
-       int choice = combo_language2->get();
+       int const choice = combo_language2->get();
        if (choice == 1)
                font.setLanguage(ignore_language);
        else if (choice == 2)
index 8152476d8d6a8aaf3e3b4b1edec1ff476587e8db..5e1635b159a915f9799eff69693ef5b69b6883cb 100644 (file)
@@ -78,7 +78,6 @@ FL_resource res[] =
 extern "C"
 int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
 {
-//#warning Please see if you can trigger this!
        // emergency save
        if (!bufferlist.empty())
                bufferlist.emergencyWriteAll();
@@ -131,25 +130,25 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        
        // If width is not set by geometry, check it against monitor width
        if ( !(geometryBitmask & 4) ) {
-               Screen * scr = DefaultScreenOfDisplay(fl_get_display());
+               Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
                if (WidthOfScreen(scr) - 8 < width)
                        width = WidthOfScreen(scr) - 8;
        }
 
        // If height is not set by geometry, check it against monitor height
        if ( !(geometryBitmask & 8) ) {
-               Screen * scr = DefaultScreenOfDisplay(fl_get_display());
+               Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
                if (HeightOfScreen(scr) - 24 < height)
                        height = HeightOfScreen(scr) - 24;
        }
 
        // Recalculate xpos if it's negative
        if (geometryBitmask & 16)
-               xpos += WidthOfScreen(DefaultScreenOfDisplay(fl_get_display())) - width;
+               xpos += WidthOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - width; //DefaultScreen(fl_get_display())) - width;
 
        // Recalculate ypos if it's negative
        if (geometryBitmask & 32)
-               ypos += HeightOfScreen(DefaultScreenOfDisplay(fl_get_display())) - height;
+               ypos += HeightOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - height; //DefaultScreen(fl_get_display())) - height;
 
        // Initialize the LyXColorHandler
        lyxColorHandler = new LyXColorHandler;
@@ -333,7 +332,7 @@ void LyXGUI::create_forms()
 #ifdef DO_USE_DEFAULT_LANGUAGE
            if ((*cit).second.lang() != "default")
 #endif
-               combo_language2->addto((*cit).second.lang().c_str());
+               combo_language2->addto((*cit).second.lang());
        }
        combo_language2->select_text(_("No change"));
 
index aafdf8fdf38874c684b4a38b59c63bfb7b54b487..ec571f60c5eb9e27cf516360417490f5120c3c34 100644 (file)
@@ -397,7 +397,7 @@ void WarnReadonly(string const & file)
 /// Get the dpi setting of the current screen
 float getScreenDPI()
 {
-       Screen * scr = DefaultScreenOfDisplay(fl_get_display());
+       Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
        return ((HeightOfScreen(scr) * 25.4 / HeightMMOfScreen(scr)) +
                (WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2;
 }
index c9f0a654cf67ec7b9d30f0a22222dbad8803aa90..eaf8725d081a3d7b7bcfd0c2a06dccf54aa38b9e 100644 (file)
@@ -449,6 +449,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        // lyxserver = new LyXServer;
 }
 
+
 // These are the default bindings known to LyX
 void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 {
@@ -498,6 +499,7 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
        kbmap->bind("S-Tab", LFUN_SHIFT_TAB);  // jug20000522
 }
 
+
 // LyX can optionally take over the handling of deadkeys
 void LyX::deadKeyBindings(kb_keymap * kbmap)
 {
@@ -525,7 +527,6 @@ void LyX::deadKeyBindings(kb_keymap * kbmap)
 }
 
 
-
 // This one is not allowed to use anything on the main form, since that
 // one does not exist yet. (Asger)
 void LyX::queryUserLyXDir(bool explicit_userdir)
@@ -680,6 +681,7 @@ void LyX::ReadEncodingsFile(string const & name)
 
 
 // Set debugging level and report result to user
+static
 void setDebuggingLevel(string const & dbgLevel)
 {
        lyxerr << _("Setting debug level to ") <<  dbgLevel << endl;
@@ -689,6 +691,7 @@ void setDebuggingLevel(string const & dbgLevel)
 
 
 // Give command line help
+static
 void commandLineHelp()
 {
        lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
@@ -705,6 +708,7 @@ void commandLineHelp()
                  "Check the LyX man page for more options.") << endl;
 }
 
+
 bool LyX::easyParse(int * argc, char * argv[])
 {
        bool gui = true;
index 0c783cb148bad8df1807953eb39bfb8ba778e03a..86d7939f17ab11f3f8b4eff6795c29817e6deb26 100644 (file)
@@ -408,7 +408,7 @@ string const LyXFont::stateText(BufferParams * params) const
        if (bits == inherit)
                ost << _("Default") << ", ";
        if (!params || (language() != params->language))
-               ost << _("Language: ") << _(language()->display().c_str()) << ", ";
+               ost << _("Language: ") << _(language()->display()) << ", ";
        if (number() != OFF)
                ost << _("  Number ") << _(GUIMiscNames[number()]);
 
index 1ee71753e3e1170ae84f9c4a7d21a26abbe8a082..2891249d4b94b80ad51f0eab852dc61a159a709a 100644 (file)
@@ -68,6 +68,7 @@
 #include "support/syscall.h"
 #include "support/lstrings.h"
 #include "support/path.h"
+#include "support/lyxfunctional.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
@@ -1207,17 +1208,21 @@ string const LyXFunc::Dispatch(int ac,
                break;
         }
 
-       case LFUN_HELP_VERSION: 
+       case LFUN_HELP_VERSION: {
                ProhibitInput(owner->view());
-               fl_show_message((string(_("LyX Version ")) + LYX_VERSION 
-                                + _(" of ") + LYX_RELEASE).c_str(),
+               string msg(_("LyX Version "));
+               msg += LYX_VERSION;
+               msg += " of ";
+               msg += LYX_RELEASE;
+               fl_show_message(msg.c_str(),
                                (_("Library directory: ")
                                 + MakeDisplayPath(system_lyxdir)).c_str(),
                                (_("User directory: ") 
                                 + MakeDisplayPath(user_lyxdir)).c_str());
                AllowInput(owner->view());
                break;
-
+       }
+       
                // --- version control -------------------------------
        case LFUN_VC_REGISTER:
        {
@@ -2432,7 +2437,7 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_GOTOFILEROW:
        {
                char file_name[100];
-               int  row;
+               int row;
                ::sscanf(argument.c_str(), " %s %d", file_name, &row);
 
                // Must replace extension of the file to be .lyx and get full path
@@ -3052,8 +3057,10 @@ string const LyXFunc::Dispatch(int ac,
                        }
                }
        } else {
-               owner->getMiniBuffer()->Set(string(_(res.c_str()))
-                                           + " " + commandshortcut);
+               string msg(_(res));
+               msg += " ";
+               msg += commandshortcut;
+               owner->getMiniBuffer()->Set(msg);
        }
 
        return res;
@@ -3069,7 +3076,8 @@ void LyXFunc::setupLocalKeymap()
 
 void LyXFunc::MenuNew(bool fromTemplate)
 {
-       string fname, initpath = lyxrc.document_path;
+       string fname;
+       string initpath = lyxrc.document_path;
        LyXFileDlg fileDlg;
 
        if (owner->view()->available()) {
@@ -3132,7 +3140,7 @@ void LyXFunc::MenuNew(bool fromTemplate)
                                // loads document
                                owner->getMiniBuffer()->Set(_("Opening document"), 
                                                            MakeDisplayPath(s), "...");
-                               XFlush(fl_display);
+                               XFlush(fl_get_display());
                                owner->view()->buffer(
                                        bufferlist.loadLyXFile(s));
                                owner->getMiniBuffer()->Set(_("Document"),
@@ -3482,13 +3490,12 @@ Inset * LyXFunc::getInsetByCode(Inset::Code code)
 {
        LyXCursor cursor = owner->view()->text->cursor;
        Buffer * buffer = owner->view()->buffer();
-       for (Buffer::inset_iterator it = Buffer::inset_iterator(cursor.par(),
-                                                               cursor.pos());
-            it != buffer->inset_iterator_end(); ++it) {
-               if ((*it)->LyxCode() == code)
-                       return *it;
-       }
-       return 0;
+       Buffer::inset_iterator it =
+               find_if(Buffer::inset_iterator(cursor.par(),
+                                              cursor.pos()),
+                       buffer->inset_iterator_end(),
+                       compare_memfun(&Inset::LyxCode, code));
+       return it != buffer->inset_iterator_end() ? (*it) : 0;
 }
 
 
index ba0d7d2aab5c92027611d6c02f0b7b9128e17a5c..1f8309193da6aa09c3e2d1404582670d6e31a91b 100644 (file)
@@ -148,9 +148,15 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                        c = cc;
                        if (c == '#') {
                                // Read rest of line (fast :-)
+                               // That is not fast... (Lgb)
+#if 1
                                is.getline(buff, sizeof(buff));
                                lyxerr[Debug::LYXLEX] << "Comment read: `" << c
                                                      << buff << "'" << endl;
+#else
+                               // unfortunately is ignore buggy (Lgb)
+                               is.ignore(100, '\n');
+#endif
                                ++lineno;
                                continue;
                        }
@@ -258,9 +264,16 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                        
                        if (c == '#') {
                                // Read rest of line (fast :-)
+                               // That is still not fast... (Lgb)
+#if 1
                                is.getline(buff, sizeof(buff));
                                lyxerr[Debug::LYXLEX] << "Comment read: `" << c
                                                      << buff << "'" << endl;
+#else
+                               // but ignore is also still buggy (Lgb)
+                               // This is fast (Lgb)
+                               is.ignore(100, '\n');
+#endif
                                ++lineno;
                                continue;
                        }
index 03b498e7061bf77120f1be98da785ed4b38026ce..03e938bb40e6ae5277c009d0bcd54e04839f36de 100644 (file)
@@ -647,7 +647,7 @@ public:
                ///
                Inset * operator*() { return (*it).inset; }
                ///
-               size_type getPos() {return (*it).pos; }
+               size_type getPos() const {return (*it).pos; }
                ///
                bool operator==(inset_iterator const & iter) const {
                        return it == iter.it;
index 19399b6a519b307950a03f61af0043e7595fff49..68b01a170eece7683b883c1a2ef972b13cbaf5b5 100644 (file)
@@ -583,7 +583,7 @@ void InsetFormula::ToggleInsetSelection(BufferView * bv)
     //int n;
     //XPoint * p = 
     //mathcursor->SelGetArea(n);
-//    XFillPolygon(fl_display, pm, LyXGetSelectionGC(), p, n, Nonconvex, CoordModeOrigin);
+//    XFillPolygon(fl_get_display(), pm, LyXGetSelectionGC(), p, n, Nonconvex, CoordModeOrigin);
 //    x -= par->xo; 
 //    y -= par->yo;
 
@@ -781,8 +781,7 @@ InsetFormula::LocalDispatch(BufferView * bv,
       result = DISPATCHED_NOUPDATE;
       break;
     case LFUN_DELETE_LINE_FORWARD:
-           //current_view->lockedInsetStoreUndo(Undo::INSERT);
-           bv->lockedInsetStoreUndo(Undo::DELETE);
+      bv->lockedInsetStoreUndo(Undo::DELETE);
       mathcursor->DelLine();
       UpdateLocal(bv);
       break;
@@ -812,8 +811,7 @@ InsetFormula::LocalDispatch(BufferView * bv,
        }
       
     case LFUN_DELETE:
-           //current_view->lockedInsetStoreUndo(Undo::INSERT);
-           bv->lockedInsetStoreUndo(Undo::DELETE);
+      bv->lockedInsetStoreUndo(Undo::DELETE);
       mathcursor->Delete();       
       bv->updateInset(this, true);
       break;    
@@ -995,7 +993,7 @@ InsetFormula::LocalDispatch(BufferView * bv,
        
        if (arg.empty())
               break;
-       strncpy(arg2, arg.c_str(), 40); arg2[39]= '\0';
+       ::strncpy(arg2, arg.c_str(), 40); arg2[39]= '\0';
        int n = sscanf(arg2, "%s %s", lf, rg);
        lf[39] = '\0'; rg[39] = '\0';
 
@@ -1069,8 +1067,7 @@ InsetFormula::LocalDispatch(BufferView * bv,
     }
     
     case LFUN_MATH_DISPLAY:
-           //current_view->lockedInsetStoreUndo(Undo::INSERT);
-           bv->lockedInsetStoreUndo(Undo::EDIT);
+      bv->lockedInsetStoreUndo(Undo::EDIT);
       display(!disp_flag);
       UpdateLocal(bv);
       break;
index 621e85af6832730a57310f5b8dea402b400357c3..533c3224dd60d65749778021d3b950dca64501ea 100644 (file)
@@ -419,8 +419,6 @@ LyxArrayBase * mathed_parse(unsigned flags, LyxArrayBase * array,
          string const name(&yytext[1]);
          
          // ugly trick to be removed soon (lyx3)
-         //char c; yyis->get(c);
-         //yyis->putback(c);
          char const c = yyis->peek();
          if (c == '[') {
              LexGetArg('[');
index a91347731b480fcfb52ad647b493b9ccd263822a..62ad6d3d67a6e489b837c6a85cbd1c4b5b57f8b3 100644 (file)
@@ -526,7 +526,7 @@ char const ** pixmapFromBitmapData(char const * s, int wx, int hx)
        }
        int ww = w/dw, hh = h/dh, x, y;
    
-       XImage * xima = XCreateImage(fl_display, 0, 1, XYBitmap, 0, 
+       XImage * xima = XCreateImage(fl_get_display(), 0, 1, XYBitmap, 0, 
                                    const_cast<char*>(reinterpret_cast<char const *>(bdata)), w, h, 8, 0);
        xima->byte_order = LSBFirst;
        xima->bitmap_bit_order = LSBFirst;
@@ -535,7 +535,7 @@ char const ** pixmapFromBitmapData(char const * s, int wx, int hx)
        if (ww > wx) ww = wx;
        if (hh > hx) hh = hx;
        XImage * sbima = XSubImage(xima, x, y, ww, hh);
-       XpmCreateDataFromImage(fl_display, const_cast<char***>(&data), sbima, sbima, 0);
+       XpmCreateDataFromImage(fl_get_display(), const_cast<char***>(&data), sbima, sbima, 0);
        
        // Dirty hack to get blue symbols quickly
        char * sx = const_cast<char*>(strstr(data[2], "FFFFFFFF"));
index 1b417b813063b53fe4f53be5885c62395360e58a..f88c947a0997959129e78b24d968b03f63703d49 100644 (file)
@@ -185,7 +185,7 @@ void MiniBuffer::Set(string const& s1, string const& s2,
 
        if (!the_buffer->focus) {
                fl_set_input(the_buffer, ntext.c_str());
-               XFlush(fl_display);
+               XFlush(fl_get_display());
                text = ntext;
        }
 }
@@ -237,7 +237,7 @@ void MiniBuffer::Init()
 
        fl_set_input(the_buffer, text.c_str());
        setTimer(0);
-       XFlush(fl_display);
+       XFlush(fl_get_display());
 }
 
 
index 6fb5e4bd27640a0f8c023d67329d8eb28ff298bb..6dc1e816444c9fd7341f349d28b6d2d2309bbafb 100644 (file)
@@ -50,7 +50,7 @@ using std::reverse;
 int tex_code_break_column = 72;  // needs non-zero initialization. set later.
 // this is a bad idea, but how can LyXParagraph find its buffer to get
 // parameters? (JMarc)
-extern BufferView * current_view;
+
 extern string bibitemWidest(Buffer const *);
 
 // this is a minibuffer
@@ -59,6 +59,8 @@ static LyXFont minibuffer_font;
 static Inset * minibuffer_inset;
 
 
+extern BufferView * current_view;
+
 // Initialization of the counter for the paragraph id's,
 // declared in lyxparagraph.h
 unsigned int LyXParagraph::paragraph_id = 0;
index 2e29133e4330aacd32b40988ea3cb43dd33e35c0..db8701de191890007bdbdfc21c72f63c9c14cfc9 100644 (file)
@@ -32,14 +32,14 @@ static
 GC createGC()
 {
        XGCValues val;
-       val.foreground = BlackPixel(fl_display
-                                   DefaultScreen(fl_display));
+       val.foreground = BlackPixel(fl_get_display()
+                                   DefaultScreen(fl_get_display()));
        
        val.function=GXcopy;
        val.graphics_exposures = false;
        val.line_style = LineSolid;
        val.line_width = 0;
-       return XCreateGC(fl_display, RootWindow(fl_display, 0), 
+       return XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0), 
                         GCForeground | GCFunction | GCGraphicsExposures
                         | GCLineWidth | GCLineStyle , &val);
 }
@@ -75,7 +75,7 @@ void LyXScreen::Redraw(LyXText * text)
 
 void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 {
-       XCopyArea(fl_display,
+       XCopyArea(fl_get_display(),
                  owner.getPixmap(),
                  owner.getWin(),
                  gc_copy,
@@ -156,7 +156,7 @@ void LyXScreen::Draw(LyXText * text, unsigned int y)
            && (old_first - y) < owner.height()) {
                if (text->first < old_first) {
                        DrawFromTo(text, 0, old_first - text->first);
-                       XCopyArea (fl_display,
+                       XCopyArea (fl_get_display(),
                                   owner.getWin(),
                                   owner.getWin(),
                                   gc_copy,
@@ -175,7 +175,7 @@ void LyXScreen::Draw(LyXText * text, unsigned int y)
                        DrawFromTo(text,
                                   owner.height() + old_first - text->first,
                                   owner.height());
-                       XCopyArea (fl_display,
+                       XCopyArea (fl_get_display(),
                                   owner.getWin(),
                                   owner.getWin(),
                                   gc_copy,
@@ -251,7 +251,7 @@ void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
        y2 = max(y2, y1);
        
        if (cursor_pixmap){
-               XFreePixmap(fl_display, cursor_pixmap);
+               XFreePixmap(fl_get_display(), cursor_pixmap);
                cursor_pixmap = 0;
        }
 
@@ -275,12 +275,12 @@ void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
                }
 
                cursor_pixmap = 
-                       XCreatePixmap (fl_display,
+                       XCreatePixmap (fl_get_display(),
                                       fl_root,
                                       cursor_pixmap_w,
                                       cursor_pixmap_h,
                                       fl_get_visual_depth());
-               XCopyArea (fl_display,
+               XCopyArea (fl_get_display(),
                           owner.getWin(),
                           cursor_pixmap,
                           gc_copy,
@@ -289,7 +289,7 @@ void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
                           cursor_pixmap_w,
                           cursor_pixmap_h,
                           0, 0);
-               XDrawLine(fl_display,
+               XDrawLine(fl_get_display(),
                          owner.getWin(),
                          gc_copy,
                          x + owner.xpos(),
@@ -302,7 +302,7 @@ void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
                case L_SHAPE:
                case REVERSED_L_SHAPE:
                        int rectangle_h = (cursor_pixmap_h+10)/20;
-                       XFillRectangle(fl_display,
+                       XFillRectangle(fl_get_display(),
                                       owner.getWin(),
                                       gc_copy,
                                       cursor_pixmap_x + owner.xpos(),
@@ -321,7 +321,7 @@ void LyXScreen::HideCursor()
        if (!cursor_visible) return;
 
        if (cursor_pixmap){
-               XCopyArea (fl_display
+               XCopyArea (fl_get_display()
                           cursor_pixmap,
                           owner.getWin(),
                           gc_copy,
index 4278b992b99fa1b5a4aebb6da598bfe15d230b7a..e0a705c8bc9022ee13c5aa62c0b192c2db1fbd86 100644 (file)
@@ -38,6 +38,7 @@ libsupport_la_SOURCES = \
        date.C \
        filetools.C \
        filetools.h \
+       fmt.C \
        getUserName.C \
        getcwd.C \
        kill.C \
@@ -45,6 +46,7 @@ libsupport_la_SOURCES = \
        lstrings.h \
        lxtl.h \
        lyxalgo.h \
+       lyxfunctional.h \
        lyxlib.h \
        lyxmanip.h \
        $(LYXSTRING) lyxsum.C \
index 2bbc1e06f085d748d827eb278878979d42e465b6..0fc53402ccff589e3de7f207361f292176e86032 100644 (file)
@@ -15,6 +15,7 @@
 #include <config.h>
 #include "StrPool.h"
 
+
 StrPool::~StrPool()
 {
         for (Pool::const_iterator cit = pool_.begin(); 
@@ -23,6 +24,11 @@ StrPool::~StrPool()
         }
 }
 
+/* One interesting thing here would be to store the strings in a map,
+   so that one string is only stored once. This would make things a
+   bit slower, but memory requirements would be lower in the long run.
+   I expect that it would be fast enough anyway. (Lgb)
+*/
 char const * StrPool::add(string const & str)
 {
        int s = str.length();
@@ -33,3 +39,5 @@ char const * StrPool::add(string const & str)
         return buf;
 }
 
+//StrPool strPool;
+
index d97a1f35e0789ac2cdf0274d5bc9328a31a6e621..2debb9b26cf4e1263c6478030bf584ec40e62d32 100644 (file)
@@ -34,4 +34,6 @@ private:
         Pool pool_;
 };
 
+//extern StrPool strPool;
+
 #endif
diff --git a/src/support/fmt.C b/src/support/fmt.C
new file mode 100644 (file)
index 0000000..d4da6de
--- /dev/null
@@ -0,0 +1,49 @@
+#include <config.h>
+#include <cstdio>
+#include <cstdarg>
+
+#include "LString.h"
+
+/* This output manipulator gives the option to use Old style format
+   specifications in ostreams. Note that this is done at the expense
+   of typesafety, so if possible this manipulator should be avoided.
+   When is it allowed to use this manipulator? I wrote it to be used
+   i18n strings and gettext, and it should only(?) be used in that
+   context.
+
+   Ad. the implementation. I have only tested this on egcs-2.91.66 with
+   glibc 2.1.2. So further testing is needed. The loop in fmt(...) will
+   usually spin one or two times, but might spin more times with older
+   glibc libraries, since the returned -1 when size is too small. Newer
+   glibc returns the needed size.
+   One problem can be that vsnprintf is not implemented on all archs,
+   but AFAIK it is part of the new ANSI C standard.
+   
+   Lgb
+*/
+
+string fmt(char const * fmtstr ...)
+{
+       int size = 80;
+       char * str = new char[size];
+       va_list ap;
+       while (true) {
+               va_start(ap, fmtstr);
+               int const r = ::vsnprintf(str, size, fmtstr, ap);
+               va_end(ap);
+               if (r == -1) { // size is too small
+                       delete [] str;
+                       size *= 2; // seems quite safe to double.
+                       str = new char[size];
+               } else if (r >= size) { // r gives the needed size
+                       delete [] str;
+                       size += r;
+                       str = new char[size];
+               } else {
+                       break;
+               }
+       }
+       string res(str);
+       delete [] str;
+       return res;
+}
index 87e67e45ea5b3e69edba38bc16f2589f62cbe85c..689a54be761ecb06a63ebaeec3406e0daaf3d9be 100644 (file)
@@ -59,7 +59,6 @@ int compare_no_case(string const & s, string const & s2)
 
 int compare_no_case(string const & s, string const & s2, unsigned int len)
 {
-//#warning verify this func please
        string::const_iterator p = s.begin();
        string::const_iterator p2 = s2.begin();
        unsigned int i = 0;
@@ -169,16 +168,17 @@ char uppercase(char c)
 string const lowercase(string const & a)
 {
        string tmp(a);
-//#ifdef __GLIBCPP__
+#if 1
        string::iterator result = tmp.begin();
        string::iterator end = tmp.end();
        for (string::iterator first = tmp.begin();
             first != end; ++first, ++result) {
                *result = lowercase(*first);
        }
-//#else
-//     transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
-//#endif
+#else
+       // We want to use this one. (Lgb)
+       transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
+#endif
        return tmp;
 }
 
@@ -186,16 +186,17 @@ string const lowercase(string const & a)
 string const uppercase(string const & a)
 {
        string tmp(a);
-//#ifdef __GLIBCPP__
+#if 1
        string::iterator result = tmp.begin();
        string::iterator end = tmp.end();
        for (string::iterator first = tmp.begin();
             first != end; ++first, ++result) {
                *result = uppercase(*first);
        }
-//#else
-//     transform(tmp.begin(), tmp.end(), tmp.begin(), toupper);
-//#endif
+#else
+       // We want to use this one. (Lgb)
+       transform(tmp.begin(), tmp.end(), tmp.begin(), toupper);
+#endif
        return tmp;
 }
 
diff --git a/src/support/lyxfunctional.h b/src/support/lyxfunctional.h
new file mode 100644 (file)
index 0000000..5eedb90
--- /dev/null
@@ -0,0 +1,128 @@
+// -*- C++ -*-
+
+#ifndef LYX_FUNCTIONAL_H
+#define LYX_FUNCTIONAL_H
+
+//namespace lyx {
+
+template<class R, class C, class A>
+class class_fun_t {
+public:
+       class_fun_t(C & ct, R(C::*p)(A)) 
+               : c(ct), cmf(p) {}
+       R operator()(A & a) const {
+               return (c.*cmf)(a);
+       }
+private:
+       C & c;
+       R(C::*cmf)(A);
+};
+
+
+template <class R, class C, class A> class_fun_t<R, C, A>
+class_fun(C & c, R(C::*f)(A))
+{
+       return class_fun_t<R, C, A>(c, f);
+}
+
+
+template <class Cont, class Type, class MemRet>
+class back_insert_fun_iterator {
+protected:
+       Cont & container;
+       MemRet(Type::*pmf)();
+public:
+       back_insert_fun_iterator(Cont & x, MemRet(Type::*p)())
+               : container(x), pmf(p) {}
+
+       back_insert_fun_iterator &
+       operator=(Type * val) {
+               container.push_back((val->*pmf)());
+               return *this;
+       }
+
+       back_insert_fun_iterator & operator*() {
+               return *this;
+       }
+       back_insert_fun_iterator & operator++() { // prefix ++
+               return *this;
+       }
+       back_insert_fun_iterator & operator++(int) { // postfix ++
+               return *this;
+       }
+};
+
+
+template <class Cont, class Type, class MemRet>
+back_insert_fun_iterator<Cont, Type, MemRet>
+back_inserter_fun(Cont & cont, MemRet(Type::*p)())
+{
+       return back_insert_fun_iterator<Cont, Type, MemRet>(cont, p);
+}
+
+
+template <class R, class C, class A>
+class compare_memfun_t {
+public:
+       compare_memfun_t(R(C::*p)(), A const & a)
+               : pmf(p), arg(a) {}
+       bool operator()(C * c) {
+               return (c->*pmf)() == arg;
+       }
+       bool operator()(C & c) {
+               return (c.*pmf)() == arg;
+       }
+private:
+       R(C::*pmf)();
+       A const & arg;
+};
+
+
+template <class R, class C, class A>
+compare_memfun_t<R, C, A>
+compare_memfun(R(C::*p)(), A const & a)
+{
+       return compare_memfun_t<R, C, A>(p, a);
+}
+
+       
+// Functors used in the template.
+
+///
+template<typename T1, typename T2>
+class equal_1st_in_pair {
+public:
+       ///
+       equal_1st_in_pair(T1 const & value) : value_(value) {}
+       ///
+       typedef std::pair<T1, T2> pair_type;
+       ///
+       bool operator() (pair_type const & p) const {
+               return p.first == value_;
+       }
+private:
+       ///
+       T1 const & value_;
+};
+
+
+///
+template<typename T1, typename T2>
+class equal_2nd_in_pair {
+public:
+       ///
+       equal_2nd_in_pair(T2 const & value) : value_(value) {}
+       ///
+       typedef std::pair<T1, T2> pair_type;
+       ///
+       bool operator() (pair_type const & p) const {
+               return p.second == value_;
+       }
+private:
+       ///
+       T2 const & value_;
+};
+
+
+// }  // end of namespace lyx
+#endif
index 52dc69692aaf2f9bcf5e900e77a25b2aeb2f2851..9c066eaab342d17d5160e4f4581251b38d40b141 100644 (file)
@@ -9,7 +9,7 @@ struct NewLineAndDepth_ {
        int depth_;
 };
 
-//
+///
 inline
 NewLineAndDepth_ newlineAndDepth(int n)
 {
@@ -18,7 +18,7 @@ NewLineAndDepth_ newlineAndDepth(int n)
        return nlad_;
 }
 
-//
+///
 inline
 std::ostream & operator<<(std::ostream & os, NewLineAndDepth_ const & nlad_)
 {
@@ -26,4 +26,7 @@ std::ostream & operator<<(std::ostream & os, NewLineAndDepth_ const & nlad_)
        return os;
 }
 
+///
+std::string fmt(char const * fmtstr ...);
+
 #endif
index 26bd1a16fd67e307a5cf600b42503e3fd054bbf9..5df0404cd119f8cfa242c674c35c499dff9617cc 100644 (file)
@@ -232,7 +232,7 @@ int Systemcalls::startscript(Starttype how, string const & what,
 int SimulateTimer;
 void back(string cmd, int retval)
 {
-       printf("Done: %s gave %d\n", cmd.c_str(), retval);
+       ::printf("Done: %s gave %d\n", cmd.c_str(), retval);
        SimulateTimer = 0;
 }
 
index c138391658121721d8a7033c73439c50e3a25ed4..ca9fe916e44594f4f8916f70922a06e07287d656 100644 (file)
 #include <functional>
 
 #include "support/LAssert.h"
-
-// Functors used in the template.
-
-///
-template<typename T1, typename T2>
-class equal_1st_in_pair {
-public:
-       ///
-       equal_1st_in_pair(T1 const & value) : value_(value) {}
-       ///
-       typedef std::pair<T1, T2> pair_type;
-       ///
-       bool operator() (pair_type const & p) const {
-               return p.first == value_;
-       }
-private:
-       ///
-       T1 const & value_;
-};
-
-
-///
-template<typename T1, typename T2>
-class equal_2nd_in_pair {
-public:
-       ///
-       equal_2nd_in_pair(T2 const & value) : value_(value) {}
-       ///
-       typedef std::pair<T1, T2> pair_type;
-       ///
-       bool operator() (pair_type const & p) const {
-               return p.second == value_;
-       }
-private:
-       ///
-       T2 const & value_;
-};
-
-
+#include "support/lyxfunctional.h"
 /** This class template is used to translate between two elements, specifically
     it was worked out to translate between an enum and strings when reading
     the lyx file.
index 215729b7a7cc60eec47a123b7ae9b3b7738b59bd..7cc4caf16501a570e42332f4fc49386cb3092ae3 100644 (file)
@@ -42,8 +42,6 @@ using std::vector;
 
 static int const WIDTH_OF_LINE = 5;
 
-extern BufferView * current_view;
-
 /// Define a few methods for the inner structs
 
 LyXTabular::cellstruct::cellstruct() 
@@ -1303,10 +1301,20 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
            string s1;
            string s2;
            is >> a >> b >> c;
+#if 1
            char ch; // skip '"'
            is >> ch;
+#else
+           // ignore is buggy but we will use it later (Lgb)
+           is.ignore(); // skip '"'
+#endif    
            getline(is, s1, '"');
+#if 1
            is >> ch; // skip '"'
+#else
+           // ignore is buggy but we will use it later (Lgb)
+           is.ignore(); // skip '"'
+#endif
            getline(is, s2, '"');
            column_info[i].alignment = static_cast<LyXAlignment>(a);
            column_info[i].left_line = b;
@@ -1319,10 +1327,20 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
                string s1;
                string s2;
                is >> a >> b >> c >> d >> e >> f >> g;
+#if 1
                char ch;
                is >> ch; // skip '"'
+#else
+               // ignore is buggy but we will use it later (Lgb)
+               is.ignore(); // skip '"'
+#endif
                getline(is, s1, '"');
+#if 1
                is >> ch; // skip '"'
+#else
+               // ignore is buggy but we will use it later (Lgb)
+               is.ignore(); // skip '"'
+#endif
                getline(is, s2, '"');
                cell_info[i][j].multicolumn = static_cast<char>(a);
                cell_info[i][j].alignment = static_cast<LyXAlignment>(b);
@@ -2362,18 +2380,17 @@ int LyXTabular::AsciiPrintCell(Buffer const * buf, ostream & os,
        break;
     }
 
-    unsigned int i;
-    for(i=0; i < len1; ++i)
+    for(unsigned int i = 0; i < len1; ++i)
        os << " ";
     os << sstr.str();
-    for(i=0; i < len2; ++i)
+    for(unsigned int i = 0; i < len2; ++i)
        os << " ";
     if (RightLine(cell))
        os << " |";
     else
        os << "  ";
 
-    return ret * 0;
+    return ret * 0; // eh? (Lgb)
 }
 
 
@@ -2395,7 +2412,7 @@ int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
            if (IsMultiColumn(cell, true))
                continue;
            ostringstream sstr;
-           (void)GetCellInset(cell)->Ascii(buf, sstr, 0);
+           GetCellInset(cell)->Ascii(buf, sstr, 0);
            if (clen[j] < sstr.str().length())
                clen[j] = sstr.str().length();
        }
@@ -2407,13 +2424,13 @@ int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
            if (!IsMultiColumn(cell, true) || IsPartOfMultiColumn(i, j))
                continue;
            ostringstream sstr;
-           (void)GetCellInset(cell)->Ascii(buf, sstr, 0);
-           int len = (int)sstr.str().length();
-           int n = cells_in_multicolumn(cell);
-           for (int k = j; (len > 0) && (k < (j+n-1)); ++k)
+           GetCellInset(cell)->Ascii(buf, sstr, 0);
+           string::size_type len = sstr.str().length();
+           int const n = cells_in_multicolumn(cell);
+           for (int k = j; (len > 0) && (k < (j + n - 1)); ++k)
                len -= clen[k];
-           if (len > (int)clen[j+n-1])
-               clen[j+n-1] = len;
+           if (len > clen[j + n - 1])
+               clen[j + n - 1] = len;
        }
     }
     cell = 0;
@@ -2428,6 +2445,7 @@ int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
        os << endl;
        AsciiBottomHLine(os, i, clen);
     }
+    return ret;
 }
 
 
index 241a8fe43e5d4eef2f7c4cabcc689b67c1525ee4..c74ef8ee19f2580c8f0eaa8def5df054647fb3e5 100644 (file)
@@ -168,13 +168,13 @@ public:
     LyXTabular * Clone(InsetTabular *);
     
     /// Returns true if there is a topline, returns false if not
-    bool TopLine(int cell, bool onlycolumn=false) const;
+    bool TopLine(int cell, bool onlycolumn = false) const;
     /// Returns true if there is a topline, returns false if not
-    bool BottomLine(int cell, bool onlycolumn=false) const;
+    bool BottomLine(int cell, bool onlycolumn = false) const;
     /// Returns true if there is a topline, returns false if not
-    bool LeftLine(int cell, bool onlycolumn=false) const;
+    bool LeftLine(int cell, bool onlycolumn = false) const;
     /// Returns true if there is a topline, returns false if not
-    bool RightLine(int cell, bool onlycolumn=false) const;
+    bool RightLine(int cell, bool onlycolumn = false) const;
     
     ///
     bool TopAlreadyDrawed(int cell) const;
@@ -493,7 +493,7 @@ private: //////////////////////////////////////////////////////////////////
     ///
     void Reinit();
     ///
-    void set_row_column_number_info(bool oldformat=false);
+    void set_row_column_number_info(bool oldformat = false);
     /// Returns true if a complete update is necessary, otherwise false
     bool SetWidthOfMulticolCell(int cell, int new_width);
     ///
index 883421062b867d0788cc02defed3a4f9c2137867..6172725245dcb39f7bda7bb84fd0179006d84efd 100644 (file)
@@ -284,9 +284,9 @@ void  TransManager::TranslateAndInsert(char c, LyXText * text)
 
 void TransManager::insertVerbatim(string const & str, LyXText * text)
 {      
-       int const l = str.length();
+       string::size_type const l = str.length();
        
-       for (int i = 0; i < l; ++i){
+       for (string::size_type i = 0; i < l; ++i) {
                if (str[i] == '\"' 
                    && text->GetFont(current_view->buffer(),text->cursor.par(),
                                     text->cursor.pos()).latex() == LyXFont::OFF