msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2008-07-21 23:07+0200\n"
+"POT-Creation-Date: 2008-07-23 00:12+0200\n"
"PO-Revision-Date: 2007-06-26 21:34+0200\n"
"Last-Translator: Ingar Pareliussen <ingarp_ved_samfundet.no>\n"
"Language-Team: Nynorsk <nn@li.org>\n"
#: src/frontends/qt4/ui/MathMatrixUi.ui:167
#: src/frontends/qt4/ui/NomenclUi.ui:92 src/frontends/qt4/ui/NoteUi.ui:38
#: src/frontends/qt4/ui/ParagraphUi.ui:82 src/frontends/qt4/ui/RefUi.ui:77
-#: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:105
+#: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:52
#: src/frontends/qt4/ui/SymbolsUi.ui:49
#: src/frontends/qt4/ui/TabularCreateUi.ui:65
#: src/frontends/qt4/ui/VSpaceUi.ui:36 src/frontends/qt4/ui/WrapUi.ui:150
#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:835
#: src/Buffer.cpp:2521 src/Buffer.cpp:2545 src/Buffer.cpp:2580
#: src/LyXFunc.cpp:666 src/LyXFunc.cpp:802 src/LyXFunc.cpp:980
-#: src/LyXVC.cpp:161 src/frontends/qt4/GuiClipboard.cpp:208
+#: src/LyXVC.cpp:179 src/frontends/qt4/GuiClipboard.cpp:208
#: src/frontends/qt4/GuiDocument.cpp:1251
#: src/frontends/qt4/GuiParagraph.cpp:69
#: src/frontends/qt4/GuiParagraph.cpp:159 src/frontends/qt4/GuiView.cpp:1464
#: src/frontends/qt4/ui/BibtexAddUi.ui:83 src/frontends/qt4/ui/BibtexUi.ui:229
#: src/frontends/qt4/ui/ChangesUi.ui:78 src/frontends/qt4/ui/LabelUi.ui:92
#: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:92
-#: src/frontends/qt4/ui/ShortcutUi.ui:118 src/LyXFunc.cpp:772
+#: src/frontends/qt4/ui/ShortcutUi.ui:65 src/LyXFunc.cpp:772
#: src/buffer_funcs.cpp:104 src/frontends/qt4/ButtonController.cpp:231
msgid "Cancel"
msgstr "Avbryt"
#: src/frontends/qt4/ui/PrefConvertersUi.ui:209
#: src/frontends/qt4/ui/PrefShortcutsUi.ui:61
-#: src/frontends/qt4/GuiPrefs.cpp:2255 src/frontends/qt4/GuiPrefs.cpp:2340
+#: src/frontends/qt4/GuiPrefs.cpp:2257 src/frontends/qt4/GuiPrefs.cpp:2320
msgid "Remo&ve"
msgstr "&Fjern"
msgid "Edit shortcut"
msgstr "&Snøggtast:"
-#: src/frontends/qt4/ui/ShortcutUi.ui:31
-msgid ""
-"Type shortcut after clicking on this field. You can reset the content with "
-"the 'Clear' button"
+#: src/frontends/qt4/ui/ShortcutUi.ui:77
+msgid "Enter LyX function or command sequence"
msgstr ""
-#: src/frontends/qt4/ui/ShortcutUi.ui:41
-msgid "Enter LyX function or command sequence"
+#: src/frontends/qt4/ui/ShortcutUi.ui:87
+msgid "Remove last key from the shortcut sequence"
msgstr ""
-#: src/frontends/qt4/ui/ShortcutUi.ui:51
+#: src/frontends/qt4/ui/ShortcutUi.ui:90
+#, fuzzy
+msgid "&Delete Key"
+msgstr "&Slett"
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:97
#, fuzzy
msgid "Clear current shortcut"
msgstr "Klarte ikkje å lage katalog. Stoppar."
-#: src/frontends/qt4/ui/ShortcutUi.ui:54 src/frontends/qt4/ui/TabularUi.ui:272
+#: src/frontends/qt4/ui/ShortcutUi.ui:100
+#: src/frontends/qt4/ui/TabularUi.ui:272
msgid "C&lear"
msgstr "&Fjern"
-#: src/frontends/qt4/ui/ShortcutUi.ui:61
+#: src/frontends/qt4/ui/ShortcutUi.ui:107
+#, fuzzy
+msgid "&Shortcut:"
+msgstr "&Snøggtast:"
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:117
#, fuzzy
msgid "&Function:"
msgstr "Funksjonar"
-#: src/frontends/qt4/ui/ShortcutUi.ui:71
-#, fuzzy
-msgid "&Shortcut:"
-msgstr "&Snøggtast:"
+#: src/frontends/qt4/ui/ShortcutUi.ui:130
+msgid ""
+"Type shortcut after clicking on this field. You can reset the content with "
+"the 'Clear' button"
+msgstr ""
#: src/frontends/qt4/ui/SpellcheckerUi.ui:35
msgid "Suggestions:"
msgstr "Angra siste registrering|A"
#: lib/ui/classic.ui:73 lib/ui/stdmenus.inc:68
-msgid "Show History|H"
+#, fuzzy
+msgid "Show History...|H"
msgstr "Vis Historie|H"
#: lib/ui/classic.ui:82 lib/ui/stdmenus.inc:77
"\t-version samandrag av versjon og byggje info\n"
"Sjå `man' sida til LyX for meir informasjon."
-#: src/LyX.cpp:993 src/support/Package.cpp:570
+#: src/LyX.cpp:993 src/support/Package.cpp:554
msgid "No system directory"
msgstr "Ingen systemkatalog"
msgid "Revert to saved document?"
msgstr "Gå tilbake til sist lagra?"
-#: src/LyXFunc.cpp:802 src/LyXVC.cpp:161
+#: src/LyXFunc.cpp:802 src/LyXVC.cpp:179
msgid "&Revert"
msgstr "&Gå tilbake til sist lagra"
msgid "Opening help file %1$s..."
msgstr "Opnar hjelpfila %1$s..."
-#: src/LyXFunc.cpp:1273
+#: src/LyXFunc.cpp:1272
#, c-format
msgid "Opening child document %1$s..."
msgstr "Opnar barne dokumentet %1$s..."
-#: src/LyXFunc.cpp:1415
+#: src/LyXFunc.cpp:1414
#, c-format
msgid "Document defaults saved in %1$s"
msgstr "Standardval for dokument er lagra i %1$s"
-#: src/LyXFunc.cpp:1418
+#: src/LyXFunc.cpp:1417
msgid "Unable to save document defaults"
msgstr "Klarte ikkje å lagre standardval for dokument "
-#: src/LyXFunc.cpp:1695
+#: src/LyXFunc.cpp:1694
#, fuzzy, c-format
msgid "Document %1$s reloaded."
msgstr "Dokumentet %1$s er ope."
-#: src/LyXFunc.cpp:1697
+#: src/LyXFunc.cpp:1696
#, fuzzy, c-format
msgid "Could not reload document %1$s"
msgstr "Kunne ikkje lese dokumentet"
-#: src/LyXFunc.cpp:1734
+#: src/LyXFunc.cpp:1733
msgid "Welcome to LyX!"
msgstr "Velkomen til LyX!"
-#: src/LyXFunc.cpp:1755
+#: src/LyXFunc.cpp:1754
msgid "Converting document to new document class..."
msgstr "Konverterer dokumentet til ny dokument klasse ..."
msgstr ""
"Papir meldinga til DVI-framsynar (La den vere tom eller bruk \"-paper\")"
-#: src/LyXVC.cpp:91
+#: src/LyXVC.cpp:100
msgid "Document not saved"
msgstr "Dokumentet er ikkje lagra!"
-#: src/LyXVC.cpp:92
+#: src/LyXVC.cpp:101
msgid "You must save the document before it can be registered."
msgstr "Du må lagra dokumentet før du kan registrere det."
-#: src/LyXVC.cpp:118
+#: src/LyXVC.cpp:133
msgid "LyX VC: Initial description"
msgstr "LyX VK: Omtale av dokumentet. "
-#: src/LyXVC.cpp:119
+#: src/LyXVC.cpp:134
msgid "(no initial description)"
msgstr "(ingen skildring)"
-#: src/LyXVC.cpp:134
+#: src/LyXVC.cpp:149
msgid "LyX VC: Log Message"
msgstr "LyX VK: Loggmelding"
-#: src/LyXVC.cpp:137
+#: src/LyXVC.cpp:152
msgid "(no log message)"
msgstr "(Inga loggmelding)"
-#: src/LyXVC.cpp:157
-#, c-format
+#: src/LyXVC.cpp:175
+#, fuzzy, c-format
msgid ""
"Reverting to the stored version of the document %1$s will lose all current "
"changes.\n"
"\n"
-"Do you want to revert to the saved version?"
+"Do you want to revert to the older version?"
msgstr ""
"Dersom du går tilbake til det sist lagra versjon av dokumentet %1$s, vil "
"alle endringane gå tapt\n"
"\n"
"Vil du gå tilbake til den siste lagra versjonen?"
-#: src/LyXVC.cpp:160
+#: src/LyXVC.cpp:178
msgid "Revert to stored version of document?"
msgstr "Gå tilbake til den siste lagra versjonen av dokumentet?"
-#: src/Paragraph.cpp:1494 src/frontends/qt4/GuiParagraph.cpp:246
+#: src/Paragraph.cpp:1505 src/frontends/qt4/GuiParagraph.cpp:246
msgid "Senseless with this layout!"
msgstr "Meiningslaust med denne stilen."
-#: src/Paragraph.cpp:1560
+#: src/Paragraph.cpp:1571
msgid "Alignment not permitted"
msgstr ""
-#: src/Paragraph.cpp:1561
+#: src/Paragraph.cpp:1572
msgid ""
"The new layout does not permit the alignment previously used.\n"
"Setting to default."
msgstr ""
-#: src/Paragraph.cpp:2029 src/frontends/qt4/LaTeXHighlighter.cpp:108
+#: src/Paragraph.cpp:2040 src/frontends/qt4/LaTeXHighlighter.cpp:108
#: src/insets/InsetListings.cpp:182 src/insets/InsetListings.cpp:190
#: src/insets/InsetListings.cpp:214 src/mathed/InsetMathString.cpp:164
#, fuzzy
msgid "LyX Warning: "
msgstr "LyX Versjon "
-#: src/Paragraph.cpp:2030 src/insets/InsetListings.cpp:183
+#: src/Paragraph.cpp:2041 src/insets/InsetListings.cpp:183
#: src/insets/InsetListings.cpp:191 src/mathed/InsetMathString.cpp:165
#, fuzzy
msgid "uncodable character"
"%1$s."
msgstr ""
-#: src/VCBackend.cpp:46
+#: src/VCBackend.cpp:46 src/VCBackend.cpp:468 src/VCBackend.cpp:515
#, fuzzy
msgid "Revision control error."
msgstr "Kontroll av versjonar"
#: src/VCBackend.cpp:47
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Please check you have installed the program called in\n"
+"Some problem occured while running the command:\n"
"'%1$s'."
+msgstr "Vi fekk ein feil når vi køyrde %1$s"
+
+#: src/VCBackend.cpp:469
+msgid ""
+"Error when commiting to repository.\n"
+"You have to manually resolve the problem.\n"
+"After pressing OK, LyX will reopen the document."
+msgstr ""
+
+#: src/VCBackend.cpp:516
+#, c-format
+msgid ""
+"Error when updating from repository.\n"
+"You have to manually resolve the conflicts NOW!\n"
+"'%1$s'.\n"
+"\n"
+"After pressing OK, LyX will try to reopen resolved document."
msgstr ""
#: src/VSpace.cpp:472
msgstr "Om LyX"
#: src/frontends/qt4/GuiApplication.cpp:386
-#: src/frontends/qt4/GuiPrefs.cpp:2473
+#: src/frontends/qt4/GuiPrefs.cpp:2497
msgid "Preferences"
msgstr "LyX-Val"
msgid "Printer"
msgstr "Skrivar"
-#: src/frontends/qt4/GuiPrefs.cpp:1876 src/frontends/qt4/GuiPrefs.cpp:2512
+#: src/frontends/qt4/GuiPrefs.cpp:1876 src/frontends/qt4/GuiPrefs.cpp:2536
msgid "User interface"
msgstr "Grensesnitt"
msgid "Shortcut"
msgstr "&Snøggtast:"
-#: src/frontends/qt4/GuiPrefs.cpp:2111
+#: src/frontends/qt4/GuiPrefs.cpp:2113
msgid "Cursor, Mouse and Editing functions"
msgstr ""
-#: src/frontends/qt4/GuiPrefs.cpp:2115
+#: src/frontends/qt4/GuiPrefs.cpp:2117
#, fuzzy
msgid "Mathematical Symbols"
msgstr "Fonetiske symbol|y"
-#: src/frontends/qt4/GuiPrefs.cpp:2119
+#: src/frontends/qt4/GuiPrefs.cpp:2121
#, fuzzy
msgid "Document and Window"
msgstr "Filhovud-feil"
-#: src/frontends/qt4/GuiPrefs.cpp:2123
+#: src/frontends/qt4/GuiPrefs.cpp:2125
msgid "Font, Layouts and Textclasses"
msgstr ""
-#: src/frontends/qt4/GuiPrefs.cpp:2127
+#: src/frontends/qt4/GuiPrefs.cpp:2129
#, fuzzy
msgid "System and Miscellaneous"
msgstr "AMS ymse"
-#: src/frontends/qt4/GuiPrefs.cpp:2253 src/frontends/qt4/GuiPrefs.cpp:2320
+#: src/frontends/qt4/GuiPrefs.cpp:2255 src/frontends/qt4/GuiPrefs.cpp:2300
#, fuzzy
msgid "Res&tore"
msgstr "Gjenopp&rett"
-#: src/frontends/qt4/GuiPrefs.cpp:2388 src/frontends/qt4/GuiPrefs.cpp:2395
-#: src/frontends/qt4/GuiPrefs.cpp:2402 src/frontends/qt4/GuiPrefs.cpp:2414
+#: src/frontends/qt4/GuiPrefs.cpp:2401 src/frontends/qt4/GuiPrefs.cpp:2408
+#: src/frontends/qt4/GuiPrefs.cpp:2415 src/frontends/qt4/GuiPrefs.cpp:2432
#, fuzzy
msgid "Failed to create shortcut"
msgstr "Klarte ikkje å lage katalog. Stoppar."
-#: src/frontends/qt4/GuiPrefs.cpp:2389
+#: src/frontends/qt4/GuiPrefs.cpp:2402
#, fuzzy
msgid "Unknown or invalid LyX function"
msgstr "Ukjent funksjon."
-#: src/frontends/qt4/GuiPrefs.cpp:2396
+#: src/frontends/qt4/GuiPrefs.cpp:2409
msgid "Invalid or empty key sequence"
msgstr ""
-#: src/frontends/qt4/GuiPrefs.cpp:2403
+#: src/frontends/qt4/GuiPrefs.cpp:2416
msgid "Shortcut is already defined"
msgstr ""
-#: src/frontends/qt4/GuiPrefs.cpp:2415
+#: src/frontends/qt4/GuiPrefs.cpp:2433
#, fuzzy
msgid "Can not insert shortcut to the list"
msgstr "Legg til ei ny grein til lista"
-#: src/frontends/qt4/GuiPrefs.cpp:2440
+#: src/frontends/qt4/GuiPrefs.cpp:2464
msgid "Identity"
msgstr "Identitet"
-#: src/frontends/qt4/GuiPrefs.cpp:2629
+#: src/frontends/qt4/GuiPrefs.cpp:2653
msgid "Choose bind file"
msgstr "Vel bindingsfil"
-#: src/frontends/qt4/GuiPrefs.cpp:2630
+#: src/frontends/qt4/GuiPrefs.cpp:2654
msgid "LyX bind files (*.bind)"
msgstr "LyX teiknbindingar (*.bind)"
-#: src/frontends/qt4/GuiPrefs.cpp:2636
+#: src/frontends/qt4/GuiPrefs.cpp:2660
msgid "Choose UI file"
msgstr "Vel UI fil"
-#: src/frontends/qt4/GuiPrefs.cpp:2637
+#: src/frontends/qt4/GuiPrefs.cpp:2661
msgid "LyX UI files (*.ui)"
msgstr "LyX UI-filer(*.ui)"
-#: src/frontends/qt4/GuiPrefs.cpp:2643
+#: src/frontends/qt4/GuiPrefs.cpp:2667
msgid "Choose keyboard map"
msgstr "Vel tastatur oversikt"
-#: src/frontends/qt4/GuiPrefs.cpp:2644
+#: src/frontends/qt4/GuiPrefs.cpp:2668
msgid "LyX keyboard maps (*.kmap)"
msgstr "LyX;tastaturoversikt.(*.kmap)"
-#: src/frontends/qt4/GuiPrefs.cpp:2650
+#: src/frontends/qt4/GuiPrefs.cpp:2674
msgid "Choose personal dictionary"
msgstr "Vel personleg ordbok"
-#: src/frontends/qt4/GuiPrefs.cpp:2651
+#: src/frontends/qt4/GuiPrefs.cpp:2675
msgid "*.pws"
msgstr "*.pws"
-#: src/frontends/qt4/GuiPrefs.cpp:2651
+#: src/frontends/qt4/GuiPrefs.cpp:2675
msgid "*.ispell"
msgstr "*.ispell"
msgid "References: "
msgstr "Referansar: "
-#: src/support/Package.cpp:451
+#: src/support/Package.cpp:435
msgid "LyX binary not found"
msgstr "Fann ikkje LyX-programmet"
-#: src/support/Package.cpp:452
+#: src/support/Package.cpp:436
#, c-format
msgid ""
"Unable to determine the path to the LyX binary from the command line %1$s"
msgstr "Klarte ikkje å finne stigen til LyX frå kommandolinja %1$s"
-#: src/support/Package.cpp:571
-#, c-format
+#: src/support/Package.cpp:555
+#, fuzzy, c-format
msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
-"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
+"LYX_DIR_16x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Klarte ikkje å finne systemstigen etter å ha leita i\n"
"\t%1$s\n"
"Prøv '-sysdir' valet til LyX frå kommandolina eller set miljøvalet "
"LYX_DIR_15x til systemstigen i fila `chkconfig.ltx'."
-#: src/support/Package.cpp:652 src/support/Package.cpp:679
+#: src/support/Package.cpp:638 src/support/Package.cpp:665
msgid "File not found"
msgstr "Kan ikkje finne fila"
-#: src/support/Package.cpp:653
+#: src/support/Package.cpp:639
#, c-format
msgid ""
"Invalid %1$s switch.\n"
"Ikkje tillate val %1$s\n"
"Stigen %2$s har ikkje %3$s i seg."
-#: src/support/Package.cpp:680
+#: src/support/Package.cpp:666
#, c-format
msgid ""
"Invalid %1$s environment variable.\n"
"Ikkje tillate miljøval %1$s\n"
"Stigen %2$s har ikkje %3$s i seg."
-#: src/support/Package.cpp:704
+#: src/support/Package.cpp:690
#, c-format
msgid ""
"Invalid %1$s environment variable.\n"
"Ikkje tillate miljøval %1$s\n"
"%2$s er ikkje ein stig."
-#: src/support/Package.cpp:706
+#: src/support/Package.cpp:692
msgid "Directory not found"
msgstr "Kan ikkje finne katalogen"
projects / lyx.git / blobdiff