You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ma...@apache.org on 2018/10/06 15:35:26 UTC
svn commit: r1843017 [2/2] - /subversion/branches/1.11.x/subversion/po/sv.po
Modified: subversion/branches/1.11.x/subversion/po/sv.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/po/sv.po?rev=1843017&r1=1843016&r2=1843017&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/1.11.x/subversion/po/sv.po [UTF-8] Sat Oct 6 15:35:26 2018
@@ -110,7 +110,7 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.9\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2018-09-19 11:06+0200\n"
+"POT-Creation-Date: 2018-10-06 17:31+0200\n"
"PO-Revision-Date: 2018-09-19 13:05+0200\n"
"Last-Translator: Subversion Developers <de...@subversion.apache.org>\n"
"Language-Team: Swedish <de...@subversion.apache.org>\n"
@@ -1803,9 +1803,9 @@ msgid "Standard properties can't be set
msgstr "Standardegenskaper kan inte sättas direkt som revisionsegenskaper"
#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1100
-#: ../libsvn_client/conflicts.c:1693 ../libsvn_client/conflicts.c:4767
-#: ../libsvn_client/conflicts.c:5268 ../libsvn_client/conflicts.c:5290
-#: ../libsvn_client/conflicts.c:5342 ../libsvn_client/conflicts.c:5815
+#: ../libsvn_client/conflicts.c:1693 ../libsvn_client/conflicts.c:4985
+#: ../libsvn_client/conflicts.c:5359 ../libsvn_client/conflicts.c:5381
+#: ../libsvn_client/conflicts.c:5433 ../libsvn_client/conflicts.c:5906
msgid "unknown author"
msgstr "okänd författare"
@@ -1979,24 +1979,24 @@ msgstr ""
"En katalog hade flyttats hit i arbetskopian från\n"
"\"%s\"."
-#: ../libsvn_client/conflicts.c:2901
+#: ../libsvn_client/conflicts.c:3119
msgid "An item containing uncommitted changes was found in the working copy."
msgstr "Ett objekt med oarkiverade ändringar hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:2905
+#: ../libsvn_client/conflicts.c:3123
msgid "An item which already occupies this path was found in the working copy."
msgstr "Ett objekt som redan upptar denna sökväg hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:2909
+#: ../libsvn_client/conflicts.c:3127
msgid "A deleted item was found in the working copy."
msgstr "Ett raderat objekt hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:2914
+#: ../libsvn_client/conflicts.c:3132
msgid "No such file or directory was found in the working copy."
msgstr "Ingen sådan fil eller katalog hittades i arbetskopian."
#. ### display deleted revision
-#: ../libsvn_client/conflicts.c:2919
+#: ../libsvn_client/conflicts.c:3137
msgid ""
"No such file or directory was found in the merge target working copy.\n"
"The item may have been deleted or moved away in the repository's history."
@@ -2004,23 +2004,23 @@ msgstr ""
"Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n"
"Objektet kan ha raderats eller flyttats bort i arkivets historia."
-#: ../libsvn_client/conflicts.c:2926
+#: ../libsvn_client/conflicts.c:3144
msgid "An unversioned item was found in the working copy."
msgstr "Ett icke versionshanterat objekt hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:2931
+#: ../libsvn_client/conflicts.c:3149
msgid "An item scheduled to be added to the repository in the next commit was found in the working copy."
msgstr "Ett objekt schemalagt för att läggas till i nästa arkivering hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:2936
+#: ../libsvn_client/conflicts.c:3154
msgid "The item in the working copy had been moved away at the time this conflict was recorded."
msgstr "Objektet i arbetskopian hade flyttas bort när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:2940
+#: ../libsvn_client/conflicts.c:3158
msgid "An item had been moved here in the working copy at the time this conflict was recorded."
msgstr "Ett objekt hade flyttats hit i arbetskopian när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:2968
+#: ../libsvn_client/conflicts.c:3186
#, c-format
msgid ""
"%s\n"
@@ -2029,41 +2029,41 @@ msgstr ""
"%s\n"
"Och sedan flyttats bort till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3033
+#: ../libsvn_client/conflicts.c:3251
msgid "No such file or directory was found in the merge target working copy.\n"
msgstr "Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n"
-#: ../libsvn_client/conflicts.c:3042
+#: ../libsvn_client/conflicts.c:3260
#, c-format
msgid "%sThe file was moved to '^/%s' in r%ld by %s."
msgstr "%sFilen flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3048
+#: ../libsvn_client/conflicts.c:3266
#, c-format
msgid "%sThe directory was moved to '^/%s' in r%ld by %s."
msgstr "%sKatalogen flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3055
+#: ../libsvn_client/conflicts.c:3273
#, c-format
msgid "%sThe item was moved to '^/%s' in r%ld by %s."
msgstr "%sObjektet flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3071
+#: ../libsvn_client/conflicts.c:3289
#, c-format
msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s."
msgstr "%sFilen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3079
+#: ../libsvn_client/conflicts.c:3297
#, c-format
msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s."
msgstr "%sKatalogen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3087
+#: ../libsvn_client/conflicts.c:3305
#, c-format
msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s."
msgstr "%sObjektet \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3101
+#: ../libsvn_client/conflicts.c:3319
#, c-format
msgid ""
"No such file or directory was found in the merge target working copy.\n"
@@ -2072,229 +2072,229 @@ msgstr ""
"Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n"
"\"^/%s\" raderades i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3125
+#: ../libsvn_client/conflicts.c:3343
msgid "An update operation tried to edit a file."
msgstr "En uppdatering försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3127
+#: ../libsvn_client/conflicts.c:3345
msgid "An update operation tried to add a file."
msgstr "En uppdatering försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3129
+#: ../libsvn_client/conflicts.c:3347
msgid "An update operation tried to delete or move a file."
msgstr "En uppdatering försökte radera eller flytta en fil."
-#: ../libsvn_client/conflicts.c:3132
+#: ../libsvn_client/conflicts.c:3350
msgid "An update operation tried to replace a file."
msgstr "En uppdatering försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3140
+#: ../libsvn_client/conflicts.c:3358
msgid "A switch operation tried to edit a file."
msgstr "En växling försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3142
+#: ../libsvn_client/conflicts.c:3360
msgid "A switch operation tried to add a file."
msgstr "En växling försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3144
+#: ../libsvn_client/conflicts.c:3362
msgid "A switch operation tried to delete or move a file."
msgstr "En växling försökte radera eller flytta en fil."
-#: ../libsvn_client/conflicts.c:3147
+#: ../libsvn_client/conflicts.c:3365
msgid "A switch operation tried to replace a file."
msgstr "En växling försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3155
+#: ../libsvn_client/conflicts.c:3373
msgid "A merge operation tried to edit a file."
msgstr "En sammanslagning försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3157
+#: ../libsvn_client/conflicts.c:3375
msgid "A merge operation tried to add a file."
msgstr "En sammanslagning försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3159
+#: ../libsvn_client/conflicts.c:3377
msgid "A merge operation tried to delete or move a file."
msgstr "En sammanslagning försökte radera eller flytta en fil."
-#: ../libsvn_client/conflicts.c:3162
+#: ../libsvn_client/conflicts.c:3380
msgid "A merge operation tried to replace a file."
msgstr "En sammanslagning försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3172
+#: ../libsvn_client/conflicts.c:3390
msgid "An update operation tried to change a directory."
msgstr "En uppdatering försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3174
+#: ../libsvn_client/conflicts.c:3392
msgid "An update operation tried to add a directory."
msgstr "En uppdatering försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3176
+#: ../libsvn_client/conflicts.c:3394
msgid "An update operation tried to delete or move a directory."
msgstr "En uppdatering försökte radera eller flytta en katalog."
-#: ../libsvn_client/conflicts.c:3179
+#: ../libsvn_client/conflicts.c:3397
msgid "An update operation tried to replace a directory."
msgstr "En uppdatering försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3187
+#: ../libsvn_client/conflicts.c:3405
msgid "A switch operation tried to edit a directory."
msgstr "En växling försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3189
+#: ../libsvn_client/conflicts.c:3407
msgid "A switch operation tried to add a directory."
msgstr "En växling försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3191
+#: ../libsvn_client/conflicts.c:3409
msgid "A switch operation tried to delete or move a directory."
msgstr "En växling försökte radera eller flytta en katalog."
-#: ../libsvn_client/conflicts.c:3194
+#: ../libsvn_client/conflicts.c:3412
msgid "A switch operation tried to replace a directory."
msgstr "En växling försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3202
+#: ../libsvn_client/conflicts.c:3420
msgid "A merge operation tried to edit a directory."
msgstr "En sammanslagning försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3204
+#: ../libsvn_client/conflicts.c:3422
msgid "A merge operation tried to add a directory."
msgstr "En sammanslagning försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3206
+#: ../libsvn_client/conflicts.c:3424
msgid "A merge operation tried to delete or move a directory."
msgstr "En sammanslagning försökte radera eller flytta en katalog."
-#: ../libsvn_client/conflicts.c:3209
+#: ../libsvn_client/conflicts.c:3427
msgid "A merge operation tried to replace a directory."
msgstr "En sammanslagning försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3220
+#: ../libsvn_client/conflicts.c:3438
msgid "An update operation tried to edit an item."
msgstr "En uppdatering försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3222
+#: ../libsvn_client/conflicts.c:3440
msgid "An update operation tried to add an item."
msgstr "En uppdatering försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3224
+#: ../libsvn_client/conflicts.c:3442
msgid "An update operation tried to delete or move an item."
msgstr "En uppdatering försökte radera eller flytta ett objekt."
-#: ../libsvn_client/conflicts.c:3227
+#: ../libsvn_client/conflicts.c:3445
msgid "An update operation tried to replace an item."
msgstr "En uppdatering försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3235
+#: ../libsvn_client/conflicts.c:3453
msgid "A switch operation tried to edit an item."
msgstr "En växling försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3237
+#: ../libsvn_client/conflicts.c:3455
msgid "A switch operation tried to add an item."
msgstr "En växling försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3239
+#: ../libsvn_client/conflicts.c:3457
msgid "A switch operation tried to delete or move an item."
msgstr "En växling försökte radera eller flytta ett objekt."
-#: ../libsvn_client/conflicts.c:3242
+#: ../libsvn_client/conflicts.c:3460
msgid "A switch operation tried to replace an item."
msgstr "En växlig försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3250
+#: ../libsvn_client/conflicts.c:3468
msgid "A merge operation tried to edit an item."
msgstr "En sammanslagning försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3252
+#: ../libsvn_client/conflicts.c:3470
msgid "A merge operation tried to add an item."
msgstr "En sammanslagning försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3254
+#: ../libsvn_client/conflicts.c:3472
msgid "A merge operation tried to delete or move an item."
msgstr "En sammanslagning försökte radera eller flytta ett objekt."
-#: ../libsvn_client/conflicts.c:3257
+#: ../libsvn_client/conflicts.c:3475
msgid "A merge operation tried to replace an item."
msgstr "En sammanslagning försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3273 ../svn/cl-conflicts.c:212
+#: ../libsvn_client/conflicts.c:3491 ../svn/cl-conflicts.c:212
msgid "upon update"
msgstr "vid uppdatering"
-#: ../libsvn_client/conflicts.c:3274 ../svn/cl-conflicts.c:213
+#: ../libsvn_client/conflicts.c:3492 ../svn/cl-conflicts.c:213
msgid "upon switch"
msgstr "vid växling"
-#: ../libsvn_client/conflicts.c:3275 ../svn/cl-conflicts.c:214
+#: ../libsvn_client/conflicts.c:3493 ../svn/cl-conflicts.c:214
msgid "upon merge"
msgstr "vid sammanslagning"
-#: ../libsvn_client/conflicts.c:3276 ../svn/cl-conflicts.c:215
+#: ../libsvn_client/conflicts.c:3494 ../svn/cl-conflicts.c:215
msgid "upon none"
msgstr "vid ingenting"
-#: ../libsvn_client/conflicts.c:3295 ../svn/cl-conflicts.c:127
+#: ../libsvn_client/conflicts.c:3513 ../svn/cl-conflicts.c:127
#: ../svn/cl-conflicts.c:234
msgid "local edit"
msgstr "lokal ändring"
-#: ../libsvn_client/conflicts.c:3298 ../svn/cl-conflicts.c:140
+#: ../libsvn_client/conflicts.c:3516 ../svn/cl-conflicts.c:140
#: ../svn/cl-conflicts.c:237
msgid "local add"
msgstr "lokalt tillägg"
-#: ../libsvn_client/conflicts.c:3301 ../svn/cl-conflicts.c:131
+#: ../libsvn_client/conflicts.c:3519 ../svn/cl-conflicts.c:131
#: ../svn/cl-conflicts.c:240
msgid "local delete"
msgstr "lokal radering"
-#: ../libsvn_client/conflicts.c:3304 ../svn/cl-conflicts.c:129
+#: ../libsvn_client/conflicts.c:3522 ../svn/cl-conflicts.c:129
#: ../svn/cl-conflicts.c:243
msgid "local obstruction"
msgstr "lokal blockering"
-#: ../libsvn_client/conflicts.c:3308 ../svn/cl-conflicts.c:247
+#: ../libsvn_client/conflicts.c:3526 ../svn/cl-conflicts.c:247
#, c-format
msgid "local %s"
msgstr "lokal %s"
-#: ../libsvn_client/conflicts.c:3317 ../svn/cl-conflicts.c:192
+#: ../libsvn_client/conflicts.c:3535 ../svn/cl-conflicts.c:192
#: ../svn/cl-conflicts.c:256
msgid "incoming edit"
msgstr "inkommande ändring"
-#: ../libsvn_client/conflicts.c:3320 ../svn/cl-conflicts.c:194
+#: ../libsvn_client/conflicts.c:3538 ../svn/cl-conflicts.c:194
#: ../svn/cl-conflicts.c:259
msgid "incoming add"
msgstr "inkommande tillägg"
-#: ../libsvn_client/conflicts.c:3323 ../svn/cl-conflicts.c:262
+#: ../libsvn_client/conflicts.c:3541 ../svn/cl-conflicts.c:262
msgid "incoming delete"
msgstr "inkommande radering"
-#: ../libsvn_client/conflicts.c:3327 ../svn/cl-conflicts.c:266
+#: ../libsvn_client/conflicts.c:3545 ../svn/cl-conflicts.c:266
#, c-format
msgid "incoming %s"
msgstr "inkommande %s"
-#: ../libsvn_client/conflicts.c:3335 ../svn/cl-conflicts.c:273
+#: ../libsvn_client/conflicts.c:3553 ../svn/cl-conflicts.c:273
#: ../svn/cl-conflicts.c:326
#, c-format
msgid "%s, %s %s"
msgstr "%s, %s %s"
-#: ../libsvn_client/conflicts.c:3394
+#: ../libsvn_client/conflicts.c:3612
#, c-format
msgid "incoming %s %s"
msgstr "inkommande %s %s"
-#: ../libsvn_client/conflicts.c:3497
+#: ../libsvn_client/conflicts.c:3715
#, c-format
msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3508 ../libsvn_client/conflicts.c:3588
-#: ../libsvn_client/conflicts.c:3842 ../libsvn_client/conflicts.c:3929
-#: ../libsvn_client/conflicts.c:4229 ../libsvn_client/conflicts.c:4297
+#: ../libsvn_client/conflicts.c:3726 ../libsvn_client/conflicts.c:3806
+#: ../libsvn_client/conflicts.c:4060 ../libsvn_client/conflicts.c:4147
+#: ../libsvn_client/conflicts.c:4447 ../libsvn_client/conflicts.c:4515
#, c-format
msgid ""
"%s\n"
@@ -2303,14 +2303,14 @@ msgstr ""
"%s\n"
"Den ersatta katalogen flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3523
+#: ../libsvn_client/conflicts.c:3741
#, c-format
msgid "File updated from r%ld to r%ld was replaced with a file from another line of history by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3535 ../libsvn_client/conflicts.c:3614
-#: ../libsvn_client/conflicts.c:3871 ../libsvn_client/conflicts.c:3957
-#: ../libsvn_client/conflicts.c:4258 ../libsvn_client/conflicts.c:4325
+#: ../libsvn_client/conflicts.c:3753 ../libsvn_client/conflicts.c:3832
+#: ../libsvn_client/conflicts.c:4089 ../libsvn_client/conflicts.c:4175
+#: ../libsvn_client/conflicts.c:4476 ../libsvn_client/conflicts.c:4543
#, c-format
msgid ""
"%s\n"
@@ -2319,14 +2319,14 @@ msgstr ""
"%s\n"
"Den ersatta filen flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3549
+#: ../libsvn_client/conflicts.c:3767
#, c-format
msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3559 ../libsvn_client/conflicts.c:3638
-#: ../libsvn_client/conflicts.c:3898 ../libsvn_client/conflicts.c:3984
-#: ../libsvn_client/conflicts.c:4352
+#: ../libsvn_client/conflicts.c:3777 ../libsvn_client/conflicts.c:3856
+#: ../libsvn_client/conflicts.c:4116 ../libsvn_client/conflicts.c:4202
+#: ../libsvn_client/conflicts.c:4570
#, c-format
msgid ""
"%s\n"
@@ -2335,97 +2335,97 @@ msgstr ""
"%s\n"
"Det ersatta objektet flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3576
+#: ../libsvn_client/conflicts.c:3794
#, c-format
msgid "Directory updated from r%ld to r%ld was replaced with a directory from another line of history by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3603
+#: ../libsvn_client/conflicts.c:3821
#, c-format
msgid "File updated from r%ld to r%ld was replaced with a directory by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3628
+#: ../libsvn_client/conflicts.c:3846
#, c-format
msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3661
+#: ../libsvn_client/conflicts.c:3879
#, c-format
msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3673
+#: ../libsvn_client/conflicts.c:3891
#, c-format
msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3689
+#: ../libsvn_client/conflicts.c:3907
#, c-format
msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3700
+#: ../libsvn_client/conflicts.c:3918
#, c-format
msgid "File updated from r%ld to r%ld was deleted by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3714
+#: ../libsvn_client/conflicts.c:3932
#, c-format
msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3725
+#: ../libsvn_client/conflicts.c:3943
#, c-format
msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3745
+#: ../libsvn_client/conflicts.c:3963
#, c-format
msgid "Directory updated backwards from r%ld to r%ld was a file before the replacement made by %s in r%ld."
msgstr "Katalog uppdaterad bakåt från r%ld till r%ld var en fil före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3752
+#: ../libsvn_client/conflicts.c:3970
#, c-format
msgid "File updated backwards from r%ld to r%ld was a file from another line of history before the replacement made by %s in r%ld."
msgstr "Fil uppdaterad bakåt från r%ld till r%ld var en fil från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3759
+#: ../libsvn_client/conflicts.c:3977
#, c-format
msgid "Item updated backwards from r%ld to r%ld was replaced with a file by %s in r%ld."
msgstr "Objekt uppdaterat bakåt från r%ld till r%ld ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3768
+#: ../libsvn_client/conflicts.c:3986
#, c-format
msgid "Directory updated backwards from r%ld to r%ld was a directory from another line of history before the replacement made by %s in r%ld."
msgstr "Katalog uppdaterad bakåt från r%ld till r%ld var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3776
+#: ../libsvn_client/conflicts.c:3994
#, c-format
msgid "File updated backwards from r%ld to r%ld was a directory before the replacement made by %s in r%ld."
msgstr "Fil uppdaterad bakåt från r%ld till r%ld var en katalog före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3782
+#: ../libsvn_client/conflicts.c:4000
#, c-format
msgid "Item updated backwards from r%ld to r%ld was replaced with a directory by %s in r%ld."
msgstr "Objekt uppdaterat bakåt från r%ld till r%ld ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3791
+#: ../libsvn_client/conflicts.c:4009
#, c-format
msgid "Directory updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld."
msgstr "Katalog uppdaterad bakåt från r%ld till r%ld fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3798
+#: ../libsvn_client/conflicts.c:4016
#, c-format
msgid "File updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld."
msgstr "Fil uppdaterad bakåt från r%ld till r%ld fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3804
+#: ../libsvn_client/conflicts.c:4022
#, c-format
msgid "Item updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld."
msgstr "Objekt uppdaterat bakåt från r%ld till r%ld fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3829
+#: ../libsvn_client/conflicts.c:4047
#, c-format
msgid ""
"Directory switched from\n"
@@ -2440,7 +2440,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3857
+#: ../libsvn_client/conflicts.c:4075
#, c-format
msgid ""
"File switched from\n"
@@ -2455,7 +2455,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3885 ../libsvn_client/conflicts.c:4128
+#: ../libsvn_client/conflicts.c:4103 ../libsvn_client/conflicts.c:4346
#, c-format
msgid ""
"Item switched from\n"
@@ -2470,7 +2470,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3915
+#: ../libsvn_client/conflicts.c:4133
#, c-format
msgid ""
"Directory switched from\n"
@@ -2485,7 +2485,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3944
+#: ../libsvn_client/conflicts.c:4162
#, c-format
msgid ""
"File switched from\n"
@@ -2500,7 +2500,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3971 ../libsvn_client/conflicts.c:4158
+#: ../libsvn_client/conflicts.c:4189 ../libsvn_client/conflicts.c:4376
#, c-format
msgid ""
"Item switched from\n"
@@ -2515,7 +2515,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4007
+#: ../libsvn_client/conflicts.c:4225
#, c-format
msgid ""
"Directory switched from\n"
@@ -2530,7 +2530,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4021
+#: ../libsvn_client/conflicts.c:4239
#, c-format
msgid ""
"Directory switched from\n"
@@ -2545,7 +2545,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4039
+#: ../libsvn_client/conflicts.c:4257
#, c-format
msgid ""
"File switched from\n"
@@ -2560,7 +2560,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4053
+#: ../libsvn_client/conflicts.c:4271
#, c-format
msgid ""
"File switched from\n"
@@ -2575,7 +2575,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4070
+#: ../libsvn_client/conflicts.c:4288
#, c-format
msgid ""
"Item switched from\n"
@@ -2590,7 +2590,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4084
+#: ../libsvn_client/conflicts.c:4302
#, c-format
msgid ""
"Item switched from\n"
@@ -2605,7 +2605,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4109 ../libsvn_client/conflicts.c:4149
+#: ../libsvn_client/conflicts.c:4327 ../libsvn_client/conflicts.c:4367
#, c-format
msgid ""
"Directory switched from\n"
@@ -2620,7 +2620,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en fil före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4119
+#: ../libsvn_client/conflicts.c:4337
#, c-format
msgid ""
"File switched from\n"
@@ -2635,7 +2635,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en fil från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4139
+#: ../libsvn_client/conflicts.c:4357
#, c-format
msgid ""
"Directory switched from\n"
@@ -2650,7 +2650,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4169
+#: ../libsvn_client/conflicts.c:4387
#, c-format
msgid ""
"Directory switched from\n"
@@ -2665,7 +2665,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4179
+#: ../libsvn_client/conflicts.c:4397
#, c-format
msgid ""
"File switched from\n"
@@ -2680,7 +2680,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4188
+#: ../libsvn_client/conflicts.c:4406
#, c-format
msgid ""
"Item switched from\n"
@@ -2695,7 +2695,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4216
+#: ../libsvn_client/conflicts.c:4434
#, c-format
msgid ""
"Directory merged from\n"
@@ -2710,7 +2710,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4244
+#: ../libsvn_client/conflicts.c:4462
#, c-format
msgid ""
"File merged from\n"
@@ -2725,7 +2725,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4270
+#: ../libsvn_client/conflicts.c:4488
#, c-format
msgid ""
"Item merged from\n"
@@ -2740,7 +2740,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4283
+#: ../libsvn_client/conflicts.c:4501
#, c-format
msgid ""
"Directory merged from\n"
@@ -2755,7 +2755,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4312
+#: ../libsvn_client/conflicts.c:4530
#, c-format
msgid ""
"File merged from\n"
@@ -2770,7 +2770,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4339
+#: ../libsvn_client/conflicts.c:4557
#, c-format
msgid ""
"Item merged from\n"
@@ -2785,7 +2785,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4375
+#: ../libsvn_client/conflicts.c:4593
#, c-format
msgid ""
"Directory merged from\n"
@@ -2800,7 +2800,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4389
+#: ../libsvn_client/conflicts.c:4607
#, c-format
msgid ""
"Directory merged from\n"
@@ -2815,7 +2815,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4407
+#: ../libsvn_client/conflicts.c:4625
#, c-format
msgid ""
"File merged from\n"
@@ -2830,7 +2830,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4421
+#: ../libsvn_client/conflicts.c:4639
#, c-format
msgid ""
"File merged from\n"
@@ -2845,7 +2845,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4438
+#: ../libsvn_client/conflicts.c:4656
#, c-format
msgid ""
"Item merged from\n"
@@ -2860,7 +2860,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4452
+#: ../libsvn_client/conflicts.c:4670
#, c-format
msgid ""
"Item merged from\n"
@@ -2875,7 +2875,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4477 ../libsvn_client/conflicts.c:4516
+#: ../libsvn_client/conflicts.c:4695 ../libsvn_client/conflicts.c:4734
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2886,7 +2886,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"till ^/%s@%ld var en fil före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4486
+#: ../libsvn_client/conflicts.c:4704
#, c-format
msgid ""
"File reverse-merged from\n"
@@ -2901,7 +2901,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en fil från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4495
+#: ../libsvn_client/conflicts.c:4713
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2916,7 +2916,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4506
+#: ../libsvn_client/conflicts.c:4724
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2927,7 +2927,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"till ^/%s@%ld var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4524
+#: ../libsvn_client/conflicts.c:4742
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2942,7 +2942,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4535
+#: ../libsvn_client/conflicts.c:4753
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2953,7 +2953,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"till ^/%s@%ld fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4544
+#: ../libsvn_client/conflicts.c:4762
#, c-format
msgid ""
"File reverse-merged from\n"
@@ -2968,7 +2968,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4553
+#: ../libsvn_client/conflicts.c:4771
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2983,52 +2983,52 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5404
+#: ../libsvn_client/conflicts.c:5495
#, c-format
msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5411
+#: ../libsvn_client/conflicts.c:5502
#, c-format
msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5416
+#: ../libsvn_client/conflicts.c:5507
#, c-format
msgid "A new directory appeared during update to r%ld; it was deleted by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5426
+#: ../libsvn_client/conflicts.c:5517
#, c-format
msgid "A new file appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld."
msgstr "En ny fil dök upp under uppdatering till r%ld; den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5433
+#: ../libsvn_client/conflicts.c:5524
#, c-format
msgid "A new file appeared during update to r%ld; it was added by %s in r%ld."
msgstr "En ny fil dök upp under uppdatering till r%ld; den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5438
+#: ../libsvn_client/conflicts.c:5529
#, c-format
msgid "A new file appeared during update to r%ld; it was deleted by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5447
+#: ../libsvn_client/conflicts.c:5538
#, c-format
msgid "A new item appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld."
msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5454
+#: ../libsvn_client/conflicts.c:5545
#, c-format
msgid "A new item appeared during update to r%ld; it was added by %s in r%ld."
msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5459
+#: ../libsvn_client/conflicts.c:5550
#, c-format
msgid "A new item appeared during update to r%ld; it was deleted by %s in r%ld."
msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5478
+#: ../libsvn_client/conflicts.c:5569
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3039,7 +3039,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5486
+#: ../libsvn_client/conflicts.c:5577
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3050,7 +3050,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5492
+#: ../libsvn_client/conflicts.c:5583
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3061,7 +3061,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5503
+#: ../libsvn_client/conflicts.c:5594
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3072,7 +3072,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5511
+#: ../libsvn_client/conflicts.c:5602
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3083,7 +3083,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5518
+#: ../libsvn_client/conflicts.c:5609
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3094,7 +3094,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5529
+#: ../libsvn_client/conflicts.c:5620
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3105,7 +3105,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5537
+#: ../libsvn_client/conflicts.c:5628
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3116,7 +3116,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5544
+#: ../libsvn_client/conflicts.c:5635
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3127,7 +3127,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5565
+#: ../libsvn_client/conflicts.c:5656
#, c-format
msgid ""
"A new directory appeared during merge of\n"
@@ -3138,7 +3138,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5571
+#: ../libsvn_client/conflicts.c:5662
#, c-format
msgid ""
"A new directory appeared during merge of\n"
@@ -3149,7 +3149,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5581
+#: ../libsvn_client/conflicts.c:5672
#, c-format
msgid ""
"A new file appeared during merge of\n"
@@ -3160,7 +3160,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5587
+#: ../libsvn_client/conflicts.c:5678
#, c-format
msgid ""
"A new file appeared during merge of\n"
@@ -3171,7 +3171,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5596
+#: ../libsvn_client/conflicts.c:5687
#, c-format
msgid ""
"A new item appeared during merge of\n"
@@ -3182,7 +3182,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5602
+#: ../libsvn_client/conflicts.c:5693
#, c-format
msgid ""
"A new item appeared during merge of\n"
@@ -3193,7 +3193,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5622
+#: ../libsvn_client/conflicts.c:5713
#, c-format
msgid ""
"A new directory appeared during reverse-merge of\n"
@@ -3204,7 +3204,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5629
+#: ../libsvn_client/conflicts.c:5720
#, c-format
msgid ""
"A new directory appeared during reverse-merge of\n"
@@ -3215,7 +3215,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5641
+#: ../libsvn_client/conflicts.c:5732
#, c-format
msgid ""
"A new file appeared during reverse-merge of\n"
@@ -3226,7 +3226,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5648
+#: ../libsvn_client/conflicts.c:5739
#, c-format
msgid ""
"A new file appeared during reverse-merge of\n"
@@ -3237,7 +3237,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5658
+#: ../libsvn_client/conflicts.c:5749
#, c-format
msgid ""
"A new item appeared during reverse-merge of\n"
@@ -3248,7 +3248,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5665
+#: ../libsvn_client/conflicts.c:5756
#, c-format
msgid ""
"A new item appeared during reverse-merge of\n"
@@ -3259,37 +3259,37 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5979
+#: ../libsvn_client/conflicts.c:6070
#, c-format
msgid "Changes destined for a directory arrived via the following revisions during update from r%ld to r%ld."
msgstr "Ändringar avsedda för en katalog kom genom följande revisioner under uppdatering från r%ld till r%ld."
-#: ../libsvn_client/conflicts.c:5985
+#: ../libsvn_client/conflicts.c:6076
#, c-format
msgid "Changes destined for a file arrived via the following revisions during update from r%ld to r%ld"
msgstr "Ändringar avsedda för en fil kom genom följande revisioner under uppdatering från r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:5990
+#: ../libsvn_client/conflicts.c:6081
#, c-format
msgid "Changes from the following revisions arrived during update from r%ld to r%ld"
msgstr "Ändringar från följande revisioner kom under uppdatering från r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:5998
+#: ../libsvn_client/conflicts.c:6089
#, c-format
msgid "Changes destined for a directory arrived via the following revisions during backwards update from r%ld to r%ld"
msgstr "Ändringar avsedda för en katalog kom genom följande revisioner under uppdatering bakåt från r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6005
+#: ../libsvn_client/conflicts.c:6096
#, c-format
msgid "Changes destined for a file arrived via the following revisions during backwards update from r%ld to r%ld"
msgstr "Ändringar avsedda för en fil kom genom följande revisioner under uppdatering bakåt från r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6011
+#: ../libsvn_client/conflicts.c:6102
#, c-format
msgid "Changes from the following revisions arrived during backwards update from r%ld to r%ld"
msgstr "Ändringar från följande revisioner kom under uppdatering bakåt från r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6025 ../libsvn_client/conflicts.c:6032
+#: ../libsvn_client/conflicts.c:6116 ../libsvn_client/conflicts.c:6123
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during switch to\n"
@@ -3298,7 +3298,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom genom följande revisioner under växling till\n"
"\"^/%s@r%ld\""
-#: ../libsvn_client/conflicts.c:6038
+#: ../libsvn_client/conflicts.c:6129
#, c-format
msgid ""
"Changes from the following revisions arrived during switch to\n"
@@ -3307,13 +3307,13 @@ msgstr ""
"Ändringar från följande revisioner kom under växling till\n"
"\"^/%s@r%ld\""
-#: ../libsvn_client/conflicts.c:6081 ../libsvn_client/conflicts.c:6098
-#: ../libsvn_client/conflicts.c:6104
+#: ../libsvn_client/conflicts.c:6172 ../libsvn_client/conflicts.c:6189
+#: ../libsvn_client/conflicts.c:6195
#, c-format
msgid "%s r%ld by %s%s"
msgstr "%s r%ld av %s%s"
-#: ../libsvn_client/conflicts.c:6091
+#: ../libsvn_client/conflicts.c:6182
#, c-format
msgid ""
"%s\n"
@@ -3328,7 +3328,7 @@ msgstr[1] ""
"%s\n"
" [%d revisioner utelämnade],\n"
-#: ../libsvn_client/conflicts.c:6163
+#: ../libsvn_client/conflicts.c:6254
#, c-format
msgid ""
"Changes destined for a directory arrived during merge of\n"
@@ -3337,7 +3337,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6170
+#: ../libsvn_client/conflicts.c:6261
#, c-format
msgid ""
"Changes destined for a file arrived during merge of\n"
@@ -3346,7 +3346,7 @@ msgstr ""
"Ändringar avsedda för en fil kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6176
+#: ../libsvn_client/conflicts.c:6267
#, c-format
msgid ""
"Changes arrived during merge of\n"
@@ -3355,7 +3355,7 @@ msgstr ""
"Ändringar kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6188
+#: ../libsvn_client/conflicts.c:6279
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during merge of\n"
@@ -3364,7 +3364,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom genom följande revisioner under sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6195
+#: ../libsvn_client/conflicts.c:6286
#, c-format
msgid ""
"Changes destined for a file arrived via the following revisions during merge of\n"
@@ -3373,7 +3373,7 @@ msgstr ""
"Ändringar avsedda för en fil kom genom följande revisioner under sammanslagninv av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6201
+#: ../libsvn_client/conflicts.c:6292
#, c-format
msgid ""
"Changes from the following revisions arrived during merge of\n"
@@ -3382,7 +3382,7 @@ msgstr ""
"Ändringar från följande revisioner kom under sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6213
+#: ../libsvn_client/conflicts.c:6304
#, c-format
msgid ""
"Changes destined for a directory arrived during reverse-merge of\n"
@@ -3391,7 +3391,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6220
+#: ../libsvn_client/conflicts.c:6311
#, c-format
msgid ""
"Changes destined for a file arrived during reverse-merge of\n"
@@ -3400,7 +3400,7 @@ msgstr ""
"Ändringar kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6226
+#: ../libsvn_client/conflicts.c:6317
#, c-format
msgid ""
"Changes arrived during reverse-merge of\n"
@@ -3409,7 +3409,7 @@ msgstr ""
"Ändringar kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6238
+#: ../libsvn_client/conflicts.c:6329
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during reverse-merge of\n"
@@ -3418,7 +3418,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom genom följande revisioner under omvänd sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6246
+#: ../libsvn_client/conflicts.c:6337
#, c-format
msgid ""
"Changes destined for a file arrived via the following revisions during reverse-merge of\n"
@@ -3427,7 +3427,7 @@ msgstr ""
"Ändringar avsedda för en fil kom genom följande revisioner under omvänd sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6254
+#: ../libsvn_client/conflicts.c:6345
#, c-format
msgid ""
"Changes from the following revisions arrived during reverse-merge of\n"
@@ -3436,411 +3436,415 @@ msgstr ""
"Ändringar från följande revisioner kom under omvänd sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6443
+#: ../libsvn_client/conflicts.c:6534
#, c-format
msgid "Tree conflict on '%s' can only be resolved to the current working copy state"
msgstr "Trädkonflikt på \"%s\" kan endast lösas till tillståndet i nuvarande arbetskopia"
-#: ../libsvn_client/conflicts.c:6627 ../libsvn_client/conflicts.c:6633
+#: ../libsvn_client/conflicts.c:6718 ../libsvn_client/conflicts.c:6724
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected a base node but found none)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (en basnod förväntades men hittades inte)"
-#: ../libsvn_client/conflicts.c:6638 ../libsvn_client/conflicts.c:6664
-#: ../libsvn_client/conflicts.c:6691 ../libsvn_client/conflicts.c:6714
+#: ../libsvn_client/conflicts.c:6729 ../libsvn_client/conflicts.c:6755
+#: ../libsvn_client/conflicts.c:6782 ../libsvn_client/conflicts.c:6805
#, c-format
msgid "Unexpected option id '%d'"
msgstr "Oväntad options-ID \"%d\""
-#: ../libsvn_client/conflicts.c:6647 ../libsvn_client/conflicts.c:6656
+#: ../libsvn_client/conflicts.c:6738 ../libsvn_client/conflicts.c:6747
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected base node kind '%s', but found '%s')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (basnodstyp \"%s\" förväntades, men \"%s\" hittades)"
-#: ../libsvn_client/conflicts.c:6672 ../libsvn_client/conflicts.c:6682
+#: ../libsvn_client/conflicts.c:6763 ../libsvn_client/conflicts.c:6773
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected base node from '^/%s@%ld', but found '^/%s@%ld')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (basnod från \"^/%s@%ld\" förväntades, men \"^/%s@%ld\" hittades)"
-#: ../libsvn_client/conflicts.c:6700 ../libsvn_client/conflicts.c:6708
+#: ../libsvn_client/conflicts.c:6791 ../libsvn_client/conflicts.c:6799
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an added item, but the item is not added)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (tillagt objekt förväntades, men objektet är inte tillagt)"
-#: ../libsvn_client/conflicts.c:6879 ../libsvn_client/conflicts.c:8716
+#: ../libsvn_client/conflicts.c:6970 ../libsvn_client/conflicts.c:8807
#, c-format
msgid "If needed, a backup copy of '%s' can be found at '%s'"
msgstr "Vid behov finns en säkerhetskopia av \"%s\" vid \"%s\""
-#: ../libsvn_client/conflicts.c:7741
+#: ../libsvn_client/conflicts.c:7832
#, c-format
msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository"
msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid \"%s\" hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:7765
+#: ../libsvn_client/conflicts.c:7856
#, c-format
msgid "Could not determine when '%s' was added the repository"
msgstr "Kunde inte avgöra när \"%s\" lades till arkivet"
-#: ../libsvn_client/conflicts.c:7780
+#: ../libsvn_client/conflicts.c:7871
#, c-format
msgid "Could not determine when '%s' was deleted from the repository"
msgstr "Kunde inte avgöra när \"%s\" raderades från arkivet"
-#: ../libsvn_client/conflicts.c:8069
+#: ../libsvn_client/conflicts.c:8160
#, c-format
msgid "Could not determine the revision in which '^/%s' was added to the repository.\n"
msgstr "Kunde inte avgöra i vilken revision \"^/%s\" lades till arkivet.\n"
-#: ../libsvn_client/conflicts.c:8165
+#: ../libsvn_client/conflicts.c:8256
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected a copied item, but the item is not a copy)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett kopierat objekt, men objektet är inte en kopia)"
-#: ../libsvn_client/conflicts.c:8176
+#: ../libsvn_client/conflicts.c:8267
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision smaller than r%ld, but the item was copied from r%ld)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från en revision mindre än r%ld, men objektet kopierades från r%ld)"
-#: ../libsvn_client/conflicts.c:8188
+#: ../libsvn_client/conflicts.c:8279
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision larger than r%ld, but the item was copied from r%ld)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från en revision större än r%ld, men objektet kopierades från r%ld)"
-#: ../libsvn_client/conflicts.c:8207
+#: ../libsvn_client/conflicts.c:8298
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s' or from '^/%s' but the item was copied from '^/%s@%ld')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från \"^/%s\" eller från \"^/%s\" men objektet kopierades från \"^/%s@%ld\")"
-#: ../libsvn_client/conflicts.c:8229
+#: ../libsvn_client/conflicts.c:8320
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s', but the item was copied from '^/%s@%ld')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från \"^/%s\", men objektet kopierades från \"^/%s@%ld\")"
-#: ../libsvn_client/conflicts.c:8278
+#: ../libsvn_client/conflicts.c:8369
#, c-format
msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository."
msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid \"%s\" hämtas från arkivet."
-#: ../libsvn_client/conflicts.c:8288
+#: ../libsvn_client/conflicts.c:8379
#, c-format
msgid "Could not find the revision in which '%s' was deleted from the repository"
msgstr "Kunde inte avgöra i vilken revision \"%s\" raderades från arkivet"
-#: ../libsvn_client/conflicts.c:8313
+#: ../libsvn_client/conflicts.c:8404
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected node kind '%s' but found '%s')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade nodtyp \"%s\" men hittade \"%s\")"
-#: ../libsvn_client/conflicts.c:8480 ../libsvn_client/conflicts.c:8763
+#: ../libsvn_client/conflicts.c:8571 ../libsvn_client/conflicts.c:8854
#, c-format
msgid "The specified conflict resolution option requires details for tree conflict at '%s' to be fetched from the repository first."
msgstr "Det angivna konfliktlösningsvalet kräver att detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet."
-#: ../libsvn_client/conflicts.c:8487
+#: ../libsvn_client/conflicts.c:8578
#, c-format
msgid "Invalid operation code '%d' recorded for conflict at '%s'"
msgstr "Ogiltig operationskod \"%d\" registrerad för konflikten vid \"%s\""
-#: ../libsvn_client/conflicts.c:8824
+#: ../libsvn_client/conflicts.c:8915
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected a copied item at '%s', but the item is not a copy)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett kopierat objekt vid \"%s\", men objektet är inte en kopia)"
-#: ../libsvn_client/conflicts.c:8837
+#: ../libsvn_client/conflicts.c:8928
#, c-format
msgid "Cannot resolve tree conflict on '%s' (could not determine origin of '%s')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte avgöra ursprunget för \"%s\")"
-#: ../libsvn_client/conflicts.c:8857
+#: ../libsvn_client/conflicts.c:8948
#, c-format
msgid "Cannot resolve tree conflict on '%s' (could not find common ancestor of '^/%s@%ld' and '^/%s@%ld')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte hitta gemensamt ursprung för \"^/%s@%ld\" och \"^/%s@%ld\")"
-#: ../libsvn_client/conflicts.c:9334 ../libsvn_client/conflicts.c:9417
-#: ../libsvn_client/conflicts.c:10802
+#: ../libsvn_client/conflicts.c:9134
+#, c-format
+msgid "Corresponding working copy node not found for '%s'"
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:9456 ../libsvn_client/conflicts.c:9539
+#: ../libsvn_client/conflicts.c:11122
msgid "Postpone"
msgstr "Lös senare"
-#: ../libsvn_client/conflicts.c:9335 ../libsvn_client/conflicts.c:9418
-#: ../libsvn_client/conflicts.c:10803
+#: ../libsvn_client/conflicts.c:9457 ../libsvn_client/conflicts.c:9540
+#: ../libsvn_client/conflicts.c:11123
msgid "skip this conflict and leave it unresolved"
msgstr "hoppa över denna konflikt och lämna den olöst"
-#: ../libsvn_client/conflicts.c:9344 ../libsvn_client/conflicts.c:9365
-#: ../libsvn_client/conflicts.c:9423
+#: ../libsvn_client/conflicts.c:9466 ../libsvn_client/conflicts.c:9487
+#: ../libsvn_client/conflicts.c:9545
msgid "Accept base"
msgstr "Godta basen"
-#: ../libsvn_client/conflicts.c:9345
+#: ../libsvn_client/conflicts.c:9467
msgid "discard local and incoming changes for this binary file"
msgstr "släng bort lokala och inkommande ändringar för denna binärfil"
-#: ../libsvn_client/conflicts.c:9350 ../libsvn_client/conflicts.c:9371
-#: ../libsvn_client/conflicts.c:9429
+#: ../libsvn_client/conflicts.c:9472 ../libsvn_client/conflicts.c:9493
+#: ../libsvn_client/conflicts.c:9551
msgid "Accept incoming"
msgstr "Godta inkommande"
-#: ../libsvn_client/conflicts.c:9351
+#: ../libsvn_client/conflicts.c:9473
msgid "accept incoming version of binary file"
msgstr "godta inkommande version av binärfil"
-#: ../libsvn_client/conflicts.c:9356 ../libsvn_client/conflicts.c:9395
-#: ../libsvn_client/conflicts.c:9435 ../libsvn_client/conflicts.c:9492
+#: ../libsvn_client/conflicts.c:9478 ../libsvn_client/conflicts.c:9517
+#: ../libsvn_client/conflicts.c:9557 ../libsvn_client/conflicts.c:9614
msgid "Mark as resolved"
msgstr "Markera som löst"
-#: ../libsvn_client/conflicts.c:9357
+#: ../libsvn_client/conflicts.c:9479
msgid "accept binary file as it appears in the working copy"
msgstr "godta binärfilen som den är i arbetskopian"
-#: ../libsvn_client/conflicts.c:9366
+#: ../libsvn_client/conflicts.c:9488
msgid "discard local and incoming changes for this file"
msgstr "släng bort lokala och inkommande ändringar för denna fil"
-#: ../libsvn_client/conflicts.c:9372
+#: ../libsvn_client/conflicts.c:9494
msgid "accept incoming version of entire file"
msgstr "godta inkommande version av hela filen"
-#: ../libsvn_client/conflicts.c:9377
+#: ../libsvn_client/conflicts.c:9499
msgid "Reject incoming"
msgstr "Avslå inkommande"
-#: ../libsvn_client/conflicts.c:9378
+#: ../libsvn_client/conflicts.c:9500
msgid "reject all incoming changes for this file"
msgstr "avslå alla inkommande ändringar för denna fil"
-#: ../libsvn_client/conflicts.c:9383 ../libsvn_client/conflicts.c:9441
+#: ../libsvn_client/conflicts.c:9505 ../libsvn_client/conflicts.c:9563
msgid "Accept incoming for conflicts"
msgstr "Godta inkommande för konflikter"
-#: ../libsvn_client/conflicts.c:9384
-msgid "accept changes only where they conflict"
-msgstr "godta ändringar bara där konflikter uppstår"
+#: ../libsvn_client/conflicts.c:9506 ../libsvn_client/conflicts.c:9564
+msgid "accept incoming changes only where they conflict"
+msgstr "godta inkommande ändringar bara där konflikter uppstår"
-#: ../libsvn_client/conflicts.c:9389 ../libsvn_client/conflicts.c:9447
+#: ../libsvn_client/conflicts.c:9511 ../libsvn_client/conflicts.c:9569
msgid "Reject conflicts"
msgstr "Avslå konflikter"
-#: ../libsvn_client/conflicts.c:9390 ../libsvn_client/conflicts.c:9448
-msgid "reject changes which conflict and accept the rest"
+#: ../libsvn_client/conflicts.c:9512
+#, fuzzy
+msgid "reject incoming changes which conflict and accept the rest"
msgstr "avslå ändringar som orsakar konflikter och godta resten"
-#: ../libsvn_client/conflicts.c:9396
+#: ../libsvn_client/conflicts.c:9518
msgid "accept the file as it appears in the working copy"
msgstr "godta filen som den är i arbetskopian"
-#: ../libsvn_client/conflicts.c:9424
+#: ../libsvn_client/conflicts.c:9546
msgid "discard local and incoming changes for this property"
msgstr "släng bort lokala och inkommande ändringar för denna egenskap"
-#: ../libsvn_client/conflicts.c:9430
+#: ../libsvn_client/conflicts.c:9552
msgid "accept incoming version of entire property value"
msgstr "godta inkommande version av hela egenskapsvärdet"
-#: ../libsvn_client/conflicts.c:9436
+#: ../libsvn_client/conflicts.c:9558
msgid "accept working copy version of entire property value"
msgstr "godta arbetskopians version av hela egenskapsvärdet"
-#: ../libsvn_client/conflicts.c:9442
-msgid "accept incoming changes only where they conflict"
-msgstr "godta inkommande ändringar bara där konflikter uppstår"
+#: ../libsvn_client/conflicts.c:9570
+msgid "reject changes which conflict and accept the rest"
+msgstr "avslå ändringar som orsakar konflikter och godta resten"
-#: ../libsvn_client/conflicts.c:9453
+#: ../libsvn_client/conflicts.c:9575
msgid "Accept merged"
msgstr "Godta sammanslaget"
-#: ../libsvn_client/conflicts.c:9454
+#: ../libsvn_client/conflicts.c:9576
msgid "accept merged version of property value"
msgstr "godta sammanslagen version av egenskapsvärde"
-#: ../libsvn_client/conflicts.c:9493
+#: ../libsvn_client/conflicts.c:9615
msgid "accept current working copy state"
msgstr "godta nuvarande tillstånd i arbetskopia"
-#: ../libsvn_client/conflicts.c:9520
+#: ../libsvn_client/conflicts.c:9642
msgid "Update move destination"
msgstr "Uppdatera flyttmålet"
-#: ../libsvn_client/conflicts.c:9521
+#: ../libsvn_client/conflicts.c:9643
msgid "apply incoming changes to move destination"
msgstr "utför inkommande ändringar på flyttmålet"
-#: ../libsvn_client/conflicts.c:9555
+#: ../libsvn_client/conflicts.c:9677
msgid "Update any moved-away children"
msgstr "Uppdatera bortflyttade barn om sådana finns"
-#: ../libsvn_client/conflicts.c:9556
+#: ../libsvn_client/conflicts.c:9678
msgid "prepare for updating moved-away children, if any"
msgstr "förbered för uppdatering av bortflyttade barn, om sådana finns"
-#: ../libsvn_client/conflicts.c:9601
+#: ../libsvn_client/conflicts.c:9723
#, c-format
msgid "ignore and do not add '^/%s@%ld' here"
msgstr "hoppa över och lägg inte till \"^/%s@%ld\" här"
-#: ../libsvn_client/conflicts.c:9609
+#: ../libsvn_client/conflicts.c:9731
#, c-format
msgid "replace '^/%s@%ld' with the locally added file"
msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda filen"
-#: ../libsvn_client/conflicts.c:9614
+#: ../libsvn_client/conflicts.c:9736
#, c-format
msgid "replace '^/%s@%ld' with the locally added directory"
msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda katalogen"
-#: ../libsvn_client/conflicts.c:9620
+#: ../libsvn_client/conflicts.c:9742
#, c-format
msgid "replace '^/%s@%ld' with the locally added item"
msgstr "ersätt \"^/%s@%ld\" med det lokalt tillagda objektet"
-#: ../libsvn_client/conflicts.c:9625
+#: ../libsvn_client/conflicts.c:9747
#, c-format
msgid "unexpected operation code '%d'"
msgstr "oväntad operationskod \"%d\""
-#: ../libsvn_client/conflicts.c:9629
+#: ../libsvn_client/conflicts.c:9751
msgid "Ignore incoming addition"
msgstr "Hoppa över inkommande tillägg"
-#: ../libsvn_client/conflicts.c:9675 ../libsvn_client/conflicts.c:9804
+#: ../libsvn_client/conflicts.c:9797 ../libsvn_client/conflicts.c:9926
#, c-format
msgid "merge '^/%s@%ld' into '%s'"
msgstr "slå samman \"^/%s@%ld\" in i \"%s\""
-#: ../libsvn_client/conflicts.c:9683 ../libsvn_client/conflicts.c:9813
+#: ../libsvn_client/conflicts.c:9805 ../libsvn_client/conflicts.c:9935
#, c-format
msgid "merge local '%s' and '^/%s@%ld'"
msgstr "slå samman lokala \"%s\" och \"^/%s@%ld\""
-#: ../libsvn_client/conflicts.c:9693
+#: ../libsvn_client/conflicts.c:9815
msgid "Merge the files"
msgstr "Slå samman filerna"
-#: ../libsvn_client/conflicts.c:9742
+#: ../libsvn_client/conflicts.c:9864
#, c-format
msgid "delete '%s', copy '^/%s@%ld' here, and merge the files"
msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman filerna"
-#: ../libsvn_client/conflicts.c:9752 ../libsvn_client/conflicts.c:9935
+#: ../libsvn_client/conflicts.c:9874 ../libsvn_client/conflicts.c:10057
msgid "Replace and merge"
msgstr "Ersätt och slå samman"
-#: ../libsvn_client/conflicts.c:9822
+#: ../libsvn_client/conflicts.c:9944
msgid "Merge the directories"
msgstr "Slå samman katalogerna"
-#: ../libsvn_client/conflicts.c:9869
+#: ../libsvn_client/conflicts.c:9991
#, c-format
msgid "delete '%s' and copy '^/%s@%ld' here"
msgstr "radera \"%s\" och kopiera hit \"^/%s@%ld\""
-#: ../libsvn_client/conflicts.c:9878
+#: ../libsvn_client/conflicts.c:10000
msgid "Delete my directory and replace it with incoming directory"
msgstr "Radera min katalog och ersätt den med inkommande katalog"
-#: ../libsvn_client/conflicts.c:9925
+#: ../libsvn_client/conflicts.c:10047
#, c-format
msgid "delete '%s', copy '^/%s@%ld' here, and merge the directories"
msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman katalogerna"
-#: ../libsvn_client/conflicts.c:10005
+#: ../libsvn_client/conflicts.c:10127
#, c-format
msgid "ignore the deletion of '^/%s@%ld'"
msgstr "hoppa över raderingen av \"^/%s@%ld\""
-#: ../libsvn_client/conflicts.c:10010
+#: ../libsvn_client/conflicts.c:10132
msgid "Ignore incoming deletion"
msgstr "Hoppa över inkommande radering"
-#: ../libsvn_client/conflicts.c:10063
+#: ../libsvn_client/conflicts.c:10185
#, c-format
msgid "accept the deletion of '%s'"
msgstr "godta borttagningen av \"%s\""
-#: ../libsvn_client/conflicts.c:10070
+#: ../libsvn_client/conflicts.c:10192
msgid "Accept incoming deletion"
msgstr "Godta inkommande radering"
-#: ../libsvn_client/conflicts.c:10109
+#: ../libsvn_client/conflicts.c:10231
#, c-format
msgid "move '%s' to '%s' and merge"
msgstr "flytta \"%s\" till \"%s\" och slå samman"
-#: ../libsvn_client/conflicts.c:10119
+#: ../libsvn_client/conflicts.c:10241
#, c-format
msgid "move and merge local changes from '%s' into '%s'"
msgstr "flytta och slå samman lokala ändringar från \"%s\" till \"%s\""
-#: ../libsvn_client/conflicts.c:10180 ../libsvn_client/conflicts.c:10240
+#: ../libsvn_client/conflicts.c:10302 ../libsvn_client/conflicts.c:10362
msgid "Move and merge"
msgstr "Flytta och slå samman"
-#: ../libsvn_client/conflicts.c:10338
+#: ../libsvn_client/conflicts.c:10426
#, c-format
msgid "apply changes to move destination '%s'"
msgstr "utför ändringar på flyttmålet \"%s\""
-#: ../libsvn_client/conflicts.c:10347
+#: ../libsvn_client/conflicts.c:10439 ../libsvn_client/conflicts.c:10447
msgid "Apply to move destination"
msgstr "Utför ändringar på flyttmålet"
-#: ../libsvn_client/conflicts.c:10412 ../libsvn_client/conflicts.c:10742
+#: ../libsvn_client/conflicts.c:10510 ../libsvn_client/conflicts.c:11021
#, c-format
msgid "apply changes to '%s'"
msgstr "utför ändringar på \"%s\""
-#: ../libsvn_client/conflicts.c:10425 ../libsvn_client/conflicts.c:10433
+#: ../libsvn_client/conflicts.c:10523 ../libsvn_client/conflicts.c:10531
msgid "Apply to corresponding local location"
msgstr "Utför ändringar på motsvarande lokalt ställe"
-#: ../libsvn_client/conflicts.c:10464 ../libsvn_client/conflicts.c:10645
+#: ../libsvn_client/conflicts.c:10614 ../libsvn_client/conflicts.c:10634
+#: ../libsvn_client/conflicts.c:10906
#, c-format
msgid "Getting a list of possible move targets requires details for tree conflict at '%s' to be fetched from the repository first"
msgstr "För att räkna upp möjliga flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:10517 ../libsvn_client/conflicts.c:10755
-#, c-format
-msgid "Setting a move target requires details for tree conflict at '%s' to be fetched from the repository first"
-msgstr "För att ange ett flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
-
-#: ../libsvn_client/conflicts.c:10526 ../libsvn_client/conflicts.c:10768
+#: ../libsvn_client/conflicts.c:10679 ../libsvn_client/conflicts.c:11036
+#: ../libsvn_client/conflicts.c:11072
#, c-format
msgid "Index '%d' is out of bounds of the possible move target list for '%s'"
msgstr "Index \"%d\" är utanför listan av möjliga flyttmål för \"%s\""
-#: ../libsvn_client/conflicts.c:10563
+#: ../libsvn_client/conflicts.c:10707
#, c-format
msgid "Repository path '%s' not found in list of possible move targets for '%s'"
msgstr "Arkivsökvägen \"%s\" fanns inte i listan av möjliga flyttmål för \"%s\""
-#: ../libsvn_client/conflicts.c:10610
+#: ../libsvn_client/conflicts.c:10751 ../libsvn_client/conflicts.c:10775
+#: ../libsvn_client/conflicts.c:10996 ../libsvn_client/conflicts.c:11059
#, c-format
-msgid "Getting a list of possible move siblings requires details for tree conflict at '%s' to be fetched from the repository first"
-msgstr "För att få en lista på möjliga syskon att flytta måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
+msgid "Setting a move target requires details for tree conflict at '%s' to be fetched from the repository first"
+msgstr "För att ange ett flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:10719
+#: ../libsvn_client/conflicts.c:10858
#, c-format
-msgid "Setting a move sibling requires details for tree conflict at '%s' to be fetched from the repository first"
-msgstr "För att ange ett syskon att flytta måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
+msgid "Getting a list of possible move siblings requires details for tree conflict at '%s' to be fetched from the repository first"
+msgstr "För att få en lista på möjliga syskon att flytta måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:10728
+#: ../libsvn_client/conflicts.c:11007
#, c-format
msgid "Index '%d' is out of bounds of the possible move sibling list for '%s'"
msgstr "Index \"%d\" är utanför listan av möjliga syskon att flytta för \"%s\""
-#: ../libsvn_client/conflicts.c:10988 ../libsvn_client/conflicts.c:11037
-#: ../libsvn_client/conflicts.c:11090
+#: ../libsvn_client/conflicts.c:11309 ../libsvn_client/conflicts.c:11358
+#: ../libsvn_client/conflicts.c:11411
#, c-format
msgid "Inapplicable conflict resolution option given for conflicted path '%s'"
msgstr "Ej tillämpbart konfliktlösningsval angivet för konfliktsökväg \"%s\""
-#: ../libsvn_client/conflicts.c:11310
+#: ../libsvn_client/conflicts.c:11631
#, c-format
msgid "Property '%s' is not in conflict."
msgstr "Egenskapen \"%s\" är inte i konflikt"
-#: ../libsvn_client/conflicts.c:11700 ../libsvn_wc/conflicts.c:3327
+#: ../libsvn_client/conflicts.c:12021 ../libsvn_wc/conflicts.c:3327
#, c-format
msgid "Unable to resolve pending conflict on '%s'"
msgstr "Kan inte lösa väntande konflikt på \"%s\""
@@ -4707,14 +4711,7 @@ msgstr ".sammanslagning-vänster"
msgid ".merge-right"
msgstr ".sammanslagning-höger"
-#: ../libsvn_client/shelf.c:2027 ../svn/shelf-cmd.c:496
-#, c-format
-msgid "%d path could not be shelved"
-msgid_plural "%d paths could not be shelved"
-msgstr[0] "%d sökväg kunde inte läggas på hyllan"
-msgstr[1] "%d sökvägar kunde inte läggas på hyllan"
-
-#: ../libsvn_client/shelf.c:2152
+#: ../libsvn_client/shelf.c:2054
#, c-format
msgid "Shelf '%s' version %d not found"
msgstr "Post \"%s\" med version %d finns inte"
@@ -12256,7 +12253,7 @@ msgstr ""
"Felaktigt val; redigera egenskapen först.\n"
"\n"
-#: ../svn/conflict-callbacks.c:1637
+#: ../svn/conflict-callbacks.c:1629
#, c-format
msgid ""
"Possible working copy destinations for moved-away '%s' are:\n"
@@ -12267,7 +12264,7 @@ msgstr ""
"%sBara ett mål kan vara en flytt; de andra är kopieringar.\n"
"Ange numret för rätt sökväg för flyttmålet: "
-#: ../svn/conflict-callbacks.c:1646
+#: ../svn/conflict-callbacks.c:1638
#, c-format
msgid ""
"Possible repository destinations for moved-away '%s' are:\n"
@@ -12278,7 +12275,7 @@ msgstr ""
"%sBara ett mål kan vara en flytt; de andra är kopieringar.\n"
"Ange numret för rätt sökväg för flyttmålet: "
-#: ../svn/conflict-callbacks.c:1728
+#: ../svn/conflict-callbacks.c:1783
#, c-format
msgid ""
"Tree conflict on '%s':\n"
@@ -12287,12 +12284,12 @@ msgstr ""
"Trädkonflikt på \"%s\":\n"
"%s\n"
-#: ../svn/conflict-callbacks.c:1748
+#: ../svn/conflict-callbacks.c:1803
#, c-format
msgid "Applying recommended resolution '%s':\n"
msgstr "Utför den rekommenderade lösningen \"%s\":\n"
-#: ../svn/conflict-callbacks.c:1773
+#: ../svn/conflict-callbacks.c:1828
#, c-format
msgid ""
"\n"
@@ -12306,12 +12303,12 @@ msgstr ""
"Se \"svn help resolve\" för vidare information.\n"
"\n"
-#: ../svn/conflict-callbacks.c:1788
+#: ../svn/conflict-callbacks.c:1843
#, c-format
msgid "Ambiguous move destinations exist in the repository; try the 'd' option\n"
msgstr "Flertydiga flyttmål finns i arkivet; försök med valet \"d\"\n"
-#: ../svn/conflict-callbacks.c:1793
+#: ../svn/conflict-callbacks.c:1848
#, c-format
msgid "Ambiguous move destinations exist in the working copy; try the 'w' option\n"
msgstr "Flertydiga flyttmål finns i arbetskopian; försök med valet \"w\"\n"
@@ -12531,237 +12528,237 @@ msgstr "svn-viewspec.py format 1 stöder
msgid "svn-viewspec.py format 1 does not support the 'switched' state found at '%s'"
msgstr "svn-viewspect.py format 1 stöder inte \"switched\"-tillståndet som fanns vid \"%s\""
-#: ../svn/info-cmd.c:457
+#: ../svn/info-cmd.c:466
#, c-format
msgid "'%s' is not a valid value for --show-item"
msgstr "\"%s\" är inte ett giltigt värde för --show-item"
-#: ../svn/info-cmd.c:465
+#: ../svn/info-cmd.c:474
#, c-format
msgid "'%s' is not a valid value for --show-item; did you mean '%s'?"
msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\"?"
-#: ../svn/info-cmd.c:475
+#: ../svn/info-cmd.c:484
#, c-format
msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?"
msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\" eller \"%s\"?"
-#: ../svn/info-cmd.c:486
+#: ../svn/info-cmd.c:495
#, c-format
msgid "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?"
msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\", \"%s\" eller \"%s\"?"
-#: ../svn/info-cmd.c:507
+#: ../svn/info-cmd.c:516
msgid "Resource is not under version control."
msgstr "Resursen är inte versionshanterad."
-#: ../svn/info-cmd.c:683 ../svnadmin/svnadmin.c:2371
+#: ../svn/info-cmd.c:692 ../svnadmin/svnadmin.c:2371
#: ../svnadmin/svnadmin.c:2607
#, c-format
msgid "Path: %s\n"
msgstr "Sökväg: %s\n"
-#: ../svn/info-cmd.c:690
+#: ../svn/info-cmd.c:699
#, c-format
msgid "Name: %s\n"
msgstr "Namn: %s\n"
-#: ../svn/info-cmd.c:694
+#: ../svn/info-cmd.c:703
#, c-format
msgid "Working Copy Root Path: %s\n"
msgstr "Sökväg till arbetskopians rot: %s\n"
-#: ../svn/info-cmd.c:700
+#: ../svn/info-cmd.c:709
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: ../svn/info-cmd.c:703
+#: ../svn/info-cmd.c:712
#, c-format
msgid "Relative URL: %s\n"
msgstr "Relativ URL: %s\n"
-#: ../svn/info-cmd.c:707
+#: ../svn/info-cmd.c:716
#, c-format
msgid "Repository Root: %s\n"
msgstr "Arkivrot: %s\n"
-#: ../svn/info-cmd.c:711
+#: ../svn/info-cmd.c:720
#, c-format
msgid "Repository UUID: %s\n"
msgstr "Arkivets UUID: %s\n"
-#: ../svn/info-cmd.c:715
+#: ../svn/info-cmd.c:724
#, c-format
msgid "Revision: %ld\n"
msgstr "Revision: %ld\n"
-#: ../svn/info-cmd.c:720
+#: ../svn/info-cmd.c:729
#, c-format
msgid "Node Kind: file\n"
msgstr "Nodtyp: fil\n"
-#: ../svn/info-cmd.c:724
+#: ../svn/info-cmd.c:733
#, c-format
msgid "Node Kind: directory\n"
msgstr "Nodtyp: katalog\n"
-#: ../svn/info-cmd.c:728
+#: ../svn/info-cmd.c:737
#, c-format
msgid "Node Kind: none\n"
msgstr "Nodtyp: ingen\n"
-#: ../svn/info-cmd.c:733
+#: ../svn/info-cmd.c:742
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Nodtyp: okänd\n"
-#: ../svn/info-cmd.c:742
+#: ../svn/info-cmd.c:751
#, c-format
msgid "Schedule: normal\n"
msgstr "Schemalagd: normal\n"
-#: ../svn/info-cmd.c:746
+#: ../svn/info-cmd.c:755
#, c-format
msgid "Schedule: add\n"
msgstr "Schemalagd: att läggas till\n"
-#: ../svn/info-cmd.c:750
+#: ../svn/info-cmd.c:759
#, c-format
msgid "Schedule: delete\n"
msgstr "Schemalagd: att raderas\n"
-#: ../svn/info-cmd.c:754
+#: ../svn/info-cmd.c:763
#, c-format
msgid "Schedule: replace\n"
msgstr "Schemalagd: att ersättas\n"
-#: ../svn/info-cmd.c:770
+#: ../svn/info-cmd.c:779
#, c-format
msgid "Depth: empty\n"
msgstr "Djup: \"empty\"\n"
-#: ../svn/info-cmd.c:774
+#: ../svn/info-cmd.c:783
#, c-format
msgid "Depth: files\n"
msgstr "Djup: \"files\"\n"
-#: ../svn/info-cmd.c:778
+#: ../svn/info-cmd.c:787
#, c-format
msgid "Depth: immediates\n"
msgstr "Djup: \"immediates\"\n"
-#: ../svn/info-cmd.c:782
+#: ../svn/info-cmd.c:791
#, c-format
msgid "Depth: exclude\n"
msgstr "Djup: \"exclude\"\n"
#. Other depths should never happen here.
-#: ../svn/info-cmd.c:793
+#: ../svn/info-cmd.c:802
#, c-format
msgid "Depth: INVALID\n"
msgstr "Djup: OGILTIGT\n"
-#: ../svn/info-cmd.c:797
+#: ../svn/info-cmd.c:806
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Kopierad från URL: %s\n"
-#: ../svn/info-cmd.c:801
+#: ../svn/info-cmd.c:810
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Kopierad från revision: %ld\n"
-#: ../svn/info-cmd.c:804
+#: ../svn/info-cmd.c:813
#, c-format
msgid "Moved From: %s\n"
msgstr "Flyttad från: %s\n"
# ###
-#: ../svn/info-cmd.c:811
+#: ../svn/info-cmd.c:820
#, c-format
msgid "Moved To: %s\n"
msgstr "Flyttad till: %s\n"
-#: ../svn/info-cmd.c:819
+#: ../svn/info-cmd.c:828
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Författare till senaste ändringen: %s\n"
-#: ../svn/info-cmd.c:823
+#: ../svn/info-cmd.c:832
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Senast ändrad i revision: %ld\n"
-#: ../svn/info-cmd.c:828
+#: ../svn/info-cmd.c:837
msgid "Last Changed Date"
msgstr "Datum för senaste ändringen"
-#: ../svn/info-cmd.c:834
+#: ../svn/info-cmd.c:843
msgid "Text Last Updated"
msgstr "Innehållet senast uppdaterat"
-#: ../svn/info-cmd.c:837
+#: ../svn/info-cmd.c:846
#, c-format
msgid "Checksum: %s\n"
msgstr "Kontrollsumma: %s\n"
-#: ../svn/info-cmd.c:871
+#: ../svn/info-cmd.c:880
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Konflikt: föregående basfil: %s\n"
-#: ../svn/info-cmd.c:879
+#: ../svn/info-cmd.c:888
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Konflikt: föregående arbetsfil: %s\n"
-#: ../svn/info-cmd.c:887
+#: ../svn/info-cmd.c:896
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "Konflikt: nuvarande basfil: %s\n"
-#: ../svn/info-cmd.c:923
+#: ../svn/info-cmd.c:932
msgid "Tree conflict"
msgstr "Trädkonflikt"
-#: ../svn/info-cmd.c:927
+#: ../svn/info-cmd.c:936
#, c-format
msgid "Conflicted Properties: %s\n"
msgstr "Konfliktegenskaper: %s\n"
-#: ../svn/info-cmd.c:953
+#: ../svn/info-cmd.c:962
msgid "Conflict Details"
msgstr "Konfliktdetaljer"
-#: ../svn/info-cmd.c:974
+#: ../svn/info-cmd.c:983
msgid "Source left"
msgstr "Källa vänster"
-#: ../svn/info-cmd.c:983
+#: ../svn/info-cmd.c:992
msgid "Source right"
msgstr "Källa höger"
# ###
-#: ../svn/info-cmd.c:992
+#: ../svn/info-cmd.c:1001
#, c-format
msgid "Lock Token: %s\n"
msgstr "Låsidentifierare: %s\n"
-#: ../svn/info-cmd.c:996
+#: ../svn/info-cmd.c:1005
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Låsägare: %s\n"
-#: ../svn/info-cmd.c:1001
+#: ../svn/info-cmd.c:1010
msgid "Lock Created"
msgstr "Lås skapat"
-#: ../svn/info-cmd.c:1005
+#: ../svn/info-cmd.c:1014
msgid "Lock Expires"
msgstr "Låset går ut"
-#: ../svn/info-cmd.c:1013
+#: ../svn/info-cmd.c:1022
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -12776,32 +12773,32 @@ msgstr[1] ""
"Låskommentar (%i rader):\n"
"%s\n"
-#: ../svn/info-cmd.c:1022
+#: ../svn/info-cmd.c:1031
#, c-format
msgid "Changelist: %s\n"
msgstr "Ändringslista: %s\n"
-#: ../svn/info-cmd.c:1200
+#: ../svn/info-cmd.c:1209
msgid "--show-item is not valid in --xml mode"
msgstr "--show-item är inte giltig i läget --xml"
-#: ../svn/info-cmd.c:1204
+#: ../svn/info-cmd.c:1213
msgid "--no-newline is not valid in --xml mode"
msgstr "--new-newline är inte giltig i läget --xml"
-#: ../svn/info-cmd.c:1219 ../svn/info-cmd.c:1239
+#: ../svn/info-cmd.c:1228 ../svn/info-cmd.c:1248
msgid "--incremental is only valid in --xml mode"
msgstr "--incremental är endast tillåten i läget --xml"
-#: ../svn/info-cmd.c:1226
+#: ../svn/info-cmd.c:1235
msgid "--no-newline is only available for single-target, non-recursive info operations"
msgstr "--no-newline är endast tillgänglig för icke-rekursiva informationsoperationer på ett enda mål"
-#: ../svn/info-cmd.c:1243
+#: ../svn/info-cmd.c:1252
msgid "--no-newline' is only valid with --show-item"
msgstr "--no-newline är endast tillåten tillsammans med --show-item"
-#: ../svn/info-cmd.c:1316 ../svnbench/null-info-cmd.c:283
+#: ../svn/info-cmd.c:1325 ../svnbench/null-info-cmd.c:283
msgid "Could not display info for all targets because some targets don't exist"
msgstr "Kunde inte visa information för alla mål eftersom några mål inte finns"
@@ -12834,7 +12831,7 @@ msgstr "Låskommentaren innehåller en n
msgid "One or more locks could not be obtained"
msgstr "Ett eller flera lås kunde inte tas"
-#: ../svn/log-cmd.c:111 ../svn/svn.c:1145 ../svn/svn.c:1217 ../svn/svn.c:1283
+#: ../svn/log-cmd.c:111 ../svn/svn.c:1147 ../svn/svn.c:1219 ../svn/svn.c:1285
msgid "\n"
msgstr "\n"
@@ -13822,6 +13819,13 @@ msgstr "--- Sparar...\n"
msgid "--- Shelving...\n"
msgstr "--- Lägger på hyllan...\n"
+#: ../svn/shelf-cmd.c:496
+#, c-format
+msgid "%d path could not be shelved"
+msgid_plural "%d paths could not be shelved"
+msgstr[0] "%d sökväg kunde inte läggas på hyllan"
+msgstr[1] "%d sökvägar kunde inte läggas på hyllan"
+
#: ../svn/shelf-cmd.c:506
#, c-format
msgid "No local modifications could be saved"
@@ -14544,10 +14548,12 @@ msgid "drop shelf after successful unshe
msgstr "ta bort hyllan efter lyckad återställning"
#: ../svn/svn.c:484
-msgid "print the working copy layout"
-msgstr "visa arbetskopians omfattning"
+msgid ""
+"print the working copy layout, formatted according\n"
+" to ARG: 'classic' or 'svn11'"
+msgstr ""
-#: ../svn/svn.c:534
+#: ../svn/svn.c:536
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -14557,11 +14563,11 @@ msgstr ""
"läggas till i arkivet. De kommer att läggas till vid nästa arkivering.\n"
"användning: add PATH...\n"
-#: ../svn/svn.c:540
+#: ../svn/svn.c:542
msgid "add intermediate parents"
msgstr "skapa mellanliggande föräldrakataloger"
-#: ../svn/svn.c:543
+#: ../svn/svn.c:545
msgid ""
"Manage cached authentication credentials.\n"
"usage: 1. svn auth [PATTERN ...]\n"
@@ -14573,7 +14579,7 @@ msgstr ""
"användning: 2. svn auth --remove MÖNSTER [MÖNSTER ...]\n"
"\n"
-#: ../svn/svn.c:547
+#: ../svn/svn.c:549
msgid ""
" With no arguments, list all cached authentication credentials.\n"
" Authentication credentials include usernames, passwords,\n"
@@ -14591,7 +14597,7 @@ msgstr ""
" autentiseringsreferenser som motsvarar ett eller flera mönster.\n"
"\n"
-#: ../svn/svn.c:554
+#: ../svn/svn.c:556
msgid ""
" If more than one pattern is specified credentials are considered only if they\n"
" match all specified patterns. Patterns are matched case-sensitively and may\n"
@@ -14612,11 +14618,11 @@ msgstr ""
" Observera att jokertecken vanligtvis behöver citeras på kommandoraden\n"
" eftersom många kommandoskal annars försöker expandera dem.\n"
-#: ../svn/svn.c:565
+#: ../svn/svn.c:567
msgid "remove matching authentication credentials"
msgstr "ta bort motsvarande autentiseringsreferenser"
-#: ../svn/svn.c:570
+#: ../svn/svn.c:572
msgid ""
"Show when each line of a file was last (or\n"
"next) changed.\n"
@@ -14628,7 +14634,7 @@ msgstr ""
"användning: blame [-rM:N] MÅL[@REV]...\n"
"\n"
-#: ../svn/svn.c:574
+#: ../svn/svn.c:576
msgid ""
" Annotate each line of a file with the revision number and author of the\n"
" last change (or optionally the next change) to that line.\n"
@@ -14638,7 +14644,7 @@ msgstr ""
" den senaste ändringen (eller nästa ändring) av raden.\n"
"\n"
-#: ../svn/svn.c:577 ../svnbench/svnbench.c:222
+#: ../svn/svn.c:579 ../svnbench/svnbench.c:222
msgid ""
" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n"
" annotate each line that is present in revision N of the file, with\n"
@@ -14652,7 +14658,7 @@ msgstr ""
" gå längre bakåt i tiden än rM.\n"
"\n"
-#: ../svn/svn.c:582 ../svnbench/svnbench.c:227
+#: ../svn/svn.c:584 ../svnbench/svnbench.c:227
msgid ""
" With a reverse revision range '-r M:N' where M > N,\n"
" annotate each line that is present in revision N of the file, with\n"
@@ -14665,7 +14671,7 @@ msgstr ""
" eller raderade raden, utan att gå längre framåt i tiden än rM.\n"
"\n"
-#: ../svn/svn.c:587 ../svnbench/svnbench.c:232
+#: ../svn/svn.c:589 ../svnbench/svnbench.c:232
msgid ""
" If specified, REV determines in which revision the target is first\n"
" looked up.\n"
@@ -14674,11 +14680,11 @@ msgstr ""
" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
"\n"
-#: ../svn/svn.c:590 ../svnbench/svnbench.c:235
+#: ../svn/svn.c:592 ../svnbench/svnbench.c:235
msgid " Write the annotated result to standard output.\n"
msgstr " Det kommenterade resultatet skrivs till standardutmatningen.\n"
-#: ../svn/svn.c:595
+#: ../svn/svn.c:597
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -14688,13 +14694,13 @@ msgstr ""
"användning: cat MÅL[@REV]...\n"
"\n"
-#: ../svn/svn.c:598
+#: ../svn/svn.c:600
msgid ""
" If specified, REV determines in which revision the target is first\n"
" looked up.\n"
msgstr " Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
-#: ../svn/svn.c:604
+#: ../svn/svn.c:606
msgid ""
"Associate (or dissociate) changelist CLNAME with the named files.\n"
"usage: 1. changelist CLNAME PATH...\n"
@@ -14705,7 +14711,7 @@ msgstr ""
"användning: 1. changelist ÄLNAMN SÖKVÄG...\n"
" 2. changelist --remove SÖKVÄG...\n"
-#: ../svn/svn.c:611
+#: ../svn/svn.c:613
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -14715,7 +14721,7 @@ msgstr ""
"användning: checkout URL[@REV]... [SÖKVÄG]\n"
"\n"
-#: ../svn/svn.c:614
+#: ../svn/svn.c:616
msgid ""
" If specified, REV determines in which revision the URL is first\n"
" looked up.\n"
@@ -14724,7 +14730,7 @@ msgstr ""
" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
"\n"
-#: ../svn/svn.c:617
+#: ../svn/svn.c:619
msgid ""
" If PATH is omitted, the basename of the URL will be used as\n"
" the destination. If multiple URLs are given each will be checked\n"
@@ -14737,7 +14743,7 @@ msgstr ""
" SÖKVÄG som får URL:ens basnamn som katalognamn.\n"
"\n"
-#: ../svn/svn.c:622
+#: ../svn/svn.c:624
msgid ""
" If --force is used, unversioned obstructing paths in the working\n"
" copy destination do not automatically cause the check out to fail.\n"
@@ -14763,7 +14769,7 @@ msgstr ""
" sökvägar som är i vägen.\n"
"\n"
-#: ../svn/svn.c:633
+#: ../svn/svn.c:635
msgid ""
" See also 'svn help update' for a list of possible characters\n"
" reporting the action taken.\n"
@@ -14771,7 +14777,7 @@ msgstr ""
" Se även \"svn help update\" för en lista av möjliga tecken i rapporten\n"
" om vilken åtgärd som utfördes.\n"
-#: ../svn/svn.c:639
+#: ../svn/svn.c:641
msgid ""
"Either recover from an interrupted operation that left the working copy locked,\n"
"or remove unwanted files.\n"
@@ -14789,7 +14795,7 @@ msgstr ""
" 3. cleanup --vacuum-pristines [AKSÖKVÄG...]\n"
"\n"
-#: ../svn/svn.c:646
+#: ../svn/svn.c:648
msgid ""
" 1. When none of the options --remove-unversioned, --remove-ignored, and\n"
" --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n"
@@ -14805,7 +14811,7 @@ msgstr ""
" i ett oanvändbart tillstånd.\n"
"\n"
-#: ../svn/svn.c:652
+#: ../svn/svn.c:654
msgid ""
" WARNING: There is no mechanism that will protect write locks still\n"
" being used by other Subversion clients. Running this command\n"
@@ -14819,7 +14825,7 @@ msgstr ""
" utan möjlighet till reparation!\n"
"\n"
-#: ../svn/svn.c:657
+#: ../svn/svn.c:659
msgid ""
" 2. If the --remove-unversioned option or the --remove-ignored option\n"
" is given, remove any unversioned or ignored items within WCPATH.\n"
@@ -14833,7 +14839,7 @@ msgstr ""
" som \"?\" och ej beaktade objekt som \"I\" om väljaren --no-ignore används.\n"
"\n"
-#: ../svn/svn.c:662
+#: ../svn/svn.c:664
msgid ""
" 3. If the --vacuum-pristines option is given, remove pristine copies of\n"
" files which are stored inside the .svn directory and which are no longer\n"
@@ -14842,11 +14848,11 @@ msgstr ""
" 3. Om väljaren --vacuum-pristines anges, ta bort orörda kopior av filer\n"
" i katalogen \".svn\" som inte längre används av någon fil i arbetskopian.\n"
-#: ../svn/svn.c:668
+#: ../svn/svn.c:670
msgid "deprecated and ignored"
msgstr "föråldrad och har ingen verkan"
-#: ../svn/svn.c:671
+#: ../svn/svn.c:673
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -14856,7 +14862,7 @@ msgstr ""
"användning: commit [SÖKVÄG...]\n"
"\n"
-#: ../svn/svn.c:674
+#: ../svn/svn.c:676
msgid ""
" A log message must be provided, but it can be empty. If it is not\n"
" given by a --message or --file option, an editor will be started.\n"
@@ -14866,7 +14872,7 @@ msgstr ""
" med en --message- eller --file-flagga, startas en editor.\n"
"\n"
-#: ../svn/svn.c:677
+#: ../svn/svn.c:679
msgid ""
" If any targets are (or contain) locked items, those will be\n"
" unlocked after a successful commit, unless --no-unlock is given.\n"
@@ -14876,7 +14882,7 @@ msgstr ""
" låsas upp efter en lyckad arkivering, såvida inte --no-unlock anges.\n"
"\n"
-#: ../svn/svn.c:680
+#: ../svn/svn.c:682
msgid ""
" If --include-externals is given, also commit file and directory\n"
" externals reached by recursion. Do not commit externals with a\n"
@@ -14885,7 +14891,7 @@ msgstr ""
" Om --include-externals anges, arkivera också externa filer och kataloger\n"
" som nås rekursivt. Arkivera inte externa objekt med en fixerad revision.\n"
-#: ../svn/svn.c:688
+#: ../svn/svn.c:690
msgid ""
"Copy files and directories in a working copy or repository.\n"
"usage: copy SRC[@REV]... DST\n"
@@ -14895,7 +14901,7 @@ msgstr ""
"användning: copy KÄLLA[@REV]... MÅL\n"
"\n"
-#: ../svn/svn.c:691
+#: ../svn/svn.c:693
msgid ""
" SRC and DST can each be either a working copy (WC) path or URL:\n"
" WC -> WC: copy and schedule for addition (with history)\n"
@@ -14919,7 +14925,7 @@ msgstr ""
" måste MÅL vara en befintlig katalog.\n"
"\n"
-#: ../svn/svn.c:700
+#: ../svn/svn.c:702
msgid ""
" WARNING: For compatibility with previous versions of Subversion,\n"
[... 2522 lines stripped ...]