#
#
# patch "ChangeLog"
#  from [453fb87ea6f84175adea838448fd18b75716079d]
#    to [94db1bbadd50774d5972335b2b24913e5cac2abc]
#
# patch "po/sv.po"
#  from [6135d5323c6a3b6a79244e4e62d773c5293a3029]
#    to [3c30314f0fcb405fdffd637d1416edeccd7ef25f]
#
============================================================
--- ChangeLog	453fb87ea6f84175adea838448fd18b75716079d
+++ ChangeLog	94db1bbadd50774d5972335b2b24913e5cac2abc
@@ -1,3 +1,8 @@
+2006-06-24  Richard Levitte  <address@hidden>
+
+	* Changelog: Convert all CRLF to LF.
+	* po/sv.po: A few more fuzzies to correct.
+
 2006-06-24  Lapo Luchini  <address@hidden>

 	* po/it.po: Updated and translated a few more strings (63 to go).
============================================================
--- po/sv.po	6135d5323c6a3b6a79244e4e62d773c5293a3029
+++ po/sv.po	3c30314f0fcb405fdffd637d1416edeccd7ef25f
@@ -145,8 +145,8 @@
 msgstr ""
 "Project-Id-Version: monotone 0.26pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-20 01:24+0200\n"
-"PO-Revision-Date: 2006-06-20 01:23+0200\n"
+"POT-Creation-Date: 2006-06-24 17:55+0200\n"
+"PO-Revision-Date: 2006-06-24 17:57+0200\n"
 "Last-Translator: Joel Rosdahl <address@hidden>\n"
 "Language-Team: Richard Levitte <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -166,8 +166,8 @@

 #: app_state.cc:155
 #, c-format
-msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
-msgstr "det finns redan en administrativ katalog (%s) i '%s'\n"
+msgid "monotone bookkeeping directory '%s' already exists in '%s'"
+msgstr "det finns redan en administrativ katalog (%s) i '%s'"

 #: app_state.cc:236
 #, c-format
@@ -297,7 +297,7 @@
 msgid "automation interface"
 msgstr "automatiseringsgränssnitt"

-#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:434 cmd_diff_log.cc:436
+#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437
 #: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446
 #: commands.cc:370
 #, c-format
@@ -379,8 +379,8 @@
 msgid "no var with name %s in domain %s"
 msgstr "det finns inga variabler med namnet %s i domänen %s"

-#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:556 cmd_files.cc:78
-#: cmd_files.cc:145 cmd_list.cc:436 cmd_merging.cc:569 cmd_ws_commit.cc:322
+#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78
+#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322
 #: commands.cc:246
 msgid "informative"
 msgstr "informativ"
@@ -399,7 +399,7 @@
 msgstr "något tecken i den partiella identiteten är inte hexadecimalt"

 #: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
-#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:615
+#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613
 msgid "[PATH]..."
 msgstr "[SÖKVÄG]..."

@@ -425,15 +425,15 @@
 "--diff-args kräver att även --external anges\n"
 "lägg till --external eller ta bort --diff-args?"

-#: cmd_diff_log.cc:492
+#: cmd_diff_log.cc:494
 msgid "no changes"
 msgstr "inga ändringar"

-#: cmd_diff_log.cc:556
+#: cmd_diff_log.cc:558
 msgid "[FILE] ..."
 msgstr "[FIL] ..."

-#: cmd_diff_log.cc:557
+#: cmd_diff_log.cc:559
 msgid ""
 "print history in reverse order (filtering by 'FILE'). If one or more "
 "revisions are given, use them as a starting point."
@@ -442,7 +442,7 @@
 "arbetskatalogen om inga filer angivits. Om en eller flera revisioner har "
 "angivits används de som utgångspunkter."

-#: cmd_diff_log.cc:620
+#: cmd_diff_log.cc:621
 #, c-format
 msgid "only one of --last/--next allowed"
 msgstr "enbart en av --last eller --next tillåten"
@@ -714,7 +714,7 @@
 msgid "empty comment"
 msgstr "tom kommentar"

-#: cmd_list.cc:64 cmd_list.cc:654
+#: cmd_list.cc:64 cmd_list.cc:655
 #, c-format
 msgid "no public key '%s' found in database"
 msgstr "den publika nyckeln '%s' finns inte i databasen"
@@ -764,7 +764,7 @@
 msgid "no epoch for branch %s"
 msgstr "ingen epok i grenen %s"

-#: cmd_list.cc:437
+#: cmd_list.cc:438
 msgid ""
 "certs ID\n"
 "keys [PATTERN]\n"
@@ -790,7 +790,7 @@
 "missing\n"
 "changed"

-#: cmd_list.cc:448
+#: cmd_list.cc:449
 msgid ""
 "show database objects, or the current workspace manifest, \n"
 "or known, unknown, intentionally ignored, missing, or \n"
@@ -799,18 +799,18 @@
 "visa databasobjekten, arbetskopians manifest, okända filer, kända \n"
 "filer, medvetet ignorerade filer, saknade filer eller ändrade filer"

-#: cmd_list.cc:630
+#: cmd_list.cc:631
 msgid "REV"
 msgstr "REV"

-#: cmd_list.cc:640
+#: cmd_list.cc:641
 #, c-format
 msgid "No such revision %s"
 msgstr "det finns ingen revision med identiteten %s"

 #: cmd_merging.cc:53 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
 #: cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 cmd_ws_commit.cc:303
-#: cmd_ws_commit.cc:517 cmd_ws_commit.cc:615
+#: cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
 msgid "workspace"
 msgstr "arbetskopia"

@@ -915,8 +915,8 @@
 msgstr "uppdaterad till revisionen %s"

 #: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523
-#: cmd_merging.cc:610 cmd_ws_commit.cc:385 cmd_ws_commit.cc:853
-#: cmd_ws_commit.cc:874
+#: cmd_merging.cc:610 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
+#: cmd_ws_commit.cc:872
 msgid "tree"
 msgstr "träd"

@@ -1404,12 +1404,12 @@
 msgid "revision %s is not a member of branch %s"
 msgstr "revisionen %s är inte med i grenen %s"

-#: cmd_ws_commit.cc:499
+#: cmd_ws_commit.cc:497
 #, c-format
 msgid "no file %s found in database for %s"
 msgstr "det finns ingen fil %s för %s i databasen"

-#: cmd_ws_commit.cc:517
+#: cmd_ws_commit.cc:515
 msgid ""
 "set PATH ATTR VALUE\n"
 "get PATH [ATTR]\n"
@@ -1419,45 +1419,45 @@
 "get SÖKVÄG [ATTR]\n"
 "drop SÖKVÄG [ATTR]"

-#: cmd_ws_commit.cc:518
+#: cmd_ws_commit.cc:516
 msgid "set, get or drop file attributes"
 msgstr "sätt, hämta eller ta bort attribut"

-#: cmd_ws_commit.cc:535
+#: cmd_ws_commit.cc:533
 #, c-format
 msgid "Unknown path '%s'"
 msgstr "Okänd sökväg '%s'"

-#: cmd_ws_commit.cc:564
+#: cmd_ws_commit.cc:562
 #, c-format
 msgid "Path '%s' does not have attribute '%s'\n"
 msgstr "Sökvägen '%s' har inget attribut '%s'\n"

-#: cmd_ws_commit.cc:592
+#: cmd_ws_commit.cc:590
 #, c-format
 msgid "No attributes for '%s'"
 msgstr "Inga attribut till '%s'"

-#: cmd_ws_commit.cc:603
+#: cmd_ws_commit.cc:601
 #, c-format
 msgid "No attribute '%s' on path '%s'"
 msgstr "Inget attribut '%s' för sökvägen '%s'"

-#: cmd_ws_commit.cc:616
+#: cmd_ws_commit.cc:614
 msgid "commit workspace to database"
 msgstr "arkivera arbetskopian i databasen"

-#: cmd_ws_commit.cc:650
+#: cmd_ws_commit.cc:648
 #, c-format
 msgid "no changes to commit"
 msgstr "inga ändringar att arkivera"

-#: cmd_ws_commit.cc:664
+#: cmd_ws_commit.cc:662
 #, c-format
 msgid "beginning commit on branch '%s'"
 msgstr "börjar arkivering av ändringar i grenen '%s'"

-#: cmd_ws_commit.cc:673
+#: cmd_ws_commit.cc:671
 #, c-format
 msgid ""
 "_MTN/log is non-empty and log message was specified on command line\n"
@@ -1468,37 +1468,37 @@
 "kanske ta bort eller flytta på _MTN/log\n"
 "eller ta bort --message/--message-file från kommandoraden?"

-#: cmd_ws_commit.cc:688
+#: cmd_ws_commit.cc:686
 #, c-format
 msgid "empty log message; commit canceled"
 msgstr "tomt loggmeddelande; arkivering avbryts"

-#: cmd_ws_commit.cc:709
+#: cmd_ws_commit.cc:707
 #, c-format
 msgid "log message rejected: %s"
 msgstr "loggmeddelandet förkastas: %s"

-#: cmd_ws_commit.cc:717
+#: cmd_ws_commit.cc:715
 #, c-format
 msgid "revision %s already in database"
 msgstr "revisionen %s finns redan i databasen"

-#: cmd_ws_commit.cc:756 cmd_ws_commit.cc:786
+#: cmd_ws_commit.cc:754 cmd_ws_commit.cc:784
 #, c-format
 msgid "file '%s' modified during commit, aborting"
 msgstr "filen '%s' ändrades under arkivering, avbryter"

-#: cmd_ws_commit.cc:768
+#: cmd_ws_commit.cc:766
 #, c-format
 msgid "Your database is missing version %s of file '%s'"
 msgstr "Din databas saknar version %s av filen '%s'"

-#: cmd_ws_commit.cc:814
+#: cmd_ws_commit.cc:812
 #, c-format
 msgid "committed revision %s"
 msgstr "arkiverade revisionen %s"

-#: cmd_ws_commit.cc:820
+#: cmd_ws_commit.cc:818
 #, c-format
 msgid ""
 "note: this revision creates divergence\n"
@@ -1507,20 +1507,20 @@
 "obs: den här revisionen skapade divergens\n"
 "obs: du kan tänkas vilja (eller kanske inte) köra '%s merge'"

-#: cmd_ws_commit.cc:853
+#: cmd_ws_commit.cc:851
 msgid "[DIRECTORY]"
 msgstr "[KATALOG]"

-#: cmd_ws_commit.cc:854
+#: cmd_ws_commit.cc:852
 msgid "setup a new workspace directory, default to current"
 msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)"

-#: cmd_ws_commit.cc:860
+#: cmd_ws_commit.cc:858
 #, c-format
 msgid "need --branch argument for setup"
 msgstr "du måste ange en gren med --branch till kommandot \"setup\""

-#: cmd_ws_commit.cc:875
+#: cmd_ws_commit.cc:873
 msgid "refresh the inodeprint cache"
 msgstr "uppdatera inodeprint-cachen"

@@ -1880,7 +1880,7 @@
 msgid "database is good"
 msgstr "databasen är i gott skick"

-#: database.cc:158
+#: database.cc:156
 #, c-format
 msgid ""
 "layout of database %s doesn't match this version of monotone\n"
@@ -1894,12 +1894,12 @@
 "(detta går inte att ångra; du vill nog ta en säkerhetskopia av databasen\n"
 "först)"

-#: database.cc:172
+#: database.cc:170
 #, c-format
 msgid "this database already contains rosters"
 msgstr "den här databasen har redan listor"

-#: database.cc:192
+#: database.cc:190
 #, c-format
 msgid ""
 "database %s contains revisions but no rosters\n"
@@ -1918,7 +1918,7 @@
 "  sedan databasen på nytt.\n"
 "ursäkta besväret."

-#: database.cc:211
+#: database.cc:209
 #, c-format
 msgid ""
 "database %s contains manifests but no revisions\n"
@@ -1929,19 +1929,19 @@
 "detta är en väldigt gammal databas; den behöver uppgraderas\n"
 "var god läs README.changesets för detaljer"

-#: database.cc:247
+#: database.cc:245
 #, c-format
 msgid "unable to probe database version in file %s"
 msgstr "kunde inte hitta någon databasversion i filen %s"

-#: database.cc:254
+#: database.cc:252
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
 msgstr ""
 "databasen %s är inte skapad med SQLite version 3; testa att dumpa och ladda "
 "på nytt"

-#: database.cc:283 schema_migration.cc:200
+#: database.cc:281 schema_migration.cc:200
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
@@ -1950,7 +1950,7 @@
 "i\n"
 "samt att det finns tillräckligt med ledigt utrymme på disken"

-#: database.cc:289 schema_migration.cc:205
+#: database.cc:287 schema_migration.cc:205
 #, c-format
 msgid ""
 "sqlite error: %s\n"
@@ -1959,12 +1959,12 @@
 "sqlite-fel: %s\n"
 "%s"

-#: database.cc:335
+#: database.cc:332
 #, c-format
 msgid "could not initialize database: %s: already exists"
 msgstr "kunde inte initiera databasen: %s: den finns redan"

-#: database.cc:340
+#: database.cc:337
 #, c-format
 msgid ""
 "existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -1975,12 +1975,12 @@
 "databasen '%s'\n"
 "avbryter skapandet av databasen"

-#: database.cc:490
+#: database.cc:487
 #, c-format
 msgid "cannot create %s; it already exists"
 msgstr "kan inte skapa %s; den finns redan"

-#: database.cc:567
+#: database.cc:564
 #, c-format
 msgid ""
 "schema version    : %s\n"
@@ -2029,52 +2029,52 @@
 "  sidstorlek          : %u\n"
 "  cachestorlek        : %u\n"

-#: database.cc:629
+#: database.cc:626
 #, c-format
 msgid "database schema version: %s"
 msgstr "databasens schemaversion: %s"

-#: database.cc:706
+#: database.cc:703
 #, c-format
 msgid "multiple statements in query: %s\n"
 msgstr "multipla kommandon i databasfråga: %s\n"

-#: database.cc:712
+#: database.cc:709
 #, c-format
 msgid "wanted %d columns got %d in query: %s"
 msgstr "ville ha %d kolumner, fick %d i databasfråga: %s"

-#: database.cc:771
+#: database.cc:768
 #, c-format
 msgid "null result in query: %s"
 msgstr "inget resultat med databasfråga: %s"

-#: database.cc:789
+#: database.cc:786
 #, c-format
 msgid "wanted %d rows got %d in query: %s"
 msgstr "ville ha %d rader, fick %d i databasfråga: %s"

-#: database.cc:1929
+#: database.cc:1926
 #, c-format
 msgid "another key with name '%s' already exists"
 msgstr "det finns redan en annan nyckel med namnet '%s'"

-#: database.cc:2983
+#: database.cc:2958
 #, c-format
 msgid "no database specified"
 msgstr "ingen databas angiven"

-#: database.cc:2991
+#: database.cc:2966
 #, c-format
 msgid "database %s does not exist"
 msgstr "databasen %s finns inte"

-#: database.cc:2992
+#: database.cc:2967
 #, c-format
 msgid "%s is a directory, not a database"
 msgstr "%s är en katalog, inte en databas"

-#: database.cc:3017
+#: database.cc:2992
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr "kunde inte öppna databasen '%s': %s"
@@ -2550,8 +2550,8 @@

 #: monotone.cc:635
 #, c-format
-msgid "monotone %s doesn't use the option %s"
-msgstr "monotone %s använder inte flaggan %s"
+msgid "%s %s doesn't use the option %s"
+msgstr "%s %s använder inte flaggan %s"

 #: monotone.cc:670
 #, c-format
@@ -3207,8 +3207,8 @@

 #: revision.cc:1021
 #, c-format
-msgid "Path %s cannot be added, as there is a directory in the way\n"
-msgstr "Filen %s kan inte läggas till, det finns en katalog i vägen\n"
+msgid "Path %s cannot be added, as there is a directory in the way"
+msgstr "Filen %s kan inte läggas till, det finns en katalog i vägen"

 #: revision.cc:1024
 #, c-format
@@ -3569,8 +3569,8 @@

 #: work.cc:623
 #, c-format
-msgid "base revision %s does not exist in database\n"
-msgstr "grundrevisionen %s finns inte i databasen\n"
+msgid "base revision %s does not exist in database"
+msgstr "grundrevisionen %s finns inte i databasen"

 #: work.cc:932
 #, c-format