another update from Helge

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

po/ChangeLog

@@ -1,3 +1,8 @@
+2005-07-06  Helge Hafting  <helge.hafting@aitel.hist.no>
+
+	* no.po: Another update, with translations for "branches", and
+	menu shortcut changes to minimize clashes.
+
 2005-07-04  Helge Hafting  <helge.hafting@aitel.hist.no>
 
 	* no.po: This time with the newly available vspace translations,

po/no.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: lyx 1.3.0\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
 "POT-Creation-Date: 2005-07-04 12:34+0200\n"
-"PO-Revision-Date: 2005-07-04 14:17+0200\n"
+"PO-Revision-Date: 2005-07-05 15:44+0200\n"
 "Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
 "Language-Team: norsk <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -270,7 +270,7 @@ msgstr "Miniside"
 
 #: src/frontends/xforms/forms/form_branch.fd:44
 msgid "Branch:|#B"
-msgstr ""
+msgstr "Gren:|#G"
 
 #: src/frontends/xforms/forms/form_browser.fd:62
 #: src/frontends/xforms/forms/form_errorlist.fd:62
@@ -681,7 +681,7 @@ msgstr "Ding 4|#g"
 
 #: src/frontends/xforms/forms/form_document.fd:1801
 msgid "New Branch:|#N"
-msgstr ""
+msgstr "Ny gren:|#N"
 
 #: src/frontends/xforms/forms/form_document.fd:1819
 #: src/frontends/xforms/forms/form_spellchecker.fd:134
@@ -693,13 +693,12 @@ msgid "Remove|#e"
 msgstr "Fjern|#e"
 
 #: src/frontends/xforms/forms/form_document.fd:1855
-#, fuzzy
 msgid "Available Branches:"
-msgstr "Tilgjengelige siteringsnøkler"
+msgstr "Tilgjengelige dokumentgrener:"
 
 #: src/frontends/xforms/forms/form_document.fd:1873
 msgid "Activated Branches:"
-msgstr ""
+msgstr "Aktive grener:"
 
 #: src/frontends/xforms/forms/form_document.fd:1891
 #, fuzzy
@@ -2128,9 +2127,8 @@ msgid "Select this if you want to split your bibliography into sections"
 msgstr ""
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:56
-#, fuzzy
 msgid "A&vailable Branches:"
-msgstr "Tilgjengelige siteringsnøkler"
+msgstr "&Tilgjengelige dokumentgrener:"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:68
 #: lib/layouts/g-brief-de.layout:33 lib/layouts/g-brief-en.layout:33
@@ -2151,27 +2149,24 @@ msgid "Color"
 msgstr "Farge"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:141
-#, fuzzy
 msgid "The available branches"
-msgstr "Søk i de tilgjengelige siteringene"
+msgstr "De tilgjengelige dokumentgrenene"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:154
 msgid "(&De)activate"
-msgstr ""
+msgstr "&Av/På"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:158
-#, fuzzy
 msgid "Toggle the selected branch"
-msgstr "Fjern den valgte siteringen"
+msgstr "Slår den valgte grenen av eller på"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:169
-#, fuzzy
 msgid "Alter Co&lor..."
-msgstr "Modifiser..."
+msgstr "&Endre farge..."
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:173
 msgid "Define or change background color"
-msgstr ""
+msgstr "Velge/forandre bakgrunnsfarge"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:184
 #: src/frontends/qt2/ui/QPrefConvertersModule.ui:324
@@ -2181,14 +2176,12 @@ msgid "&Remove"
 msgstr "Fjern"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:188
-#, fuzzy
 msgid "Remove the selected branch"
-msgstr "Fjern den valgte siteringen"
+msgstr "Fjern den valgte dokumentgrenen"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:235
-#, fuzzy
 msgid "&New:"
-msgstr "&Ny"
+msgstr "&Ny:"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:257
 #: src/frontends/qt2/ui/QBibtexAddDialogBase.ui:175
@@ -2200,7 +2193,7 @@ msgstr "Legg til"
 
 #: src/frontends/qt2/ui/BranchesModuleBase.ui:261
 msgid "Add a new branch to the list"
-msgstr ""
+msgstr "Legg en ny dokumentgren til listen"
 
 #: src/frontends/qt2/ui/BulletsModuleBase.ui:118
 msgid "&First level"
@@ -2210,7 +2203,6 @@ msgstr "&F
 #: src/frontends/qt2/ui/BulletsModuleBase.ui:413
 #: src/frontends/qt2/ui/BulletsModuleBase.ui:669
 #: src/frontends/qt2/ui/BulletsModuleBase.ui:963
-#, fuzzy
 msgid "Size:"
 msgstr "Størrelse:"
 
@@ -2413,9 +2405,8 @@ msgid "Appears in TOC"
 msgstr "I innholdsliste"
 
 #: src/frontends/qt2/ui/NumberingModuleBase.ui:200
-#, fuzzy
 msgid "Example numbering and table of contents"
-msgstr "Sett inn innholdsfortegnelse"
+msgstr "Eksempel på nummerering og innholdsliste"
 
 #: src/frontends/qt2/ui/PageLayoutModuleBase.ui:41
 msgid "Paper Size"
@@ -2854,14 +2845,12 @@ msgid "T&ype:"
 msgstr "&Type:"
 
 #: src/frontends/qt2/ui/QBranchDialogBase.ui:90
-#, fuzzy
 msgid "&Available branches:"
-msgstr "Tilgjengelige siteringsnøkler"
+msgstr "Tilgjengelige dokumentgrener:"
 
 #: src/frontends/qt2/ui/QBranchDialogBase.ui:105
-#, fuzzy
 msgid "Select your branch"
-msgstr "Merk forrige bokstav"
+msgstr "Velg dokumentgren"
 
 #: src/frontends/qt2/ui/QChangesDialogBase.ui:60
 msgid "Change :"
@@ -8951,7 +8940,7 @@ msgstr "Eksporter|E"
 
 #: lib/ui/classic.ui:59 lib/ui/stdmenus.ui:48
 msgid "Print...|P"
-msgstr "Skriv...|S"
+msgstr "Skriv ut...|u"
 
 #: lib/ui/classic.ui:60 lib/ui/stdmenus.ui:49
 msgid "Fax...|F"
@@ -8959,7 +8948,7 @@ msgstr "Faks...|F"
 
 #: lib/ui/classic.ui:62 lib/ui/stdmenus.ui:51
 msgid "Exit|x"
-msgstr "Avslutt|A"
+msgstr "Avslutt|v"
 
 #: lib/ui/classic.ui:68 lib/ui/stdmenus.ui:59
 msgid "Register...|R"
@@ -9119,7 +9108,7 @@ msgstr "Bytt om kolonner"
 
 #: lib/ui/classic.ui:141 lib/ui/stdmenus.ui:141
 msgid "Left|L"
-msgstr "Venstrejustert|#V"
+msgstr "Venstrejustert|V"
 
 #: lib/ui/classic.ui:142 lib/ui/stdmenus.ui:142
 msgid "Center|C"
@@ -9127,11 +9116,11 @@ msgstr "Sentrert"
 
 #: lib/ui/classic.ui:143 lib/ui/stdmenus.ui:143
 msgid "Right|R"
-msgstr "Høyrejustert|#H"
+msgstr "Høyrejustert|H"
 
 #: lib/ui/classic.ui:145 lib/ui/stdmenus.ui:145
 msgid "Top|T"
-msgstr "Toppjustert rad|#T"
+msgstr "Toppjustert rad|T"
 
 #: lib/ui/classic.ui:146 lib/ui/stdmenus.ui:146
 msgid "Middle|M"
@@ -9139,7 +9128,7 @@ msgstr "Midtjustert rad|M"
 
 #: lib/ui/classic.ui:147 lib/ui/stdmenus.ui:147
 msgid "Bottom|B"
-msgstr "Bunnjustert rad|#B"
+msgstr "Bunnjustert rad|B"
 
 #: lib/ui/classic.ui:159 lib/ui/stdmenus.ui:161
 msgid "Toggle Numbering|N"
@@ -9224,7 +9213,7 @@ msgstr ""
 #: lib/ui/classic.ui:199 lib/ui/classic.ui:260 lib/ui/stdmenus.ui:198
 #: lib/ui/stdmenus.ui:290
 msgid "Inline Formula|I"
-msgstr "Formel i teksten|I"
+msgstr "Formel i teksten|i"
 
 #: lib/ui/classic.ui:200 lib/ui/stdmenus.ui:199
 msgid "Displayed Formula|D"
@@ -9268,7 +9257,7 @@ msgstr "Litteraturreferanse...|L"
 
 #: lib/ui/classic.ui:218 lib/ui/stdmenus.ui:250
 msgid "Cross-reference...|r"
-msgstr "Kryssreferanse...|r"
+msgstr "Kryssreferanse...|K"
 
 #: lib/ui/classic.ui:219 lib/ui/stdmenus.ui:251
 msgid "Label...|L"
@@ -9296,7 +9285,7 @@ msgstr "URL...|U"
 
 #: lib/ui/classic.ui:225 lib/ui/stdmenus.ui:243
 msgid "Note|N"
-msgstr "Notis|N"
+msgstr "Notis|o"
 
 #: lib/ui/classic.ui:226
 msgid "Lists & TOC|O"
@@ -9373,7 +9362,7 @@ msgstr "Vertikal avstand..."
 
 #: lib/ui/classic.ui:249 lib/ui/stdmenus.ui:285
 msgid "Line Break|L"
-msgstr "Linjeskift|L"
+msgstr "Linjeskift|i"
 
 #: lib/ui/classic.ui:250 lib/ui/stdmenus.ui:265
 msgid "Ellipsis|i"
@@ -9381,7 +9370,7 @@ msgstr "Ellipse|i"
 
 #: lib/ui/classic.ui:251 lib/ui/stdmenus.ui:266
 msgid "End of Sentence|E"
-msgstr "Punktum som avslutter setning|S"
+msgstr "Punktum som avslutter setning|s"
 
 #: lib/ui/classic.ui:252
 msgid "Single Quote|Q"
@@ -9525,7 +9514,7 @@ msgstr "\"Floatflt\" figur"
 
 #: lib/ui/classic.ui:310 lib/ui/classic.ui:360 lib/ui/stdmenus.ui:342
 msgid "Table of Contents|C"
-msgstr "Innholdsfortegnelse|I"
+msgstr "Innholdsfortegnelse|n"
 
 #: lib/ui/classic.ui:312 lib/ui/stdmenus.ui:344
 msgid "Index List|I"
@@ -9700,7 +9689,7 @@ msgstr "Brukermanual|B"
 
 #: lib/ui/classic.ui:410 lib/ui/stdmenus.ui:444
 msgid "Extended Features|E"
-msgstr "Utvidede egenskaper|u"
+msgstr "Utvidede egenskaper|U"
 
 #: lib/ui/classic.ui:411 lib/ui/stdmenus.ui:445
 msgid "Customization|C"
@@ -9790,7 +9779,7 @@ msgstr "Tekststil..."
 
 #: lib/ui/stdmenus.ui:93
 msgid "Paragraph Settings...|P"
-msgstr "Avsnitt...|A"
+msgstr "Avsnittsinnstillinger...|v"
 
 #: lib/ui/stdmenus.ui:96
 msgid "Table|T"
@@ -9826,7 +9815,7 @@ msgstr "Notisinnstillinger...|N"
 
 #: lib/ui/stdmenus.ui:112
 msgid "Branch Settings...|B"
-msgstr ""
+msgstr "Gren-innstillinger...|G"
 
 #: lib/ui/stdmenus.ui:113
 msgid "Box Settings...|x"
@@ -9907,7 +9896,7 @@ msgstr "Tooltips|o"
 
 #: lib/ui/stdmenus.ui:239
 msgid "Special Formatting|o"
-msgstr "Spesiell formattering|S"
+msgstr "Spesiell formattering|p"
 
 #: lib/ui/stdmenus.ui:240
 msgid "List / TOC|i"
@@ -9919,7 +9908,7 @@ msgstr "Flytende (Float)|a"
 
 #: lib/ui/stdmenus.ui:244
 msgid "Branch|B"
-msgstr ""
+msgstr "Dokumentgren|D"
 
 #: lib/ui/stdmenus.ui:245
 #, fuzzy
@@ -9945,7 +9934,7 @@ msgstr "Tabell...|T"
 
 #: lib/ui/stdmenus.ui:261
 msgid "TeX Code|X"
-msgstr "TeX|T"
+msgstr "TeX-kode|X"
 
 #: lib/ui/stdmenus.ui:267
 msgid "Ordinary Quote|Q"
@@ -9984,7 +9973,7 @@ msgstr "Eksternt materiale...|E"
 
 #: lib/ui/stdmenus.ui:354
 msgid "Child Document...|d"
-msgstr "Underdokument...|D"
+msgstr "Underdokument...|d"
 
 #: lib/ui/stdmenus.ui:358
 msgid "LyX Note|N"
@@ -10004,7 +9993,7 @@ msgstr "Spore endringer"
 
 #: lib/ui/stdmenus.ui:379
 msgid "Table of Contents|T"
-msgstr "Innholdsfortegnelse|I"
+msgstr "Innholdsfortegnelse|n"
 
 #: lib/ui/stdmenus.ui:380
 msgid "LaTeX Preamble...|P"
@@ -12027,9 +12016,8 @@ msgid "BibTeX Bibliography"
 msgstr "BibTeX referanseliste"
 
 #: src/frontends/qt2/QBranch.C:36 src/frontends/xforms/FormBranch.C:35
-#, fuzzy
 msgid "Branch Settings"
-msgstr "\"Float\" innstillinger"
+msgstr "Gren-innstillinger"
 
 #: src/frontends/qt2/QChanges.C:63
 msgid "Change by "
@@ -12153,9 +12141,8 @@ msgstr "\"Float\"-plassering"
 
 #: src/frontends/qt2/QDocumentDialog.C:86
 #: src/frontends/xforms/FormDocument.C:442
-#, fuzzy
 msgid "Branches"
-msgstr "Fransk"
+msgstr "Dokumentgrener"
 
 #: src/frontends/qt2/QDocumentDialog.C:87
 #: src/frontends/qt2/QDocumentDialog.C:212
@@ -12722,9 +12709,8 @@ msgid "Activate if you want to enter Regular Expressions."
 msgstr ""
 
 #: src/frontends/xforms/FormColorpicker.C:69
-#, fuzzy
 msgid "Select Color"
-msgstr "Velg "
+msgstr "Velg farge"
 
 #: src/frontends/xforms/FormColorpicker.C:190
 msgid "RGB"
@@ -12789,32 +12775,27 @@ msgstr ""
 
 #: src/frontends/xforms/FormDocument.C:395
 msgid "Enter the name of a new branch."
-msgstr ""
+msgstr "Oppgi navn på ny dokumentgren."
 
 #: src/frontends/xforms/FormDocument.C:397
-#, fuzzy
 msgid "Add a new branch to the document."
-msgstr "Fjern den valgte siteringen"
+msgstr "Legg til en ny dokumentgren."
 
 #: src/frontends/xforms/FormDocument.C:399
-#, fuzzy
 msgid "Remove the selected branch from the document."
-msgstr "Fjern den valgte siteringen"
+msgstr "Fjern den valgte dokumentgrenen"
 
 #: src/frontends/xforms/FormDocument.C:401
-#, fuzzy
 msgid "Activate the selected branch for output."
-msgstr "Flytt den valgte siteringen ned"
+msgstr "Aktiver den valgte dokumentgrenen for utskrift."
 
 #: src/frontends/xforms/FormDocument.C:403
-#, fuzzy
 msgid "Deactivate the selected activated branch."
-msgstr "Fjern den valgte siteringen"
+msgstr "Deaktiver den valgte dokumentgrenen."
 
 #: src/frontends/xforms/FormDocument.C:405
-#, fuzzy
 msgid "Available branches for this document."
-msgstr "Fjern den valgte siteringen"
+msgstr "Tilgjengelige dokumentgrener for dette dokumentet."
 
 #: src/frontends/xforms/FormDocument.C:407
 msgid "Activated branches. Content will occur in the document's output"
@@ -12822,11 +12803,11 @@ msgstr ""
 
 #: src/frontends/xforms/FormDocument.C:409
 msgid "Modify background color of branch inset"
-msgstr ""
+msgstr "Forandre bakgrunnsfargen i dokumentgrenen"
 
 #: src/frontends/xforms/FormDocument.C:411
 msgid "Background color of branch inset"
-msgstr ""
+msgstr "Bakgrunnsfarge for dokumentgren"
 
 #: src/frontends/xforms/FormDocument.C:423
 msgid "Document"
@@ -13763,9 +13744,8 @@ msgid "Opened Box Inset"
 msgstr "Åpnet text inset"
 
 #: src/insets/insetbranch.C:72
-#, fuzzy
 msgid "Opened Branch Inset"
-msgstr "Åpnet \"float inset\""
+msgstr "Åpnet \"gren-inset\""
 
 #: src/insets/insetcaption.C:77
 #, fuzzy
@@ -13796,7 +13776,6 @@ msgid "Opened ERT Inset"
 msgstr "Åpnet ERT inset"
 
 #: src/insets/insetert.C:368
-#, fuzzy
 msgid "ERT"
 msgstr "ERT"