* po/*.po: remerge (again :-( )

[lyx.git] / po / nb.po

diff --git a/po/nb.po b/po/nb.po
index aa9f0f842e9598d286f4fac0419a52fb12e041ca..2575ff3cccc700cf56b8a70844d87c0566a6e555 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyx 1.4.0\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-01-20 18:32+0100\n"
+"POT-Creation-Date: 2007-01-21 12:01+0100\n"
 "PO-Revision-Date: 2006-11-03 15:48+0100\n"
 "Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
 "Language-Team: norsk <no@li.org>\n"
@@ -3352,7 +3352,7 @@ msgstr "UnderUnderSeksjon*"
 #: lib/layouts/amsdefs.inc:125 lib/layouts/db_stdstruct.inc:11
 #: lib/layouts/scrclass.inc:216 lib/layouts/stdstruct.inc:12
 #: lib/layouts/stdstruct.inc:27 lib/layouts/svjour.inc:252
-#: src/output_plaintext.C:152 src/output_plaintext.C:155
+#: src/output_plaintext.C:152
 msgid "Abstract"
 msgstr "Sammendrag"
 
@@ -3636,7 +3636,6 @@ msgstr ""
 #: lib/layouts/llncs.layout:275 lib/layouts/siamltex.layout:194
 #: lib/layouts/amsdefs.inc:243 lib/layouts/stdstruct.inc:53
 #: lib/layouts/svjour.inc:340 src/output_plaintext.C:164
-#: src/output_plaintext.C:167
 msgid "References"
 msgstr "Referanser"
 
@@ -7741,13 +7740,15 @@ msgstr "BibTeX Referanseliste...|B"
 msgid "LyX Document...|X"
 msgstr "LyX dokument...|X"
 
-#: lib/ui/classic.ui:320
-msgid "Plain Text as Lines...|L"
-msgstr "Ren tekst som linjer...|l"
+#: lib/ui/classic.ui:320 lib/ui/stdmenus.inc:380
+#, fuzzy
+msgid "Plain Text...|T"
+msgstr "Ren tekst"
 
-#: lib/ui/classic.ui:321
-msgid "Plain Text as Paragraphs...|P"
-msgstr "Ren tekst som avsnitt...|a"
+#: lib/ui/classic.ui:321 lib/ui/stdmenus.inc:381
+#, fuzzy
+msgid "Plain Text, Join Lines...|J"
+msgstr "Ren tekst som linjer...|l"
 
 #: lib/ui/classic.ui:325 lib/ui/stdmenus.inc:413
 msgid "Track Changes|T"
@@ -8384,16 +8385,6 @@ msgstr "Mattepanel|p"
 msgid "Text Wrap Float|W"
 msgstr "Område som teksten brytes rundt"
 
-#: lib/ui/stdmenus.inc:380
-#, fuzzy
-msgid "Plain Text...|T"
-msgstr "Ren tekst"
-
-#: lib/ui/stdmenus.inc:381
-#, fuzzy
-msgid "Plain Text, Join Lines...|J"
-msgstr "Ren tekst som linjer...|l"
-
 #: lib/ui/stdmenus.inc:383
 msgid "External Material...|M"
 msgstr "Eksternt materiale...|E"
@@ -8804,6 +8795,39 @@ msgstr "Forkast alle endringer"
 msgid "Next note"
 msgstr "Neste notis"
 
+#: lib/ui/stdtoolbars.inc:166
+#, fuzzy
+msgid "View/Update Document"
+msgstr "Lagre dokumentet"
+
+#: lib/ui/stdtoolbars.inc:167
+#, fuzzy
+msgid "View DVI"
+msgstr "Vis|V"
+
+#: lib/ui/stdtoolbars.inc:168
+#, fuzzy
+msgid "Update DVI"
+msgstr "&Oppdater"
+
+#: lib/ui/stdtoolbars.inc:169
+msgid "View PDF (pdflatex)"
+msgstr ""
+
+#: lib/ui/stdtoolbars.inc:170
+msgid "Update PDF (pdflatex)"
+msgstr ""
+
+#: lib/ui/stdtoolbars.inc:171
+#, fuzzy
+msgid "View PostScript"
+msgstr "Post Scriptum"
+
+#: lib/ui/stdtoolbars.inc:172
+#, fuzzy
+msgid "Update PostScript"
+msgstr "Post Scriptum"
+
 #: src/BufferView.C:216
 #, c-format
 msgid ""
@@ -9229,12 +9253,14 @@ msgid "No Documents Open!"
 msgstr "Ingen åpne dokumenter!"
 
 #: src/MenuBackend.C:540
-msgid "Plain Text as Lines"
-msgstr "Ren tekst som linjer"
+#, fuzzy
+msgid "Plain Text"
+msgstr "Ren tekst"
 
 #: src/MenuBackend.C:542
-msgid "Plain Text as Paragraphs"
-msgstr "Ren tekst som avsnitt"
+#, fuzzy
+msgid "Plain Text, Join Lines"
+msgstr "Ren tekst som linjer"
 
 #: src/MenuBackend.C:714
 #, fuzzy
@@ -12541,6 +12567,14 @@ msgstr ""
 "Kunne ikke åpne dokumentet\n"
 "%1$s."
 
+#: src/output_plaintext.C:155
+msgid "Abstract: "
+msgstr "Sammendrag: "
+
+#: src/output_plaintext.C:167
+msgid "References: "
+msgstr "Referanser: "
+
 #: src/support/filefilterlist.C:109
 msgid "All files (*)"
 msgstr "Alle filer (*)"