X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=po%2Fsv.po;h=95774a1e74b838191e959200c33096584f49c682;hb=8864a7cc89abc6d910896aa4681e89fd71c5e4f1;hp=7a7100036aa21e1deac9cf9f401d9283f27f0e50;hpb=c88f6fb3dfa138986362e578edea4f00b5ba44c3;p=lilypond.git

diff --git a/po/sv.po b/po/sv.po
index 7a7100036a..95774a1e74 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.7.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-08 16:22+0200\n"
-"PO-Revision-Date: 2003-08-23 13:30+0200\n"
+"POT-Creation-Date: 2006-12-24 10:40+0100\n"
+"PO-Revision-Date: 2006-12-23 16:16+0100\n"
 "Last-Translator: Martin Norbäck <d95mback@dtek.chalmers.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,146 +71,159 @@ msgid "Running %s..."
 msgstr "Kör %s..."
 
 #: lilylib.py:203
-#, python-format
-msgid "Usage: %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "varning: %s\n"
+
+#: abc2ly.py:1349 convert-ly.py:80 lilypond-book.py:125 midi2ly.py:869
+#, fuzzy, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "Användning: %s [FLAGGA]... FIL"
 
 #: abc2ly.py:1351
+#, python-format
 msgid ""
-"This program converts ABC music files (see\n"
-"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input."
 msgstr ""
 
-#: abc2ly.py:1354
-#, fuzzy
-msgid "set output filename to FILE"
+#: abc2ly.py:1355 etf2ly.py:1200 midi2ly.py:885
+msgid "write output to FILE"
 msgstr "skriv utdata till FIL"
 
-#: abc2ly.py:1356
+#: abc2ly.py:1357
 msgid "be strict about succes"
 msgstr ""
 
-#: abc2ly.py:1358
+#: abc2ly.py:1359
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
+#: abc2ly.py:1361 convert-ly.py:112 etf2ly.py:1208 lilypond-book.py:168
+#: midi2ly.py:911 musicxml2ly.py:505
+#, fuzzy
+msgid "Report bugs via"
+msgstr ""
+"Rapportera programfel till %s\n"
+"Rapportera fel i översättningen till <sv@li.org>"
+
 #: convert-ly.py:41
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version.\n"
-"\n"
-"Examples:\n"
-"\n"
-"  convert-ly -e old.ly\n"
-"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
+"version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:57 lilypond-book.py:97 warn.cc:48 input.cc:90
+#: convert-ly.py:43 lilypond-book.py:73
+#, fuzzy
+msgid "Examples:"
+msgstr "Exempel:"
+
+#: convert-ly.py:56 lilypond-book.py:98 warn.cc:48 input.cc:90
 #, fuzzy, c-format, python-format
 msgid "warning: %s"
 msgstr "varning: %s\n"
 
-#: convert-ly.py:60 lilypond-book.py:100 warn.cc:54 input.cc:96 input.cc:104
+#: convert-ly.py:59 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
 #, fuzzy, c-format, python-format
 msgid "error: %s"
 msgstr "fel: %s\n"
 
-#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:120 midi2ly.py:98
+#: convert-ly.py:75 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
 msgid "Distributed under terms of the GNU General Public License."
 msgstr "Distribueras under GNU General Public License."
 
-#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:121 midi2ly.py:99
+#: convert-ly.py:76 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
 msgid "It comes with NO WARRANTY."
 msgstr "INGEN GARANTI ges för programmet."
 
-#: convert-ly.py:88 convert-ly.py:108
+#: convert-ly.py:86 convert-ly.py:106
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:90
+#: convert-ly.py:88
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:93
+#: convert-ly.py:91
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:96
+#: convert-ly.py:94
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:102
-msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:100
+msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:107
+#: convert-ly.py:105
 msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:154
+#: convert-ly.py:153
 msgid "Applying conversion: "
 msgstr ""
 
 #: convert-ly.py:166
-msgid "error while converting"
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168 score-engraver.cc:74
-msgid "Aborting"
+#: convert-ly.py:168
+msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:192
+#: convert-ly.py:190
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "Behandlar \"%s\"..."
 
-#: convert-ly.py:279 source-file.cc:54
+#: convert-ly.py:277 relocate.cc:360 source-file.cc:54
 #, c-format, python-format
-msgid "can't open file: `%s'"
+msgid "cannot open file: `%s'"
 msgstr "kan inte öppna fil: \"%s\""
 
-#: convert-ly.py:286
+#: convert-ly.py:284
 #, fuzzy, python-format
-msgid "can't determine version for `%s'. Skipping"
+msgid "cannot determine version for `%s'.  Skipping"
 msgstr "kan inte hitta standardtypsnitt: \"%s\""
 
+#: etf2ly.py:1196
+#, fuzzy, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "Användning: %s [FLAGGA]... FIL"
+
 #: etf2ly.py:1198
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
-"Finale product. This program will convert a subset of ETF to a\n"
-"ready-to-use lilypond file."
+"Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
+"file."
 msgstr ""
 
-#: etf2ly.py:1201 midi2ly.py:885
-msgid "write output to FILE"
-msgstr "skriv utdata till FIL"
-
-#: etf2ly.py:1202 midi2ly.py:886 main.cc:173 main.cc:179
+#: etf2ly.py:1201 midi2ly.py:886 musicxml2ly.py:498 main.cc:172 main.cc:178
 msgid "FILE"
 msgstr "FIL"
 
-#: etf2ly.py:1204 midi2ly.py:899
-#, fuzzy
-msgid "show warranty"
+#: etf2ly.py:1203 lilypond-book.py:165 midi2ly.py:899 main.cc:185
+msgid "show warranty and copyright"
 msgstr "visa garanti och copyright"
 
-#: lilypond-book.py:70
+#: lilypond-book.py:71
+#, fuzzy
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
-"\n"
-"Example usage:\n"
-"\n"
-" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-" lilypond-book --process='lilypond -I include' BOOK\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr ""
+"Bearbeta LilyPond-stycken i ett hybriddokument i html, LaTex eller texinfo"
+
+#: lilypond-book.py:78
+msgid "BOOK"
 msgstr ""
 
-#: lilypond-book.py:86
+#: lilypond-book.py:87
 #, python-format
 msgid "Exiting (%d)..."
 msgstr "Avslutar (%d)... "
 
-#: lilypond-book.py:118
+#: lilypond-book.py:119
 #, python-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright © %s av"
@@ -226,7 +239,8 @@ msgstr ""
 
 #: lilypond-book.py:135
 #, fuzzy
-msgid "use output format FORMAT (texi [default], texi-html, latex, html)"
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr "använd utdataformat FMT (texi [standard], texi-html, latex, html)"
 
 #: lilypond-book.py:138
@@ -234,6 +248,10 @@ msgstr "anv
 msgid "add DIR to include path"
 msgstr "lägg till KATALOG till sökvägen"
 
+#: lilypond-book.py:139 lilypond-book.py:144 main.cc:171
+msgid "DIR"
+msgstr "KATALOG"
+
 #: lilypond-book.py:143
 #, fuzzy
 msgid "write output to DIR"
@@ -247,151 +265,151 @@ msgstr ""
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:154
+msgid "Create PDF files for use with PDFTeX"
+msgstr ""
+
+#: lilypond-book.py:157
 msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeXmust use this with "
-"dvips -h INPUT.psfonts"
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:162 midi2ly.py:896 main.cc:183
+#: lilypond-book.py:160 midi2ly.py:896 musicxml2ly.py:489 main.cc:184
 msgid "be verbose"
 msgstr "var utförlig"
 
-#: lilypond-book.py:168 main.cc:184
-msgid "show warranty and copyright"
-msgstr "visa garanti och copyright"
-
-#: lilypond-book.py:721
+#: lilypond-book.py:773
 #, fuzzy, python-format
 msgid "file not found: %s"
 msgstr "klav \"%s\" hittades inte"
 
-#: lilypond-book.py:952
+#: lilypond-book.py:1004
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:955
+#: lilypond-book.py:1007
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:959
+#: lilypond-book.py:1011
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:962
+#: lilypond-book.py:1014
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:981
+#: lilypond-book.py:1033
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1318
+#: lilypond-book.py:1388
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Öppnar rör \"%s\"..."
 
-#: lilypond-book.py:1335
+#: lilypond-book.py:1405
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "\"%s\" misslyckades (%d)"
 
-#: lilypond-book.py:1336
+#: lilypond-book.py:1406
 msgid "The error log is as follows:"
 msgstr "Felloggen är följande:"
 
-#: lilypond-book.py:1405
-msgid "Can't find \\begin{document} in LaTeX document"
+#: lilypond-book.py:1476
+msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1513
+#: lilypond-book.py:1586
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "Skriver \"%s\"..."
 
-#: lilypond-book.py:1518
+#: lilypond-book.py:1591
 #, fuzzy
 msgid "Processing..."
 msgstr "Behandlar..."
 
-#: lilypond-book.py:1522
+#: lilypond-book.py:1595
 #, fuzzy
 msgid "All snippets are up to date..."
 msgstr "lugn, %s är senaste versionen"
 
-#: lilypond-book.py:1532
+#: lilypond-book.py:1605
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "kan inte hitta standardtypsnitt: \"%s\""
 
-#: lilypond-book.py:1543
+#: lilypond-book.py:1616
 #, fuzzy, python-format
 msgid "%s is up to date."
 msgstr "lugn, %s är senaste versionen"
 
-#: lilypond-book.py:1549
+#: lilypond-book.py:1622
 #, python-format
 msgid "Writing `%s'..."
 msgstr "Skriver \"%s\"..."
 
-#: lilypond-book.py:1604
+#: lilypond-book.py:1677
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
 # här är det fråga om rensning av en temporärkatalog
-#: lilypond-book.py:1608
+#: lilypond-book.py:1681
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Rensar %s..."
 
-#: lilypond-book.py:1627
+#: lilypond-book.py:1700
 #, fuzzy
 msgid "Dissecting..."
 msgstr "Listar \"%s\"..."
 
 # här är det fråga om rensning av en temporärkatalog
-#: lilypond-book.py:1643
+#: lilypond-book.py:1716
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Rensar %s..."
 
-#: lilypond-book.py:1652
+#: lilypond-book.py:1725
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "Behandlar \"%s\"..."
 
-#: lilypond-book.py:1666
+#: lilypond-book.py:1739
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Startar \"%s\""
 
-#: lilypond-book.py:1743
+#: lilypond-book.py:1815
 #, fuzzy, python-format
 msgid "Writing fonts to %s..."
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: lilypond-book.py:1758
+#: lilypond-book.py:1830
 msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-book.py:1759
+#: lilypond-book.py:1831
 msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1834
 msgid "DVIPS usage:"
 msgstr ""
 
-#: midi2ly.py:106 lily-library.scm:541 lily-library.scm:549
+#: midi2ly.py:106 lily-library.scm:624 lily-library.scm:632
 msgid "warning: "
 msgstr "varning: "
 
-#: midi2ly.py:109 midi2ly.py:925
+#: midi2ly.py:109 midi2ly.py:924
 msgid "error: "
 msgstr "fel: "
 
@@ -406,10 +424,10 @@ msgstr "Avslutar... "
 msgid "%s output to `%s'..."
 msgstr "%s skrivet till \"%s\"..."
 
-#: midi2ly.py:871
-#, fuzzy
-msgid "Convert MIDI to LilyPond source."
-msgstr "Konvertera MIDI till LilyPond"
+#: midi2ly.py:871 musicxml2ly.py:485
+#, fuzzy, python-format
+msgid "Convert %s to LilyPond input."
+msgstr "Konvertera mup till LilyPond"
 
 #: midi2ly.py:875
 msgid "print absolute pitches"
@@ -453,34 +471,59 @@ msgstr "tolka all text som lyrik"
 
 #: midi2ly.py:905
 #, fuzzy
-msgid "example"
+msgid "Examples"
 msgstr "Exempel:"
 
-#: midi2ly.py:926
+#: midi2ly.py:925
 msgid "no files specified on command line."
 msgstr "inga filer angivna på kommandoraden."
 
-#: getopt-long.cc:141
+#: musicxml2ly.py:473
+msgid "musicxml2ly FILE.xml"
+msgstr ""
+
+#: musicxml2ly.py:476
+#, fuzzy, python-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Det här är fri programvara. Den täcks av \"GNU General Public License\",\n"
+"och du får ändra och/eller distribuera kopior av den under vissa\n"
+"villkor. Kör \"%s --warranty\" för mer information.\n"
+
+#: musicxml2ly.py:495
+msgid "Use lxml.etree; uses less memory and cpu time."
+msgstr ""
+
+#: musicxml2ly.py:503
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "skriv utdata till FIL"
+
+#: getopt-long.cc:140
 #, c-format
 msgid "option `%s' requires an argument"
 msgstr "flaggan \"%s\" kräver ett argument"
 
-#: getopt-long.cc:145
-#, c-format
-msgid "option `%s' doesn't allow an argument"
+#: getopt-long.cc:144
+#, fuzzy, c-format
+msgid "option `%s' does not allow an argument"
 msgstr "flaggan \"%s\" tillåter inget argument"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "okänd flagga: \"%s\""
 
-#: getopt-long.cc:155
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "ogiltigt argument \"%s\" till flaggan \"%s\""
 
-#: warn.cc:68 grob.cc:552 input.cc:82
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "programmeringsfel: "
@@ -489,86 +532,75 @@ msgstr "programmeringsfel: "
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:238
+#: accidental-engraver.cc:240
 #, fuzzy, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr "Lista av höjningar/säkningar måste börja med context-name: %s"
 
-#: accidental-engraver.cc:266
+#: accidental-engraver.cc:268
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:282
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:243 key-signature-interface.cc:124
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "höjning/säkning \"%s\" hittades inte"
 
-#: align-interface.cc:164
+#: align-interface.cc:222
 msgid ""
 "vertical alignment called before line-breaking.\n"
 "Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: align-interface.cc:314
-msgid "tried to get a translation for something that isn't my child"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
-#: all-font-metrics.cc:164
+#: all-font-metrics.cc:173
 #, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "kan inte hitta typsnitt: \"%s\""
 
-#: all-font-metrics.cc:165
-#, fuzzy
-msgid "loading default font"
-msgstr "Läser in standardtypsnitt"
-
-#: all-font-metrics.cc:172
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "kan inte hitta standardtypsnitt: \"%s\""
-
-#: all-font-metrics.cc:173 includable-lexer.cc:62 lily-parser-scheme.cc:108
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(sökväg: \"%s\")"
-
-#: all-font-metrics.cc:174 volta-engraver.cc:158
-#, fuzzy
-msgid "giving up"
-msgstr "Ger upp"
-
 #: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: axis-group-engraver.cc:82
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:83
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:84
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:94
+#: axis-group-interface.cc:96
 msgid "tried to calculate pure-height at a non-breakpoint"
 msgstr ""
 
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
 #: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
@@ -582,19 +614,20 @@ msgstr "har redan en balk"
 msgid "unterminated beam"
 msgstr "oavslutad balk"
 
-#: beam-engraver.cc:237 chord-tremolo-engraver.cc:134
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 msgid "stem must have Rhythmic structure"
 msgstr "skaft måste ha en rytmisk struktur"
 
-#: beam-engraver.cc:245
-msgid "stem doesn't fit in beam"
+#: beam-engraver.cc:246
+#, fuzzy
+msgid "stem does not fit in beam"
 msgstr "skaftet passar inte i balken"
 
-#: beam-engraver.cc:246
+#: beam-engraver.cc:247
 msgid "beam was started here"
 msgstr "balken startade här"
 
-#: beam-quanting.cc:306
+#: beam-quanting.cc:307
 #, fuzzy
 msgid "no feasible beam position"
 msgstr "Ingen lämplig radbrytning hittades"
@@ -604,24 +637,24 @@ msgstr "Ingen l
 msgid "removing beam with no stems"
 msgstr "balk har mindre än två synliga skaft"
 
-#: beam.cc:995
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:208
+#: break-alignment-interface.cc:208
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Ingen avståndsdata från %s till \"%s\""
 
 #: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
 #. FIXME: constant error message.
 #: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "kan inte hitta omgivningen \"%s\""
 
 #. We could change the current translator's id, but that would make
@@ -653,7 +686,7 @@ msgstr "icke avslutat ackordtremolo"
 msgid "expect 2 elements for chord tremolo, found %d"
 msgstr ""
 
-#: clef.cc:55
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr "klav \"%s\" hittades inte"
@@ -667,7 +700,7 @@ msgstr "ok
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:106
+#: coherent-ligature-engraver.cc:100
 #, fuzzy, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
@@ -676,26 +709,26 @@ msgstr ""
 #. if we get to here, just put everything on one line
 #: constrained-breaking.cc:176 constrained-breaking.cc:193
 #, fuzzy
-msgid "couldn't find line breaking that satisfies constraints"
+msgid "cannot find line breaking that satisfies constraints"
 msgstr "kunde inte hitta något typsnitt som uppfyller "
 
-#: context-def.cc:128
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "Programmet har ingen sådan typ"
 
-#: context-property.cc:77
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
 #: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "kan inte hitta eller skapa: \"%s\""
 
 #: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "kan inte hitta eller skapa \"%s\" kallad \"%s\""
 
 #: context.cc:276
@@ -705,7 +738,7 @@ msgstr ""
 
 #: context.cc:388
 #, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "kan inte hitta eller skapa: \"%s\""
 
 #: custos.cc:77
@@ -713,17 +746,22 @@ msgstr "kan inte hitta eller skapa: \"%s\""
 msgid "custos `%s' not found"
 msgstr "custos \"%s\" hittades inte"
 
-#: dispatcher.cc:72
+#: dispatcher.cc:71
 msgid "Event class should be a symbol"
 msgstr ""
 
-#: dispatcher.cc:79
+#: dispatcher.cc:78
 #, fuzzy, c-format
 msgid "Unknown event class %s"
 msgstr "okänd klusterstil: \"%s\""
 
+#: dots.cc:38
+#, fuzzy, c-format
+msgid "dot `%s' not found"
+msgstr "paus \"%s\" hittades inte, "
+
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "kan inte hitta start på crescendo/diminuendo"
 
 #: dynamic-engraver.cc:195
@@ -743,11 +781,7 @@ msgstr "Cresc startade h
 msgid "unterminated (de)crescendo"
 msgstr "oavslutat crescendo/diminuendo"
 
-#: engraver.cc:102
-msgid "not setting creation callback: not a procedure"
-msgstr ""
-
-#: extender-engraver.cc:130 extender-engraver.cc:139
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "oavslutad utökare"
 
@@ -770,15 +804,15 @@ msgstr "kan inte skapa katalog: \"%s\""
 msgid "adding font directory: %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: general-scheme.cc:161
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:162
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:91
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "Oavslutat glissando."
@@ -811,46 +845,38 @@ msgstr "implicit \\%s tillagt"
 #. ligature may not start with 2nd head of pes or flexa
 #: gregorian-ligature-engraver.cc:212
 #, fuzzy
-msgid "can't apply `\\~' on first head of ligature"
+msgid "cannot apply `\\~' on first head of ligature"
 msgstr "kan inte hitta start på ligatur"
 
 #. (pitch == prev_pitch)
 #: gregorian-ligature-engraver.cc:224
-msgid "can't apply `\\~' on heads with identical pitch"
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:48
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "okänd klusterstil: \"%s\""
 
-#: grob-interface.cc:59
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: grob-property.cc:36
-msgid "not setting modification callback: not a procedure"
-msgstr ""
-
 #: grob.cc:253
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:179
+#: hairpin.cc:183
 msgid "decrescendo too small"
 msgstr "diminuendo för litet"
 
-#: hairpin.cc:180
-msgid "crescendo too small"
-msgstr "crescendo för litet"
-
-#: horizontal-bracket-engraver.cc:58
+#: horizontal-bracket-engraver.cc:59
 #, fuzzy
-msgid "don't have that many brackets"
+msgid "do not have that many brackets"
 msgstr "Har inte så många klamrar"
 
-#: horizontal-bracket-engraver.cc:67
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Motsägande notgrupphändelser."
@@ -869,93 +895,98 @@ msgstr "oavslutat bindestreck"
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:60 lily-guile.cc:96 lily-parser-scheme.cc:115
+#: includable-lexer.cc:60 lily-guile.cc:90 lily-parser-scheme.cc:116
 #, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(sökväg: \"%s\")"
+
 #: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "okänd position"
 
-#: ligature-engraver.cc:95
-msgid "can't find start of ligature"
+#: ligature-engraver.cc:93
+msgid "cannot find start of ligature"
 msgstr "kan inte hitta start på ligatur"
 
-#: ligature-engraver.cc:100
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr "ingen högergräns"
 
-#: ligature-engraver.cc:122
+#: ligature-engraver.cc:120
 msgid "already have a ligature"
 msgstr "har redan en ligatur"
 
-#: ligature-engraver.cc:131
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr "ingen vänstergräns"
 
-#: ligature-engraver.cc:175
+#: ligature-engraver.cc:173
 msgid "unterminated ligature"
 msgstr "oavslutad ligatur"
 
-#: ligature-engraver.cc:204
+#: ligature-engraver.cc:202
 #, fuzzy
 msgid "ignoring rest: ligature may not contain rest"
 msgstr "ligatur får inte innehålla paus; ignorerar paus"
 
-#: ligature-engraver.cc:205
+#: ligature-engraver.cc:203
 msgid "ligature was started here"
 msgstr "ligaturen startade här"
 
-#: lily-guile.cc:98
+#: lily-guile.cc:92
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(inläsningssökväg: \"%s\""
 
-#: lily-guile.cc:439
+#: lily-guile.cc:518
 #, fuzzy, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr "Kan inte hitta egenskapstypkontroll för \"%s\" (%s)"
 
-#: lily-guile.cc:442
+#: lily-guile.cc:521
 #, fuzzy
 msgid "perhaps a typing error?"
 msgstr "Kanske har du gjort ett skrivfel?"
 
-#: lily-guile.cc:448
+#: lily-guile.cc:527
 #, fuzzy
 msgid "doing assignment anyway"
 msgstr "Gör tilldelningen ändå."
 
-#: lily-guile.cc:460
+#: lily-guile.cc:539
 #, fuzzy, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 "Typkontroll för \"%s\" misslyckades. Värde \"%s\" måste ha typen \"%s\""
 
-#: lily-lexer.cc:222
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "Identifierarnamn är ett nyckelord: \"%s\""
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fel vid filslut: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "kan inte hitta tecken som heter: \"%s\""
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:88
 #, fuzzy, c-format
-msgid "Changing working directory to `%s'"
+msgid "Changing working directory to: `%s'"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
 #: lily-parser-scheme.cc:125
@@ -963,21 +994,21 @@ msgstr "kan inte hitta fil: \"%s\""
 msgid "Processing `%s'"
 msgstr "Behandlar \"%s\"..."
 
-#: lily-parser.cc:97
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "Tolkar..."
 
-#: lily-parser.cc:126
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "Krullparenteser matchar inte"
 
-#: lyric-combine-music-iterator.cc:286
+#: lyric-combine-music-iterator.cc:291
 #, fuzzy, c-format
 msgid "cannot find Voice `%s'"
 msgstr "kan inte hitta fil: \"%s\""
 
-#: main.cc:117
+#: main.cc:116
 #, fuzzy, c-format
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
@@ -989,7 +1020,7 @@ msgstr ""
 "och du får ändra och/eller distribuera kopior av den under vissa\n"
 "villkor. Kör \"%s --warranty\" för mer information.\n"
 
-#: main.cc:123
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -1001,7 +1032,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1019,136 +1050,134 @@ msgstr ""
 "detta program. Om inte, skriv till Free Software Foundation, Inc.,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: main.cc:154
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:154
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps,eps,\n"
-"scm, svg, tex, texstr)\n"
-"default: PS"
+"use backend BACK (eps, gnome, ps [default],\n"
+"scm, svg, tex, texstr)"
 msgstr ""
 
-#: main.cc:156
+#: main.cc:155
 #, fuzzy
-msgid "SYM=VAL"
+msgid "SYM[=VAL]"
 msgstr "NYCKEL=VÄRDE"
 
-#: main.cc:157
+#: main.cc:156
 msgid ""
-"set a Scheme program option. Uses #t if VAL is not specified\n"
-"Try -dhelp for help."
+"set Scheme option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
-#: main.cc:160
+#: main.cc:159
 msgid "EXPR"
 msgstr "UTTR"
 
-#: main.cc:160
+#: main.cc:159
 #, fuzzy
 msgid "evaluate scheme code"
 msgstr "Kan inte evaluera Scheme i säkert läge"
 
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:163
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:164
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "skapa PDF-utdata"
 
-#: main.cc:165
-msgid "relocate using directory of lilypond program"
-msgstr ""
-
-#: main.cc:166
+#: main.cc:164
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "skapa PDF-utdata"
 
-#: main.cc:167
+#: main.cc:165
 #, fuzzy
 msgid "generate PNG"
 msgstr "skapa PS.GZ"
 
-#: main.cc:168
+#: main.cc:166
 #, fuzzy
 msgid "generate PostScript"
 msgstr "skapa PostScript-utdata"
 
-#: main.cc:169
+#: main.cc:167
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-# förklaring av flaggan -h
-#: main.cc:170
-#, fuzzy
-msgid "print this help"
-msgstr "denna hjälp"
+#: main.cc:168
+msgid "show this help and exit"
+msgstr ""
 
-#: main.cc:171
+#: main.cc:169
 msgid "FIELD"
 msgstr "FÄLT"
 
-#: main.cc:171
+#: main.cc:169
 #, fuzzy
-msgid "dump a header field to file BASENAME.FIELD"
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
 msgstr "skriv rubrikfält till BASNAMN.FÄLT"
 
-#: main.cc:172
-msgid "DIR"
-msgstr "KATALOG"
-
-#: main.cc:172
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "lägg till KATALOG till sökvägen"
 
-#: main.cc:173
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "använd FIL som init-fil"
 
-#: main.cc:175
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:178
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "skapa PostScript-utdata"
 
-#: main.cc:179
+#: main.cc:178
 #, fuzzy
 msgid "write output to FILE (suffix will be added)"
 msgstr "skriv utdata till FIL"
 
-#: main.cc:180
+#: main.cc:179
 #, fuzzy
 msgid "generate a preview of the first system"
 msgstr "skapa en bild av det första systemet"
 
+#: main.cc:180
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
 #: main.cc:181
-msgid "disallow unsafe Scheme and PostScript operations"
+msgid ""
+"disallow unsafe Scheme and PostScript\n"
+"operations"
 msgstr ""
 
-#: main.cc:182
-msgid "print version number"
+#: main.cc:183
+#, fuzzy
+msgid "show version number and exit"
 msgstr "visa versionsnummer"
 
-#: main.cc:223
+#: main.cc:224
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1156,81 +1185,81 @@ msgid ""
 msgstr "Copyright © %s av"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:250
+#: main.cc:251
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Användning: %s [FLAGGA]... FIL..."
 
-#: main.cc:252
+#: main.cc:253
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "Typsätt musik och/eller spela MIDI från FIL"
 
-#: main.cc:254
+#: main.cc:255
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:256
+#: main.cc:257
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:258
+#: main.cc:259
 #, c-format
 msgid "Options:"
 msgstr "Flaggor:"
 
-#: main.cc:262
+#: main.cc:263
 #, fuzzy, c-format
 msgid "Report bugs via %s"
 msgstr ""
 "Rapportera programfel till %s\n"
 "Rapportera fel i översättningen till <sv@li.org>"
 
-#: main.cc:308
+#: main.cc:309
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:322
+#: main.cc:323
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "inställningen finns inte: \"%s\""
 
-#: main.cc:324
+#: main.cc:325
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:339
+#: main.cc:340
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "omgivning finns inte: %s"
 
-#: main.cc:341
+#: main.cc:342
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: main.cc:349
+#: main.cc:350
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: main.cc:356
+#: main.cc:357
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: main.cc:362
+#: main.cc:363
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "kan inte ändra \"%s\" till \"%s\""
 
-#: main.cc:368
+#: main.cc:369
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
 #: main.cc:415
@@ -1238,7 +1267,7 @@ msgstr "kan inte skapa katalog: \"%s\""
 msgid "Evaluating %s"
 msgstr ""
 
-#: main.cc:638
+#: main.cc:645
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1252,40 +1281,40 @@ msgstr ""
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:88
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr "ligature med mindre än 2 huvuden -> skippar"
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:112
 #, fuzzy
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr "kan inte bestämma tonhöjd för ligaturprimitiv -> skippar"
 
-#: mensural-ligature-engraver.cc:129
+#: mensural-ligature-engraver.cc:126
 #, fuzzy
 msgid "single note ligature - skipping"
 msgstr "primintervall inom ligatur -> skippar"
 
-#: mensural-ligature-engraver.cc:141
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr "primintervall inom ligatur -> skippar"
 
-#: mensural-ligature-engraver.cc:153
+#: mensural-ligature-engraver.cc:150
 #, fuzzy
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr "mensural ligature: längd ingen av L, B, S -> skippar"
 
-#: mensural-ligature-engraver.cc:201
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:212
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:239
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1293,7 +1322,7 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:359
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr "föll igenom case oväntat"
 
@@ -1312,116 +1341,119 @@ msgstr "Mensural_ligature: (join_left == 0)"
 msgid "no such MIDI instrument: `%s'"
 msgstr "instrumentet finns inte: \"%s\""
 
-#: midi-item.cc:273
-msgid "silly pitch"
-msgstr "tokig ton"
-
-#: midi-item.cc:289
+#: midi-item.cc:285
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
 #: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "kan inte öppna fil: \"%s\""
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "kan inte öppna fil: \"%s\""
 
-#: music-iterator.cc:172
+#: music-iterator.cc:171
 msgid "Sending non-event to context"
 msgstr ""
 
-#: music.cc:142
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected \"%s\", found: %s"
+msgid "octave check failed; expected \"%s\", found: \"%s\""
 msgstr ""
 
-#: music.cc:208
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "Transponering med %s gör ändring större än två"
 
-#: new-fingering-engraver.cc:87
-msgid "can't add text scripts to individual note heads"
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:246
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:247
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:415
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "För många krockande notkolumner. Ignorerar dem."
 
-#: note-column.cc:123
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:69
+#: note-head.cc:63
 #, fuzzy, c-format
 msgid "none of note heads `%s' or `%s' found"
 msgstr "nothuvud \"%s\" ej funnet"
 
-#: note-heads-engraver.cc:63
+#: note-heads-engraver.cc:61
 msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %lu bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "kan inte öppna fil: \"%s\""
 
 #: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "kan inte hitta typsnitt: \"%s\""
 
-#: open-type-font.cc:96
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:98
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:171 open-type-font.cc:295
+#: open-type-font.cc:173 open-type-font.cc:297
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid "FT_Get_Glyph_Name() returned error: %u"
 msgstr ""
 
-#: page-turn-page-breaking.cc:227
+#: page-turn-page-breaking.cc:205
 msgid ""
-"couldn't fit the first page turn onto a single page. Consider setting first-"
+"cannot fit the first page turn onto a single page.  Consider setting first-"
 "page-number to an even number."
 msgstr ""
 
-#: page-turn-page-breaking.cc:240
+#: page-turn-page-breaking.cc:218
 #, c-format
 msgid "Calculating page and line breaks (%d possible page breaks)..."
 msgstr ""
 
-#: page-turn-page-breaking.cc:258 paper-score.cc:154
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
 #, fuzzy
 msgid "Drawing systems..."
 msgstr "Skapar stämmor..."
 
-#: pango-font.cc:215
+#: pango-font.cc:181
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "inte en PostScript-fil: \"%s\""
 
-#: pango-font.cc:263
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
@@ -1457,15 +1489,15 @@ msgstr "oavslutad procentrepris"
 msgid "Track..."
 msgstr "Spår... "
 
-#: performance.cc:66
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:67
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:95
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "MIDI-utdata till \"%s\"..."
@@ -1474,23 +1506,23 @@ msgstr "MIDI-utdata till \"%s\"..."
 msgid "unterminated phrasing slur"
 msgstr "oavslutad fraseringsbåge"
 
-#: piano-pedal-engraver.cc:304
+#: piano-pedal-engraver.cc:286
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:319 piano-pedal-engraver.cc:330
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
 #: piano-pedal-performer.cc:93
 #, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "kan inte hitta start på pianopedal: \"%s\""
 
-#: piano-pedal-engraver.cc:377
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "kan inte hitta start på pianopedal: \"%s\""
 
-#: program-option.cc:195
+#: program-option.cc:205
 #, fuzzy, c-format
 msgid "no such internal option: %s"
 msgstr "Okänd internt alternativ!"
@@ -1500,110 +1532,109 @@ msgstr "Ok
 msgid "not a grob name, `%s'"
 msgstr "Inte ett grob-namn, \"%s\"."
 
-#: relative-octave-check.cc:39
+#: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
 #: relocate.cc:44
 #, fuzzy, c-format
-msgid "Setting %s to %s\n"
+msgid "Setting %s to %s"
 msgstr "kan inte skapa katalog: \"%s\""
 
-#: relocate.cc:58
+#: relocate.cc:59
 #, fuzzy, c-format
 msgid "no such file: %s for %s"
 msgstr "omgivning finns inte: %s"
 
-#: relocate.cc:68 relocate.cc:86
+#: relocate.cc:69 relocate.cc:87
 #, fuzzy, c-format
 msgid "no such directory: %s for %s"
 msgstr "omgivning finns inte: %s"
 
-#: relocate.cc:78
+#: relocate.cc:79
 #, c-format
 msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: relocate.cc:98
+#: relocate.cc:99
 #, c-format
 msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: relocate.cc:128
+#: relocate.cc:129
 #, c-format
 msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: relocate.cc:168
+#: relocate.cc:169
 #, c-format
 msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: relocate.cc:175
+#: relocate.cc:176
 #, c-format
 msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: relocate.cc:184
+#: relocate.cc:185
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s"
 msgstr ""
 
-#: relocate.cc:353
-#, fuzzy, c-format
-msgid "Relocation file %s\n"
-msgstr "kan inte öppna fil: \"%s\""
-
-#: relocate.cc:358
+#: relocate.cc:354
 #, fuzzy, c-format
-msgid "can't open file %s"
+msgid "Relocation file: %s"
 msgstr "kan inte öppna fil: \"%s\""
 
-#: relocate.cc:388
+#: relocate.cc:390
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
 
-#: rest-collision.cc:150
-msgid "can't resolve rest collision: rest direction not set"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
 msgstr ""
 
-#: rest-collision.cc:164 rest-collision.cc:209
+#: rest-collision.cc:165 rest-collision.cc:210
 msgid "too many colliding rests"
 msgstr "för många krockande pauser"
 
-#: rest.cc:143
+#: rest.cc:144
 #, fuzzy, c-format
 msgid "rest `%s' not found"
 msgstr "paus \"%s\" hittades inte, "
 
-#: score-engraver.cc:68
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "kan inte hitta \"%s\""
 
-#: score-engraver.cc:70
+#: score-engraver.cc:69
 #, fuzzy
 msgid "Music font has not been installed properly."
 msgstr "Typsnitten är inte korrekt installerade. Avbryter"
 
-#: score-engraver.cc:72
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(sökväg: \"%s\")"
 
-#: score.cc:222
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr ""
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "Behöver musik i partitur"
 
-#: score.cc:223
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:228
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "Fel funna/*, behandlar inte partitur*/"
@@ -1611,7 +1642,7 @@ msgstr "Fel funna/*, behandlar inte partitur*/"
 #. FIXME:
 #: script-engraver.cc:102
 #, fuzzy
-msgid "don't know how to interpret articulation: "
+msgid "do not know how to interpret articulation: "
 msgstr "Kan inte tolka artikulering \"%s\""
 
 #: script-engraver.cc:103
@@ -1624,17 +1655,18 @@ msgstr "Scheme-alternativ:"
 msgid "No spring between column %d and next one"
 msgstr "Ingen fjäder mellan kolumn %d och nästa"
 
-#: slur-engraver.cc:83
-msgid "Invalid direction of slur-event"
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
 msgstr ""
 
-#: slur-engraver.cc:156
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "oavslutad båge"
 
-#: slur-engraver.cc:165
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "kan inte hitta start på båge"
 
 #: source-file.cc:74
@@ -1646,58 +1678,58 @@ msgstr ""
 msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:95
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr "tremololängd är för lång"
 
 #. FIXME:
-#: stem-engraver.cc:132
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Lägger till nothuvud till inkompatibel båge (typ = %d)"
 
-#: stem-engraver.cc:134
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:104
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "Konstig skaftstorlek; kolla efter smala balkar"
 
-#: stem.cc:627
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr "flaggan \"%s\" hittades ej"
 
-#: stem.cc:638
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "flaggstrecket \"%s\" hittades inte"
 
-#: system.cc:178
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr "Elementantal %d."
 
-#: system.cc:270
+#: system.cc:276
 #, fuzzy, c-format
 msgid "Grob count %d"
 msgstr "Elementantal %d "
 
-#: text-spanner-engraver.cc:60
-msgid "can't find start of text spanner"
+#: text-spanner-engraver.cc:61
+msgid "cannot find start of text spanner"
 msgstr "kan inte hitta start på textbryggare"
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:73
 msgid "already have a text spanner"
 msgstr "har redan en textbryggare"
 
-#: text-spanner-engraver.cc:132
+#: text-spanner-engraver.cc:133
 msgid "unterminated text spanner"
 msgstr "oavslutad textbryggare"
 
-#: tie-engraver.cc:257
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "ensam båge"
 
@@ -1706,14 +1738,14 @@ msgstr "ensam b
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:63
+#: time-signature-engraver.cc:64
 #, fuzzy, c-format
 msgid "strange time signature found: %d/%d"
 msgstr "Hittade underlig tidssignatur %d/%d"
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:82
+#: time-signature.cc:83
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr "tidssignatursymbol \"%s\" hittades inte: återgår till numrerad stil"
@@ -1723,43 +1755,39 @@ msgstr "tidssignatursymbol \"%s\" hittades inte: 
 msgid "unknown translator: `%s'"
 msgstr "okänd översättare: \"%s\""
 
-#: translator-group.cc:152
+#: translator-group.cc:151
 #, c-format
-msgid "can't find: `%s'"
+msgid "cannot find: `%s'"
 msgstr "kan inte hitta: \"%s\""
 
-#: translator.cc:310
+#: translator.cc:332
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:311
+#: translator.cc:333
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:67
+#: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "kan inte hitta start på textbryggare"
 
-#: trill-spanner-engraver.cc:79
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "har redan en textbryggare"
 
-#: tuplet-engraver.cc:72
-msgid "invalid direction of tuplet-span-event"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:364
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:601
+#: vaticana-ligature-engraver.cc:714
 #, fuzzy, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr "Vaticana_ligature_engraver: sätter `spacing-increment = %f': ptr=%ul"
@@ -1779,273 +1807,285 @@ msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr "Vaticana_ligature: (delta_pitch == 0)"
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:143
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "kan inte hitta start på textbryggare"
 
-#: volta-engraver.cc:153
+#: volta-engraver.cc:154
 #, fuzzy
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr "Har redan en reprisbryggare. Stoppar den tidigare."
 
-#: volta-engraver.cc:157
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "har redan en textbryggare"
 
-#: parser.yy:704
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Ger upp"
+
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1174
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1481
+#: parser.yy:1475
 #, fuzzy
 msgid "second argument must be pitch list"
 msgstr "Andra argumentet måste vara en symbol"
 
-#: parser.yy:1508 parser.yy:1513 parser.yy:1988
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "Måste vara i textläge (Lyric mode) för sångtext"
 
-#: parser.yy:1612
+#: parser.yy:1604
 #, fuzzy
 msgid "expecting string as script definition"
 msgstr "Väntade sträng som skriptdefinition"
 
-#: parser.yy:1770 parser.yy:1820
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "inte en längd: %d"
 
-#: parser.yy:1940
+#: parser.yy:1926
 #, fuzzy
 msgid "have to be in Note mode for notes"
 msgstr "Måste vara i notläge (Note mode) för noter"
 
-#: parser.yy:2004
+#: parser.yy:1987
 #, fuzzy
 msgid "have to be in Chord mode for chords"
 msgstr "Måste vara i ackordläge (Chord mode) för ackord"
 
-#: lexer.ll:177
+#: lexer.ll:176
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:181
+#: lexer.ll:180
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:236
+#: lexer.ll:235
 #, fuzzy, c-format
 msgid "Renaming input to: `%s'"
 msgstr "Öppnar rör \"%s\"..."
 
-#: lexer.ll:254
+#: lexer.ll:252
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:258
+#: lexer.ll:256
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:262
+#: lexer.ll:260
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:275
+#: lexer.ll:273
 msgid "EOF found inside a comment"
 msgstr "filslut hittat inuti en kommentar"
 
-#: lexer.ll:290
+#: lexer.ll:288
 #, fuzzy
 msgid "\\maininput not allowed outside init files"
 msgstr "\\maininput förbjudet utanför init-filer"
 
-#: lexer.ll:314
+#: lexer.ll:312
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr "felaktig eller odefinierad identifierare: \"%s\""
 
 #. backup rule
-#: lexer.ll:323
+#: lexer.ll:321
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:468
+#: lexer.ll:466
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr "Krullparentes funnen i slutet på sångtext. Glömde du ett mellanslag?"
 
-#: lexer.ll:561
+#: lexer.ll:559
 #, fuzzy
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr "Krullparentes funnen i slutet på sångtext. Glömde du ett mellanslag?"
 
-#: lexer.ll:661
+#: lexer.ll:659
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ogiltigt tecken: \"%c\""
 
-#: lexer.ll:776
+#: lexer.ll:774 lexer.ll:775
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "okänd \"escaped\" sträng: \"\\%s\""
 
-#: lexer.ll:882
+#: lexer.ll:880 lexer.ll:881
 #, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Felaktig lilypond-version: %s (%s, %s)"
+msgid "file too old: %s (oldest supported: %s)"
+msgstr ""
 
-#: lexer.ll:883
-msgid "Consider updating the input with the convert-ly script"
+#: lexer.ll:881 lexer.ll:882
+#, fuzzy
+msgid "consider updating the input with the convert-ly script"
 msgstr "Fundera på att uppdatera indata med skriptet \"convert-ly\""
 
-#: backend-library.scm:19 lily.scm:479 ps-to-png.scm:88
-#, fuzzy, lisp-format
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr ""
+
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Startar \"%s\""
 
 #: backend-library.scm:24
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "`~a' failed (~a)"
 msgstr "\"%s\" misslyckades (%d)"
 
 #: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "Skriver \"%s\"..."
 
-#: backend-library.scm:110
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "Skriver \"%s\"..."
 
-#: backend-library.scm:156
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "skriver rubrikfält \"%s\" till \"%s\"..."
 
 #: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:116
-#, lisp-format
+#: define-event-classes.scm:119
+#, scheme-format
 msgid "event class ~A seems to be unused"
 msgstr ""
 
 #. should be programming-error
-#: define-event-classes.scm:122
-#, lisp-format
+#: define-event-classes.scm:125
+#, scheme-format
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:256
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1249
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "inte en längd: %d"
 
-#: define-music-types.scm:734
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:737
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
+#: define-music-types.scm:754
+#, fuzzy, scheme-format
+msgid "cannot find music object: ~S"
 msgstr "kan inte hitta omgivningen \"%s\""
 
-#: define-music-types.scm:757
-#, fuzzy, lisp-format
+#: define-music-types.scm:774
+#, fuzzy, scheme-format
 msgid "unknown repeat type `~S'"
 msgstr "okänd klusterstil: \"%s\""
 
-#: define-music-types.scm:758
+#: define-music-types.scm:775
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
 #: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
+#, fuzzy, scheme-format
+msgid "cannot find interface for property: ~S"
 msgstr "kan inte hitta teckennummer: %d"
 
 #: document-backend.scm:145
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr "okänd klusterstil: \"%s\""
 
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "Behandlar..."
 
 #: documentation-lib.scm:150
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "Skriver \"%s\"..."
 
 #: documentation-lib.scm:172
-#, fuzzy, lisp-format
-msgid "can't find description for property ~S (~S)"
+#, fuzzy, scheme-format
+msgid "cannot find description for property ~S (~S)"
 msgstr "kan inte hitta teckennummer: %d"
 
-#: framework-eps.scm:77 framework-eps.scm:78
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "Skriver \"%s\"..."
 
-#: framework-ps.scm:278
-#, lisp-format
-msgid "can't embed ~S=~S"
+#: framework-ps.scm:279
+#, scheme-format
+msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:331
-#, lisp-format
-msgid "can't extract file matching ~a from ~a"
+#: framework-ps.scm:332
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:348
-#, lisp-format
-msgid "don't know how to embed ~S=~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:379
-#, fuzzy, lisp-format
-msgid "don't know how to embed font ~s ~s ~s"
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
 msgstr "Kan inte tolka artikulering \"%s\""
 
-#: framework-ps.scm:610
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:729
+#, scheme-format
+msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:629 framework-ps.scm:632
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
+#: framework-ps.scm:748 framework-ps.scm:751
+#, scheme-format
+msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:639
+#: framework-ps.scm:758
 msgid ""
-"nThe PostScript backend does not support the 'classic'\n"
+"\n"
+"The PostScript backend does not support the 'classic'\n"
 "framework. Use the EPS backend instead,\n"
 "\n"
 "  lilypond -b eps <file>\n"
@@ -2054,57 +2094,57 @@ msgid ""
 msgstr ""
 
 #: framework-tex.scm:360
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "filnamnet får inte innehålla mellanslag: \"%s\""
 
 #: layout-beam.scm:29
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
 #: layout-beam.scm:46
-#, lisp-format
+#, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
 
-#: layout-page-layout.scm:353
+#: layout-page-layout.scm:357
 #, fuzzy
 msgid "Calculating page breaks..."
 msgstr "Beräknar radbrytningar..."
 
-#: lily-library.scm:510
-#, fuzzy, lisp-format
+#: lily-library.scm:593
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "okänd översättare: \"%s\""
 
-#: lily-library.scm:543
-#, lisp-format
+#: lily-library.scm:626
+#, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:550
+#: lily-library.scm:633
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:131
-#, fuzzy, lisp-format
-msgid "Can't find ~A"
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "cannot find: ~A"
 msgstr "kan inte hitta: \"%s\""
 
-#: lily.scm:196
-#, lisp-format
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:409 lily.scm:469
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
 # här är det fråga om skrivning till en fil
-#: lily.scm:459
-#, fuzzy, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr "beroenden skrivna till \"%s\"..."
 
@@ -2112,49 +2152,49 @@ msgstr "beroenden skrivna till \"%s\"..."
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:132
-#, lisp-format
+#: ly-syntax-constructors.scm:136
+#, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:210
+#: music-functions.scm:213
 #, fuzzy
-msgid "More alternatives than repeats. Junking excess alternatives"
+msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr "Fler alternativ än repriser. Slänger överblivna alternativ."
 
-#: music-functions.scm:229
-#, lisp-format
+#: music-functions.scm:232
+#, scheme-format
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:535
-#, fuzzy, lisp-format
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "väntade tomrum"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:586
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:745
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
+#: music-functions.scm:748
+#, fuzzy, scheme-format
+msgid "cannot find quoted music: `~S'"
 msgstr "kan inte hitta typsnitt: \"%s\""
 
-#: music-functions.scm:953
-#, fuzzy, lisp-format
+#: music-functions.scm:942
+#, fuzzy, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr "okänd typsättning av höjning/sänkning: %s. Ignorered"
 
@@ -2163,42 +2203,42 @@ msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
 #: output-svg.scm:42
-#, lisp-format
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
 #: output-svg.scm:132
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
 #: output-tex.scm:98
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
+#, fuzzy, scheme-format
+msgid "cannot find ~a in ~a"
 msgstr "kan inte hitta start på balk"
 
 #: paper.scm:69
 msgid "Not in toplevel scope"
 msgstr ""
 
-#: paper.scm:114
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:126
-#, lisp-format
+#: paper.scm:129
+#, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
 #: parser-clef.scm:126
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "unknown clef type `~a'"
 msgstr "okänd klusterstil: \"%s\""
 
@@ -2206,16 +2246,53 @@ msgstr "ok
 msgid "see scm/clef.scm for supported clefs"
 msgstr ""
 
-#: ps-to-png.scm:97
-#, fuzzy, lisp-format
+#: ps-to-png.scm:88
+#, fuzzy, scheme-format
 msgid "~a exited with status: ~S"
 msgstr "kommandot avslutade med värde %d"
 
 #: to-xml.scm:190
-#, fuzzy
-msgid "assertion failed"
+#, fuzzy, scheme-format
+msgid "assertion failed: ~S"
 msgstr "LaTeX misslyckades."
 
+#, fuzzy
+#~ msgid "show warranty"
+#~ msgstr "visa garanti och copyright"
+
+#, fuzzy
+#~ msgid "Convert MIDI to LilyPond source."
+#~ msgstr "Konvertera MIDI till LilyPond"
+
+#, fuzzy
+#~ msgid "example"
+#~ msgstr "Exempel:"
+
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "Läser in standardtypsnitt"
+
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "kan inte hitta standardtypsnitt: \"%s\""
+
+#~ msgid "crescendo too small"
+#~ msgstr "crescendo för litet"
+
+# förklaring av flaggan -h
+#, fuzzy
+#~ msgid "print this help"
+#~ msgstr "denna hjälp"
+
+#~ msgid "silly pitch"
+#~ msgstr "tokig ton"
+
+#, fuzzy
+#~ msgid "cannot open file %s"
+#~ msgstr "kan inte öppna fil: \"%s\""
+
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Felaktig lilypond-version: %s (%s, %s)"
+
 #~ msgid "no one to print a tremolos"
 #~ msgstr "det finns ingen som kan skriva tremolon"
 
@@ -2238,7 +2315,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "no one to print a repeat brace"
 #~ msgstr "det finns ingen som kan skriva ett repristecken"
 
-#~ msgid "can't find `%s' context"
+#~ msgid "cannot find `%s' context"
 #~ msgstr "kan inte hitta omgivningen \"%s\""
 
 #~ msgid "Optimal demerits: %f"
@@ -2276,7 +2353,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr ""
 #~ "%s: TFM-fil har %u parametrar, vilket är mer än de %u jag kan hantera"
 
-#~ msgid "can't find ascii character: %d"
+#~ msgid "cannot find ascii character: %d"
 #~ msgstr "kan inte hitta ASCII-tecken: %d"
 
 #~ msgid "no one to print a tuplet start bracket"
@@ -2295,16 +2372,12 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "Fler alternativ än repriser. Slänger överblivna alternativ."
 
 #, fuzzy
-#~ msgid "can't find signature for music function"
+#~ msgid "cannot find signature for music function"
 #~ msgstr "kan inte hitta omgivningen \"%s\""
 
 #~ msgid "lilylib module"
 #~ msgstr "lilylib-modul"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS]... FILE"
-#~ msgstr "Användning: %s [FLAGGA]... FIL"
-
 #~ msgid "Opening pipe `%s'"
 #~ msgstr "Öppnar rör \"%s\"..."
 
@@ -2339,13 +2412,6 @@ msgstr "LaTeX misslyckades."
 #~ msgid "command exited with value %d"
 #~ msgstr "kommandot avslutade med värde %d"
 
-#~ msgid "Example:"
-#~ msgstr "Exempel:"
-
-#, fuzzy
-#~ msgid "Convert mup to LilyPond source."
-#~ msgstr "Konvertera mup till LilyPond"
-
 #~ msgid "debug"
 #~ msgstr "felsökningsutdata"
 
@@ -2372,7 +2438,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "Skriver \"%s\"..."
 
 #, fuzzy
-#~ msgid "can't dlopen: %s: %s"
+#~ msgid "cannot dlopen: %s: %s"
 #~ msgstr "kan inte öppna fil: \"%s\""
 
 #, fuzzy
@@ -2409,7 +2475,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "kan inte skapa katalog: \"%s\""
 
 #, fuzzy
-#~ msgid "can't handle a percent repeat of length: %s"
+#~ msgid "cannot handle a percent repeat of length: %s"
 #~ msgstr "Vet inte hur en procentrepris av denna längd ska hanteras."
 
 #~ msgid "lilypond -e EXPR means:"
@@ -2479,7 +2545,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "icke-fatalt fel: "
 
 #, fuzzy
-#~ msgid "can't find CFF/PFA/PFB font ~S=~S"
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
 #~ msgstr "kan inte hitta typsnitt: \"%s\""
 
 #, fuzzy
@@ -2522,7 +2588,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "Programming error: "
 #~ msgstr "programmeringsfel: "
 
-#~ msgid "Can't switch translators, I'm there already"
+#~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "Kan inte byta översättare, jag är redan där"
 
 #, fuzzy
@@ -2539,7 +2605,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "Huh?  Got %d, expected %d characters"
 #~ msgstr "Öh? Fick %d, väntade %d tecken"
 
-#~ msgid "Don't you want polyphonic voices instead?"
+#~ msgid "Donnot you want polyphonic voices instead?"
 #~ msgstr "Vill du ha polyfoniska stämmor istället?"
 
 #~ msgid "No volta spanner to end"
@@ -2558,11 +2624,11 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "FIXA: tonartsbytessammanslagning"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "Kpathsea kan inte hitta TFML-fil \"%s\""
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "Kpathsea kan inte hitta TFML-fil \"%s\""
 
 #, fuzzy
@@ -2578,7 +2644,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "skapa PNG-sidbilder"
 
 #, fuzzy
-#~ msgid "don't generate full pages"
+#~ msgid "do not generate full pages"
 #~ msgstr "skapa inte bilder"
 
 #, fuzzy
@@ -2601,10 +2667,6 @@ msgstr "LaTeX misslyckades."
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "Kpathsea kan inte hitta TFML-fil \"%s\""
 
-#, fuzzy
-#~ msgid "Cannot switch translators, I'm there already"
-#~ msgstr "Kan inte byta översättare, jag är redan där"
-
 #, fuzzy
 #~ msgid "Converting to `~a.ps'..."
 #~ msgstr "Skriver \"%s\"..."
@@ -2626,7 +2688,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "keep all output, output to directory %s.dir"
 #~ msgstr "behåll all utdata, utdata till katalogen %s.dir"
 
-#~ msgid "don't run LilyPond"
+#~ msgid "do not run LilyPond"
 #~ msgstr "kör inte LilyPond"
 
 #~ msgid "produce MIDI output only"
@@ -2699,16 +2761,12 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "%s skrivet till \"%s\"..."
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "kan inte hitta fil: \"%s\""
 
 #~ msgid " 1998--2005"
 #~ msgstr " 1998-2003"
 
-#~ msgid "Process LilyPond snippets in hybrid html, LaTeX or texinfo document"
-#~ msgstr ""
-#~ "Bearbeta LilyPond-stycken i ett hybriddokument i html, LaTex eller texinfo"
-
 #~ msgid "DIM"
 #~ msgstr "DIM"
 
@@ -2744,7 +2802,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "prepend PREF before each -M dependency"
 #~ msgstr "lägg till PREF före varje beroende angett med -M"
 
-#~ msgid "don't run lilypond"
+#~ msgid "do not run lilypond"
 #~ msgstr "kör inte lilypond"
 
 #~ msgid "strip all lilypond blocks from output"
@@ -2898,7 +2956,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "from musical definition: %s"
 #~ msgstr "från musikdefinition: %s"
 
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "kan inte hitta start på fraseringsbåge"
 
 #~ msgid "unterminated pedal bracket"
@@ -2999,7 +3057,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "EOF i en sträng"
 
 # det handlar om mmap här
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "kan inte göra \"mmap\" på filen"
 
 #~ msgid "<stdin>"
@@ -3074,7 +3132,7 @@ msgstr "LaTeX misslyckades."
 #~ msgstr "Textbryggare för liten"
 
 #~ msgid ""
-#~ "Can't find property type-check for `%s'.  Perhaps you made a typing "
+#~ "Cannot find property type-check for `%s'.  Perhaps you made a typing "
 #~ "error? Doing assignment anyway."
 #~ msgstr ""
 #~ "Kan inte hitta egenskapstypkontroll för \"%s\". Kanske har du gjort ett "
@@ -3086,7 +3144,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "Expecting %d arguments"
 #~ msgstr "Väntade %d argument"
 
-#~ msgid "Can't specify direction for this request"
+#~ msgid "Cannot specify direction for this request"
 #~ msgstr "Kan inte ange riktning för denna förfrågan"
 
 #~ msgid "Oldest supported input version: %s"
@@ -3136,7 +3194,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "enable debugging output"
 #~ msgstr "slå på felsökningsutdata"
 
-#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgid "do not output tuplets, double dots or rests, smallest is 32"
 #~ msgstr "mata inte ut tupler, dubbelpunkteringar eller pauser, minsta är 32"
 
 #~ msgid "set FILE as default output"
@@ -3145,13 +3203,13 @@ msgstr "LaTeX misslyckades."
 #~ msgid "be quiet"
 #~ msgstr "var tyst"
 
-#~ msgid "don't output rests or skips"
+#~ msgid "do not output rests or skips"
 #~ msgstr "mata inte ut pauser eller hopp"
 
 #~ msgid "set smallest duration"
 #~ msgstr "ställ in minsta längd"
 
-#~ msgid "don't timestamp the output"
+#~ msgid "do not timestamp the output"
 #~ msgstr "tidsstämpla inte utdata"
 
 #~ msgid "assume no double dotted notes"
@@ -3193,7 +3251,7 @@ msgstr "LaTeX misslyckades."
 #~ msgid "invalid number of tracks"
 #~ msgstr "ogiltigt antal spår"
 
-#~ msgid "can't handle non-metrical time"
+#~ msgid "cannot handle non-metrical time"
 #~ msgstr "kan inte hantera icke-metrisk tid"
 
 #~ msgid "Junking note-end event: channel = %d, pitch = %d"