#
#
# patch "ChangeLog"
# from [65ec4cc540866c8534344697a1c10d0f6fff5cae]
# to [1459d5eec254d68dae2fa0371ead09f6bc6c2d05]
#
# patch "po/sv.po"
# from [889716d1854881f3db2ff220d94ef740ebd846d3]
# to [6a166fbc8f8ec80c5ab74c835c073a34e65296e2]
#
============================================================
--- ChangeLog 65ec4cc540866c8534344697a1c10d0f6fff5cae
+++ ChangeLog 1459d5eec254d68dae2fa0371ead09f6bc6c2d05
@@ -1,3 +1,7 @@
+2006-03-08 Richard Levitte
+
+ * po/sv.po: Traduce 2 new strings.
+
2006-03-08 Nathaniel Smith
* tests/t_disapprove_branch.at: Actually add.
============================================================
--- po/sv.po 889716d1854881f3db2ff220d94ef740ebd846d3
+++ po/sv.po 6a166fbc8f8ec80c5ab74c835c073a34e65296e2
@@ -144,8 +144,8 @@
msgstr ""
"Project-Id-Version: monotone 0.26pre1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-05 14:56+0100\n"
-"PO-Revision-Date: 2006-03-05 19:49+0100\n"
+"POT-Creation-Date: 2006-03-08 15:30+0100\n"
+"PO-Revision-Date: 2006-03-08 15:32+0100\n"
"Last-Translator: Joel Rosdahl \n"
"Language-Team: Richard Levitte \n"
"MIME-Version: 1.0\n"
@@ -203,12 +203,12 @@
msgid "negative or zero next not allowed\n"
msgstr "talet angett med --next får inte vara negativt eller noll\n"
-#: app_state.cc:530
+#: app_state.cc:536
#, c-format
msgid "Failed to read options file %s"
msgstr "Misslyckades med att läsa filen %s"
-#: app_state.cc:547
+#: app_state.cc:553
#, c-format
msgid "Failed to write options file %s"
msgstr "Misslyckades med att skriva filen %s"
@@ -303,8 +303,8 @@
msgstr "pid-filen '%s' finns redan"
#: commands.cc:325 commands.cc:1334 commands.cc:1404 commands.cc:1840
-#: commands.cc:2682 commands.cc:3303 commands.cc:3538 commands.cc:3577
-#: commands.cc:3922
+#: commands.cc:2686 commands.cc:3307 commands.cc:3542 commands.cc:3581
+#: commands.cc:3926
msgid "informative"
msgstr "informativ"
@@ -343,8 +343,8 @@
"du kanske borde överväga '%s merge'"
#: commands.cc:482 commands.cc:758 commands.cc:1422 commands.cc:1506
-#: commands.cc:2732 commands.cc:2760 commands.cc:2763 commands.cc:2899
-#: commands.cc:3560
+#: commands.cc:2736 commands.cc:2764 commands.cc:2767 commands.cc:2903
+#: commands.cc:3564
#, c-format
msgid "no such revision '%s'"
msgstr "det finns ingen revision med identiteten '%s'"
@@ -389,7 +389,7 @@
msgid "expanded partial id '%s' to '%s'\n"
msgstr "expanderade partiell identitet '%s' till '%s'\n"
-#: commands.cc:584 netsync.cc:1726
+#: commands.cc:584 netsync.cc:1727
#, c-format
msgid "no public key '%s' found in database"
msgstr "den publika nyckeln '%s' finns inte i databasen"
@@ -620,12 +620,12 @@
msgstr "tom kommentar"
#: commands.cc:1189 commands.cc:1218 commands.cc:1243 commands.cc:1268
-#: commands.cc:2183 commands.cc:2301 commands.cc:2835 commands.cc:3351
+#: commands.cc:2187 commands.cc:2305 commands.cc:2839 commands.cc:3355
msgid "workspace"
msgstr "arbetskopia"
-#: commands.cc:1189 commands.cc:1218 commands.cc:1334 commands.cc:2301
-#: commands.cc:2682 commands.cc:3351
+#: commands.cc:1189 commands.cc:1218 commands.cc:1334 commands.cc:2305
+#: commands.cc:2686 commands.cc:3355
msgid "[PATH]..."
msgstr "[SÃKVÃG]..."
@@ -667,8 +667,8 @@
"PLACERA_GAMLA.\n"
"Det rekommenderas varmt att använda --execute."
-#: commands.cc:1288 commands.cc:1301 commands.cc:1381 commands.cc:3458
-#: commands.cc:3903
+#: commands.cc:1288 commands.cc:1301 commands.cc:1381 commands.cc:3462
+#: commands.cc:3907
msgid "debug"
msgstr "felsökning"
@@ -724,13 +724,13 @@
msgid "write file from database to stdout"
msgstr "skriv ut angiven fil från databasen"
-#: commands.cc:1434 commands.cc:1436 commands.cc:3569
+#: commands.cc:1434 commands.cc:1436 commands.cc:3573
#, c-format
msgid "no file '%s' found in revision '%s'\n"
msgstr "filen '%s' finns inte i revisionen '%s'\n"
-#: commands.cc:1448 commands.cc:1577 commands.cc:3036 commands.cc:3089
-#: commands.cc:3100 commands.cc:3250 commands.cc:3258 commands.cc:3812
+#: commands.cc:1448 commands.cc:1577 commands.cc:3040 commands.cc:3093
+#: commands.cc:3104 commands.cc:3254 commands.cc:3262 commands.cc:3816
msgid "tree"
msgstr "träd"
@@ -794,12 +794,12 @@
msgid "show unmerged head revisions of branch"
msgstr "visa ej ihopslagna lövrevisioner i grenen"
-#: commands.cc:1585 commands.cc:3045
+#: commands.cc:1585 commands.cc:3049
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "var god ange en gren med --branch=GREN"
-#: commands.cc:1590 commands.cc:3049 commands.cc:3138 commands.cc:3141
+#: commands.cc:1590 commands.cc:3053 commands.cc:3142 commands.cc:3145
#, c-format
msgid "branch '%s' is empty\n"
msgstr "grenen '%s' är tom\n"
@@ -1018,7 +1018,12 @@
msgid "manipulate database state"
msgstr "gör ändringar direkt i databasen"
-#: commands.cc:2183
+#: commands.cc:2177
+#, c-format
+msgid "The epoch must be %s characters"
+msgstr "Epoken måste innehålla %s tecken"
+
+#: commands.cc:2187
msgid ""
"set PATH ATTR VALUE\n"
"get PATH [ATTR]\n"
@@ -1028,40 +1033,40 @@
"get SÃKVÃG [ATTR]\n"
"drop SÃKVÃG [ATTR]"
-#: commands.cc:2184
+#: commands.cc:2188
msgid "set, get or drop file attributes"
msgstr "sätt, hämta eller ta bort attribut"
-#: commands.cc:2200
+#: commands.cc:2204
#, c-format
msgid "Unknown path '%s'"
msgstr "Okänd sökväg '%s'"
-#: commands.cc:2229
+#: commands.cc:2233
#, c-format
msgid "Path '%s' does not have attribute '%s'\n"
msgstr "Sökvägen '%s' har inget attribut '%s'\n"
-#: commands.cc:2283
+#: commands.cc:2287
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message och --message-file får inte anges samtidigt"
-#: commands.cc:2302
+#: commands.cc:2306
msgid "commit workspace to database"
msgstr "arkivera arbetskopian i databasen"
-#: commands.cc:2320
+#: commands.cc:2324
#, c-format
msgid "no changes to commit\n"
msgstr "inga ändringar att arkivera\n"
-#: commands.cc:2334
+#: commands.cc:2338
#, c-format
msgid "beginning commit on branch '%s'\n"
msgstr "börjar arkivering av ändringar i grenen '%s'\n"
-#: commands.cc:2343
+#: commands.cc:2347
#, c-format
msgid ""
"MT/log is non-empty and log message was specified on command line\n"
@@ -1072,32 +1077,32 @@
"kanske ta bort eller flytta på MT/log\n"
"eller ta bort --message/--message-file från kommandoraden?"
-#: commands.cc:2355
+#: commands.cc:2359
#, c-format
msgid "empty log message; commit canceled"
msgstr "tomt loggmeddelande; arkivering avbryts"
-#: commands.cc:2374
+#: commands.cc:2378
#, c-format
msgid "log message rejected: %s\n"
msgstr "loggmeddelandet förkastas: %s\n"
-#: commands.cc:2382
+#: commands.cc:2386
#, c-format
msgid "revision %s already in database\n"
msgstr "revisionen %s finns redan i databasen\n"
-#: commands.cc:2420 commands.cc:2437 commands.cc:2456
+#: commands.cc:2424 commands.cc:2441 commands.cc:2460
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "filen '%s' ändrades under arkivering, avbryter"
-#: commands.cc:2482
+#: commands.cc:2486
#, c-format
msgid "committed revision %s\n"
msgstr "arkiverade revisionen %s\n"
-#: commands.cc:2488
+#: commands.cc:2492
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1106,7 +1111,7 @@
"obs: den här revisionen skapade divergens\n"
"obs: du kan tänkas vilja (eller kanske inte) köra '%s merge'"
-#: commands.cc:2683
+#: commands.cc:2687
msgid ""
"show current diffs on stdout.\n"
"If one revision is given, the diff between the workspace and\n"
@@ -1118,7 +1123,7 @@
"revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n"
"inget format anges används unified."
-#: commands.cc:2699
+#: commands.cc:2703
#, c-format
msgid ""
"--diff-args requires --external\n"
@@ -1127,16 +1132,16 @@
"--diff-args kräver att även --external anges\n"
"lägg till --external eller ta bort --diff-args?"
-#: commands.cc:2741
+#: commands.cc:2745
#, c-format
msgid "current revision has no ancestor"
msgstr "denna revision har ingen förälder"
-#: commands.cc:2804
+#: commands.cc:2808
msgid "no changes"
msgstr "inga ändringar"
-#: commands.cc:2836
+#: commands.cc:2840
msgid ""
"update workspace.\n"
"This command modifies your workspace to be based off of a\n"
@@ -1150,12 +1155,12 @@
"Om en revision har angivits så uppdateras arbetskopian till den,\n"
"i annat fall uppdateras den till lövet i grenen."
-#: commands.cc:2874
+#: commands.cc:2878
#, c-format
msgid "this workspace is a new project; cannot update"
msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera"
-#: commands.cc:2881
+#: commands.cc:2885
#, c-format
msgid ""
"your request matches no descendents of the current revision\n"
@@ -1166,32 +1171,32 @@
"faktum är att den inte ens matchar nuvarande revision\n"
"du kanske vill ange --revision="
-#: commands.cc:2886
+#: commands.cc:2890
#, c-format
msgid "multiple update candidates:"
msgstr "mer än en uppdateringskandidat:"
-#: commands.cc:2890
+#: commands.cc:2894
#, c-format
msgid "choose one with '%s update -r'"
msgstr "välj en med '%s update -r'"
-#: commands.cc:2891
+#: commands.cc:2895
#, c-format
msgid "multiple update candidates remain after selection"
msgstr "mer än en kandidat är kvar efter urval"
-#: commands.cc:2906
+#: commands.cc:2910
#, c-format
msgid "already up to date at %s\n"
msgstr "redan uppdaterad till %s\n"
-#: commands.cc:2914
+#: commands.cc:2918
#, c-format
msgid "selected update target %s\n"
msgstr "valt uppdateringsmål är %s\n"
-#: commands.cc:2926
+#: commands.cc:2930
#, c-format
msgid ""
"revision %s is not a member of branch %s\n"
@@ -1200,157 +1205,157 @@
"revisionen %s är inte i grenen %s\n"
"försök igen med en explicit --branch\n"
-#: commands.cc:3026
+#: commands.cc:3030
#, c-format
msgid "updated to base revision %s\n"
msgstr "uppdaterad till revisionen %s\n"
-#: commands.cc:3036
+#: commands.cc:3040
msgid "merge unmerged heads of branch"
msgstr "slå ihop ej ihopslagna löv i grenen"
-#: commands.cc:3052
+#: commands.cc:3056
#, c-format
msgid "branch '%s' is already merged\n"
msgstr "löven i grenen '%s' är redan ihopslagna\n"
-#: commands.cc:3060
+#: commands.cc:3064
#, c-format
msgid "starting with revision 1 / %d\n"
msgstr "börjar med revision 1 av %d\n"
-#: commands.cc:3064
+#: commands.cc:3068
#, c-format
msgid "merging with revision %d / %d\n"
msgstr "slår ihop med revision %d av %d\n"
-#: commands.cc:3065 commands.cc:3066 commands.cc:3148 commands.cc:3281
-#: commands.cc:3282
+#: commands.cc:3069 commands.cc:3070 commands.cc:3152 commands.cc:3285
+#: commands.cc:3286
#, c-format
msgid "[source] %s\n"
msgstr "[källa] %s\n"
-#: commands.cc:3083 commands.cc:3246 commands.cc:3300
+#: commands.cc:3087 commands.cc:3250 commands.cc:3304
#, c-format
msgid "[merged] %s\n"
msgstr "[ihopslagen] %s\n"
-#: commands.cc:3086
+#: commands.cc:3090
#, c-format
msgid "note: your workspaces have not been updated\n"
msgstr "obs: dina arbetskopior har inte uppdaterats\n"
-#: commands.cc:3089
+#: commands.cc:3093
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "KÃLLGREN MÃ
LGREN"
-#: commands.cc:3090
+#: commands.cc:3094
msgid "merge from one branch to another asymmetrically"
msgstr "slå ihop asymmetriskt från en gren till en annan"
-#: commands.cc:3100
+#: commands.cc:3104
msgid "SOURCE-BRANCH DEST-BRANCH DIR"
msgstr "KÃLLGREN MÃ
LGREN KATALOG"
-#: commands.cc:3101
+#: commands.cc:3105
msgid "merge one branch into a subdirectory in another branch"
msgstr "slå ihop en gren till en underkatalog i en annan gren"
-#: commands.cc:3139 commands.cc:3142
+#: commands.cc:3143 commands.cc:3146
#, c-format
msgid "branch '%s' is not merged\n"
msgstr "löven i grenen '%s' är inte ihopslagna\n"
-#: commands.cc:3147
+#: commands.cc:3151
#, c-format
msgid "propagating %s -> %s\n"
msgstr "propagerar %s -> %s\n"
-#: commands.cc:3149
+#: commands.cc:3153
#, c-format
msgid "[target] %s\n"
msgstr "[mål] %s\n"
-#: commands.cc:3154
+#: commands.cc:3158
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
msgstr "grenen '%s' är uppdaterad med avseende på grenen '%s'\n"
-#: commands.cc:3156
+#: commands.cc:3160
#, c-format
msgid "no action taken\n"
msgstr "inget utfördes\n"
-#: commands.cc:3160
+#: commands.cc:3164
#, c-format
msgid "no merge necessary; putting %s in branch '%s'\n"
msgstr "ingen ihopslagning behövs; sätter %s i grenen '%s'\n"
-#: commands.cc:3196
+#: commands.cc:3200
#, c-format
msgid "Path %s not found in destination tree."
msgstr "Sökvägen %s finns inte i målträdet."
-#: commands.cc:3250
+#: commands.cc:3254
msgid "refresh the inodeprint cache"
msgstr "uppdatera inodeprint-cachen"
-#: commands.cc:3259
+#: commands.cc:3263
msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
msgstr "VÃNSTERREVISION HÃGERREVISION MÃ
LGREN"
-#: commands.cc:3260
+#: commands.cc:3264
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr ""
"slå ihop två explicit angivna revisioner, placera resultatet i angiven gren"
-#: commands.cc:3274
+#: commands.cc:3278
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s och %s är samma revision, avbryter"
-#: commands.cc:3276 commands.cc:3278
+#: commands.cc:3280 commands.cc:3282
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s är redan förfader till %s"
-#: commands.cc:3303
+#: commands.cc:3307
msgid "(revision|file|key) PARTIAL-ID"
msgstr "(revision|file|key) PARTIAL-ID"
-#: commands.cc:3304
+#: commands.cc:3308
msgid "complete partial id"
msgstr "utöka den partiella identiteten"
-#: commands.cc:3313
+#: commands.cc:3317
#, c-format
msgid "non-hex digits in partial id"
msgstr "något tecken i den partiella identiteten är inte hexadecimalt"
-#: commands.cc:3352
+#: commands.cc:3356
msgid "revert file(s), dir(s) or entire workspace (\".\")"
msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")"
-#: commands.cc:3429
+#: commands.cc:3433
#, c-format
msgid "reverting %s"
msgstr "återställer %s"
-#: commands.cc:3433
+#: commands.cc:3437
#, c-format
msgid "no file version %s found in database for %s"
msgstr "filversionen %s finns inte i databasen för %s"
-#: commands.cc:3446
+#: commands.cc:3450
#, c-format
msgid "recreating %s/"
msgstr "återställer %s/"
-#: commands.cc:3458
+#: commands.cc:3462
msgid "RCSFILE..."
msgstr "RCSFIL..."
-#: commands.cc:3459
+#: commands.cc:3463
msgid ""
"parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions.you probably want "
@@ -1360,36 +1365,36 @@
"detta kommando importerar inte revisioner; du vill antagligen använda\n"
"cvs_import"
-#: commands.cc:3475
+#: commands.cc:3479
msgid "rcs"
msgstr "rcs"
-#: commands.cc:3475
+#: commands.cc:3479
msgid "CVSROOT"
msgstr "CVSROOT"
-#: commands.cc:3475
+#: commands.cc:3479
msgid "import all versions in CVS repository"
msgstr "importera alla revisioner i ett CVS-arkiv"
-#: commands.cc:3538
+#: commands.cc:3542
msgid "PATH"
msgstr "SÃKVÃG"
-#: commands.cc:3539
+#: commands.cc:3543
msgid "print annotated copy of the file from REVISION"
msgstr "skriv ut filen ur REVISION med extra detaljer"
-#: commands.cc:3559
+#: commands.cc:3563
#, c-format
msgid "no revision for file '%s' in database"
msgstr "filen '%s' har ingen revision i databasen"
-#: commands.cc:3577
+#: commands.cc:3581
msgid "[FILE] ..."
msgstr "[FIL] ..."
-#: commands.cc:3578
+#: commands.cc:3582
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
@@ -1398,34 +1403,34 @@
"arbetskatalogen om inga filer angivits. Om en eller flera revisioner\n"
"har angivits används de som utgångspunkter."
-#: commands.cc:3626
+#: commands.cc:3630
#, c-format
msgid "Unknown file '%s' for log command"
msgstr "Okänd fil '%s'"
-#: commands.cc:3644
+#: commands.cc:3648
#, c-format
msgid "only one of --last/--next allowed"
msgstr "enbart en av --last eller --next tillåten"
-#: commands.cc:3812
+#: commands.cc:3816
msgid "[DIRECTORY]"
msgstr "[KATALOG]"
-#: commands.cc:3812
+#: commands.cc:3816
msgid "setup a new workspace directory, default to current"
msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)"
-#: commands.cc:3818
+#: commands.cc:3822
#, c-format
msgid "need --branch argument for setup"
msgstr "du måste ange en gren med --branch till kommandot \"setup\""
-#: commands.cc:3832
+#: commands.cc:3836
msgid "automation"
msgstr "automatisering"
-#: commands.cc:3833
+#: commands.cc:3837
msgid ""
"interface_version\n"
"heads [BRANCH]\n"
@@ -1477,84 +1482,84 @@
"packet_for_fdelta GAMMAL_FIL NY_FIL\n"
"keys\n"
-#: commands.cc:3857
+#: commands.cc:3861
msgid "automation interface"
msgstr "automatiseringsgränssnitt"
-#: commands.cc:3871 commands.cc:3887
+#: commands.cc:3875 commands.cc:3891
msgid "vars"
msgstr "variabler"
-#: commands.cc:3871
+#: commands.cc:3875
msgid "DOMAIN NAME VALUE"
msgstr "DOMÃN NAMN VÃRDE"
-#: commands.cc:3872
+#: commands.cc:3876
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
msgstr "sätt databasvariabeln NAMN till VÃRDE i domänen DOMÃN"
-#: commands.cc:3887
+#: commands.cc:3891
msgid "DOMAIN NAME"
msgstr "DOMÃN NAMN"
-#: commands.cc:3888
+#: commands.cc:3892
msgid "remove the database variable NAME in domain DOMAIN"
msgstr "ta bort databasvariabeln NAMN frÃ¥n domänen DOMÃN"
-#: commands.cc:3899
+#: commands.cc:3903
#, c-format
msgid "no var with name %s in domain %s"
msgstr "det finns inga variabler med namnet %s i domänen %s"
-#: commands.cc:3903
+#: commands.cc:3907
msgid "REVID"
msgstr "REVID"
-#: commands.cc:3904
+#: commands.cc:3908
msgid "dump the roster associated with the given REVID"
msgstr "skriv ut den lista som hör ihop med angivet REVID"
-#: commands.cc:3922
+#: commands.cc:3926
msgid "REV REV"
msgstr "REV REV"
-#: commands.cc:3922
+#: commands.cc:3926
msgid ""
"Show what conflicts would need to be resolved to merge the given revisions."
msgstr ""
"Visa de konflikter som behöver lösas om de givna revisionerna slås ihop."
-#: commands.cc:3931 commands.cc:3933
+#: commands.cc:3935 commands.cc:3937
#, c-format
msgid "%s in an ancestor of %s; no merge is needed."
msgstr "%s är en förfader till %s; någon ihopslagning behövs inte."
-#: commands.cc:3947
+#: commands.cc:3951
#, c-format
msgid "There are %s node_name_conflicts."
msgstr "Det finns %s node_name-konflikter."
-#: commands.cc:3948
+#: commands.cc:3952
#, c-format
msgid "There are %s file_content_conflicts."
msgstr "Det finns %s file_content-konflikter."
-#: commands.cc:3949
+#: commands.cc:3953
#, c-format
msgid "There are %s node_attr_conflicts."
msgstr "Det finns %s node_attr-konflikter."
-#: commands.cc:3950
+#: commands.cc:3954
#, c-format
msgid "There are %s orphaned_node_conflicts."
msgstr "Det finns %s orphaned_node-konflikter."
-#: commands.cc:3951
+#: commands.cc:3955
#, c-format
msgid "There are %s rename_target_conflicts."
msgstr "Det finns %s rename_target-konflikter."
-#: commands.cc:3952
+#: commands.cc:3956
#, c-format
msgid "There are %s directory_loop_conflicts."
msgstr "Det finns %s directory_loop-konflikter."
@@ -1571,7 +1576,7 @@
msgid "markings"
msgstr "markeringar"
-#: database_check.cc:319 database_check.cc:507 netsync.cc:2759
+#: database_check.cc:319 database_check.cc:507 netsync.cc:2760
#: rcs_import.cc:1226
msgid "revisions"
msgstr "revisioner"
@@ -1580,7 +1585,7 @@
msgid "ancestry"
msgstr "föräldraskap"
-#: database_check.cc:451 netsync.cc:2763
+#: database_check.cc:451 netsync.cc:2764
msgid "keys"
msgstr "nycklar"
@@ -1616,7 +1621,9 @@
#: database_check.cc:591
#, c-format
msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n"
-msgstr "listan %s går inte att tyda (den kanske innehåller onormaliserade sökvägar?)\n"
+msgstr ""
+"listan %s går inte att tyda (den kanske innehåller onormaliserade "
+"sökvägar?)\n"
#: database_check.cc:598
#, c-format
@@ -1628,7 +1635,9 @@
msgid ""
"revision %s missing (%d revision references; %d cert references; %d parent "
"references; %d child references; %d roster references)\n"
-msgstr "revisionen %s saknas (%d revisionsreferenser; %d certreferenser; %d föräldrareferenser; %d barnreferenser; %d listareferenser)\n"
+msgstr ""
+"revisionen %s saknas (%d revisionsreferenser; %d certreferenser; %d "
+"föräldrareferenser; %d barnreferenser; %d listareferenser)\n"
#: database_check.cc:631
#, c-format
@@ -1822,7 +1831,8 @@
#: database_check.cc:948
#, c-format
msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n"
-msgstr "kontroll klar: %d filer; %d listor; %d revisioner; %d nycklar; %d cert\n"
+msgstr ""
+"kontroll klar: %d filer; %d listor; %d revisioner; %d nycklar; %d cert\n"
#: database_check.cc:954
#, c-format
@@ -2259,7 +2269,7 @@
msgid "Directory '%s' does not exists"
msgstr "Katalogen '%s' finns inte"
-#: lua.cc:587 rcs_import.cc:1217 work.cc:396
+#: lua.cc:587 rcs_import.cc:1217 work.cc:420
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' är inte en katalog"
@@ -2410,103 +2420,107 @@
msgid "exclude files when printing logs"
msgstr "ta ej med ihopslagningar i loggen"
-#: monotone.cc:86
+#: monotone.cc:78
+msgid "also operate on the contents of any listed directories"
+msgstr "ta även med innehållet för varje listad katalog"
+
+#: monotone.cc:87
msgid "print debug log to stderr while running"
msgstr "skriv ut felsökningslogg till stderr under körning"
-#: monotone.cc:87
+#: monotone.cc:88
msgid "file to dump debugging log to, on failure"
msgstr "fil att skriva ut felsökningsloggen till om något gick fel"
-#: monotone.cc:88
+#: monotone.cc:89
msgid "file to write the log to"
msgstr "fil att skriva ut loggen till"
-#: monotone.cc:89
+#: monotone.cc:90
msgid "suppress log and progress messages"
msgstr "skriv inte ut loggar eller förloppsmeddelanden"
-#: monotone.cc:90
+#: monotone.cc:91
msgid "display help message"
msgstr "skriv ut extra hjälptext"
-#: monotone.cc:91
+#: monotone.cc:92
msgid "print version number, then exit"
msgstr "skriv ut versionsnumret och avsluta sedan omedelbart"
-#: monotone.cc:92
+#: monotone.cc:93
msgid "print detailed version number, then exit"
msgstr "skriv ut detaljerad versionsinformation och avsluta sedan omedelbart"
-#: monotone.cc:93
+#: monotone.cc:94
msgid "insert command line arguments taken from the given file"
msgstr "använd kommandoradsargument ur denna fil"
-#: monotone.cc:94
+#: monotone.cc:95
msgid "set ticker style (count|dot|none)"
msgstr "sätt stilen för förloppsinformationen (count|dot|none)"
-#: monotone.cc:95
+#: monotone.cc:96
msgid "do not load standard lua hooks"
msgstr "använd inte standard-lua-rutinerna"
-#: monotone.cc:96
+#: monotone.cc:97
msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files"
msgstr "använd inte ~/.monotone/monotonerc eller MT/monotonerc"
-#: monotone.cc:97
+#: monotone.cc:98
msgid "load extra rc file"
msgstr "använd denna lua-fil"
-#: monotone.cc:98
+#: monotone.cc:99
msgid "set key for signatures"
msgstr "ange nyckel att signera med"
-#: monotone.cc:99
+#: monotone.cc:100
msgid "set name of database"
msgstr "ange databasens filnamn"
-#: monotone.cc:100
+#: monotone.cc:101
msgid "limit search for workspace to specified root"
msgstr "begränsa sökningen efter arbetskopian till denna katalog"
-#: monotone.cc:101
+#: monotone.cc:102
msgid "verbose completion output"
msgstr "ge utförlig information"
-#: monotone.cc:102
+#: monotone.cc:103
msgid "set location of key store"
msgstr "ange i vilken katalog nycklarna finns"
-#: monotone.cc:103
+#: monotone.cc:104
msgid "set location of configuration directory"
msgstr "ange i vilken katalog konfigurationsfilerna finns"
-#: monotone.cc:207
+#: monotone.cc:208
#, c-format
msgid "problem parsing arguments from file %s: %s"
msgstr "problem att tyda argumenten i filen %s: %s"
-#: monotone.cc:216
+#: monotone.cc:217
#, c-format
msgid "weird error when stuffing arguments read from %s: %s\n"
msgstr "underligt fel när argument lästa från %s stoppades in: %s\n"
-#: monotone.cc:298
+#: monotone.cc:299
msgid "[OPTION...] command [ARGS...]\n"
msgstr "[FLAGGOR...] kommando [ARGUMENT...]\n"
-#: monotone.cc:546
+#: monotone.cc:551
#, c-format
msgid "syntax error near the \"%s\" option: %s"
msgstr "syntaxfel nära flaggan \"%s\": %s"
-#: monotone.cc:585
+#: monotone.cc:590
#, c-format
msgid "monotone %s doesn't use the option %s"
msgstr "monotone %s använder inte flaggan %s"
-#: monotone.cc:620
+#: monotone.cc:625
#, c-format
msgid "Options specific to '%s %s':"
msgstr "Specifika flaggor för '%s %s':"
@@ -2630,17 +2644,17 @@
msgid "revs out"
msgstr "rev ut"
-#: netsync.cc:814
+#: netsync.cc:815
#, c-format
msgid "underflow on count of %s items to receive"
msgstr "underflöde vid räkning av %s enheter att ta emot"
-#: netsync.cc:1160
+#: netsync.cc:1161
#, c-format
msgid "received network error: %s"
msgstr "nätverksfel: %s"
-#: netsync.cc:1192
+#: netsync.cc:1193
#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -2661,12 +2675,12 @@
"jag väntade mig %s\n"
"'%s unset %s %s' åsidosätter denna kontroll\n"
-#: netsync.cc:1202
+#: netsync.cc:1203
#, c-format
msgid "server key changed"
msgstr "serverns nyckel ändrad"
-#: netsync.cc:1207
+#: netsync.cc:1208
#, c-format
msgid ""
"first time connecting to server %s\n"
@@ -2677,48 +2691,48 @@
"jag antar att det är rätt server, men du kan tänkas vilja dubbelkolla\n"
"deras nyckels fingeravtryck: %s\n"
-#: netsync.cc:1214
+#: netsync.cc:1215
#, c-format
msgid "saving public key for %s to database\n"
msgstr "sparar publik nyckel för %s i databasen\n"
-#: netsync.cc:1302
+#: netsync.cc:1303
#, c-format
msgid "rejected attempt at anonymous connection for write\n"
msgstr "nekade försök att ansluta anonymt för skrivning\n"
-#: netsync.cc:1309
+#: netsync.cc:1310
#, c-format
msgid "rejected attempt at anonymous connection while running as sink\n"
msgstr "nekade försök att ansluta anonymt under körning som \"sink\"\n"
-#: netsync.cc:1324 netsync.cc:1421
+#: netsync.cc:1325 netsync.cc:1422
#, c-format
msgid "not serving branch '%s'"
msgstr "serverar ej grenen %s"
-#: netsync.cc:1329
+#: netsync.cc:1330
#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "anonym åtkomst av grenen '%s' nekades av servern"
-#: netsync.cc:1336
+#: netsync.cc:1337
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
msgstr "tillät anonym läsning av alla grenar som matchar '%s' och inte '%s'\n"
-#: netsync.cc:1368
+#: netsync.cc:1369
#, c-format
msgid "detected replay attack in auth netcmd\n"
msgstr "upptäckte \"replay\"-attack i auth netcmd\n"
-#: netsync.cc:1390
+#: netsync.cc:1391
#, c-format
msgid "remote public key hash '%s' is unknown\n"
msgstr ""
"publik nyckel med kontrollsumman '%s' som kommer från andra sidan är okänd\n"
-#: netsync.cc:1407
+#: netsync.cc:1408
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -2727,7 +2741,7 @@
"nekade läsning för '%s' av alla grenar som matchar '%s' och inte '%s' under "
"körning som \"pure sink\"\n"
-#: netsync.cc:1427
+#: netsync.cc:1428
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
@@ -2735,18 +2749,18 @@
"nekade läsning för '%s' av alla grenar som matchar '%s' och inte '%s' på "
"grund av grenen '%s'\n"
-#: netsync.cc:1430
+#: netsync.cc:1431
#, c-format
msgid "access to branch '%s' denied by server"
msgstr "Ã¥tkomst till grenen '%s' nekades av servern"
-#: netsync.cc:1440
+#: netsync.cc:1441
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
msgstr ""
"tillät läsning för '%s' av alla grenar som matchar '%s' och inte '%s'\n"
-#: netsync.cc:1449
+#: netsync.cc:1450
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -2755,165 +2769,165 @@
"nekade skrivning för '%s' av alla grenar som matchar '%s' och inte '%s' "
"under körning som \"pure source\"\n"
-#: netsync.cc:1457
+#: netsync.cc:1458
#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'\n"
msgstr ""
"nekade skrivning för '%s' av alla grenar som matchar '%s' och inte '%s'\n"
-#: netsync.cc:1463
+#: netsync.cc:1464
#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
msgstr ""
"tillät skrivning för '%s' av alla grenar som matchar '%s' och inte '%s'\n"
-#: netsync.cc:1503
+#: netsync.cc:1504
#, c-format
msgid "bad client signature\n"
msgstr "felaktig signatur från klienten\n"
-#: netsync.cc:1519
+#: netsync.cc:1520
#, c-format
msgid "Unexpected 'refine' command on non-refined item type\n"
msgstr "Oväntat kommando \"refine\" på icke-raffinerad typ\n"
-#: netsync.cc:1616
+#: netsync.cc:1617
#, c-format
msgid "unknown bye phase %d received"
msgstr "okänd hejdå-fas %d mottagen"
-#: netsync.cc:1631
+#: netsync.cc:1632
#, c-format
msgid "Unexpected 'done' command on non-refined item type\n"
msgstr "Oväntat kommando \"done\" på icke-raffinerad typ\n"
-#: netsync.cc:1711
+#: netsync.cc:1712
#, c-format
msgid "epoch with hash '%s' does not exist in our database"
msgstr "epoken med kontrollsumman '%s' finns inte i databasen"
-#: netsync.cc:1740
+#: netsync.cc:1741
#, c-format
msgid "revision '%s' does not exist in our database"
msgstr "revisionen '%s' finns inte i databasen"
-#: netsync.cc:1754
+#: netsync.cc:1755
#, c-format
msgid "file '%s' does not exist in our database"
msgstr "filen '%s' finns inte i databasen"
-#: netsync.cc:1768
+#: netsync.cc:1769
#, c-format
msgid "cert '%s' does not exist in our database"
msgstr "certet '%s' finns inte i databasen"
-#: netsync.cc:1820
+#: netsync.cc:1821
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
msgstr ""
"I grenen %s har servern epok '%s' medan klienten har '%s'; dessa stämmer "
"inte överens."
-#: netsync.cc:1841
+#: netsync.cc:1842
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr ""
"kontrollsummering misslyckades för den publika nyckeln '%s' (%s); ville ha '%"
"s' men fick '%s'"
-#: netsync.cc:1858
+#: netsync.cc:1859
#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr "kontrollsummering misslyckades för revisionscertet '%s'"
-#: netsync.cc:1933
+#: netsync.cc:1934
#, c-format
msgid "Received warning from usher: %s"
msgstr "Fick varning från usher: %s"
-#: netsync.cc:2020 netsync.cc:2051
+#: netsync.cc:2021 netsync.cc:2052
msgid "source and sink"
msgstr "källa och mottagare"
-#: netsync.cc:2021 netsync.cc:2052
+#: netsync.cc:2022 netsync.cc:2053
msgid "source"
msgstr "källa"
-#: netsync.cc:2021 netsync.cc:2052
+#: netsync.cc:2022 netsync.cc:2053
msgid "sink"
msgstr "mottagare"
-#: netsync.cc:2206
+#: netsync.cc:2207
#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr "indatabuffert för %s är överfull\n"
-#: netsync.cc:2218 netsync.cc:2275
+#: netsync.cc:2219 netsync.cc:2276
#, c-format
msgid "protocol error while processing peer %s: '%s'\n"
msgstr "protokollfel vid behandling av %s: '%s'\n"
-#: netsync.cc:2224
+#: netsync.cc:2225
#, c-format
msgid "error: %s\n"
msgstr "fel: %s\n"
-#: netsync.cc:2254
+#: netsync.cc:2255
#, c-format
msgid "connecting to %s\n"
msgstr "ansluter till %s\n"
-#: netsync.cc:2290
+#: netsync.cc:2291
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting\n"
msgstr "att vänta på I/O från %s tog för lång tid, kopplar ifrån\n"
-#: netsync.cc:2305
+#: netsync.cc:2306
#, c-format
msgid "got OOB data from peer %s, disconnecting\n"
msgstr "fick OOB-data från %s, kopplar ifrån\n"
-#: netsync.cc:2320
+#: netsync.cc:2321
#, c-format
msgid "processing failure while talking to peer %s, disconnecting\n"
msgstr "tar hand om misslyckande i samtal med %s, kopplar ifrån\n"
-#: netsync.cc:2337
+#: netsync.cc:2338
#, c-format
msgid "successful exchange with %s\n"
msgstr "lyckat utbyte med %s\n"
-#: netsync.cc:2343
+#: netsync.cc:2344
#, c-format
msgid "peer %s disconnected after we informed them of error\n"
msgstr "%s kopplade ifrån efter att vi informerade den om ett fel\n"
-#: netsync.cc:2348
+#: netsync.cc:2349
#, c-format
msgid "I/O failure while talking to peer %s, disconnecting\n"
msgstr "I/O-fel i samtal med %s, kopplar ifrån\n"
-#: netsync.cc:2377
+#: netsync.cc:2378
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad\n"
msgstr "protokollfel i samtal med %s: '%s', markerar det som felaktigt\n"
-#: netsync.cc:2409
+#: netsync.cc:2410
#, c-format
msgid "accepted new client connection from %s : %s\n"
msgstr "tar emot ny klientanslutning från %s: %s\n"
-#: netsync.cc:2443
+#: netsync.cc:2444
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting\n"
msgstr "protokollfel i samtal med %s: '%s', kopplar ifrån\n"
-#: netsync.cc:2454
+#: netsync.cc:2455
#, c-format
msgid "peer %s read failed in working state (error)\n"
msgstr "läsning från %s fallerade i tillståndet \"working\" (fel)\n"
-#: netsync.cc:2459
+#: netsync.cc:2460
#, c-format
msgid ""
"peer %s read failed in shutdown state (possibly client misreported error)\n"
@@ -2921,17 +2935,17 @@
"läsning från %s fallerade i tillståndet \"shutdown\" (klienten kan felaktigt "
"ha rapporterat ett fel)\n"
-#: netsync.cc:2465
+#: netsync.cc:2466
#, c-format
msgid "peer %s read failed in confirmed state (success)\n"
msgstr "läsning från %s fallerade i tillståndet \"confirmed\" (framgång)\n"
-#: netsync.cc:2486
+#: netsync.cc:2487
#, c-format
msgid "peer %s write failed in working state (error)\n"
msgstr "skrivning till %s fallerade i tillståndet \"working\" (fel)\n"
-#: netsync.cc:2491
+#: netsync.cc:2492
#, c-format
msgid ""
"peer %s write failed in shutdown state (possibly client misreported error)\n"
@@ -2939,57 +2953,57 @@
"skrivning till %s fallerade i tillståndet \"shutdown\" (klienten kan "
"felaktigt ha rapporterat ett fel)\n"
-#: netsync.cc:2497
+#: netsync.cc:2498
#, c-format
msgid "peer %s write failed in confirmed state (success)\n"
msgstr "skrivning till %s fallerade i tillståndet \"confirmed\" (framgång)\n"
-#: netsync.cc:2524
+#: netsync.cc:2525
#, c-format
msgid "peer %s processing finished, disconnecting\n"
msgstr "behandling av %s slutförd, kopplar ifrån\n"
-#: netsync.cc:2546
+#: netsync.cc:2547
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
msgstr "fd %d (%s) har varit inaktiv för länge, kopplar ifrån\n"
-#: netsync.cc:2614
+#: netsync.cc:2615
#, c-format
msgid "beginning service on %s : %s\n"
msgstr "startar tjänst på %s : %s\n"
-#: netsync.cc:2615
+#: netsync.cc:2616
msgid ""
msgstr ""
-#: netsync.cc:2629
+#: netsync.cc:2630
#, c-format
msgid "session limit %d reached, some connections will be refused\n"
msgstr ""
"gränsen för antalet sessioner, %d, är nådd, en del uppkopplingar kommer att "
"nekas\n"
-#: netsync.cc:2684
+#: netsync.cc:2685
#, c-format
msgid "got OOB from peer %s, disconnecting\n"
msgstr "fick OOB-data från %s, kopplar ifrån\n"
-#: netsync.cc:2753
+#: netsync.cc:2754
#, c-format
msgid "finding items to synchronize:\n"
msgstr "letar efter saker att synkronisera:\n"
-#: netsync.cc:2761
+#: netsync.cc:2762
msgid "certificates"
msgstr "certifikat"
-#: netsync.cc:2870
+#: netsync.cc:2871
#, c-format
msgid "Cannot find key '%s'"
msgstr "Kan inte hitta nyckeln '%s'"
-#: netsync.cc:2910
+#: netsync.cc:2911
#, c-format
msgid ""
"include branch pattern contains a quote character:\n"
@@ -2998,7 +3012,7 @@
"grenmönstret givet med --include innehåller ett citattecken:\n"
"%s\n"
-#: netsync.cc:2916
+#: netsync.cc:2917
#, c-format
msgid ""
"exclude branch pattern contains a quote character:\n"
@@ -3007,7 +3021,7 @@
"grenmönstret givet med --exclude innehåller ett citattecken:\n"
"%s\n"
-#: netsync.cc:2939 netsync.cc:2943
+#: netsync.cc:2940 netsync.cc:2944
#, c-format
msgid "network error: %s"
msgstr "nätverksfel: %s"
@@ -3182,7 +3196,8 @@
#: revision.cc:1373
#, c-format
msgid "converting existing revision graph to new roster-style revisions\n"
-msgstr "konverterar existerande revisionsgraf till nya revisioner i lista-stil\n"
+msgstr ""
+"konverterar existerande revisionsgraf till nya revisioner i lista-stil\n"
#: revision.cc:1427
#, c-format
@@ -3405,165 +3420,165 @@
msgid "Invalid hmac length of %d bytes"
msgstr "felaktig HMAC-längd, %d byte"
-#: work.cc:117
+#: work.cc:118
#, c-format
msgid "skipping ignorable file %s"
msgstr "hoppar över ignorerbar fil %s"
-#: work.cc:126
+#: work.cc:127
#, c-format
msgid "skipping %s, already accounted for in workspace"
msgstr "hoppar över %s, den finns redan noterad i arbetskopian"
-#: work.cc:130
+#: work.cc:131
#, c-format
msgid "adding %s to workspace manifest"
msgstr "lägger till %s i arbetskopians manifest"
-#: work.cc:214
+#: work.cc:221
#, c-format
msgid "skipping %s, not currently tracked"
msgstr "hoppar över %s, ej noterad i arbetskopian för närvarande"
-#: work.cc:222
+#: work.cc:231
#, c-format
msgid "cannot remove %s/, it is not empty"
msgstr "kan inte ta bort %s/, den är inte tom"
-#: work.cc:224
+#: work.cc:242
#, c-format
msgid "dropping %s from workspace manifest"
msgstr "tar bort %s från arbetskopians manifest"
-#: work.cc:281
+#: work.cc:305
#, c-format
msgid "destination dir %s/ does not exist in current revision"
msgstr "målkatalogen %s/ finns inte i nuvarande revision"
-#: work.cc:284
+#: work.cc:308
#, c-format
msgid "destination %s is an existing file in current revision"
msgstr "målet %s är en existerande fil i nuvarande revision"
-#: work.cc:294
+#: work.cc:318
#, c-format
msgid "empty path %s is not allowed"
msgstr "tom sökväg %s ej tillåten"
-#: work.cc:308
+#: work.cc:332
#, c-format
msgid "%s does not exist in current revision"
msgstr "%s finns inte i nuvarande revision"
-#: work.cc:311
+#: work.cc:335
#, c-format
msgid "destination %s already exists in current revision"
msgstr "målet %s finns redan i nuvarande revision"
-#: work.cc:320
+#: work.cc:344
#, c-format
msgid "renaming %s to %s in workspace manifest"
msgstr "byter namn från %s till %s i arbetskopians manifest"
-#: work.cc:345
+#: work.cc:369
#, c-format
msgid "%s doesn't exist in workspace, skipping"
msgstr "hoppar över %s, den existerar inte i arbetskopian"
-#: work.cc:349
+#: work.cc:373
#, c-format
msgid "destination %s already exists in workspace, skipping"
msgstr "hoppar över %s, den finns redan noterad i arbetskopian"
-#: work.cc:376
+#: work.cc:400
#, c-format
msgid "proposed new root directory '%s' is not versioned or does not exist"
msgstr ""
"den föreslagna nya rotkatalogen '%s' är inte noterad i arbetskopian eller "
"finns inte"
-#: work.cc:378
+#: work.cc:402
#, c-format
msgid "proposed new root directory '%s' is not a directory"
msgstr "den föreslagna nya rotkatalogen '%s' är inte en katalog"
-#: work.cc:383
+#: work.cc:407
#, c-format
msgid "proposed new root directory '%s' contains illegal path %s"
msgstr ""
"den föreslagna nya rotkatalogen '%s' innehåller den otillåtna sökvägen %s"
-#: work.cc:393
+#: work.cc:417
#, c-format
msgid "directory '%s' is not versioned or does not exist"
msgstr "katalogen '%s' är inte noterad i arbetskopian eller finns inte"
-#: work.cc:399
+#: work.cc:423
#, c-format
msgid "'%s' is in the way"
msgstr "'%s' är i vägen"
-#: work.cc:496
+#: work.cc:520
#, c-format
msgid "workspace is corrupt: %s does not exist"
msgstr "arbetskopian är korrupt: %s finns inte"
-#: work.cc:497
+#: work.cc:521
#, c-format
msgid "workspace is corrupt: %s is a directory"
msgstr "arbetskopian är korrupt: %s är en katalog"
-#: work.cc:507
+#: work.cc:531
#, c-format
msgid "Problem with workspace: %s is unreadable"
msgstr "Problem med arbetskatalogen: %s är oläsbar"
-#: work.cc:533
+#: work.cc:557
#, c-format
msgid "base revision %s does not exist in database\n"
msgstr "grundrevisionen %s finns inte i databasen\n"
-#: work.cc:871
+#: work.cc:894
#, c-format
msgid "dropping %s"
msgstr "slänger %s"
-#: work.cc:882 work.cc:893
+#: work.cc:905 work.cc:916
#, c-format
msgid "path %s already exists"
msgstr "sökvägen %s finns redan"
-#: work.cc:915 work.cc:942
+#: work.cc:938 work.cc:965
#, c-format
msgid "adding %s"
msgstr "lägger till %s"
-#: work.cc:931
+#: work.cc:954
#, c-format
msgid "path '%s' already exists, cannot create"
msgstr "sökvägen '%s' finns redan, kan inte skapa den"
-#: work.cc:938
+#: work.cc:961
#, c-format
msgid "renaming %s to %s"
msgstr "byter namn på %s till %s"
-#: work.cc:973
+#: work.cc:996
#, c-format
msgid "file '%s' does not exist"
msgstr "filen '%s' finns inte"
-#: work.cc:974
+#: work.cc:997
#, c-format
msgid "file '%s' is a directory"
msgstr "filen '%s' är en katalog"
-#: work.cc:979
+#: work.cc:1002
#, c-format
msgid "content of file '%s' has changed, not overwriting"
msgstr "innehållet i filen '%s' har ändrats, skriver inte över"
-#: work.cc:980
+#: work.cc:1003
#, c-format
msgid "updating %s to %s"
msgstr "uppdaterar %s till %s"