Modified: subversion/trunk/subversion/po/sv.po URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/sv.po?rev=1826557&r1=1826556&r2=1826557&view=diff ============================================================================== --- subversion/trunk/subversion/po/sv.po [UTF-8] (original) +++ subversion/trunk/subversion/po/sv.po [UTF-8] Mon Mar 12 15:56:43 2018 @@ -110,7 +110,7 @@ msgid "" msgstr "" "Project-Id-Version: subversion 1.9\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2018-03-06 10:56+0100\n" +"POT-Creation-Date: 2018-03-12 16:55+0100\n" "PO-Revision-Date: 2018-03-06 11:13+0100\n" "Last-Translator: Subversion Developers <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ -324,7 +324,7 @@ msgstr "Läsfel i rör" #. is errno on POSIX #: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435 #: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571 -#: ../svnlook/svnlook.c:2000 +#: ../svnlook/svnlook.c:2034 #, c-format msgid "Write error" msgstr "Fel vid skrivning" @@ -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:1747 +#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1810 #, c-format msgid "Revision range is not allowed" msgstr "Revisionsområde otillåtet" @@ -1564,7 +1564,7 @@ msgid "GNOME Keyring is locked and we ar 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:941 +#: ../libsvn_subr/opt.c:1234 #, c-format msgid "'%s' ends in a reserved name" msgstr "\"%s\" slutar med ett reserverat namn" @@ -1592,13 +1592,14 @@ msgid "Unsupported node kind for path '% msgstr "Nodtypen för sökvägen \"%s\" stöds inte" #: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65 -#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3098 -#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:861 +#: ../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/resolved.c:120 ../libsvn_client/revert.c:149 -#: ../libsvn_client/shelve.c:194 ../libsvn_client/status.c:368 +#: ../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/util.c:990 ../svnbench/util.c:76 +#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1053 ../svn/util.c:990 +#: ../svnbench/util.c:76 #, c-format msgid "'%s' is not a local path" msgstr "\"%s\" är ingen lokal sökväg" @@ -1653,7 +1654,7 @@ msgstr "URL:en \"%s\" pekar på en katal msgid "Target changelist name must not be empty" msgstr "Ändringslistan får inte ha tomt namn" -#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1449 +#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1446 #: ../svnbench/null-export-cmd.c:293 #, c-format msgid "URL '%s' doesn't exist" @@ -3460,356 +3461,356 @@ msgstr "Kan inte lösa trädkonflikten p 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:6731 ../libsvn_client/conflicts.c:8546 +#: ../libsvn_client/conflicts.c:6732 ../libsvn_client/conflicts.c:8547 #, 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:7594 +#: ../libsvn_client/conflicts.c:7595 #, 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:7618 +#: ../libsvn_client/conflicts.c:7619 #, 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:7633 +#: ../libsvn_client/conflicts.c:7634 #, 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:7922 +#: ../libsvn_client/conflicts.c:7923 #, 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:8026 +#: ../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:8043 +#: ../libsvn_client/conflicts.c:8044 #, 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:8054 +#: ../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:8064 +#: ../libsvn_client/conflicts.c:8065 #, 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:8077 +#: ../libsvn_client/conflicts.c:8078 #, 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:8096 +#: ../libsvn_client/conflicts.c:8097 #, 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:8118 +#: ../libsvn_client/conflicts.c:8119 #, 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:8143 +#: ../libsvn_client/conflicts.c:8144 #, 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:8310 ../libsvn_client/conflicts.c:8593 +#: ../libsvn_client/conflicts.c:8311 ../libsvn_client/conflicts.c:8594 #, 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:8317 +#: ../libsvn_client/conflicts.c:8318 #, 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:8654 +#: ../libsvn_client/conflicts.c:8655 #, 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:8667 +#: ../libsvn_client/conflicts.c:8668 #, 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:8687 +#: ../libsvn_client/conflicts.c:8688 #, 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:9042 ../libsvn_client/conflicts.c:9125 -#: ../libsvn_client/conflicts.c:10283 +#: ../libsvn_client/conflicts.c:9044 ../libsvn_client/conflicts.c:9127 +#: ../libsvn_client/conflicts.c:10293 msgid "Postpone" msgstr "Lös senare" -#: ../libsvn_client/conflicts.c:9043 ../libsvn_client/conflicts.c:9126 -#: ../libsvn_client/conflicts.c:10284 +#: ../libsvn_client/conflicts.c:9045 ../libsvn_client/conflicts.c:9128 +#: ../libsvn_client/conflicts.c:10294 msgid "skip this conflict and leave it unresolved" msgstr "hoppa över denna konflikt och lämna den olöst" -#: ../libsvn_client/conflicts.c:9052 ../libsvn_client/conflicts.c:9073 -#: ../libsvn_client/conflicts.c:9131 +#: ../libsvn_client/conflicts.c:9054 ../libsvn_client/conflicts.c:9075 +#: ../libsvn_client/conflicts.c:9133 msgid "Accept base" msgstr "Godta basen" -#: ../libsvn_client/conflicts.c:9053 +#: ../libsvn_client/conflicts.c:9055 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:9058 ../libsvn_client/conflicts.c:9079 -#: ../libsvn_client/conflicts.c:9137 +#: ../libsvn_client/conflicts.c:9060 ../libsvn_client/conflicts.c:9081 +#: ../libsvn_client/conflicts.c:9139 msgid "Accept incoming" msgstr "Godta inkommande" -#: ../libsvn_client/conflicts.c:9059 +#: ../libsvn_client/conflicts.c:9061 msgid "accept incoming version of binary file" msgstr "godta inkommande version av binärfil" -#: ../libsvn_client/conflicts.c:9064 ../libsvn_client/conflicts.c:9103 -#: ../libsvn_client/conflicts.c:9143 ../libsvn_client/conflicts.c:9200 +#: ../libsvn_client/conflicts.c:9066 ../libsvn_client/conflicts.c:9105 +#: ../libsvn_client/conflicts.c:9145 ../libsvn_client/conflicts.c:9202 msgid "Mark as resolved" msgstr "Markera som löst" -#: ../libsvn_client/conflicts.c:9065 +#: ../libsvn_client/conflicts.c:9067 msgid "accept binary file as it appears in the working copy" msgstr "godta binärfilen som den är i arbetskopian" -#: ../libsvn_client/conflicts.c:9074 +#: ../libsvn_client/conflicts.c:9076 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:9080 +#: ../libsvn_client/conflicts.c:9082 msgid "accept incoming version of entire file" msgstr "godta inkommande version av hela filen" -#: ../libsvn_client/conflicts.c:9085 +#: ../libsvn_client/conflicts.c:9087 msgid "Reject incoming" msgstr "Avslå inkommande" -#: ../libsvn_client/conflicts.c:9086 +#: ../libsvn_client/conflicts.c:9088 msgid "reject all incoming changes for this file" msgstr "avslå alla inkommande ändringar för denna fil" -#: ../libsvn_client/conflicts.c:9091 ../libsvn_client/conflicts.c:9149 +#: ../libsvn_client/conflicts.c:9093 ../libsvn_client/conflicts.c:9151 msgid "Accept incoming for conflicts" msgstr "Godta inkommande för konflikter" -#: ../libsvn_client/conflicts.c:9092 +#: ../libsvn_client/conflicts.c:9094 msgid "accept changes only where they conflict" msgstr "godta ändringar bara där konflikter uppstår" -#: ../libsvn_client/conflicts.c:9097 ../libsvn_client/conflicts.c:9155 +#: ../libsvn_client/conflicts.c:9099 ../libsvn_client/conflicts.c:9157 msgid "Reject conflicts" msgstr "Avslå konflikter" -#: ../libsvn_client/conflicts.c:9098 ../libsvn_client/conflicts.c:9156 +#: ../libsvn_client/conflicts.c:9100 ../libsvn_client/conflicts.c:9158 msgid "reject changes which conflict and accept the rest" msgstr "avslå ändringar som orsakar konflikter och godta resten" -#: ../libsvn_client/conflicts.c:9104 +#: ../libsvn_client/conflicts.c:9106 msgid "accept the file as it appears in the working copy" msgstr "godta filen som den är i arbetskopian" -#: ../libsvn_client/conflicts.c:9132 +#: ../libsvn_client/conflicts.c:9134 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:9138 +#: ../libsvn_client/conflicts.c:9140 msgid "accept incoming version of entire property value" msgstr "godta inkommande version av hela egenskapsvärdet" -#: ../libsvn_client/conflicts.c:9144 +#: ../libsvn_client/conflicts.c:9146 msgid "accept working copy version of entire property value" msgstr "godta arbetskopians version av hela egenskapsvärdet" -#: ../libsvn_client/conflicts.c:9150 +#: ../libsvn_client/conflicts.c:9152 msgid "accept incoming changes only where they conflict" msgstr "godta inkommande ändringar bara där konflikter uppstår" -#: ../libsvn_client/conflicts.c:9161 +#: ../libsvn_client/conflicts.c:9163 msgid "Accept merged" msgstr "Godta sammanslaget" -#: ../libsvn_client/conflicts.c:9162 +#: ../libsvn_client/conflicts.c:9164 msgid "accept merged version of property value" msgstr "godta sammanslagen version av egenskapsvärde" -#: ../libsvn_client/conflicts.c:9201 +#: ../libsvn_client/conflicts.c:9203 msgid "accept current working copy state" msgstr "godta nuvarande tillstånd i arbetskopia" -#: ../libsvn_client/conflicts.c:9228 +#: ../libsvn_client/conflicts.c:9230 msgid "Update move destination" msgstr "Uppdatera flyttmålet" -#: ../libsvn_client/conflicts.c:9229 +#: ../libsvn_client/conflicts.c:9231 msgid "apply incoming changes to move destination" msgstr "utför inkommande ändringar på flyttmålet" -#: ../libsvn_client/conflicts.c:9263 +#: ../libsvn_client/conflicts.c:9265 msgid "Update any moved-away children" msgstr "Uppdatera bortflyttade barn om sådana finns" -#: ../libsvn_client/conflicts.c:9264 +#: ../libsvn_client/conflicts.c:9266 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:9309 +#: ../libsvn_client/conflicts.c:9311 #, 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:9317 +#: ../libsvn_client/conflicts.c:9319 #, 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:9322 +#: ../libsvn_client/conflicts.c:9324 #, 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:9328 +#: ../libsvn_client/conflicts.c:9330 #, 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:9333 +#: ../libsvn_client/conflicts.c:9335 #, c-format msgid "unexpected operation code '%d'" msgstr "oväntad operationskod \"%d\"" -#: ../libsvn_client/conflicts.c:9337 +#: ../libsvn_client/conflicts.c:9339 msgid "Ignore incoming addition" msgstr "Hoppa över inkommande tillägg" -#: ../libsvn_client/conflicts.c:9383 ../libsvn_client/conflicts.c:9508 +#: ../libsvn_client/conflicts.c:9385 ../libsvn_client/conflicts.c:9510 #, c-format msgid "merge '^/%s@%ld' into '%s'" msgstr "slå samman \"^/%s@%ld\" in i \"%s\"" -#: ../libsvn_client/conflicts.c:9391 ../libsvn_client/conflicts.c:9516 +#: ../libsvn_client/conflicts.c:9393 ../libsvn_client/conflicts.c:9518 #, c-format msgid "merge local '%s' and '^/%s@%ld'" msgstr "slå samman lokala \"%s\" och \"^/%s@%ld\"" -#: ../libsvn_client/conflicts.c:9401 +#: ../libsvn_client/conflicts.c:9403 msgid "Merge the files" msgstr "Slå samman filerna" -#: ../libsvn_client/conflicts.c:9450 +#: ../libsvn_client/conflicts.c:9452 #, 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:9460 ../libsvn_client/conflicts.c:9638 +#: ../libsvn_client/conflicts.c:9462 ../libsvn_client/conflicts.c:9640 msgid "Replace and merge" msgstr "Ersätt och slå samman" -#: ../libsvn_client/conflicts.c:9525 +#: ../libsvn_client/conflicts.c:9527 msgid "Merge the directories" msgstr "Slå samman katalogerna" -#: ../libsvn_client/conflicts.c:9572 +#: ../libsvn_client/conflicts.c:9574 #, c-format msgid "delete '%s' and copy '^/%s@%ld' here" msgstr "radera \"%s\" och kopiera hit \"^/%s@%ld\"" -#: ../libsvn_client/conflicts.c:9581 +#: ../libsvn_client/conflicts.c:9583 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:9628 +#: ../libsvn_client/conflicts.c:9630 #, 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:9706 +#: ../libsvn_client/conflicts.c:9710 #, c-format msgid "ignore the deletion of '^/%s@%ld'" msgstr "hoppa över raderingen av \"^/%s@%ld\"" -#: ../libsvn_client/conflicts.c:9711 +#: ../libsvn_client/conflicts.c:9715 msgid "Ignore incoming deletion" msgstr "Hoppa över inkommande radering" -#: ../libsvn_client/conflicts.c:9761 +#: ../libsvn_client/conflicts.c:9768 #, c-format msgid "accept the deletion of '%s'" msgstr "godta borttagningen av \"%s\"" -#: ../libsvn_client/conflicts.c:9768 +#: ../libsvn_client/conflicts.c:9775 msgid "Accept incoming deletion" msgstr "Godta inkommande radering" -#: ../libsvn_client/conflicts.c:9807 +#: ../libsvn_client/conflicts.c:9814 #, c-format msgid "move '%s' to '%s' and merge" msgstr "flytta \"%s\" till \"%s\" och slå samman" -#: ../libsvn_client/conflicts.c:9817 +#: ../libsvn_client/conflicts.c:9824 #, 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:9878 ../libsvn_client/conflicts.c:9935 +#: ../libsvn_client/conflicts.c:9885 ../libsvn_client/conflicts.c:9945 msgid "Move and merge" msgstr "Flytta och slå samman" -#: ../libsvn_client/conflicts.c:10019 +#: ../libsvn_client/conflicts.c:10029 #, c-format msgid "apply changes to move destination '%s'" msgstr "utför ändringar på flyttmålet \"%s\"" -#: ../libsvn_client/conflicts.c:10028 +#: ../libsvn_client/conflicts.c:10038 msgid "Apply to move destination" msgstr "Utför ändringar på flyttmålet" -#: ../libsvn_client/conflicts.c:10061 ../libsvn_client/conflicts.c:10189 +#: ../libsvn_client/conflicts.c:10071 ../libsvn_client/conflicts.c:10199 #, 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:10114 ../libsvn_client/conflicts.c:10237 +#: ../libsvn_client/conflicts.c:10124 ../libsvn_client/conflicts.c:10247 #, 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:10123 ../libsvn_client/conflicts.c:10250 +#: ../libsvn_client/conflicts.c:10133 ../libsvn_client/conflicts.c:10260 #, 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:10160 +#: ../libsvn_client/conflicts.c:10170 #, 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:10467 ../libsvn_client/conflicts.c:10516 -#: ../libsvn_client/conflicts.c:10569 +#: ../libsvn_client/conflicts.c:10477 ../libsvn_client/conflicts.c:10526 +#: ../libsvn_client/conflicts.c:10579 #, 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:10789 +#: ../libsvn_client/conflicts.c:10799 #, c-format msgid "Property '%s' is not in conflict." msgstr "Egenskapen \"%s\" är inte i konflikt" -#: ../libsvn_client/conflicts.c:11179 ../libsvn_wc/conflicts.c:3292 +#: ../libsvn_client/conflicts.c:11189 ../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\"" @@ -3869,7 +3870,7 @@ 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 -#: ../svnlook/svnlook.c:1411 +#: ../svnlook/svnlook.c:1445 #, c-format msgid "Path '%s' does not exist" msgstr "Sökvägen \"%s\" finns inte" @@ -3943,7 +3944,7 @@ msgstr "Sökvägen \"%s\" finns inte i a #: ../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 -#: ../libsvn_wc/update_editor.c:4228 +#: ../libsvn_wc/update_editor.c:4239 #, c-format msgid "Checksum mismatch for '%s'" msgstr "Felaktig kontrollsumma för \"%s\"" @@ -3987,11 +3988,11 @@ msgstr "URL:en \"%s\" finns inte" msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "Revisioner (förutom HEAD) kan ej anges vid flyttoperationer" -#: ../libsvn_client/deprecated.c:1667 +#: ../libsvn_client/deprecated.c:1750 msgid "No commits in repository" msgstr "Ingenting har arkiverats i arkivet" -#: ../libsvn_client/deprecated.c:3052 ../libsvn_wc/deprecated.c:4202 +#: ../libsvn_client/deprecated.c:3151 ../libsvn_wc/deprecated.c:4229 msgid "Non-recursive relocation not supported" msgstr "Icke-rekursiv omlokalisering otillåten" @@ -4016,49 +4017,50 @@ msgstr "%s\t(finns ej)" msgid "%s\t(working copy)" msgstr "%s\t(arbetskopia)" -#: ../libsvn_client/diff.c:934 +#: ../libsvn_client/diff.c:944 #, 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:1471 ../libsvn_client/merge.c:7301 +#: ../libsvn_client/diff.c:1481 ../libsvn_client/merge.c:7301 #: ../libsvn_client/merge.c:10654 msgid "Not all required revisions are specified" msgstr "Alla revisioner som krävs angavs inte" -#: ../libsvn_client/diff.c:1485 +#: ../libsvn_client/diff.c:1495 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:1522 +#: ../libsvn_client/diff.c:1532 #, 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:1527 +#: ../libsvn_client/diff.c:1537 #, 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:1703 +#: ../libsvn_client/diff.c:1713 #, 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:1708 +#: ../libsvn_client/diff.c:1718 #, 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:1807 -msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported" +#: ../libsvn_client/diff.c:1817 +#, fuzzy +msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported" msgstr "Tyvärr anropades svn_client_diff6 på ett sätt som inte stöds ännu" -#: ../libsvn_client/diff.c:1847 -msgid "Only diffs between a path's text-base and its working files are supported at this time" -msgstr "Endast skillnader mellan en arbetskopias textbas och arbetsfilerna stöds för närvarande" +#: ../libsvn_client/diff.c:1857 +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 "" -#: ../libsvn_client/diff.c:2551 ../libsvn_client/diff.c:2638 +#: ../libsvn_client/diff.c:2632 ../libsvn_client/diff.c:2696 msgid "Cannot ignore properties and show only properties at the same time" msgstr "Kan inte samtidigt bortse från egenskaper och bara visa egenskaper" @@ -4076,7 +4078,7 @@ msgstr "\"%s\" är inte ett giltigt rads msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "Destinationskatalogen finns och kommer inte att skrivas över om det inte framtvingas" -#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1529 +#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1526 #: ../libsvn_wc/adm_crawler.c:1270 ../libsvn_wc/copy.c:651 #: ../libsvn_wc/crop.c:239 ../libsvn_wc/crop.c:342 ../libsvn_wc/info.c:377 #: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2728 @@ -4097,14 +4099,14 @@ msgstr "Destinationskatalogen finns och msgid "The node '%s' was not found." msgstr "Noden \"%s\" kunde inte hittas." -#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1182 -#: ../libsvn_client/export.c:1237 +#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1181 +#: ../libsvn_client/export.c:1235 #, c-format msgid "Destination file '%s' exists, and will not be overwritten unless forced" msgstr "Destinationsfilen \"%s\" finns och kommer inte att skrivas över om det inte framtvingas" -#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1187 -#: ../libsvn_client/export.c:1242 +#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1186 +#: ../libsvn_client/export.c:1240 #, c-format msgid "Destination '%s' exists. Cannot overwrite directory with non-directory" msgstr "Destinationen \"%s\" finns redan. En katalog kan inte skrivas över med något som inte är en katalog" @@ -4646,15 +4648,30 @@ msgstr "Sökvägen \"%s\" saknar senaste msgid "Unrecognized revision type requested for '%s'" msgstr "Okänd revisionstyp begärd för \"%s\"" -#: ../libsvn_client/shelve.c:56 +#: ../libsvn_client/shelf.c:58 msgid "Shelf name cannot be the empty string" msgstr "Hyllnamnet kan inte vara tomma strängen" -#: ../libsvn_client/shelve.c:84 +#: ../libsvn_client/shelf.c:86 #, c-format msgid "Shelve: Bad encoded name '%s'" msgstr "Shelve: Felaktigt kodat namn \"%s\"" +#: ../libsvn_client/shelf.c:148 +#, fuzzy, c-format +msgid "shelf '%s': no versions available" +msgstr "\"%s\": ingen låsidentifierare tillgänglig" + +#: ../libsvn_client/shelf.c:152 +#, c-format +msgid "shelf '%s' has no version %d: max version is %d" +msgstr "" + +#: ../libsvn_client/shelf.c:455 +#, fuzzy, c-format +msgid "Shelf '%s' not found" +msgstr "\"%s\" finns inte" + #: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601 #: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542 #: ../libsvn_wc/wc_db.c:13629 ../libsvn_wc/wc_db_wcroot.c:722 @@ -4683,7 +4700,7 @@ msgid "Directory '%s' has no URL" msgstr "Katalogen \"%s\" saknar URL" #: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236 -#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4921 +#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4932 #, c-format msgid "" "'%s'\n" @@ -4838,15 +4855,15 @@ msgstr "Sökvägen \"%s\" måste vara in msgid "Failed to delete mmap '%s'" msgstr "Kunde inte ta bort minnesmappning \"%s\"" -#: ../libsvn_diff/parse-diff.c:368 +#: ../libsvn_diff/parse-diff.c:373 msgid "Unexpected data in base85 section" msgstr "Oväntad data i base85-sektion" -#: ../libsvn_diff/parse-diff.c:437 +#: ../libsvn_diff/parse-diff.c:442 msgid "Base85 data expands to longer than declared filesize" msgstr "Base85-data expanderas till mer än deklarerad filstorlek" -#: ../libsvn_diff/parse-diff.c:441 +#: ../libsvn_diff/parse-diff.c:446 msgid "Base85 data expands to smaller than declared filesize" msgstr "Base85-data expanderas till mindre än deklarerad filstorlek" @@ -7103,7 +7120,7 @@ msgstr "URL:en \"%s\" är inte ett barn msgid "'%s' path not found" msgstr "Sökvägen \"%s\" finns inte" -#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:759 +#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:777 #: ../libsvn_ra_svn/client.c:3093 #, c-format msgid "Don't know anything about capability '%s'" @@ -7179,7 +7196,7 @@ msgstr "REPORT-svaret innehöll inte de msgid "Got unrecognized encoding '%s'" msgstr "Okänd kodning \"%s\"" -#: ../libsvn_ra_serf/list.c:126 ../libsvn_ra_serf/log.c:172 +#: ../libsvn_ra_serf/list.c:113 ../libsvn_ra_serf/log.c:172 #, c-format msgid "Unsupported encoding '%s'" msgstr "Kodningen \"%s\" stöds ej" @@ -7246,34 +7263,39 @@ msgstr "När egenskapen \"%s\" på \"%s\ msgid "While handling the '%s' path:" msgstr "När sökvägen \"%s\" behandlades:" -#: ../libsvn_ra_serf/options.c:473 +#: ../libsvn_ra_serf/options.c:413 +#, c-format +msgid "The server at '%s' does not support the HTTP/DAV protocol" +msgstr "" + +#: ../libsvn_ra_serf/options.c:491 msgid "The OPTIONS response did not include the youngest revision" msgstr "OPTIONS-svaret innehöll inte den yngsta revisionen" -#: ../libsvn_ra_serf/options.c:514 +#: ../libsvn_ra_serf/options.c:532 msgid "The OPTIONS response did not include the requested activity-collection-set value" msgstr "OPTIONS-svaret innehöll inte det efterfrågade värdet på \"activity-collection-set\"" -#: ../libsvn_ra_serf/options.c:556 +#: ../libsvn_ra_serf/options.c:574 msgid "Location header not set on redirect response" msgstr "Platshuvud inte satt i omriktningssvar" -#: ../libsvn_ra_serf/options.c:586 ../libsvn_ra_serf/util.c:1835 +#: ../libsvn_ra_serf/options.c:604 ../libsvn_ra_serf/util.c:1835 #, c-format msgid "Repository moved permanently to '%s'" msgstr "Arkivet har permanent flyttats till \"%s\"" -#: ../libsvn_ra_serf/options.c:587 ../libsvn_ra_serf/util.c:1836 +#: ../libsvn_ra_serf/options.c:605 ../libsvn_ra_serf/util.c:1836 #, c-format msgid "Repository moved temporarily to '%s'" msgstr "Arkivet har tillfälligt flyttats till \"%s\"" -#: ../libsvn_ra_serf/options.c:742 +#: ../libsvn_ra_serf/options.c:760 #, c-format msgid "Don't know how to handle '%s' for capability '%s'" msgstr "Kan inte hantera \"%s\" för förmåga \"%s\"" -#: ../libsvn_ra_serf/options.c:766 +#: ../libsvn_ra_serf/options.c:784 #, c-format msgid "Attempt to fetch capability '%s' resulted in '%s'" msgstr "Ett försök att hämta förmåga \"%s\" resulterade i \"%s\"" @@ -8103,17 +8125,17 @@ msgstr "Delta-djupet \"exclude\" stöds msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry" msgstr "Editeringen börjar på ett ogiltigt ställe; minst en av sökvägarna är ingen katalog och det fanns ingen källpost" -#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:988 +#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:1051 #, c-format msgid "* Dumped revision %ld.\n" msgstr "* Dumpade revision %ld.\n" -#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:994 +#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:1057 #, c-format msgid "* Verified revision %ld.\n" msgstr "* Verifierade revision %ld.\n" -#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1042 +#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1105 #, c-format msgid "" "\n" @@ -8124,7 +8146,7 @@ msgstr "" "------- Arkiverade revision %ld >>>\n" "\n" -#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1048 +#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1111 #, c-format msgid "" "\n" @@ -8135,36 +8157,36 @@ msgstr "" "------- Arkiverade ny revision %ld (från originalrevisionen %ld) >>>\n" "\n" -#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1061 +#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1124 #, c-format msgid " * editing path : %s ..." msgstr " * editerar sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1067 +#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1130 #, c-format msgid " * deleting path : %s ..." msgstr " * raderar sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1073 +#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1136 #, c-format msgid " * adding path : %s ..." msgstr " * lägger till sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1079 +#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1142 #, c-format msgid " * replacing path : %s ..." msgstr " * ersätter sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1088 +#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1151 msgid " done.\n" msgstr " klart.\n" -#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1097 +#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1160 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "<<< Startade ny transaktion, baserad på originalrevisionen %ld\n" -#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1110 +#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1173 #, c-format msgid " removing '\\r' from %s ..." msgstr " tar bort \"\\r\" från %s ..." @@ -9066,7 +9088,8 @@ msgstr "Kan inte beräkna begärt datum" msgid "Can't expand time" msgstr "Kan inte dela upp tid" -#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/opt.c:302 +#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/opt.c:410 +#: ../libsvn_subr/opt.c:513 msgid "" "\n" "Valid options:\n" @@ -9074,7 +9097,8 @@ msgstr "" "\n" "Giltiga flaggor:\n" -#: ../libsvn_subr/deprecated.c:441 ../libsvn_subr/opt.c:426 +#: ../libsvn_subr/deprecated.c:441 ../libsvn_subr/opt.c:693 +#: ../libsvn_subr/opt.c:719 #, c-format msgid "" "\"%s\": unknown command.\n" @@ -9083,8 +9107,8 @@ msgstr "" "\"%s\": okänt kommando.\n" "\n" -#: ../libsvn_subr/deprecated.c:619 ../libsvn_subr/opt.c:1241 -#: ../svnrdump/svnrdump.c:597 +#: ../libsvn_subr/deprecated.c:619 ../libsvn_subr/opt.c:1534 +#: ../libsvn_subr/opt.c:1584 ../svnrdump/svnrdump.c:603 #, c-format msgid "Type '%s help' for usage.\n" msgstr "Skriv \"%s help\" för användning.\n" @@ -9703,11 +9727,11 @@ msgstr "Kan inte låsa upp mutex" msgid "Can't get module file name" msgstr "Kan inte erhålla modulens filnamn" -#: ../libsvn_subr/opt.c:189 +#: ../libsvn_subr/opt.c:273 msgid " ARG" msgstr " ARG" -#: ../libsvn_subr/opt.c:324 +#: ../libsvn_subr/opt.c:432 ../libsvn_subr/opt.c:535 msgid "" "\n" "Global options:\n" @@ -9715,37 +9739,37 @@ msgstr "" "\n" "Globala flaggor:\n" -#: ../libsvn_subr/opt.c:827 +#: ../libsvn_subr/opt.c:1120 #, c-format msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?" msgstr "Syntaxfel i den fixerade revisionen \"%s\"; menade du \"%s@\"?" -#: ../libsvn_subr/opt.c:833 +#: ../libsvn_subr/opt.c:1126 #, c-format msgid "Syntax error parsing peg revision '%s'" msgstr "Syntaxfel i den fixerade revisionen \"%s\"" -#: ../libsvn_subr/opt.c:970 +#: ../libsvn_subr/opt.c:1263 msgid "Revision property pair is empty" msgstr "Revisionsegenskapsparet är tomt" -#: ../libsvn_subr/opt.c:990 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337 +#: ../libsvn_subr/opt.c:1283 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337 #: ../svn/propset-cmd.c:68 #, c-format msgid "'%s' is not a valid Subversion property name" msgstr "\"%s\" är inget giltigt namn på en Subversion-egenskap" -#: ../libsvn_subr/opt.c:1066 +#: ../libsvn_subr/opt.c:1359 #, c-format msgid "URL '%s' contains a '..' element" msgstr "URL:en \"%s\" innehåller ett \"..\"-element" -#: ../libsvn_subr/opt.c:1099 +#: ../libsvn_subr/opt.c:1392 #, c-format msgid "Error resolving case of '%s'" msgstr "Kunde inte ta reda på skiftläge för \"%s\"" -#: ../libsvn_subr/opt.c:1121 +#: ../libsvn_subr/opt.c:1414 #, c-format msgid "" "%s, version %s\n" @@ -9756,7 +9780,7 @@ msgstr "" " kompilerad %s %s på %s\n" "\n" -#: ../libsvn_subr/opt.c:1138 +#: ../libsvn_subr/opt.c:1431 msgid "" "System information:\n" "\n" @@ -9764,21 +9788,21 @@ msgstr "" "Systeminformation:\n" "\n" -#: ../libsvn_subr/opt.c:1139 +#: ../libsvn_subr/opt.c:1432 #, c-format msgid "* running on %s\n" msgstr "* kör på %s\n" -#: ../libsvn_subr/opt.c:1143 +#: ../libsvn_subr/opt.c:1436 #, c-format msgid " - %s\n" msgstr " - %s\n" -#: ../libsvn_subr/opt.c:1153 +#: ../libsvn_subr/opt.c:1446 msgid "* linked dependencies:\n" msgstr "* länkade beroenden:\n" -#: ../libsvn_subr/opt.c:1178 +#: ../libsvn_subr/opt.c:1471 msgid "* loaded shared libraries:\n" msgstr "* inlästa delat bibliotek:\n" @@ -10063,19 +10087,19 @@ msgstr "Filen \"%s\" har inkonsekventa r msgid "Can't read special file: File '%s' not found" msgstr "Kan inte läsa specialfil: Filen \"%s\" hittades ej" -#: ../libsvn_subr/sysinfo.c:1238 +#: ../libsvn_subr/sysinfo.c:1239 msgid "Intel" msgstr "Intel" -#: ../libsvn_subr/sysinfo.c:1239 +#: ../libsvn_subr/sysinfo.c:1240 msgid "Intel 64-bit" msgstr "64-bitars Intel" -#: ../libsvn_subr/sysinfo.c:1240 +#: ../libsvn_subr/sysinfo.c:1241 msgid "PowerPC" msgstr "PowerPC" -#: ../libsvn_subr/sysinfo.c:1241 +#: ../libsvn_subr/sysinfo.c:1242 msgid "PowerPC 64-bit" msgstr "64-bitars PowerPC" @@ -10313,17 +10337,17 @@ msgstr "Revisionen %ld stämmer inte med msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" msgstr "URL:en \"%s\" (UUID: \"%s\") stämmer inte med den existerande URL:en \"%s\" (UUID: \"%s\") i \"%s\"" -#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5334 +#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5345 #, c-format msgid "Can't find parent directory's node while trying to add '%s'" msgstr "Kunde inte hitta föräldrakatalogens nod när \"%s\" skulle läggas till" -#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5328 +#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5339 #, c-format msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "Kan inte lägga till \"%s\" i en föräldrakatalog som är schemalagd för radering" -#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5341 +#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5352 #, c-format msgid "Can't schedule an addition of '%s' below a not-directory node" msgstr "Kan inte schemalägga ett tillägg av \"%s\" under en nod som inte är en katalog" @@ -10361,78 +10385,78 @@ msgstr "För gammalt loggformat; var god msgid "Not a conflict skel" msgstr "Inte ett konfliktskelett" -#: ../libsvn_wc/conflicts.c:608 ../libsvn_wc/conflicts.c:705 +#: ../libsvn_wc/conflicts.c:624 ../libsvn_wc/conflicts.c:721 msgid "Not a completed conflict skel" msgstr "Inte ett fullständigt konfliktskelett" -#: ../libsvn_wc/conflicts.c:786 ../libsvn_wc/conflicts.c:859 -#: ../libsvn_wc/conflicts.c:949 +#: ../libsvn_wc/conflicts.c:802 ../libsvn_wc/conflicts.c:875 +#: ../libsvn_wc/conflicts.c:966 msgid "Conflict not set" msgstr "Konflikt inte satt" -#: ../libsvn_wc/conflicts.c:1316 ../libsvn_wc/conflicts.c:1991 -#: ../libsvn_wc/conflicts.c:2036 +#: ../libsvn_wc/conflicts.c:1350 ../libsvn_wc/conflicts.c:2025 +#: ../libsvn_wc/conflicts.c:2070 msgid "Conflict callback violated API: returned no results" msgstr "Konfliktprocedur bröt mot API:et: returnerade inga resultat" -#: ../libsvn_wc/conflicts.c:1359 +#: ../libsvn_wc/conflicts.c:1393 msgid "Conflict callback violated API: returned no merged file" msgstr "Konfliktprocedur bröt mot API:et: returnerade ingen sammanslagen fil" -#: ../libsvn_wc/conflicts.c:1646 +#: ../libsvn_wc/conflicts.c:1680 #, c-format msgid "Conflict on '%s' cannot be resolved to 'theirs-conflict' or 'mine-conflict' because a merged version of the file cannot be created." msgstr "Konflikt på \"%s\" kan inte lösas till \"theirs-conflict\" eller \"mine-conflict\" eftersom en sammanslagen version av filen inte kan skapas." -#: ../libsvn_wc/conflicts.c:1691 +#: ../libsvn_wc/conflicts.c:1725 #, c-format msgid "Conflict on '%s' could not be resolved because the chosen version of the file is not available." msgstr "Konflikt på \"%s\" kan inte lösas eftersom den valda versionen av filen inte finns." -#: ../libsvn_wc/conflicts.c:2506 +#: ../libsvn_wc/conflicts.c:2540 msgid "Invalid 'conflict_result' argument" msgstr "Ogiltigt \"conflict_result\"-argument" -#: ../libsvn_wc/conflicts.c:2768 ../libsvn_wc/conflicts.c:2813 +#: ../libsvn_wc/conflicts.c:2803 ../libsvn_wc/conflicts.c:2848 #, c-format msgid "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; '%s' not resolved" msgstr "Trädkonflikt kan endast lösas till tillstånden \"working\" eller \"mine-conflict\"; \"%s\" ej löst" -#: ../libsvn_wc/conflicts.c:2840 +#: ../libsvn_wc/conflicts.c:2875 #, c-format msgid "Tree conflict can only be resolved to 'working' state; '%s' is no longer moved" msgstr "Trädkonflikt kan endast lösas till tillståndet \"working\"; \"%s\" har inte längre flyttats" -#: ../libsvn_wc/conflicts.c:2858 +#: ../libsvn_wc/conflicts.c:2893 #, c-format msgid "Tree conflict can only be resolved to 'working' state; '%s' not resolved" msgstr "Trädkonflikt kan endast lösas till tillståndet \"working\"; \"%s\" ej löst" -#: ../libsvn_wc/conflicts.c:3035 +#: ../libsvn_wc/conflicts.c:3070 msgid "No conflict-callback and no pre-defined conflict-choice provided" msgstr "Ingen konfliktprocedur och inget fördefinierad konfliktval tillhandahölls" -#: ../libsvn_wc/conflicts.c:3304 +#: ../libsvn_wc/conflicts.c:3339 #, c-format msgid "Unable to resolve conflicts on '%s'" msgstr "Kan inte lösa konflikten på \"%s\"" -#: ../libsvn_wc/conflicts.c:3495 ../libsvn_wc/conflicts.c:3581 -#: ../libsvn_wc/conflicts.c:3660 ../libsvn_wc/conflicts.c:3746 -#: ../libsvn_wc/conflicts.c:3813 +#: ../libsvn_wc/conflicts.c:3530 ../libsvn_wc/conflicts.c:3616 +#: ../libsvn_wc/conflicts.c:3695 ../libsvn_wc/conflicts.c:3781 +#: ../libsvn_wc/conflicts.c:3848 #, c-format msgid "Unexpected conflict operation '%s' on '%s'" msgstr "Oväntad konfliktsoperation \"%s\" på \"%s\"" -#: ../libsvn_wc/conflicts.c:3503 ../libsvn_wc/conflicts.c:3588 -#: ../libsvn_wc/conflicts.c:3666 ../libsvn_wc/conflicts.c:3752 -#: ../libsvn_wc/conflicts.c:3819 +#: ../libsvn_wc/conflicts.c:3538 ../libsvn_wc/conflicts.c:3623 +#: ../libsvn_wc/conflicts.c:3701 ../libsvn_wc/conflicts.c:3787 +#: ../libsvn_wc/conflicts.c:3854 #, c-format msgid "Unexpected conflict reason '%s' on '%s'" msgstr "Oväntad konfliktorsak \"%s\" på \"%s\"" -#: ../libsvn_wc/conflicts.c:3594 ../libsvn_wc/conflicts.c:3672 -#: ../libsvn_wc/conflicts.c:3758 ../libsvn_wc/conflicts.c:3825 +#: ../libsvn_wc/conflicts.c:3629 ../libsvn_wc/conflicts.c:3707 +#: ../libsvn_wc/conflicts.c:3793 ../libsvn_wc/conflicts.c:3860 #, c-format msgid "Unexpected conflict action '%s' on '%s'" msgstr "Oväntad konflikthandling \"%s\" på \"%s\"" @@ -10561,7 +10585,7 @@ msgstr "\"%s\" representerar arkivroten msgid "File '%s' has local modifications" msgstr "Filen \"%s\" har lokala ändringar" -#: ../libsvn_wc/deprecated.c:2393 +#: ../libsvn_wc/deprecated.c:2420 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "Hittade \"%s\", vilket var oväntat: sökvägen är markerad som \"saknad\"" @@ -11096,31 +11120,31 @@ msgstr "" msgid "'%s' is not valid as filename in directory '%s'" msgstr "\"%s\" är inte giltig som filnamn i katalogen \"%s\"" -#: ../libsvn_wc/update_editor.c:1507 +#: ../libsvn_wc/update_editor.c:1511 #, c-format msgid "Unexpected attempt to add a node at path '%s'" msgstr "Oväntat försök att lägga till en nod vid sökvägen \"%s\"" -#: ../libsvn_wc/update_editor.c:1518 +#: ../libsvn_wc/update_editor.c:1522 #, c-format msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" msgstr "Oväntat försök att ändra, radera eller ersätta en nod vid sökvägen \"%s\"" -#: ../libsvn_wc/update_editor.c:1899 +#: ../libsvn_wc/update_editor.c:1904 #, c-format msgid "Failed to add directory '%s': object of the same name as the administrative directory" msgstr "Kunde inte lägga till katalogen \"%s\": objektet har samma namn som förvaltningskatalogen" -#: ../libsvn_wc/update_editor.c:2572 +#: ../libsvn_wc/update_editor.c:2580 msgid "Couldn't do property merge" msgstr "Kunde inte slå ihop egenskaper" -#: ../libsvn_wc/update_editor.c:3111 +#: ../libsvn_wc/update_editor.c:3119 #, c-format msgid "Failed to add file '%s': object of the same name as the administrative directory" msgstr "Misslyckades att lägga till filen \"%s\": objektet har samma namn som förvaltningskatalogen" -#: ../libsvn_wc/update_editor.c:3650 +#: ../libsvn_wc/update_editor.c:3661 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -11131,22 +11155,22 @@ msgstr "" " väntad: %s\n" " lagrad: %s\n" -#: ../libsvn_wc/update_editor.c:5309 +#: ../libsvn_wc/update_editor.c:5320 #, c-format msgid "Node '%s' exists." msgstr "Noden \"%s\" finns redan." -#: ../libsvn_wc/update_editor.c:5369 +#: ../libsvn_wc/update_editor.c:5380 #, c-format msgid "Copyfrom-url '%s' has different repository root than '%s'" msgstr "URL:en för kopieringskällan till \"%s\" har annan arkivrot än \"%s\"" -#: ../libsvn_wc/update_editor.c:5581 +#: ../libsvn_wc/update_editor.c:5592 #, c-format msgid "'%s' is not an unmodified copied directory" msgstr "\"%s\" är inte en oförändrad kopierad katalog" -#: ../libsvn_wc/update_editor.c:5592 +#: ../libsvn_wc/update_editor.c:5603 #, c-format msgid "Copyfrom '%s' doesn't match original location of '%s'" msgstr "Kopieringskällan \"%s\" motsvarar inte den ursprungliga platsen \"%s\"" @@ -11434,46 +11458,46 @@ msgstr "Den orörda texten med MD5-kontr msgid "'%s' is not deleted" msgstr "\"%s\" är inte raderad" -#: ../libsvn_wc/wc_db_update_move.c:459 ../libsvn_wc/wc_db_update_move.c:483 +#: ../libsvn_wc/wc_db_update_move.c:464 ../libsvn_wc/wc_db_update_move.c:488 #, c-format msgid "'%s' already in conflict" msgstr "\"%s\" är redan i konflikt" -#: ../libsvn_wc/wc_db_update_move.c:1621 +#: ../libsvn_wc/wc_db_update_move.c:1627 msgid ".working" msgstr ".arbetskopia" -#: ../libsvn_wc/wc_db_update_move.c:2183 +#: ../libsvn_wc/wc_db_update_move.c:2189 #, c-format msgid "Cannot apply update because '%s' is a switched path (please switch it back to its original URL and try again)" msgstr "Kan inte utföra uppdatering eftersom \"%s\" är en växlad sökväg (växla den tillbaka till dess ursprungliga URL och försök igen)" -#: ../libsvn_wc/wc_db_update_move.c:2192 +#: ../libsvn_wc/wc_db_update_move.c:2198 #, c-format msgid "Cannot apply update because '%s' is a mixed-revision working copy (please update and try again)" msgstr "Kan inte utföra uppdatering eftersom \"%s\" är en arbetskopia med blandad revision (uppdatera och försök igen)" -#: ../libsvn_wc/wc_db_update_move.c:2245 +#: ../libsvn_wc/wc_db_update_move.c:2251 #, c-format msgid "The node '%s' has not been moved away" msgstr "Noden \"%s\" har inte flyttats bort" -#: ../libsvn_wc/wc_db_update_move.c:2709 +#: ../libsvn_wc/wc_db_update_move.c:2715 #, c-format msgid "Cannot merge local changes from '%s' because '%s' already contains other local changes (please commit or revert these other changes and try again)" msgstr "Kan inte slå samman lokala ändringar från \"%s\" eftersom \"%s\" redan innehåller andra lokala ändringar (arkivera eller återställ dessa andra ändringar och försök igen)" -#: ../libsvn_wc/wc_db_update_move.c:4083 +#: ../libsvn_wc/wc_db_update_move.c:4089 #, c-format msgid "'%s' is not in conflict" msgstr "\"%s\" är inte i konflikt" -#: ../libsvn_wc/wc_db_update_move.c:4096 +#: ../libsvn_wc/wc_db_update_move.c:4102 #, c-format msgid "'%s' is not a valid tree-conflict victim" msgstr "\"%s\" är inte ett giltigt offer för trädkonflikt" -#: ../libsvn_wc/wc_db_update_move.c:4109 +#: ../libsvn_wc/wc_db_update_move.c:4115 #, c-format msgid "'%s' is already a moved away tree-conflict" msgstr "\"%s\" är redan en bortflyttad trädkonflikt" @@ -12391,8 +12415,8 @@ msgstr "" "Subversion är ett verktyg för versionshantering.\n" "Se http://subversion.apache.org/ för ytterligare information\n" -#: ../svn/help-cmd.c:71 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:610 -#: ../svnsync/svnsync.c:1933 +#: ../svn/help-cmd.c:71 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:616 +#: ../svnsync/svnsync.c:1938 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -12465,8 +12489,8 @@ msgstr "\"%s\" är inget giltigt värde msgid "Resource is not under version control." msgstr "Resursen är inte versionshanterad." -#: ../svn/info-cmd.c:436 ../svnadmin/svnadmin.c:2304 -#: ../svnadmin/svnadmin.c:2540 +#: ../svn/info-cmd.c:436 ../svnadmin/svnadmin.c:2367 +#: ../svnadmin/svnadmin.c:2603 #, c-format msgid "Path: %s\n" msgstr "Sökväg: %s\n" @@ -12744,91 +12768,91 @@ 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:110 +#: ../svn/log-cmd.c:111 ../svn/svn.c:1129 ../svn/svn.c:1201 ../svn/svn.c:1267 msgid "\n" msgstr "\n" -#: ../svn/log-cmd.c:340 +#: ../svn/log-cmd.c:341 msgid "(no author)" msgstr "(författare saknas)" -#: ../svn/log-cmd.c:346 +#: ../svn/log-cmd.c:347 msgid "(no date)" msgstr "(datum saknas)" -#: ../svn/log-cmd.c:376 +#: ../svn/log-cmd.c:377 #, c-format msgid " | %d line" msgid_plural " | %d lines" msgstr[0] " | %d rad" msgstr[1] " | %d rader" -#: ../svn/log-cmd.c:393 +#: ../svn/log-cmd.c:394 #, c-format msgid "Changed paths:\n" msgstr "Ändrade sökvägar:\n" -#: ../svn/log-cmd.c:413 +#: ../svn/log-cmd.c:414 #, c-format msgid " (from %s:%ld)" msgstr " (från %s:%ld)" -#: ../svn/log-cmd.c:431 +#: ../svn/log-cmd.c:432 #, c-format msgid "Reverse merged via:" msgstr "Omvänt sammanslaget från:" -#: ../svn/log-cmd.c:433 +#: ../svn/log-cmd.c:434 #, c-format msgid "Merged via:" msgstr "Sammanslaget från:" -#: ../svn/log-cmd.c:716 +#: ../svn/log-cmd.c:717 msgid "'with-all-revprops' option only valid in XML mode" msgstr "Flaggan \"with-all-revprops\" är endast tillåten i XML-läge" -#: ../svn/log-cmd.c:720 +#: ../svn/log-cmd.c:721 msgid "'with-no-revprops' option only valid in XML mode" msgstr "Flaggan \"with-no-revprops\" är endast tillåten i XML-läge" -#: ../svn/log-cmd.c:724 +#: ../svn/log-cmd.c:725 msgid "'with-revprop' option only valid in XML mode" msgstr "Flaggan \"with-revprop\" är endast tillåten i XML-läge" -#: ../svn/log-cmd.c:731 +#: ../svn/log-cmd.c:732 msgid "'diff' option is not supported in XML mode" msgstr "Flaggan \"diff\" stöds ej i XML-läge" -#: ../svn/log-cmd.c:737 +#: ../svn/log-cmd.c:738 msgid "'quiet' and 'diff' options are mutually exclusive" msgstr "Flaggorna \"quiet\" och \"quit\" kan inte användas samtidigt" -#: ../svn/log-cmd.c:741 +#: ../svn/log-cmd.c:742 msgid "'diff-cmd' option requires 'diff' option" msgstr "Flaggan \"diff-cmd\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:745 +#: ../svn/log-cmd.c:746 msgid "'internal-diff' option requires 'diff' option" msgstr "Flaggan \"internal-diff\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:749 +#: ../svn/log-cmd.c:750 msgid "'extensions' option requires 'diff' option" msgstr "Flaggan \"extensions\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:754 +#: ../svn/log-cmd.c:755 msgid "'depth' option requires 'diff' option" msgstr "Flaggan \"depth\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:770 ../svnbench/null-log-cmd.c:158 +#: ../svn/log-cmd.c:771 ../svnbench/null-log-cmd.c:158 msgid "-c and -r are mutually exclusive" msgstr "-c och -r kan inte användas samtidigt" -#: ../svn/log-cmd.c:802 +#: ../svn/log-cmd.c:803 #, c-format msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path" msgstr "Endast relativa sökvägar kan anges efter en URL för \"svn log\", men \"%s\" är inte en relativ sökväg" -#: ../svn/log-cmd.c:849 +#: ../svn/log-cmd.c:850 #, c-format msgid "cannot assign with 'with-revprop' option (drop the '=')" msgstr "kan inte tilldela med flaggan \"with-revprop\" (ta bort \"=\")" @@ -12856,9 +12880,9 @@ msgid "Second revision required" msgstr "En andra revision måste anges" #: ../svn/merge-cmd.c:368 ../svn/merge-cmd.c:395 ../svn/mergeinfo-cmd.c:361 -#: ../svnadmin/svnadmin.c:2508 ../svnlook/svnlook.c:2052 -#: ../svnlook/svnlook.c:2246 ../svnlook/svnlook.c:2350 -#: ../svnlook/svnlook.c:2385 +#: ../svnadmin/svnadmin.c:2571 ../svnlook/svnlook.c:2086 +#: ../svnlook/svnlook.c:2280 ../svnlook/svnlook.c:2384 +#: ../svnlook/svnlook.c:2419 msgid "Too many arguments given" msgstr "För många argument" @@ -13313,7 +13337,7 @@ msgstr "Ersätter %s\n" msgid "Transmitting file data " msgstr "Skickar filinnehåll " -#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2485 ../svnbench/notify.c:749 +#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2548 ../svnbench/notify.c:749 #, c-format msgid "'%s' locked by user '%s'.\n" msgstr "\"%s\" låstes av användaren \"%s\".\n" @@ -13511,7 +13535,7 @@ msgid "Error writing to stream" msgstr "Fel vid skrivning till ström" #: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 ../svn/proplist-cmd.c:160 -#: ../svnlook/svnlook.c:1743 ../svnlook/svnlook.c:1898 +#: ../svnlook/svnlook.c:1777 ../svnlook/svnlook.c:1932 #, c-format msgid "" "Inherited properties on '%s',\n" @@ -13521,8 +13545,8 @@ msgstr "" "från \"%s\":\n" #. Not a --revprop -#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1778 -#: ../svnlook/svnlook.c:1933 +#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1812 +#: ../svnlook/svnlook.c:1967 #, c-format msgid "Properties on '%s':\n" msgstr "Egenskaper på \"%s\":\n" @@ -13650,39 +13674,160 @@ msgstr "flaggan --accept saknas" msgid "invalid 'accept' ARG" msgstr "ogiltigt \"accept\"-argument" -#: ../svn/revert-cmd.c:80 +#: ../svn/revert-cmd.c:81 msgid "Try 'svn revert --depth infinity' instead?" msgstr "Försök med \"svn revert --depth infinity\" istället?" -#: ../svn/shelve-cmd.c:112 +#: ../svn/shelf-cmd.c:123 +#, fuzzy +msgid "All targets must be in the same WC" +msgstr "Alla icke-relativa mål måste ha samma rot-URL" + +#: ../svn/shelf-cmd.c:141 +#, c-format +msgid "%d days" +msgstr "" + +#: ../svn/shelf-cmd.c:143 +#, c-format +msgid "%d hours" +msgstr "" + +#: ../svn/shelf-cmd.c:145 +#, c-format +msgid "%d minutes" +msgstr "" + +#: ../svn/shelf-cmd.c:174 #, c-format msgid "Could not run external command '%s'" msgstr "Kunde inte köra externa kommandot \"%s\"" -#: ../svn/shelve-cmd.c:143 +#: ../svn/shelf-cmd.c:263 +#, fuzzy, c-format +msgid "version %d" +msgstr "versionsfel" + +#: ../svn/shelf-cmd.c:266 +#, fuzzy, c-format +msgid "version %d of %d" +msgstr "Ej versionshanterad fil%s" + +#: ../svn/shelf-cmd.c:272 #, c-format -msgid "%-30s %6d mins old %10ld bytes %4d paths changed\n" -msgstr "%-30s %6d min gammal %10ld byte %4d sökvägar ändrade\n" +msgid ", %d paths changed" +msgstr "" + +#: ../svn/shelf-cmd.c:274 +#, fuzzy, c-format +msgid "%s, %s ago%s\n" +msgstr "%s, %s %s" -#: ../svn/shelve-cmd.c:147 +#: ../svn/shelf-cmd.c:289 #, c-format msgid " %.50s\n" msgstr " %.50s\n" -#: ../svn/shelve-cmd.c:189 -msgid "No shelved changes found" +#: ../svn/shelf-cmd.c:390 +#, fuzzy +msgid "No shelves found" msgstr "Inga ändringar lagda på hyllan" -#: ../svn/shelve-cmd.c:285 +#: ../svn/shelf-cmd.c:542 +#, fuzzy, c-format +msgid "--- Save a new version of '%s' in WC root '%s'\n" +msgstr "Låsning misslyckades: nyare version av \"%s\" finns" + +#: ../svn/shelf-cmd.c:543 +#, c-format +msgid "--- Shelve '%s' in WC root '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:550 +msgid "--- Modifications to save:\n" +msgstr "" + +#: ../svn/shelf-cmd.c:551 +msgid "--- Modifications to shelve:\n" +msgstr "" + +#: ../svn/shelf-cmd.c:564 +#, fuzzy, c-format +msgid "No local modifications found" +msgstr "Lokala ändringar kvarlämnade som \"%s\"\n" + +#: ../svn/shelf-cmd.c:569 +#, fuzzy, c-format +msgid "--- Saving...\n" +msgstr "--- Sammanslagning\n" + +#: ../svn/shelf-cmd.c:570 +#, fuzzy, c-format +msgid "--- Shelving...\n" +msgstr "--- Sammanslagning\n" + +#: ../svn/shelf-cmd.c:578 +#, fuzzy, c-format +msgid "None of the local modifications could be saved" +msgstr "Lokala ändringar kvarlämnade som \"%s\"\n" + +#: ../svn/shelf-cmd.c:579 +#, fuzzy, c-format +msgid "None of the local modifications could be shelved" +msgstr "Lokala ändringar kvarlämnade som \"%s\"\n" + +#: ../svn/shelf-cmd.c:648 +msgid "--- Paths modified in shelf and in WC:\n" +msgstr "" + +#: ../svn/shelf-cmd.c:678 +msgid "Cannot unshelve/restore, as at least one path is modified in shelf and in WC" +msgstr "" + +#: ../svn/shelf-cmd.c:743 +#, c-format +msgid "--- Unshelve '%s' in WC root '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:768 +msgid "Unshelve/restore failed due to conflicts" +msgstr "" + +#: ../svn/shelf-cmd.c:781 #, c-format -msgid "No changes were shelved" -msgstr "Inga ändringar lades på hyllan" +msgid "restored '%s' version %d and deleted %d newer versions\n" +msgstr "" -#: ../svn/shelve-cmd.c:327 +#: ../svn/shelf-cmd.c:785 #, c-format -msgid "unshelving the youngest change, '%s'\n" +msgid "restored '%s' version %d (the newest version)\n" +msgstr "" + +#: ../svn/shelf-cmd.c:842 +#, fuzzy, c-format +msgid "deleted '%s'\n" +msgstr "Återställde \"%s\"\n" + +#: ../svn/shelf-cmd.c:942 +#, fuzzy, c-format +msgid "saved '%s' version %d\n" +msgstr " Uppdaterade \"%s\" till r%ld.\n" + +#: ../svn/shelf-cmd.c:946 +#, fuzzy, c-format +msgid "shelved '%s' version %d\n" +msgstr "Checkade ut revision %ld.\n" + +#: ../svn/shelf-cmd.c:977 +#, fuzzy, c-format +msgid "unshelving the youngest shelf, '%s'\n" msgstr "tar bort den yngsta ändringen från hyllan, \"%s\"\n" +#: ../svn/shelf-cmd.c:987 ../svn/shelf-cmd.c:1155 ../svn/shelf-cmd.c:1203 +#: ../svnadmin/svnadmin.c:766 +msgid "Too many arguments" +msgstr "För många argument" + #: ../svn/status-cmd.c:97 #, c-format msgid " Text conflicts: %u\n" @@ -13726,42 +13871,42 @@ msgstr "flyttad från %s" msgid "moved to %s" msgstr "flyttad till %s" -#: ../svn/svn.c:161 +#: ../svn/svn.c:159 msgid "force operation to run" msgstr "tvinga operationen att utföras" -#: ../svn/svn.c:163 +#: ../svn/svn.c:161 msgid "force validity of log message source" msgstr "acceptera alltid det angivna loggmeddelandet" -#: ../svn/svn.c:164 ../svn/svn.c:165 ../svnadmin/svnadmin.c:168 +#: ../svn/svn.c:162 ../svn/svn.c:163 ../svnadmin/svnadmin.c:168 #: ../svnadmin/svnadmin.c:171 ../svnbench/svnbench.c:83 #: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:944 #: ../svndumpfilter/svndumpfilter.c:947 ../svnfsfs/svnfsfs.c:89 #: ../svnfsfs/svnfsfs.c:92 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127 -#: ../svnsync/svnsync.c:284 ../svnsync/svnsync.c:286 +#: ../svnsync/svnsync.c:289 ../svnsync/svnsync.c:291 msgid "show help on a subcommand" msgstr "visa hjälp för ett underkommando" -#: ../svn/svn.c:166 +#: ../svn/svn.c:164 msgid "specify log message ARG" msgstr "ange loggmeddelande ARG" -#: ../svn/svn.c:167 ../svnbench/svnbench.c:85 +#: ../svn/svn.c:165 ../svnbench/svnbench.c:85 msgid "print nothing, or only summary information" msgstr "ingen utmatning, eller bara sammanfattning" -#: ../svn/svn.c:168 ../svnbench/svnbench.c:86 +#: ../svn/svn.c:166 ../svnbench/svnbench.c:86 msgid "descend recursively, same as --depth=infinity" msgstr "gå ner rekursivt, som --depth=infinity" -#: ../svn/svn.c:169 ../svnbench/svnbench.c:87 +#: ../svn/svn.c:167 ../svnbench/svnbench.c:87 msgid "obsolete; try --depth=files or --depth=immediates" msgstr "" "föråldrat; försök med --depth=files\n" " eller --depth=immediates" -#: ../svn/svn.c:171 ../svnbench/svnbench.c:89 +#: ../svn/svn.c:169 ../svnbench/svnbench.c:89 msgid "" "the change made by revision ARG (like -r ARG-1:ARG)\n" " If ARG is negative this is like -r ARG:ARG-1\n" @@ -13774,7 +13919,7 @@ msgstr "" " Om ARG är på formen ARG1-ARG2 så är detta samma\n" " som ARG1:ARG2, där ARG1 ingår" -#: ../svn/svn.c:179 ../svnbench/svnbench.c:97 +#: ../svn/svn.c:177 ../svnbench/svnbench.c:97 msgid "" "ARG (some commands also take ARG1:ARG2 range)\n" " A revision argument can be one of:\n" @@ -13798,41 +13943,41 @@ msgstr "" " arkiveringen vid eller före BASE\n" " \"PREV\" revisionen före COMMITTED" -#: ../svn/svn.c:194 +#: ../svn/svn.c:192 msgid "read log message from file ARG" msgstr "läs loggmeddelande från filen ARG" -#: ../svn/svn.c:196 +#: ../svn/svn.c:194 msgid "give output suitable for concatenation" msgstr "skapa utdata som kan slås ihop" -#: ../svn/svn.c:198 +#: ../svn/svn.c:196 msgid "treat value as being in charset encoding ARG" msgstr "" "betrakta värdet som om det använder\n" " teckenkodningen ARG" -#: ../svn/svn.c:199 ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:112 +#: ../svn/svn.c:197 ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:112 #: ../svndumpfilter/svndumpfilter.c:950 ../svnfsfs/svnfsfs.c:95 -#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:134 -#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:282 +#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:140 +#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:287 #: ../svnversion/svnversion.c:144 msgid "show program version information" msgstr "visa programversionsinformation" -#: ../svn/svn.c:200 ../svnbench/svnbench.c:113 +#: ../svn/svn.c:198 ../svnbench/svnbench.c:113 msgid "print extra information" msgstr "visa extrainformation" -#: ../svn/svn.c:201 +#: ../svn/svn.c:199 msgid "display update information" msgstr "visa uppdateringsinformation" -#: ../svn/svn.c:202 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:116 +#: ../svn/svn.c:200 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:122 msgid "specify a username ARG" msgstr "ange ett användarnamn ARG" -#: ../svn/svn.c:204 +#: ../svn/svn.c:202 msgid "" "specify a password ARG (caution: on many operating\n" " systems, other users will be able to see this)" @@ -13840,11 +13985,11 @@ msgstr "" "ange lösenordet ARG (varning: på många system\n" " kan andra användare se detta)" -#: ../svn/svn.c:209 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:120 +#: ../svn/svn.c:207 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:126 msgid "read password from stdin" msgstr "läs lösenord från standard in" -#: ../svn/svn.c:211 +#: ../svn/svn.c:209 msgid "" "Specify differencing options for external diff or\n" " internal diff or blame. Default: '-u'. Options are\n" @@ -13872,13 +14017,13 @@ msgstr "" " -U N, --context N: Visa N rader sammanhang\n" " -p, --show-c-function: Visa funktionsnamn i C" -#: ../svn/svn.c:231 ../svnbench/svnbench.c:119 +#: ../svn/svn.c:229 ../svnbench/svnbench.c:119 msgid "pass contents of file ARG as additional args" msgstr "" "använd innehållet i filen ARG som ytterligare\n" " argument" -#: ../svn/svn.c:233 ../svnbench/svnbench.c:121 +#: ../svn/svn.c:231 ../svnbench/svnbench.c:121 msgid "" "limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')" @@ -13886,7 +14031,7 @@ msgstr "" "begränsa kommandot till djupet ARG (\"empty\",\n" " \"files\", \"immediates\" eller \"infinity\")" -#: ../svn/svn.c:237 +#: ../svn/svn.c:235 msgid "" "set new working copy depth to ARG ('exclude',\n" " 'empty', 'files', 'immediates', or 'infinity')" @@ -13894,19 +14039,19 @@ msgstr "" "sätt arbetskopians djup till ARG (\"exclude\",\n" " \"empty\", \"files\", \"immediates\" eller \"infinity\")" -#: ../svn/svn.c:240 ../svnlook/svnlook.c:182 +#: ../svn/svn.c:238 ../svnlook/svnlook.c:182 msgid "output in XML" msgstr "visa information som XML" -#: ../svn/svn.c:241 +#: ../svn/svn.c:239 msgid "DEPRECATED" msgstr "FÖRÅLDRAT" -#: ../svn/svn.c:243 ../svnbench/svnbench.c:126 +#: ../svn/svn.c:241 ../svnbench/svnbench.c:126 msgid "do not cross copies while traversing history" msgstr "följ inte kopieringar när historiken gås igenom" -#: ../svn/svn.c:245 +#: ../svn/svn.c:243 msgid "" "disregard default and svn:ignore and\n" " svn:global-ignores property ignores" @@ -13914,12 +14059,12 @@ msgstr "" "bortse ifrån svn:ignore, svn:global-ignores och\n" " standarduteslutningar" -#: ../svn/svn.c:249 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:130 -#: ../svnsync/svnsync.c:198 +#: ../svn/svn.c:247 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:136 +#: ../svnsync/svnsync.c:203 msgid "do not cache authentication tokens" msgstr "spara inte autentiseringsinformation" -#: ../svn/svn.c:251 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:144 +#: ../svn/svn.c:249 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:150 msgid "" "deprecated; same as\n" " --trust-server-cert-failures=unknown-ca" @@ -13927,7 +14072,7 @@ msgstr "" "föråldrat; samma som\n" " --trust-server-cert-failures=unknown-ca" -#: ../svn/svn.c:255 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:148 +#: ../svn/svn.c:253 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:154 msgid "" "with --non-interactive, accept SSL server\n" " certificates with failures; ARG is comma-separated\n" @@ -13944,7 +14089,7 @@ msgstr "" " certifikat), \"not-yet-valid\" (certifikatet ännu\n" " ej giltigt) och \"other\" (alla andra fel)." -#: ../svn/svn.c:269 ../svnrdump/svnrdump.c:122 ../svnsync/svnsync.c:190 +#: ../svn/svn.c:267 ../svnrdump/svnrdump.c:128 ../svnsync/svnsync.c:195 msgid "" "do no interactive prompting (default is to prompt\n" " only if standard input is a terminal device)" @@ -13952,7 +14097,7 @@ msgstr "" "ingen interaktiv fråga (vanligtvis ställs frågor\n" " bara om standardinmatningen är en terminal)" -#: ../svn/svn.c:273 ../svnrdump/svnrdump.c:126 ../svnsync/svnsync.c:194 +#: ../svn/svn.c:271 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:199 msgid "" "do interactive prompting even if standard input\n" " is not a terminal device" @@ -13960,59 +14105,59 @@ msgstr "" "ställ interaktiva frågor även om\n" " standardinmatningen inte är en terminal" -#: ../svn/svn.c:277 +#: ../svn/svn.c:275 msgid "try operation but make no changes" msgstr "testa operationen, men gör inga ändringar" -#: ../svn/svn.c:279 +#: ../svn/svn.c:277 msgid "disable merge tracking; diff nodes as if related" msgstr "" "stäng av sammanslagningsföljning; jämför som om\n" " noderna var besläktade" -#: ../svn/svn.c:281 +#: ../svn/svn.c:279 msgid "ignore externals definitions" msgstr "bortse ifrån externals-definitioner" -#: ../svn/svn.c:282 +#: ../svn/svn.c:280 msgid "use ARG as merge command" msgstr "använd ARG som merge-kommando" -#: ../svn/svn.c:283 +#: ../svn/svn.c:281 msgid "use ARG as external editor" msgstr "använd ARG som extern editor" -#: ../svn/svn.c:285 +#: ../svn/svn.c:283 msgid "merge only mergeinfo differences" msgstr "" "slå bara ihop skillnader i\n" " sammanslagningsinformationen" -#: ../svn/svn.c:286 +#: ../svn/svn.c:284 msgid "use ARG as the older target" msgstr "använd ARG som det äldre målet" -#: ../svn/svn.c:287 +#: ../svn/svn.c:285 msgid "use ARG as the newer target" msgstr "använd ARG som det nyare målet" -#: ../svn/svn.c:289 +#: ../svn/svn.c:287 msgid "operate on a revision property (use with -r)" msgstr "arbeta med en revisionsegenskap (används med -r)" -#: ../svn/svn.c:290 +#: ../svn/svn.c:288 msgid "relocate via URL-rewriting" msgstr "omlokalisera genom att skriva om URL:er" -#: ../svn/svn.c:292 ../svnadmin/svnadmin.c:221 ../svnbench/svnbench.c:150 -#: ../svnrdump/svnrdump.c:114 ../svnsync/svnsync.c:248 +#: ../svn/svn.c:290 ../svnadmin/svnadmin.c:221 ../svnbench/svnbench.c:150 +#: ../svnrdump/svnrdump.c:120 ../svnsync/svnsync.c:253 msgid "read user configuration files from directory ARG" msgstr "" "läs användarens konfigurationsfiler från katalogen\n" " ARG" -#: ../svn/svn.c:294 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:136 -#: ../svnsync/svnsync.c:250 +#: ../svn/svn.c:292 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:142 +#: ../svnsync/svnsync.c:255 msgid "" "set user configuration option in the format:\n" " FILE:SECTION:OPTION=[VALUE]\n" @@ -14024,15 +14169,15 @@ msgstr "" " Till exempel:\n" " servers:global:http-library=serf" -#: ../svn/svn.c:301 +#: ../svn/svn.c:299 msgid "enable automatic properties" msgstr "aktivera automatiska egenskaper" -#: ../svn/svn.c:302 +#: ../svn/svn.c:300 msgid "disable automatic properties" msgstr "deaktivera automatiska egenskaper" -#: ../svn/svn.c:304 +#: ../svn/svn.c:302 msgid "" "use a different EOL marker than the standard\n" " system marker for files with the svn:eol-style\n" @@ -14044,39 +14189,39 @@ msgstr "" " \"eol-style\" satt till \"native\". ARG kan vara\n" " något av \"LF\", \"CR\" och \"CRLF\"" -#: ../svn/svn.c:311 ../svnbench/svnbench.c:159 +#: ../svn/svn.c:309 ../svnbench/svnbench.c:159 msgid "maximum number of log entries" msgstr "maximalt antal loggposter" -#: ../svn/svn.c:312 +#: ../svn/svn.c:310 msgid "don't unlock the targets" msgstr "lås inte upp målen" -#: ../svn/svn.c:313 +#: ../svn/svn.c:311 msgid "remove changelist association" msgstr "ta bort koppling till ändringslista" -#: ../svn/svn.c:315 +#: ../svn/svn.c:313 msgid "operate only on members of changelist ARG" msgstr "arbeta endast med medlemmar av ändringslistan ARG" -#: ../svn/svn.c:317 +#: ../svn/svn.c:315 msgid "don't delete changelists after commit" msgstr "ta inte bort ändringslistor efter arkivering" -#: ../svn/svn.c:318 +#: ../svn/svn.c:316 msgid "keep path in working copy" msgstr "behåll sökväg i arbetskopia" -#: ../svn/svn.c:320 ../svnbench/svnbench.c:161 +#: ../svn/svn.c:318 ../svnbench/svnbench.c:161 msgid "retrieve all revision properties" msgstr "hämta alla revisionsegenskaper" -#: ../svn/svn.c:322 ../svnbench/svnbench.c:163 +#: ../svn/svn.c:320 ../svnbench/svnbench.c:163 msgid "retrieve no revision properties" msgstr "hämta inga revisionsegenskaper" -#: ../svn/svn.c:324 ../svnbench/svnbench.c:165 +#: ../svn/svn.c:322 ../svnbench/svnbench.c:165 msgid "" "set revision property ARG in new revision\n" " using the name[=value] format" @@ -14084,11 +14229,11 @@ msgstr "" "sätt revisionsegenskapen ARG i ny revision\n" " på formatet namn[=värde]" -#: ../svn/svn.c:327 +#: ../svn/svn.c:325 msgid "make intermediate directories" msgstr "skapa mellanliggande kataloger" -#: ../svn/svn.c:329 ../svnbench/svnbench.c:169 +#: ../svn/svn.c:327 ../svnbench/svnbench.c:169 msgid "" "use/display additional information from merge\n" " history" @@ -14096,7 +14241,7 @@ msgstr "" "använd/visa ytterligare information från\n" " sammanslagningshistoriken" -#: ../svn/svn.c:333 +#: ../svn/svn.c:331 msgid "" "specify automatic conflict resolution action\n" " ('postpone', 'working', 'base', 'mine-conflict',\n" @@ -14111,7 +14256,7 @@ msgstr "" " (förkortningar: \"p\", \"mc\", \"tc\", \"mf\", \"tf\",\n" " \"e\", \"l\", \"r\")" -#: ../svn/svn.c:344 +#: ../svn/svn.c:342 msgid "" "specify which collection of revisions to display\n" " ('merged', 'eligible')" @@ -14119,11 +14264,11 @@ msgstr "" "ange slag av revisioner att visa\n" " (\"merged\", \"eligible\")" -#: ../svn/svn.c:348 +#: ../svn/svn.c:346 msgid "deprecated" msgstr "avrådes" -#: ../svn/svn.c:350 +#: ../svn/svn.c:348 msgid "" "number of leading path components to strip from\n" " paths parsed from the patch file. --strip 0\n" @@ -14143,67 +14288,67 @@ msgstr "" " Katalogseparatorn är \"/\" på alla plattformar.\n" " Ett \"/\" i början räknas som en katalog." -#: ../svn/svn.c:366 +#: ../svn/svn.c:364 msgid "don't expand keywords" msgstr "expandera inte nyckelord" -#: ../svn/svn.c:368 +#: ../svn/svn.c:366 msgid "apply the unidiff in reverse" msgstr "anbringa unidiffen baklänges" -#: ../svn/svn.c:370 +#: ../svn/svn.c:368 msgid "ignore whitespace during pattern matching" msgstr "strunta i tomrum vid mönstermatchning" -#: ../svn/svn.c:371 +#: ../svn/svn.c:369 msgid "produce diff output" msgstr "utdata i form av skillnader" #. maps to show_diff #. diff options -#: ../svn/svn.c:373 ../svnlook/svnlook.c:139 +#: ../svn/svn.c:371 ../svnlook/svnlook.c:139 msgid "use ARG as diff command" msgstr "använd ARG som diff-kommando" -#: ../svn/svn.c:375 +#: ../svn/svn.c:373 msgid "override diff-cmd specified in config file" msgstr "kringgå \"diff-cmd\" angiven i inställningsfilen" -#: ../svn/svn.c:377 ../svnlook/svnlook.c:133 +#: ../svn/svn.c:375 ../svnlook/svnlook.c:133 msgid "do not print differences for added files" msgstr "visa inte skillnader för tillagda filer" -#: ../svn/svn.c:379 ../svnlook/svnlook.c:136 +#: ../svn/svn.c:377 ../svnlook/svnlook.c:136 msgid "do not print differences for deleted files" msgstr "visa inte skillnader för raderade filer" -#: ../svn/svn.c:381 +#: ../svn/svn.c:379 msgid "don't diff copied or moved files with their source" msgstr "" "jämför inte kopierade eller flyttade filer\n" " med deras källa" -#: ../svn/svn.c:383 +#: ../svn/svn.c:381 msgid "diff unrelated nodes as delete and add" msgstr "jämför obesläktade noder som radering och tillägg" -#: ../svn/svn.c:384 +#: ../svn/svn.c:382 msgid "show a summary of the results" msgstr "visa en sammanfattning av resultatet" -#: ../svn/svn.c:386 +#: ../svn/svn.c:384 msgid "use git's extended diff format" msgstr "använd git:s utökade format" -#: ../svn/svn.c:388 ../svnlook/svnlook.c:142 +#: ../svn/svn.c:386 ../svnlook/svnlook.c:142 msgid "ignore properties during the operation" msgstr "strunta i egenskaper" -#: ../svn/svn.c:390 ../svnlook/svnlook.c:145 +#: ../svn/svn.c:388 ../svnlook/svnlook.c:145 msgid "show only properties during the operation" msgstr "visa endast egenskaper" -#: ../svn/svn.c:392 +#: ../svn/svn.c:390 msgid "" "generate diff suitable for generic third-party\n" " patch tools; currently the same as\n" @@ -14213,7 +14358,7 @@ msgstr "" " patch-verktyg; för närvarande samma som\n" " \"--show-copies-as-adds --ignore-properties\"" -#: ../svn/svn.c:400 +#: ../svn/svn.c:398 msgid "" "Allow operation on mixed-revision working copy.\n" " Use of this option is not recommended!\n" @@ -14223,7 +14368,7 @@ msgstr "" " Användning av denna flagga rekommenderas inte!\n" " Kör \"svn update\" istället." -#: ../svn/svn.c:406 +#: ../svn/svn.c:404 msgid "" "also operate on externals defined by\n" " svn:externals properties" @@ -14231,11 +14376,11 @@ msgstr "" "verka även på externa objekt\n" " definierade av egenskaperna svn:externals" -#: ../svn/svn.c:410 +#: ../svn/svn.c:408 msgid "retrieve properties set on parents of the target" msgstr "hämta egenskaper satta på målets föräldrar" -#: ../svn/svn.c:412 +#: ../svn/svn.c:410 msgid "" "use ARG as search pattern (glob syntax, case-\n" " and accent-insensitive, may require quotation marks\n" @@ -14246,31 +14391,31 @@ msgstr "" " behöva citattecken för att hindra expansion i\n" " skalet)" -#: ../svn/svn.c:418 +#: ../svn/svn.c:416 msgid "combine ARG with the previous search pattern" msgstr "kombinera ARG med föregående sökmönster" -#: ../svn/svn.c:420 +#: ../svn/svn.c:418 msgid "show revision log message, author and date" msgstr "visa loggmeddelande, författare och datum" -#: ../svn/svn.c:422 +#: ../svn/svn.c:420 msgid "remove unversioned items" msgstr "visa icke versionshanterade objekt" -#: ../svn/svn.c:423 +#: ../svn/svn.c:421 msgid "remove ignored items" msgstr "ta bort ej beaktade objekt" -#: ../svn/svn.c:424 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140 +#: ../svn/svn.c:422 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140 msgid "do not output the trailing newline" msgstr "skriv inte ut det avslutande radslutet" -#: ../svn/svn.c:425 +#: ../svn/svn.c:423 msgid "show cached passwords" msgstr "visa cachade lösenord" -#: ../svn/svn.c:427 +#: ../svn/svn.c:425 msgid "" "pin externals with no explicit revision to their\n" " current revision (recommended when tagging)" @@ -14279,7 +14424,7 @@ msgstr "" " vid deras nuvarande revision (rekommenderas\n" " vid märkning)" -#: ../svn/svn.c:431 +#: ../svn/svn.c:429 msgid "" "print only the item identified by ARG:\n" " 'kind' node kind of TARGET\n" @@ -14316,7 +14461,7 @@ msgstr "" " författare till \"last-changed-revision\"\n" " \"wc-root\" rot för MÅLets arbetskopia" -#: ../svn/svn.c:466 +#: ../svn/svn.c:464 msgid "" "Local additions are merged with incoming additions\n" " instead of causing a tree conflict. Use of this\n" @@ -14328,25 +14473,17 @@ msgstr "" " väljare rekommenderas inte! Använd \"svn resolve\"\n" " för att lösa trädkonflikter istället." -#: ../svn/svn.c:475 +#: ../svn/svn.c:473 msgid "remove unreferenced pristines from .svn directory" msgstr "" "ta bort orörda filer som inte används\n" " från .svn-katalogen" -#: ../svn/svn.c:477 -msgid "list shelved patches" -msgstr "lista patchar på hyllan" - -#: ../svn/svn.c:478 -msgid "do not delete the shelved patch" -msgstr "radera inte patchen på hyllan" - -#: ../svn/svn.c:479 -msgid "delete the shelved patch" -msgstr "radera patchen på hyllan" +#: ../svn/svn.c:476 +msgid "drop shelf after successful unshelve" +msgstr "" -#: ../svn/svn.c:529 +#: ../svn/svn.c:526 msgid "" "Put files and directories under version control, scheduling\n" "them for addition to repository. They will be added in next commit.\n" @@ -14356,16 +14493,20 @@ 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:534 +#: ../svn/svn.c:532 msgid "add intermediate parents" msgstr "skapa mellanliggande föräldrakataloger" -#: ../svn/svn.c:537 +#: ../svn/svn.c:535 msgid "" "Manage cached authentication credentials.\n" "usage: 1. svn auth [PATTERN ...]\n" "usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:539 +msgid "" " With no arguments, list all cached authentication credentials.\n" " Authentication credentials include usernames, passwords,\n" " SSL certificates, and SSL client-certificate passphrases.\n" @@ -14373,6 +14514,11 @@ msgid "" " or more patterns. With the --remove option, remove cached authentication\n" " credentials matching one or more patterns.\n" "\n" +msgstr "" + +#: ../svn/svn.c:546 +#, fuzzy +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" " contain glob wildcards:\n" @@ -14403,59 +14549,74 @@ 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:558 +#: ../svn/svn.c:557 msgid "remove matching authentication credentials" msgstr "ta bort motsvarande autentiseringsreferenser" -#: ../svn/svn.c:563 +#: ../svn/svn.c:562 msgid "" "Show when each line of a file was last (or\n" "next) changed.\n" "usage: blame [-rM:N] TARGET[@REV]...\n" "\n" +msgstr "" + +#: ../svn/svn.c:566 +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" "\n" +msgstr "" + +#: ../svn/svn.c:569 ../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" " the last revision at or before rN that changed or added the line,\n" " looking back no further than rM.\n" "\n" +msgstr "" + +#: ../svn/svn.c:574 ../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" " the next revision after rN that changed or deleted the line,\n" " looking forward no further than rM.\n" "\n" +msgstr "" + +#: ../svn/svn.c:579 ../svnbench/svnbench.c:232 +#, fuzzy +msgid "" " If specified, REV determines in which revision the target is first\n" " looked up.\n" "\n" -" Write the annotated result to standard output.\n" msgstr "" -"Visa när varje rad i en fil senast\n" -"ändrades, eller när den ändras därefter.\n" -"användning: blame [-rM:N] MÅL[@REV]...\n" -"\n" -" Kommentera varje rad i en fil med visa revisionsnumret och författaren till\n" -" den senaste ändringen (eller nästa ändring) av raden.\n" -"\n" -" Utan revisionsintervall (samma som -r0:REV), eller med \"-r M:N\" där M < N,\n" -" kommentera varje rad som finns i revision N av filen, med den senaste\n" -" revisionen i eller före rN som ändrade eller lade till raden, utan att\n" -" gå längre bakåt i tiden än rM.\n" -"\n" -" Med ett bakvänt revisionsintervall \"-r M:N\" där M > N, kommentera varje rad\n" -" som finns i revision N av filen, med nästa revision efter rN som ändrade\n" -" eller raderade raden, utan att gå längre framåt i tiden än rM.\n" +"Visa innehållet i angivna filer eller URL:er.\n" +"användning: cat MÅL[@REV]...\n" "\n" " Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" -"\n" -" Det kommenterade resultatet skrivs till standardutmatningen.\n" + +#: ../svn/svn.c:582 ../svnbench/svnbench.c:235 +msgid " Write the annotated result to standard output.\n" +msgstr "" #: ../svn/svn.c:587 +#, fuzzy msgid "" "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" "\n" +msgstr "" +"Visa innehållet i angivna filer eller URL:er.\n" +"användning: cat MÅL[@REV]...\n" +"\n" +" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" + +#: ../svn/svn.c:590 +#, fuzzy +msgid "" " If specified, REV determines in which revision the target is first\n" " looked up.\n" msgstr "" @@ -14464,7 +14625,7 @@ msgstr "" "\n" " Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" -#: ../svn/svn.c:595 +#: ../svn/svn.c:596 msgid "" "Associate (or dissociate) changelist CLNAME with the named files.\n" "usage: 1. changelist CLNAME PATH...\n" @@ -14475,19 +14636,37 @@ msgstr "" "användning: 1. changelist ÄLNAMN SÖKVÄG...\n" " 2. changelist --remove SÖKVÄG...\n" -#: ../svn/svn.c:601 +#: ../svn/svn.c:603 msgid "" "Check out a working copy from a repository.\n" "usage: checkout URL[@REV]... [PATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:606 +#, fuzzy +msgid "" " If specified, REV determines in which revision the URL is first\n" " looked up.\n" "\n" +msgstr "" +"Visa innehållet i angivna filer eller URL:er.\n" +"användning: cat MÅL[@REV]...\n" +"\n" +" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" + +#: ../svn/svn.c:609 +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" " out into a sub-directory of PATH, with the name of the sub-directory\n" " being the basename of the URL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:614 +#, fuzzy +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy destination do not automatically cause the check out to fail.\n" " If the obstructing path is the same type (file or directory) as the\n" @@ -14499,8 +14678,6 @@ msgid "" " to the working copy. All properties from the repository are applied\n" " to the obstructing path.\n" "\n" -" See also 'svn help update' for a list of possible characters\n" -" reporting the action taken.\n" msgstr "" "Checka ut en arbetskopia från ett arkiv.\n" "användning: checkout URL[@REV]... [SÖKVÄG]\n" @@ -14525,7 +14702,13 @@ 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:628 +#: ../svn/svn.c:625 +msgid "" +" See also 'svn help update' for a list of possible characters\n" +" reporting the action taken.\n" +msgstr "" + +#: ../svn/svn.c:631 msgid "" "Either recover from an interrupted operation that left the working copy locked,\n" "or remove unwanted files.\n" @@ -14534,88 +14717,85 @@ msgid "" " cleanup --remove-ignored [WCPATH...]\n" " 3. cleanup --vacuum-pristines [WCPATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:638 +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" " the 'svn status' command) from the working copy. Usually, this is only\n" " necessary if a Subversion client has crashed while using the working copy,\n" " leaving it in an unusable state.\n" "\n" +msgstr "" + +#: ../svn/svn.c:644 +msgid "" " WARNING: There is no mechanism that will protect write locks still\n" " being used by other Subversion clients. Running this command\n" " without any options while another client is using the working\n" " copy can corrupt the working copy beyond repair!\n" "\n" +msgstr "" + +#: ../svn/svn.c:649 +msgid "" " 2. If the --remove-unversioned option or the --remove-ignored option\n" " is given, remove any unversioned or ignored items within WCPATH.\n" " Note that the 'svn status' command shows unversioned items as '?',\n" " and ignored items as 'I' if the --no-ignore option is given to it.\n" "\n" +msgstr "" + +#: ../svn/svn.c:654 +msgid "" " 3. If the --vacuum-pristines option is given, remove pristine copies of\n"
[... 8777 lines stripped ...]
