subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1842404 [7/11] - in /subversion/branches/better-pristines: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ contrib/client-side/svn_load_dirs/ doc/user/ notes/logo/ notes/shelving/ subversion/bindings/javahl/ subversi...
Date Sun, 30 Sep 2018 18:26:49 GMT
Modified: subversion/branches/better-pristines/subversion/po/sv.po
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/po/sv.po?rev=1842404&r1=1842403&r2=1842404&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/better-pristines/subversion/po/sv.po [UTF-8] Sun Sep 30 18:26:47 2018
@@ -110,8 +110,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2018-03-12 16:55+0100\n"
-"PO-Revision-Date: 2018-03-12 16:58+0100\n"
+"POT-Creation-Date: 2018-09-19 11:06+0200\n"
+"PO-Revision-Date: 2018-09-19 13:05+0200\n"
 "Last-Translator: Subversion Developers <dev@subversion.apache.org>\n"
 "Language-Team: Swedish <dev@subversion.apache.org>\n"
 "Language: sv\n"
@@ -962,7 +962,7 @@ msgstr "Kunde inte läsa data från resp
 msgid "Repository has been moved"
 msgstr "Arkivet har flyttats"
 
-#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:937
+#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:940
 msgid "Connection timed out"
 msgstr "Nätverksanslutningen gick ut"
 
@@ -1062,7 +1062,7 @@ msgstr "Operationen tillåter ej att kä
 msgid "Operation does not apply to directory"
 msgstr "Operationen kan ej utföras på en katalog"
 
-#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1810
+#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1813
 #, c-format
 msgid "Revision range is not allowed"
 msgstr "Revisionsområde otillåtet"
@@ -1559,12 +1559,12 @@ msgstr "Certifikatssignaturen stämmer e
 msgid "Certficate verification failed"
 msgstr "Certifikatskontrollen misslyckades"
 
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:296
 msgid "GNOME Keyring is locked and we are non-interactive"
 msgstr "GNOMEs nyckelkedja är låst och vi är inte interaktiva"
 
 #: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365
-#: ../libsvn_subr/opt.c:1234
+#: ../libsvn_subr/opt.c:908
 #, c-format
 msgid "'%s' ends in a reserved name"
 msgstr "\"%s\" slutar med ett reserverat namn"
@@ -1594,11 +1594,11 @@ msgstr "Nodtypen för sökvägen \"%s\"
 #: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65
 #: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3197
 #: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861
-#: ../libsvn_client/patch.c:3745 ../libsvn_client/relocate.c:155
+#: ../libsvn_client/patch.c:3747 ../libsvn_client/relocate.c:155
 #: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152
-#: ../libsvn_client/shelf.c:378 ../libsvn_client/status.c:368
-#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:701
-#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1053 ../svn/util.c:990
+#: ../libsvn_client/shelf.c:1105 ../libsvn_client/status.c:444
+#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:749
+#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1023 ../svn/util.c:990
 #: ../svnbench/util.c:76
 #, c-format
 msgid "'%s' is not a local path"
@@ -1802,39 +1802,39 @@ msgstr "Arkiveringsobjektet \"%s\" har k
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr "Standardegenskaper kan inte sättas direkt som revisionsegenskaper"
 
-#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1095
-#: ../libsvn_client/conflicts.c:1688 ../libsvn_client/conflicts.c:4625
-#: ../libsvn_client/conflicts.c:5124 ../libsvn_client/conflicts.c:5146
-#: ../libsvn_client/conflicts.c:5197 ../libsvn_client/conflicts.c:5674
+#: ../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
 msgid "unknown author"
 msgstr "okänd författare"
 
-#: ../libsvn_client/conflicts.c:1126
+#: ../libsvn_client/conflicts.c:1131
 msgid "A file containing uncommitted changes was found in the working copy."
 msgstr "En fil med oarkiverade ändringar hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1129
+#: ../libsvn_client/conflicts.c:1134
 msgid "A file which differs from the corresponding file on the merge source branch was found in the working copy."
 msgstr "En fil som skiljer sig från motsvarande fil i källgrenen för sammanslagningen hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1134
+#: ../libsvn_client/conflicts.c:1139
 msgid "A file which already occupies this path was found in the working copy."
 msgstr "En fil som redan upptar denna sökväg hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1138
+#: ../libsvn_client/conflicts.c:1143
 msgid "An unversioned file was found in the working copy."
 msgstr "En icke versionshanterad fil fanns i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1142
+#: ../libsvn_client/conflicts.c:1147
 msgid "A deleted file was found in the working copy."
 msgstr "En raderad fil hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1147
+#: ../libsvn_client/conflicts.c:1152
 msgid "No such file was found in the working copy."
 msgstr "Ingen sådan fil hittades i arbetskopian."
 
 #. ### display deleted revision
-#: ../libsvn_client/conflicts.c:1151
+#: ../libsvn_client/conflicts.c:1156
 msgid ""
 "No such file was found in the merge target working copy.\n"
 "Perhaps the file has been deleted or moved away in the repository's history?"
@@ -1843,7 +1843,7 @@ msgstr ""
 "Kanske filen har raderats eller flyttas bort i arkivets historia?"
 
 #. ### show more details about copies or replacements?
-#: ../libsvn_client/conflicts.c:1161
+#: ../libsvn_client/conflicts.c:1166
 msgid "A file scheduled to be added to the repository in the next commit was found in the working copy."
 msgstr "En fil schemalagd för att läggas till i nästa arkivering hittades i arbetskopian."
 
@@ -1852,11 +1852,11 @@ msgstr "En fil schemalagd för att lägg
 #. * This case cannot happen until we detect incoming
 #. * moves, which we currently don't do.
 #. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1192 ../libsvn_client/conflicts.c:1224
+#: ../libsvn_client/conflicts.c:1197 ../libsvn_client/conflicts.c:1229
 msgid "The file in the working copy had been moved away at the time this conflict was recorded."
 msgstr "Filen i arbetskopian var bortflyttad när denna konflikt registrerades."
 
-#: ../libsvn_client/conflicts.c:1207 ../libsvn_client/conflicts.c:1240
+#: ../libsvn_client/conflicts.c:1212 ../libsvn_client/conflicts.c:1245
 #, c-format
 msgid ""
 "The file in the working copy was moved away to\n"
@@ -1870,11 +1870,11 @@ msgstr ""
 #. * This case cannot happen until we detect incoming
 #. * moves, which we currently don't do.
 #. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1266 ../libsvn_client/conflicts.c:1298
+#: ../libsvn_client/conflicts.c:1271 ../libsvn_client/conflicts.c:1303
 msgid "A file had been moved here in the working copy at the time this conflict was recorded."
 msgstr "En fil hade flyttats hit i arbetskopian när denna konflikt registrerades."
 
-#: ../libsvn_client/conflicts.c:1281 ../libsvn_client/conflicts.c:1314
+#: ../libsvn_client/conflicts.c:1286 ../libsvn_client/conflicts.c:1319
 #, c-format
 msgid ""
 "A file was moved here in the working copy from\n"
@@ -1883,32 +1883,32 @@ msgstr ""
 "En fil hade flyttats hit i arbetskopian från\n"
 "\"%s\"."
 
-#: ../libsvn_client/conflicts.c:1350
+#: ../libsvn_client/conflicts.c:1355
 msgid "A directory containing uncommitted changes was found in the working copy."
 msgstr "En katalog med oarkiverade ändringar hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1353
+#: ../libsvn_client/conflicts.c:1358
 msgid "A directory which differs from the corresponding directory on the merge source branch was found in the working copy."
 msgstr "En katalog som skiljer sig från motsvarande katalog i källgrenen för sammanslagningen hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1358
+#: ../libsvn_client/conflicts.c:1363
 msgid "A directory which already occupies this path was found in the working copy."
 msgstr "En katalog som redan upptar denna sökväg hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1362
+#: ../libsvn_client/conflicts.c:1367
 msgid "An unversioned directory was found in the working copy."
 msgstr "En icke versionshanterad katalog hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1366
+#: ../libsvn_client/conflicts.c:1371
 msgid "A deleted directory was found in the working copy."
 msgstr "En raderad katalog hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:1372
+#: ../libsvn_client/conflicts.c:1377
 msgid "No such directory was found in the working copy."
 msgstr "Ingen sådan katalog hittades i arbetskopian."
 
 #. ### display deleted revision
-#: ../libsvn_client/conflicts.c:1376
+#: ../libsvn_client/conflicts.c:1381
 msgid ""
 "No such directory was found in the merge target working copy.\n"
 "Perhaps the directory has been deleted or moved away in the repository's history?"
@@ -1917,16 +1917,16 @@ msgstr ""
 "Kanske katalogen har raderats eller flyttats bort i arkivets historia?"
 
 #. ### show more details about copies or replacements?
-#: ../libsvn_client/conflicts.c:1386
+#: ../libsvn_client/conflicts.c:1391
 msgid "A directory scheduled to be added to the repository in the next commit was found in the working copy."
 msgstr "En katalog schemalagd för att läggas till i nästa arkivering hittades i arbetskopian."
 
 #. The move no longer exists.
-#: ../libsvn_client/conflicts.c:1418
+#: ../libsvn_client/conflicts.c:1423
 msgid "The directory in the working copy had been moved away at the time this conflict was recorded."
 msgstr "Katalogen i arbetskopian hade flyttas bort när denna konflikt registrerades."
 
-#: ../libsvn_client/conflicts.c:1433
+#: ../libsvn_client/conflicts.c:1438
 #, c-format
 msgid ""
 "The directory in the working copy was moved away to\n"
@@ -1939,11 +1939,11 @@ msgstr ""
 #. * This case cannot happen until we detect incoming
 #. * moves, which we currently don't do.
 #. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1450
+#: ../libsvn_client/conflicts.c:1455
 msgid "The directory had been moved away at the time this conflict was recorded."
 msgstr "Katalogen hade flyttats bort när denna konflikt registrerades."
 
-#: ../libsvn_client/conflicts.c:1466
+#: ../libsvn_client/conflicts.c:1471
 #, c-format
 msgid ""
 "The directory was moved away to\n"
@@ -1957,11 +1957,11 @@ msgstr ""
 #. * This case cannot happen until we detect incoming
 #. * moves, which we currently don't do.
 #. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1492 ../libsvn_client/conflicts.c:1524
+#: ../libsvn_client/conflicts.c:1497 ../libsvn_client/conflicts.c:1529
 msgid "A directory had been moved here at the time this conflict was recorded."
 msgstr "En katalog hade flyttats hit när denna konflikt registrerades."
 
-#: ../libsvn_client/conflicts.c:1507
+#: ../libsvn_client/conflicts.c:1512
 #, c-format
 msgid ""
 "A directory was moved here from\n"
@@ -1970,7 +1970,7 @@ msgstr ""
 "En katalog hade flyttats hit från\n"
 "\"%s\"."
 
-#: ../libsvn_client/conflicts.c:1540
+#: ../libsvn_client/conflicts.c:1545
 #, c-format
 msgid ""
 "A directory was moved here in the working copy from\n"
@@ -1979,24 +1979,24 @@ msgstr ""
 "En katalog hade flyttats hit i arbetskopian från\n"
 "\"%s\"."
 
-#: ../libsvn_client/conflicts.c:2759
+#: ../libsvn_client/conflicts.c:2901
 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:2763
+#: ../libsvn_client/conflicts.c:2905
 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:2767
+#: ../libsvn_client/conflicts.c:2909
 msgid "A deleted item was found in the working copy."
 msgstr "Ett raderat objekt hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:2772
+#: ../libsvn_client/conflicts.c:2914
 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:2777
+#: ../libsvn_client/conflicts.c:2919
 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:2784
+#: ../libsvn_client/conflicts.c:2926
 msgid "An unversioned item was found in the working copy."
 msgstr "Ett icke versionshanterat objekt hittades i arbetskopian."
 
-#: ../libsvn_client/conflicts.c:2789
+#: ../libsvn_client/conflicts.c:2931
 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:2794
+#: ../libsvn_client/conflicts.c:2936
 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:2798
+#: ../libsvn_client/conflicts.c:2940
 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:2826
+#: ../libsvn_client/conflicts.c:2968
 #, 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:2891
+#: ../libsvn_client/conflicts.c:3033
 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:2900
+#: ../libsvn_client/conflicts.c:3042
 #, 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:2906
+#: ../libsvn_client/conflicts.c:3048
 #, 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:2913
+#: ../libsvn_client/conflicts.c:3055
 #, 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:2929
+#: ../libsvn_client/conflicts.c:3071
 #, 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:2937
+#: ../libsvn_client/conflicts.c:3079
 #, 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:2945
+#: ../libsvn_client/conflicts.c:3087
 #, 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:2959
+#: ../libsvn_client/conflicts.c:3101
 #, 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:2983
+#: ../libsvn_client/conflicts.c:3125
 msgid "An update operation tried to edit a file."
 msgstr "En uppdatering försökte ändra en fil."
 
-#: ../libsvn_client/conflicts.c:2985
+#: ../libsvn_client/conflicts.c:3127
 msgid "An update operation tried to add a file."
 msgstr "En uppdatering försökte lägga till en fil."
 
-#: ../libsvn_client/conflicts.c:2987
+#: ../libsvn_client/conflicts.c:3129
 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:2990
+#: ../libsvn_client/conflicts.c:3132
 msgid "An update operation tried to replace a file."
 msgstr "En uppdatering försökte ersätta en fil."
 
-#: ../libsvn_client/conflicts.c:2998
+#: ../libsvn_client/conflicts.c:3140
 msgid "A switch operation tried to edit a file."
 msgstr "En växling försökte ändra en fil."
 
-#: ../libsvn_client/conflicts.c:3000
+#: ../libsvn_client/conflicts.c:3142
 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:3002
+#: ../libsvn_client/conflicts.c:3144
 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:3005
+#: ../libsvn_client/conflicts.c:3147
 msgid "A switch operation tried to replace a file."
 msgstr "En växling försökte ersätta en fil."
 
-#: ../libsvn_client/conflicts.c:3013
+#: ../libsvn_client/conflicts.c:3155
 msgid "A merge operation tried to edit a file."
 msgstr "En sammanslagning försökte ändra en fil."
 
-#: ../libsvn_client/conflicts.c:3015
+#: ../libsvn_client/conflicts.c:3157
 msgid "A merge operation tried to add a file."
 msgstr "En sammanslagning försökte lägga till en fil."
 
-#: ../libsvn_client/conflicts.c:3017
+#: ../libsvn_client/conflicts.c:3159
 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:3020
+#: ../libsvn_client/conflicts.c:3162
 msgid "A merge operation tried to replace a file."
 msgstr "En sammanslagning försökte ersätta en fil."
 
-#: ../libsvn_client/conflicts.c:3030
+#: ../libsvn_client/conflicts.c:3172
 msgid "An update operation tried to change a directory."
 msgstr "En uppdatering försökte ändra en katalog."
 
-#: ../libsvn_client/conflicts.c:3032
+#: ../libsvn_client/conflicts.c:3174
 msgid "An update operation tried to add a directory."
 msgstr "En uppdatering försökte lägga till en katalog."
 
-#: ../libsvn_client/conflicts.c:3034
+#: ../libsvn_client/conflicts.c:3176
 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:3037
+#: ../libsvn_client/conflicts.c:3179
 msgid "An update operation tried to replace a directory."
 msgstr "En uppdatering försökte ersätta en katalog."
 
-#: ../libsvn_client/conflicts.c:3045
+#: ../libsvn_client/conflicts.c:3187
 msgid "A switch operation tried to edit a directory."
 msgstr "En växling försökte ändra en katalog."
 
-#: ../libsvn_client/conflicts.c:3047
+#: ../libsvn_client/conflicts.c:3189
 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:3049
+#: ../libsvn_client/conflicts.c:3191
 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:3052
+#: ../libsvn_client/conflicts.c:3194
 msgid "A switch operation tried to replace a directory."
 msgstr "En växling försökte ersätta en katalog."
 
-#: ../libsvn_client/conflicts.c:3060
+#: ../libsvn_client/conflicts.c:3202
 msgid "A merge operation tried to edit a directory."
 msgstr "En sammanslagning försökte ändra en katalog."
 
-#: ../libsvn_client/conflicts.c:3062
+#: ../libsvn_client/conflicts.c:3204
 msgid "A merge operation tried to add a directory."
 msgstr "En sammanslagning försökte lägga till en katalog."
 
-#: ../libsvn_client/conflicts.c:3064
+#: ../libsvn_client/conflicts.c:3206
 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:3067
+#: ../libsvn_client/conflicts.c:3209
 msgid "A merge operation tried to replace a directory."
 msgstr "En sammanslagning försökte ersätta en katalog."
 
-#: ../libsvn_client/conflicts.c:3078
+#: ../libsvn_client/conflicts.c:3220
 msgid "An update operation tried to edit an item."
 msgstr "En uppdatering försökte ändra ett objekt."
 
-#: ../libsvn_client/conflicts.c:3080
+#: ../libsvn_client/conflicts.c:3222
 msgid "An update operation tried to add an item."
 msgstr "En uppdatering försökte lägga till ett objekt."
 
-#: ../libsvn_client/conflicts.c:3082
+#: ../libsvn_client/conflicts.c:3224
 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:3085
+#: ../libsvn_client/conflicts.c:3227
 msgid "An update operation tried to replace an item."
 msgstr "En uppdatering försökte ersätta ett objekt."
 
-#: ../libsvn_client/conflicts.c:3093
+#: ../libsvn_client/conflicts.c:3235
 msgid "A switch operation tried to edit an item."
 msgstr "En växling försökte ändra ett objekt."
 
-#: ../libsvn_client/conflicts.c:3095
+#: ../libsvn_client/conflicts.c:3237
 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:3097
+#: ../libsvn_client/conflicts.c:3239
 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:3100
+#: ../libsvn_client/conflicts.c:3242
 msgid "A switch operation tried to replace an item."
 msgstr "En växlig försökte ersätta ett objekt."
 
-#: ../libsvn_client/conflicts.c:3108
+#: ../libsvn_client/conflicts.c:3250
 msgid "A merge operation tried to edit an item."
 msgstr "En sammanslagning försökte ändra ett objekt."
 
-#: ../libsvn_client/conflicts.c:3110
+#: ../libsvn_client/conflicts.c:3252
 msgid "A merge operation tried to add an item."
 msgstr "En sammanslagning försökte lägga till ett objekt."
 
-#: ../libsvn_client/conflicts.c:3112
+#: ../libsvn_client/conflicts.c:3254
 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:3115
+#: ../libsvn_client/conflicts.c:3257
 msgid "A merge operation tried to replace an item."
 msgstr "En sammanslagning försökte ersätta ett objekt."
 
-#: ../libsvn_client/conflicts.c:3131 ../svn/cl-conflicts.c:212
+#: ../libsvn_client/conflicts.c:3273 ../svn/cl-conflicts.c:212
 msgid "upon update"
 msgstr "vid uppdatering"
 
-#: ../libsvn_client/conflicts.c:3132 ../svn/cl-conflicts.c:213
+#: ../libsvn_client/conflicts.c:3274 ../svn/cl-conflicts.c:213
 msgid "upon switch"
 msgstr "vid växling"
 
-#: ../libsvn_client/conflicts.c:3133 ../svn/cl-conflicts.c:214
+#: ../libsvn_client/conflicts.c:3275 ../svn/cl-conflicts.c:214
 msgid "upon merge"
 msgstr "vid sammanslagning"
 
-#: ../libsvn_client/conflicts.c:3134 ../svn/cl-conflicts.c:215
+#: ../libsvn_client/conflicts.c:3276 ../svn/cl-conflicts.c:215
 msgid "upon none"
 msgstr "vid ingenting"
 
-#: ../libsvn_client/conflicts.c:3153 ../svn/cl-conflicts.c:127
+#: ../libsvn_client/conflicts.c:3295 ../svn/cl-conflicts.c:127
 #: ../svn/cl-conflicts.c:234
 msgid "local edit"
 msgstr "lokal ändring"
 
-#: ../libsvn_client/conflicts.c:3156 ../svn/cl-conflicts.c:140
+#: ../libsvn_client/conflicts.c:3298 ../svn/cl-conflicts.c:140
 #: ../svn/cl-conflicts.c:237
 msgid "local add"
 msgstr "lokalt tillägg"
 
-#: ../libsvn_client/conflicts.c:3159 ../svn/cl-conflicts.c:131
+#: ../libsvn_client/conflicts.c:3301 ../svn/cl-conflicts.c:131
 #: ../svn/cl-conflicts.c:240
 msgid "local delete"
 msgstr "lokal radering"
 
-#: ../libsvn_client/conflicts.c:3162 ../svn/cl-conflicts.c:129
+#: ../libsvn_client/conflicts.c:3304 ../svn/cl-conflicts.c:129
 #: ../svn/cl-conflicts.c:243
 msgid "local obstruction"
 msgstr "lokal blockering"
 
-#: ../libsvn_client/conflicts.c:3166 ../svn/cl-conflicts.c:247
+#: ../libsvn_client/conflicts.c:3308 ../svn/cl-conflicts.c:247
 #, c-format
 msgid "local %s"
 msgstr "lokal %s"
 
-#: ../libsvn_client/conflicts.c:3175 ../svn/cl-conflicts.c:192
+#: ../libsvn_client/conflicts.c:3317 ../svn/cl-conflicts.c:192
 #: ../svn/cl-conflicts.c:256
 msgid "incoming edit"
 msgstr "inkommande ändring"
 
-#: ../libsvn_client/conflicts.c:3178 ../svn/cl-conflicts.c:194
+#: ../libsvn_client/conflicts.c:3320 ../svn/cl-conflicts.c:194
 #: ../svn/cl-conflicts.c:259
 msgid "incoming add"
 msgstr "inkommande tillägg"
 
-#: ../libsvn_client/conflicts.c:3181 ../svn/cl-conflicts.c:262
+#: ../libsvn_client/conflicts.c:3323 ../svn/cl-conflicts.c:262
 msgid "incoming delete"
 msgstr "inkommande radering"
 
-#: ../libsvn_client/conflicts.c:3185 ../svn/cl-conflicts.c:266
+#: ../libsvn_client/conflicts.c:3327 ../svn/cl-conflicts.c:266
 #, c-format
 msgid "incoming %s"
 msgstr "inkommande %s"
 
-#: ../libsvn_client/conflicts.c:3193 ../svn/cl-conflicts.c:273
+#: ../libsvn_client/conflicts.c:3335 ../svn/cl-conflicts.c:273
 #: ../svn/cl-conflicts.c:326
 #, c-format
 msgid "%s, %s %s"
 msgstr "%s, %s %s"
 
-#: ../libsvn_client/conflicts.c:3252
+#: ../libsvn_client/conflicts.c:3394
 #, c-format
 msgid "incoming %s %s"
 msgstr "inkommande %s %s"
 
-#: ../libsvn_client/conflicts.c:3355
+#: ../libsvn_client/conflicts.c:3497
 #, 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:3366 ../libsvn_client/conflicts.c:3446
-#: ../libsvn_client/conflicts.c:3700 ../libsvn_client/conflicts.c:3787
-#: ../libsvn_client/conflicts.c:4087 ../libsvn_client/conflicts.c:4155
+#: ../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
 #, c-format
 msgid ""
 "%s\n"
@@ -2303,14 +2303,14 @@ msgstr ""
 "%s\n"
 "Den ersatta katalogen flyttades till \"^/%s\"."
 
-#: ../libsvn_client/conflicts.c:3381
+#: ../libsvn_client/conflicts.c:3523
 #, 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:3393 ../libsvn_client/conflicts.c:3472
-#: ../libsvn_client/conflicts.c:3729 ../libsvn_client/conflicts.c:3815
-#: ../libsvn_client/conflicts.c:4116 ../libsvn_client/conflicts.c:4183
+#: ../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
 #, c-format
 msgid ""
 "%s\n"
@@ -2319,14 +2319,14 @@ msgstr ""
 "%s\n"
 "Den ersatta filen flyttades till \"^/%s\"."
 
-#: ../libsvn_client/conflicts.c:3407
+#: ../libsvn_client/conflicts.c:3549
 #, 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:3417 ../libsvn_client/conflicts.c:3496
-#: ../libsvn_client/conflicts.c:3756 ../libsvn_client/conflicts.c:3842
-#: ../libsvn_client/conflicts.c:4210
+#: ../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
 #, c-format
 msgid ""
 "%s\n"
@@ -2335,97 +2335,97 @@ msgstr ""
 "%s\n"
 "Det ersatta objektet flyttades till \"^/%s\"."
 
-#: ../libsvn_client/conflicts.c:3434
+#: ../libsvn_client/conflicts.c:3576
 #, 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:3461
+#: ../libsvn_client/conflicts.c:3603
 #, 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:3486
+#: ../libsvn_client/conflicts.c:3628
 #, 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:3519
+#: ../libsvn_client/conflicts.c:3661
 #, 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:3531
+#: ../libsvn_client/conflicts.c:3673
 #, 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:3547
+#: ../libsvn_client/conflicts.c:3689
 #, 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:3558
+#: ../libsvn_client/conflicts.c:3700
 #, 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:3572
+#: ../libsvn_client/conflicts.c:3714
 #, 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:3583
+#: ../libsvn_client/conflicts.c:3725
 #, 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:3603
+#: ../libsvn_client/conflicts.c:3745
 #, 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:3610
+#: ../libsvn_client/conflicts.c:3752
 #, 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:3617
+#: ../libsvn_client/conflicts.c:3759
 #, 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:3626
+#: ../libsvn_client/conflicts.c:3768
 #, 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:3634
+#: ../libsvn_client/conflicts.c:3776
 #, 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:3640
+#: ../libsvn_client/conflicts.c:3782
 #, 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:3649
+#: ../libsvn_client/conflicts.c:3791
 #, 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:3656
+#: ../libsvn_client/conflicts.c:3798
 #, 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:3662
+#: ../libsvn_client/conflicts.c:3804
 #, 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:3687
+#: ../libsvn_client/conflicts.c:3829
 #, 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:3715
+#: ../libsvn_client/conflicts.c:3857
 #, 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:3743 ../libsvn_client/conflicts.c:3986
+#: ../libsvn_client/conflicts.c:3885 ../libsvn_client/conflicts.c:4128
 #, 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:3773
+#: ../libsvn_client/conflicts.c:3915
 #, 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:3802
+#: ../libsvn_client/conflicts.c:3944
 #, 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:3829 ../libsvn_client/conflicts.c:4016
+#: ../libsvn_client/conflicts.c:3971 ../libsvn_client/conflicts.c:4158
 #, 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:3865
+#: ../libsvn_client/conflicts.c:4007
 #, 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:3879
+#: ../libsvn_client/conflicts.c:4021
 #, 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:3897
+#: ../libsvn_client/conflicts.c:4039
 #, 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:3911
+#: ../libsvn_client/conflicts.c:4053
 #, 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:3928
+#: ../libsvn_client/conflicts.c:4070
 #, 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:3942
+#: ../libsvn_client/conflicts.c:4084
 #, 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:3967 ../libsvn_client/conflicts.c:4007
+#: ../libsvn_client/conflicts.c:4109 ../libsvn_client/conflicts.c:4149
 #, 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:3977
+#: ../libsvn_client/conflicts.c:4119
 #, 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:3997
+#: ../libsvn_client/conflicts.c:4139
 #, 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:4027
+#: ../libsvn_client/conflicts.c:4169
 #, 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:4037
+#: ../libsvn_client/conflicts.c:4179
 #, 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:4046
+#: ../libsvn_client/conflicts.c:4188
 #, 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:4074
+#: ../libsvn_client/conflicts.c:4216
 #, 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:4102
+#: ../libsvn_client/conflicts.c:4244
 #, 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:4128
+#: ../libsvn_client/conflicts.c:4270
 #, 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:4141
+#: ../libsvn_client/conflicts.c:4283
 #, 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:4170
+#: ../libsvn_client/conflicts.c:4312
 #, 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:4197
+#: ../libsvn_client/conflicts.c:4339
 #, 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:4233
+#: ../libsvn_client/conflicts.c:4375
 #, 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:4247
+#: ../libsvn_client/conflicts.c:4389
 #, 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:4265
+#: ../libsvn_client/conflicts.c:4407
 #, 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:4279
+#: ../libsvn_client/conflicts.c:4421
 #, 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:4296
+#: ../libsvn_client/conflicts.c:4438
 #, 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:4310
+#: ../libsvn_client/conflicts.c:4452
 #, 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:4335 ../libsvn_client/conflicts.c:4374
+#: ../libsvn_client/conflicts.c:4477 ../libsvn_client/conflicts.c:4516
 #, 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:4344
+#: ../libsvn_client/conflicts.c:4486
 #, 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:4353
+#: ../libsvn_client/conflicts.c:4495
 #, 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:4364
+#: ../libsvn_client/conflicts.c:4506
 #, 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:4382
+#: ../libsvn_client/conflicts.c:4524
 #, 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:4393
+#: ../libsvn_client/conflicts.c:4535
 #, 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:4402
+#: ../libsvn_client/conflicts.c:4544
 #, 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:4411
+#: ../libsvn_client/conflicts.c:4553
 #, 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:5263
+#: ../libsvn_client/conflicts.c:5404
 #, 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:5270
+#: ../libsvn_client/conflicts.c:5411
 #, 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:5275
+#: ../libsvn_client/conflicts.c:5416
 #, 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:5285
+#: ../libsvn_client/conflicts.c:5426
 #, 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:5292
+#: ../libsvn_client/conflicts.c:5433
 #, 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:5297
+#: ../libsvn_client/conflicts.c:5438
 #, 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:5306
+#: ../libsvn_client/conflicts.c:5447
 #, 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:5313
+#: ../libsvn_client/conflicts.c:5454
 #, 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:5318
+#: ../libsvn_client/conflicts.c:5459
 #, 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:5337
+#: ../libsvn_client/conflicts.c:5478
 #, 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:5345
+#: ../libsvn_client/conflicts.c:5486
 #, 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:5351
+#: ../libsvn_client/conflicts.c:5492
 #, 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:5362
+#: ../libsvn_client/conflicts.c:5503
 #, 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:5370
+#: ../libsvn_client/conflicts.c:5511
 #, 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:5377
+#: ../libsvn_client/conflicts.c:5518
 #, 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:5388
+#: ../libsvn_client/conflicts.c:5529
 #, 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:5396
+#: ../libsvn_client/conflicts.c:5537
 #, 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:5403
+#: ../libsvn_client/conflicts.c:5544
 #, 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:5424
+#: ../libsvn_client/conflicts.c:5565
 #, 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:5430
+#: ../libsvn_client/conflicts.c:5571
 #, 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:5440
+#: ../libsvn_client/conflicts.c:5581
 #, 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:5446
+#: ../libsvn_client/conflicts.c:5587
 #, 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:5455
+#: ../libsvn_client/conflicts.c:5596
 #, 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:5461
+#: ../libsvn_client/conflicts.c:5602
 #, 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:5481
+#: ../libsvn_client/conflicts.c:5622
 #, 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:5488
+#: ../libsvn_client/conflicts.c:5629
 #, 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:5500
+#: ../libsvn_client/conflicts.c:5641
 #, 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:5507
+#: ../libsvn_client/conflicts.c:5648
 #, 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:5517
+#: ../libsvn_client/conflicts.c:5658
 #, 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:5524
+#: ../libsvn_client/conflicts.c:5665
 #, 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:5835
+#: ../libsvn_client/conflicts.c:5979
 #, 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:5841
+#: ../libsvn_client/conflicts.c:5985
 #, 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:5846
+#: ../libsvn_client/conflicts.c:5990
 #, 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:5854
+#: ../libsvn_client/conflicts.c:5998
 #, 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:5861
+#: ../libsvn_client/conflicts.c:6005
 #, 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:5867
+#: ../libsvn_client/conflicts.c:6011
 #, 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:5881 ../libsvn_client/conflicts.c:5888
+#: ../libsvn_client/conflicts.c:6025 ../libsvn_client/conflicts.c:6032
 #, 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:5894
+#: ../libsvn_client/conflicts.c:6038
 #, c-format
 msgid ""
 "Changes from the following revisions arrived during switch to\n"
@@ -3307,22 +3307,28 @@ msgstr ""
 "Ändringar från följande revisioner kom under växling till\n"
 "\"^/%s@r%ld\""
 
-#: ../libsvn_client/conflicts.c:5937 ../libsvn_client/conflicts.c:5951
-#: ../libsvn_client/conflicts.c:5957
+#: ../libsvn_client/conflicts.c:6081 ../libsvn_client/conflicts.c:6098
+#: ../libsvn_client/conflicts.c:6104
 #, c-format
 msgid "%s r%ld by %s%s"
 msgstr "%s r%ld av %s%s"
 
-#: ../libsvn_client/conflicts.c:5947
+#: ../libsvn_client/conflicts.c:6091
 #, c-format
 msgid ""
 "%s\n"
+" [%d revision omitted for brevity],\n"
+msgid_plural ""
+"%s\n"
 " [%d revisions omitted for brevity],\n"
-msgstr ""
+msgstr[0] ""
+"%s\n"
+" [%d revision utelämnad],\n"
+msgstr[1] ""
 "%s\n"
 " [%d revisioner utelämnade],\n"
 
-#: ../libsvn_client/conflicts.c:6016
+#: ../libsvn_client/conflicts.c:6163
 #, c-format
 msgid ""
 "Changes destined for a directory arrived during merge of\n"
@@ -3331,7 +3337,7 @@ msgstr ""
 "Ändringar avsedda för en katalog kom under sammanslagning av\n"
 "\"^/%s:%ld\"."
 
-#: ../libsvn_client/conflicts.c:6023
+#: ../libsvn_client/conflicts.c:6170
 #, c-format
 msgid ""
 "Changes destined for a file arrived during merge of\n"
@@ -3340,7 +3346,7 @@ msgstr ""
 "Ändringar avsedda för en fil kom under sammanslagning av\n"
 "\"^/%s:%ld\"."
 
-#: ../libsvn_client/conflicts.c:6029
+#: ../libsvn_client/conflicts.c:6176
 #, c-format
 msgid ""
 "Changes arrived during merge of\n"
@@ -3349,7 +3355,7 @@ msgstr ""
 "Ändringar kom under sammanslagning av\n"
 "\"^/%s:%ld\"."
 
-#: ../libsvn_client/conflicts.c:6041
+#: ../libsvn_client/conflicts.c:6188
 #, c-format
 msgid ""
 "Changes destined for a directory arrived via the following revisions during merge of\n"
@@ -3358,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:6048
+#: ../libsvn_client/conflicts.c:6195
 #, c-format
 msgid ""
 "Changes destined for a file arrived via the following revisions during merge of\n"
@@ -3367,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:6054
+#: ../libsvn_client/conflicts.c:6201
 #, c-format
 msgid ""
 "Changes from the following revisions arrived during merge of\n"
@@ -3376,7 +3382,7 @@ msgstr ""
 "Ändringar från följande revisioner kom under sammanslagning av\n"
 "\"^/%s:%ld-%ld\""
 
-#: ../libsvn_client/conflicts.c:6066
+#: ../libsvn_client/conflicts.c:6213
 #, c-format
 msgid ""
 "Changes destined for a directory arrived during reverse-merge of\n"
@@ -3385,7 +3391,7 @@ msgstr ""
 "Ändringar avsedda för en katalog kom under omvänd sammanslagning av\n"
 "\"^/%s:%ld\"."
 
-#: ../libsvn_client/conflicts.c:6073
+#: ../libsvn_client/conflicts.c:6220
 #, c-format
 msgid ""
 "Changes destined for a file arrived during reverse-merge of\n"
@@ -3394,7 +3400,7 @@ msgstr ""
 "Ändringar kom under omvänd sammanslagning av\n"
 "\"^/%s:%ld\"."
 
-#: ../libsvn_client/conflicts.c:6079
+#: ../libsvn_client/conflicts.c:6226
 #, c-format
 msgid ""
 "Changes arrived during reverse-merge of\n"
@@ -3403,7 +3409,7 @@ msgstr ""
 "Ändringar kom under omvänd sammanslagning av\n"
 "\"^/%s:%ld\"."
 
-#: ../libsvn_client/conflicts.c:6091
+#: ../libsvn_client/conflicts.c:6238
 #, c-format
 msgid ""
 "Changes destined for a directory arrived via the following revisions during reverse-merge of\n"
@@ -3412,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:6099
+#: ../libsvn_client/conflicts.c:6246
 #, c-format
 msgid ""
 "Changes destined for a file arrived via the following revisions during reverse-merge of\n"
@@ -3421,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:6107
+#: ../libsvn_client/conflicts.c:6254
 #, c-format
 msgid ""
 "Changes from the following revisions arrived during reverse-merge of\n"
@@ -3430,387 +3436,411 @@ msgstr ""
 "Ändringar från följande revisioner kom under omvänd sammanslagning av\n"
 "\"^/%s:%ld-%ld\""
 
-#: ../libsvn_client/conflicts.c:6296
+#: ../libsvn_client/conflicts.c:6443
 #, 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:6480 ../libsvn_client/conflicts.c:6486
+#: ../libsvn_client/conflicts.c:6627 ../libsvn_client/conflicts.c:6633
 #, 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:6491 ../libsvn_client/conflicts.c:6517
-#: ../libsvn_client/conflicts.c:6544 ../libsvn_client/conflicts.c:6567
+#: ../libsvn_client/conflicts.c:6638 ../libsvn_client/conflicts.c:6664
+#: ../libsvn_client/conflicts.c:6691 ../libsvn_client/conflicts.c:6714
 #, c-format
 msgid "Unexpected option id '%d'"
 msgstr "Oväntad options-ID \"%d\""
 
-#: ../libsvn_client/conflicts.c:6500 ../libsvn_client/conflicts.c:6509
+#: ../libsvn_client/conflicts.c:6647 ../libsvn_client/conflicts.c:6656
 #, 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:6525 ../libsvn_client/conflicts.c:6535
+#: ../libsvn_client/conflicts.c:6672 ../libsvn_client/conflicts.c:6682
 #, 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:6553 ../libsvn_client/conflicts.c:6561
+#: ../libsvn_client/conflicts.c:6700 ../libsvn_client/conflicts.c:6708
 #, 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:6732 ../libsvn_client/conflicts.c:8547
+#: ../libsvn_client/conflicts.c:6879 ../libsvn_client/conflicts.c:8716
 #, 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:7595
+#: ../libsvn_client/conflicts.c:7741
 #, 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:7619
+#: ../libsvn_client/conflicts.c:7765
 #, 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:7634
+#: ../libsvn_client/conflicts.c:7780
 #, 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:7923
+#: ../libsvn_client/conflicts.c:8069
 #, 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:8027
-#, 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:8044
+#: ../libsvn_client/conflicts.c:8165
 #, 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:8055
-#, 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:8065
+#: ../libsvn_client/conflicts.c:8176
 #, 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:8078
+#: ../libsvn_client/conflicts.c:8188
 #, 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:8097
+#: ../libsvn_client/conflicts.c:8207
 #, 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:8119
+#: ../libsvn_client/conflicts.c:8229
 #, 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:8144
+#: ../libsvn_client/conflicts.c:8278
+#, 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
+#, 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
 #, 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:8311 ../libsvn_client/conflicts.c:8594
+#: ../libsvn_client/conflicts.c:8480 ../libsvn_client/conflicts.c:8763
 #, 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:8318
+#: ../libsvn_client/conflicts.c:8487
 #, 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:8655
+#: ../libsvn_client/conflicts.c:8824
 #, 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:8668
+#: ../libsvn_client/conflicts.c:8837
 #, 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:8688
+#: ../libsvn_client/conflicts.c:8857
 #, 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:9044 ../libsvn_client/conflicts.c:9127
-#: ../libsvn_client/conflicts.c:10293
+#: ../libsvn_client/conflicts.c:9334 ../libsvn_client/conflicts.c:9417
+#: ../libsvn_client/conflicts.c:10802
 msgid "Postpone"
 msgstr "Lös senare"
 
-#: ../libsvn_client/conflicts.c:9045 ../libsvn_client/conflicts.c:9128
-#: ../libsvn_client/conflicts.c:10294
+#: ../libsvn_client/conflicts.c:9335 ../libsvn_client/conflicts.c:9418
+#: ../libsvn_client/conflicts.c:10803
 msgid "skip this conflict and leave it unresolved"
 msgstr "hoppa över denna konflikt och lämna den olöst"
 
-#: ../libsvn_client/conflicts.c:9054 ../libsvn_client/conflicts.c:9075
-#: ../libsvn_client/conflicts.c:9133
+#: ../libsvn_client/conflicts.c:9344 ../libsvn_client/conflicts.c:9365
+#: ../libsvn_client/conflicts.c:9423
 msgid "Accept base"
 msgstr "Godta basen"
 
-#: ../libsvn_client/conflicts.c:9055
+#: ../libsvn_client/conflicts.c:9345
 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:9060 ../libsvn_client/conflicts.c:9081
-#: ../libsvn_client/conflicts.c:9139
+#: ../libsvn_client/conflicts.c:9350 ../libsvn_client/conflicts.c:9371
+#: ../libsvn_client/conflicts.c:9429
 msgid "Accept incoming"
 msgstr "Godta inkommande"
 
-#: ../libsvn_client/conflicts.c:9061
+#: ../libsvn_client/conflicts.c:9351
 msgid "accept incoming version of binary file"
 msgstr "godta inkommande version av binärfil"
 
-#: ../libsvn_client/conflicts.c:9066 ../libsvn_client/conflicts.c:9105
-#: ../libsvn_client/conflicts.c:9145 ../libsvn_client/conflicts.c:9202
+#: ../libsvn_client/conflicts.c:9356 ../libsvn_client/conflicts.c:9395
+#: ../libsvn_client/conflicts.c:9435 ../libsvn_client/conflicts.c:9492
 msgid "Mark as resolved"
 msgstr "Markera som löst"
 
-#: ../libsvn_client/conflicts.c:9067
+#: ../libsvn_client/conflicts.c:9357
 msgid "accept binary file as it appears in the working copy"
 msgstr "godta binärfilen som den är i arbetskopian"
 
-#: ../libsvn_client/conflicts.c:9076
+#: ../libsvn_client/conflicts.c:9366
 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:9082
+#: ../libsvn_client/conflicts.c:9372
 msgid "accept incoming version of entire file"
 msgstr "godta inkommande version av hela filen"
 
-#: ../libsvn_client/conflicts.c:9087
+#: ../libsvn_client/conflicts.c:9377
 msgid "Reject incoming"
 msgstr "Avslå inkommande"
 
-#: ../libsvn_client/conflicts.c:9088
+#: ../libsvn_client/conflicts.c:9378
 msgid "reject all incoming changes for this file"
 msgstr "avslå alla inkommande ändringar för denna fil"
 
-#: ../libsvn_client/conflicts.c:9093 ../libsvn_client/conflicts.c:9151
+#: ../libsvn_client/conflicts.c:9383 ../libsvn_client/conflicts.c:9441
 msgid "Accept incoming for conflicts"
 msgstr "Godta inkommande för konflikter"
 
-#: ../libsvn_client/conflicts.c:9094
+#: ../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:9099 ../libsvn_client/conflicts.c:9157
+#: ../libsvn_client/conflicts.c:9389 ../libsvn_client/conflicts.c:9447
 msgid "Reject conflicts"
 msgstr "Avslå konflikter"
 
-#: ../libsvn_client/conflicts.c:9100 ../libsvn_client/conflicts.c:9158
+#: ../libsvn_client/conflicts.c:9390 ../libsvn_client/conflicts.c:9448
 msgid "reject changes which conflict and accept the rest"
 msgstr "avslå ändringar som orsakar konflikter och godta resten"
 
-#: ../libsvn_client/conflicts.c:9106
+#: ../libsvn_client/conflicts.c:9396
 msgid "accept the file as it appears in the working copy"
 msgstr "godta filen som den är i arbetskopian"
 
-#: ../libsvn_client/conflicts.c:9134
+#: ../libsvn_client/conflicts.c:9424
 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:9140
+#: ../libsvn_client/conflicts.c:9430
 msgid "accept incoming version of entire property value"
 msgstr "godta inkommande version av hela egenskapsvärdet"
 
-#: ../libsvn_client/conflicts.c:9146
+#: ../libsvn_client/conflicts.c:9436
 msgid "accept working copy version of entire property value"
 msgstr "godta arbetskopians version av hela egenskapsvärdet"
 
-#: ../libsvn_client/conflicts.c:9152
+#: ../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:9163
+#: ../libsvn_client/conflicts.c:9453
 msgid "Accept merged"
 msgstr "Godta sammanslaget"
 
-#: ../libsvn_client/conflicts.c:9164
+#: ../libsvn_client/conflicts.c:9454
 msgid "accept merged version of property value"
 msgstr "godta sammanslagen version av egenskapsvärde"
 
-#: ../libsvn_client/conflicts.c:9203
+#: ../libsvn_client/conflicts.c:9493
 msgid "accept current working copy state"
 msgstr "godta nuvarande tillstånd i arbetskopia"
 
-#: ../libsvn_client/conflicts.c:9230
+#: ../libsvn_client/conflicts.c:9520
 msgid "Update move destination"
 msgstr "Uppdatera flyttmålet"
 
-#: ../libsvn_client/conflicts.c:9231
+#: ../libsvn_client/conflicts.c:9521
 msgid "apply incoming changes to move destination"
 msgstr "utför inkommande ändringar på flyttmålet"
 
-#: ../libsvn_client/conflicts.c:9265
+#: ../libsvn_client/conflicts.c:9555
 msgid "Update any moved-away children"
 msgstr "Uppdatera bortflyttade barn om sådana finns"
 
-#: ../libsvn_client/conflicts.c:9266
+#: ../libsvn_client/conflicts.c:9556
 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:9311
+#: ../libsvn_client/conflicts.c:9601
 #, 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:9319
+#: ../libsvn_client/conflicts.c:9609
 #, 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:9324
+#: ../libsvn_client/conflicts.c:9614
 #, 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:9330
+#: ../libsvn_client/conflicts.c:9620
 #, 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:9335
+#: ../libsvn_client/conflicts.c:9625
 #, c-format
 msgid "unexpected operation code '%d'"
 msgstr "oväntad operationskod \"%d\""
 
-#: ../libsvn_client/conflicts.c:9339
+#: ../libsvn_client/conflicts.c:9629
 msgid "Ignore incoming addition"
 msgstr "Hoppa över inkommande tillägg"
 
-#: ../libsvn_client/conflicts.c:9385 ../libsvn_client/conflicts.c:9510
+#: ../libsvn_client/conflicts.c:9675 ../libsvn_client/conflicts.c:9804
 #, c-format
 msgid "merge '^/%s@%ld' into '%s'"
 msgstr "slå samman \"^/%s@%ld\" in i \"%s\""
 
-#: ../libsvn_client/conflicts.c:9393 ../libsvn_client/conflicts.c:9518
+#: ../libsvn_client/conflicts.c:9683 ../libsvn_client/conflicts.c:9813
 #, c-format
 msgid "merge local '%s' and '^/%s@%ld'"
 msgstr "slå samman lokala \"%s\" och \"^/%s@%ld\""
 
-#: ../libsvn_client/conflicts.c:9403
+#: ../libsvn_client/conflicts.c:9693
 msgid "Merge the files"
 msgstr "Slå samman filerna"
 
-#: ../libsvn_client/conflicts.c:9452
+#: ../libsvn_client/conflicts.c:9742
 #, 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:9462 ../libsvn_client/conflicts.c:9640
+#: ../libsvn_client/conflicts.c:9752 ../libsvn_client/conflicts.c:9935
 msgid "Replace and merge"
 msgstr "Ersätt och slå samman"
 
-#: ../libsvn_client/conflicts.c:9527
+#: ../libsvn_client/conflicts.c:9822
 msgid "Merge the directories"
 msgstr "Slå samman katalogerna"
 
-#: ../libsvn_client/conflicts.c:9574
+#: ../libsvn_client/conflicts.c:9869
 #, c-format
 msgid "delete '%s' and copy '^/%s@%ld' here"
 msgstr "radera \"%s\" och kopiera hit \"^/%s@%ld\""
 
-#: ../libsvn_client/conflicts.c:9583
+#: ../libsvn_client/conflicts.c:9878
 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:9630
+#: ../libsvn_client/conflicts.c:9925
 #, 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:9710
+#: ../libsvn_client/conflicts.c:10005
 #, c-format
 msgid "ignore the deletion of '^/%s@%ld'"
 msgstr "hoppa över raderingen av \"^/%s@%ld\""
 
-#: ../libsvn_client/conflicts.c:9715
+#: ../libsvn_client/conflicts.c:10010
 msgid "Ignore incoming deletion"
 msgstr "Hoppa över inkommande radering"
 
-#: ../libsvn_client/conflicts.c:9768
+#: ../libsvn_client/conflicts.c:10063
 #, c-format
 msgid "accept the deletion of '%s'"
 msgstr "godta borttagningen av \"%s\""
 
-#: ../libsvn_client/conflicts.c:9775
+#: ../libsvn_client/conflicts.c:10070
 msgid "Accept incoming deletion"
 msgstr "Godta inkommande radering"
 
-#: ../libsvn_client/conflicts.c:9814
+#: ../libsvn_client/conflicts.c:10109
 #, c-format
 msgid "move '%s' to '%s' and merge"
 msgstr "flytta \"%s\" till \"%s\" och slå samman"
 
-#: ../libsvn_client/conflicts.c:9824
+#: ../libsvn_client/conflicts.c:10119
 #, 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:9885 ../libsvn_client/conflicts.c:9945
+#: ../libsvn_client/conflicts.c:10180 ../libsvn_client/conflicts.c:10240
 msgid "Move and merge"
 msgstr "Flytta och slå samman"
 
-#: ../libsvn_client/conflicts.c:10029
+#: ../libsvn_client/conflicts.c:10338
 #, c-format
 msgid "apply changes to move destination '%s'"
 msgstr "utför ändringar på flyttmålet \"%s\""
 
-#: ../libsvn_client/conflicts.c:10038
+#: ../libsvn_client/conflicts.c:10347
 msgid "Apply to move destination"
 msgstr "Utför ändringar på flyttmålet"
 
-#: ../libsvn_client/conflicts.c:10071 ../libsvn_client/conflicts.c:10199
+#: ../libsvn_client/conflicts.c:10412 ../libsvn_client/conflicts.c:10742
+#, c-format
+msgid "apply changes to '%s'"
+msgstr "utför ändringar på \"%s\""
+
+#: ../libsvn_client/conflicts.c:10425 ../libsvn_client/conflicts.c:10433
+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
 #, 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:10124 ../libsvn_client/conflicts.c:10247
+#: ../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:10133 ../libsvn_client/conflicts.c:10260
+#: ../libsvn_client/conflicts.c:10526 ../libsvn_client/conflicts.c:10768
 #, 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:10170
+#: ../libsvn_client/conflicts.c:10563
 #, 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:10477 ../libsvn_client/conflicts.c:10526
-#: ../libsvn_client/conflicts.c:10579
+#: ../libsvn_client/conflicts.c:10610
+#, 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"
+
+#: ../libsvn_client/conflicts.c:10719
+#, 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"
+
+#: ../libsvn_client/conflicts.c:10728
+#, 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
 #, 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:10799
+#: ../libsvn_client/conflicts.c:11310
 #, c-format
 msgid "Property '%s' is not in conflict."
 msgstr "Egenskapen \"%s\" är inte i konflikt"
 
-#: ../libsvn_client/conflicts.c:11189 ../libsvn_wc/conflicts.c:3327
+#: ../libsvn_client/conflicts.c:11700 ../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\""
@@ -3848,7 +3878,7 @@ msgstr "Sökvägen \"%s\" finns men är
 #: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:1715
 #: ../libsvn_client/copy.c:2090 ../libsvn_client/copy.c:2732
 #: ../libsvn_client/import.c:911 ../libsvn_client/mtcc.c:456
-#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1900
+#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1920
 #, c-format
 msgid "Path '%s' already exists"
 msgstr "Sökvägen \"%s\" finns redan"
@@ -3869,7 +3899,7 @@ msgstr "Katalogen \"%s\" är inte versio
 msgid "Path '%s' is not a directory"
 msgstr "Sökvägen \"%s\" är ingen katalog"
 
-#: ../libsvn_client/copy.c:1131 ../libsvn_client/merge.c:10252
+#: ../libsvn_client/copy.c:1131 ../libsvn_client/merge.c:10270
 #: ../svnlook/svnlook.c:1445
 #, c-format
 msgid "Path '%s' does not exist"
@@ -3940,7 +3970,7 @@ msgid "Path '%s' is not in the working c
 msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
 
 #: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814
-#: ../libsvn_client/repos_diff.c:1002 ../libsvn_fs_fs/dag.c:1107
+#: ../libsvn_client/repos_diff.c:997 ../libsvn_fs_fs/dag.c:1107
 #: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229
 #: ../libsvn_ra_svn/client.c:1506 ../libsvn_wc/diff_editor.c:2109
 #: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711
@@ -3992,78 +4022,78 @@ msgstr "Revisioner (förutom HEAD) kan e
 msgid "No commits in repository"
 msgstr "Ingenting har arkiverats i arkivet"
 
-#: ../libsvn_client/deprecated.c:3151 ../libsvn_wc/deprecated.c:4229
+#: ../libsvn_client/deprecated.c:3151 ../libsvn_wc/deprecated.c:4228
 msgid "Non-recursive relocation not supported"
 msgstr "Icke-rekursiv omlokalisering otillåten"
 
-#: ../libsvn_client/diff.c:66
+#: ../libsvn_client/diff.c:69
 #, c-format
 msgid "Path '%s' must be an immediate child of the directory '%s'"
 msgstr "Sökvägen \"%s\" måste stå omedelbart under katalogen \"%s\""
 
-#: ../libsvn_client/diff.c:241
+#: ../libsvn_client/diff.c:292
 #, c-format
 msgid "%s\t(revision %ld)"
 msgstr "%s\t(revision %ld)"
 
-#: ../libsvn_client/diff.c:243
+#: ../libsvn_client/diff.c:294
 #, c-format
 msgid "%s\t(nonexistent)"
 msgstr "%s\t(finns ej)"
 
 #. SVN_INVALID_REVNUM
-#: ../libsvn_client/diff.c:245
+#: ../libsvn_client/diff.c:296
 #, c-format
 msgid "%s\t(working copy)"
 msgstr "%s\t(arbetskopia)"
 
-#: ../libsvn_client/diff.c:944
+#: ../libsvn_client/diff.c:978
 #, c-format
 msgid "Cannot display: file marked as a binary type.%s"
 msgstr "Kan inte visa: filen markerad som binär.%s"
 
-#: ../libsvn_client/diff.c:1481 ../libsvn_client/merge.c:7301
-#: ../libsvn_client/merge.c:10654
+#: ../libsvn_client/diff.c:1474 ../libsvn_client/merge.c:7344
+#: ../libsvn_client/merge.c:10672
 msgid "Not all required revisions are specified"
 msgstr "Alla revisioner som krävs angavs inte"
 
-#: ../libsvn_client/diff.c:1495
+#: ../libsvn_client/diff.c:1488
 msgid "At least one revision must be something other than BASE or WORKING when diffing a URL"
 msgstr "Åtminstone en revision måste vara något annat än BASE eller WORKING för diff av en URL"
 
-#: ../libsvn_client/diff.c:1532
+#: ../libsvn_client/diff.c:1525
 #, c-format
 msgid "Diff target '%s' was not found in the repository at revision '%ld'"
 msgstr "\"%s\" fanns inte i revision %ld i arkivet"
 
-#: ../libsvn_client/diff.c:1537
+#: ../libsvn_client/diff.c:1530
 #, c-format
 msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
 msgstr "\"%s\" fanns inte i revision %ld eller %ld i arkivet"
 
-#: ../libsvn_client/diff.c:1713
+#: ../libsvn_client/diff.c:1717
 #, c-format
 msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
 msgstr "\"%s\" fanns inte i revision %ld och %ld i arkivet"
 
-#: ../libsvn_client/diff.c:1718
+#: ../libsvn_client/diff.c:1722
 #, c-format
 msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'"
 msgstr "\"%s\" och \"%s\" fanns inte i revision %ld och %ld i arkivet"
 
-#: ../libsvn_client/diff.c:1817
+#: ../libsvn_client/diff.c:1821
 msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported"
 msgstr "Tyvärr anropades svn_client_diff7 på ett sätt som inte stöds ännu"
 
-#: ../libsvn_client/diff.c:1857
+#: ../libsvn_client/diff.c:1863
 msgid "A non-URL diff at this time must be either from a path's base to the same path's working version or between the working versions of two paths"
 msgstr "En diff som inte är en URL måste antingen komma från sökvägens bas till samma sökvägs arbetsversion eller mellan två arbetsversioner av två sökvägar"
 
-#: ../libsvn_client/diff.c:2632 ../libsvn_client/diff.c:2696
+#: ../libsvn_client/diff.c:2794 ../libsvn_client/diff.c:2857
 msgid "Cannot ignore properties and show only properties at the same time"
 msgstr "Kan inte samtidigt bortse från egenskaper och bara visa egenskaper"
 
-#: ../libsvn_client/diff_local.c:789 ../libsvn_wc/props.c:1675
+#: ../libsvn_client/diff_local.c:733 ../libsvn_wc/props.c:1675
 #, c-format
 msgid "'%s' is not a file or directory"
 msgstr "\"%s\" är ingen fil eller katalog"
@@ -4176,8 +4206,8 @@ msgstr "\"%s\" är av en typ som är ok�
 msgid "New entry name required when importing a file"
 msgstr "Nytt postnamn krävs vid import av en fil"
 
-#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3752
-#: ../libsvn_client/patch.c:3764 ../libsvn_wc/delete.c:93
+#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3754
+#: ../libsvn_client/patch.c:3766 ../libsvn_wc/delete.c:93
 #: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:78
 #, c-format
 msgid "'%s' does not exist"
@@ -4250,12 +4280,12 @@ msgstr "De speciella revisionerna PREV,
 msgid "Missing required revision specification"
 msgstr "Revisionsspecifikation saknas"
 
-#: ../libsvn_client/merge.c:416
+#: ../libsvn_client/merge.c:436
 #, c-format
 msgid "URL '%s' of '%s' is not in repository '%s'"
 msgstr "URL:en \"%s\" för \"%s\" är inte i arkivet \"%s\""
 
-#: ../libsvn_client/merge.c:453
+#: ../libsvn_client/merge.c:473
 #, c-format
 msgid "'%s' must be from the same repository as '%s'"
 msgstr "\"%s\" måste vara från samma arkiv som \"%s\""
@@ -4263,26 +4293,26 @@ msgstr "\"%s\" måste vara från samma a
 #. xgettext: the '.working', '.merge-left.r%ld' and
 #. '.merge-right.r%ld' strings are used to tag onto a file
 #. name in case of a merge conflict
-#: ../libsvn_client/merge.c:2111
+#: ../libsvn_client/merge.c:2108
 #, c-format
 msgid ".working%s%s"
 msgstr ".arbetskopia%s%s"
 
-#: ../libsvn_client/merge.c:2114
+#: ../libsvn_client/merge.c:2111
 #, c-format
 msgid ".merge-left.r%ld%s%s"
 msgstr ".sammanslagning-vänster.r%ld%s%s"
 
-#: ../libsvn_client/merge.c:2118
+#: ../libsvn_client/merge.c:2115
 #, c-format
 msgid ".merge-right.r%ld%s%s"
 msgstr ".sammanslagning-höger.r%ld%s%s"
 
-#: ../libsvn_client/merge.c:4816
+#: ../libsvn_client/merge.c:4859
 msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
 msgstr "Det går inte att göra en omvänd sammanslagning av revisioner från en sökvägs egen framtid; försök att uppdatera först"
 
-#: ../libsvn_client/merge.c:5537
+#: ../libsvn_client/merge.c:5580
 #, c-format
 msgid ""
 "One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -4295,79 +4325,79 @@ msgstr ""
 "lös alla konflikter och kör om sammanslagningen för att ta hand om\n"
 "de återstående revisionerna"
 
-#: ../libsvn_client/merge.c:6353
+#: ../libsvn_client/merge.c:6396
 #, c-format
 msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
 msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för \"%s\"; följning av sammanslagning ej möjlig"
 
-#: ../libsvn_client/merge.c:6504
+#: ../libsvn_client/merge.c:6547
 msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
 msgstr "Följning av sammanslagning kräver att inga delträd saknas; försök att återställa dessa först:\n"
 
-#: ../libsvn_client/merge.c:7505
+#: ../libsvn_client/merge.c:7548
 #, c-format
 msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
 msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för målet \"%s\"; följning av sammanslagning ej möjlig"
 
-#: ../libsvn_client/merge.c:9823
+#: ../libsvn_client/merge.c:9856
 msgid "Use of two URLs is not compatible with mergeinfo modification"
 msgstr "Det går inte att använda två URL:er vid ändring av sammanslagningsinformationen"
 
-#: ../libsvn_client/merge.c:9830 ../libsvn_client/merge.c:10166
+#: ../libsvn_client/merge.c:9863 ../libsvn_client/merge.c:10184
 msgid "Merge from foreign repository is not compatible with mergeinfo modification"
 msgstr "Sammanslagning från annat arkiv går inte vid ändring av sammanslagningsinformationen"
 
-#: ../libsvn_client/merge.c:10259 ../libsvn_client/merge.c:10402
+#: ../libsvn_client/merge.c:10277 ../libsvn_client/merge.c:10420
 #, c-format
 msgid "Merge target '%s' does not exist in the working copy"
 msgstr "Sammanslagningsmålet \"%s\" finns inte i arbetskopian"
 
-#: ../libsvn_client/merge.c:10282
+#: ../libsvn_client/merge.c:10300
 msgid "Cannot determine revision of working copy"
 msgstr "Arbetskopians revision kan inte bestämmas"
 
-#: ../libsvn_client/merge.c:10288
+#: ../libsvn_client/merge.c:10306
 #, c-format
 msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
 msgstr "Sammanslagning till en arbetskopia i blandad revision [%ld:%ld] går inte; försök med att uppdatera först"
 
-#: ../libsvn_client/merge.c:10303
+#: ../libsvn_client/merge.c:10321
 msgid "Cannot merge into a working copy with a switched subtree"
 msgstr "Kan inte slå samman till en arbetskopia med växlat delträd"
 
-#: ../libsvn_client/merge.c:10319
+#: ../libsvn_client/merge.c:10337
 msgid "Cannot merge into a working copy that has local modifications"
 msgstr "Kan inte slå samman till en arbetskopia som har lokala ändringar"
 
-#: ../libsvn_client/merge.c:10339 ../svn/merge-cmd.c:56
+#: ../libsvn_client/merge.c:10357 ../svn/merge-cmd.c:56
 #, c-format
 msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)"
 msgstr "Ogiltig sammanslagningskälla \"%s\"; en sökväg i en arbetskopia kan bara användas med en arkivrevision (ett nummer, ett datum eller \"HEAD\")"
 
-#: ../libsvn_client/merge.c:10657 ../svn/merge-cmd.c:123
+#: ../libsvn_client/merge.c:10675 ../svn/merge-cmd.c:123
 msgid "Merge sources must both be either paths or URLs"
 msgstr "Båda sammanslagningskällorna måste vara antingen sökvägar eller URL:er"
 
-#: ../libsvn_client/merge.c:11427 ../libsvn_client/merge.c:11589
-#: ../libsvn_client/merge.c:12507
+#: ../libsvn_client/merge.c:11445 ../libsvn_client/merge.c:11607
+#: ../libsvn_client/merge.c:12525
 #, c-format
 msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr "\"%s@%ld\" måste ha samma ursprung som \"%s@%ld\""
 
-#: ../libsvn_client/merge.c:11539
+#: ../libsvn_client/merge.c:11557
 #, c-format
 msgid "Neither the reintegrate source nor target can be the root of the repository"
 msgstr "Varken återföreningens källa eller mål kan vara arkivets rot"
 
-#: ../libsvn_client/merge.c:11549
+#: ../libsvn_client/merge.c:11567
 msgid "Reintegrate merge not possible"
 msgstr "Återförenande sammanslagning ej möjlig"
 
-#: ../libsvn_client/merge.c:11619
+#: ../libsvn_client/merge.c:11637
 msgid "    Missing ranges: "

[... 7249 lines stripped ...]


Mime
View raw message