You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/11/17 01:09:55 UTC
svn commit: r1035869 [12/19] - in /subversion/branches/performance: ./
build/ build/generator/ build/generator/templates/ build/win32/
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/j...
Modified: subversion/branches/performance/subversion/po/nb.po
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/po/nb.po?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/po/nb.po [UTF-8] (original)
+++ subversion/branches/performance/subversion/po/nb.po [UTF-8] Wed Nov 17 00:09:50 2010
@@ -88,11 +88,12 @@
msgid ""
msgstr ""
"Project-Id-Version: subversion 1.7\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2009-10-14 16:27+0200\n"
+"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
+"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2009-10-14 16:21+0200\n"
"Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
"Language-Team: Norwegian <de...@subversion.tigris.org>\n"
+"Language: no\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -148,25 +149,25 @@ msgid "'%s' is not a file in filesystem
msgstr "«%s» er ikke en fil i filsystem «%s»"
#. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
-#: ../include/private/svn_fs_util.h:125
+#: ../include/private/svn_fs_util.h:126
#, c-format
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "Stien «%s» er allerede låst av bruker «%s» i filsystem «%s»"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:132
+#: ../include/private/svn_fs_util.h:133
#, c-format
msgid "No lock on path '%s' in filesystem '%s'"
msgstr "Ingen lås på stien «%s» i filsystem «%s»"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:139
+#: ../include/private/svn_fs_util.h:140
#, c-format
msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
msgstr "Låsen er utgått: Låsnøkkel «%s» i filsystem «%s»"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:146
+#: ../include/private/svn_fs_util.h:147
#, c-format
msgid "No username is currently associated with filesystem '%s'"
msgstr "Ingen brukernavn er for øyeblikket assosiert med filsystem «%s»"
@@ -174,7 +175,7 @@ msgstr "Ingen brukernavn er for øyeblik
#. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
#. LOCK_OWNER doesn't match the USERNAME associated with FS.
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:155
+#: ../include/private/svn_fs_util.h:156
#, c-format
msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
msgstr "Brukeren «%s» prøver å bruke en lås som eies av «%s» i filsystem «%s»"
@@ -215,7 +216,7 @@ msgstr "Filstien ligger ikke like under
msgid "Bogus UUID"
msgstr "Ugyldig UUID"
-#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:869
+#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:887
msgid "Invalid configuration value"
msgstr "Ugyldig verdi i innstilling"
@@ -280,8 +281,8 @@ msgstr "Rammefeil i rørprotokollen"
msgid "Read error in pipe"
msgstr "Lesefeil i rør"
-#: ../include/svn_error_codes.h:275 ../libsvn_subr/cmdline.c:319
-#: ../libsvn_subr/cmdline.c:336 ../svn/util.c:919 ../svnlook/main.c:1769
+#: ../include/svn_error_codes.h:275 ../libsvn_subr/cmdline.c:341
+#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:923 ../svnlook/main.c:1802
#, c-format
msgid "Write error"
msgstr "Feil ved skriving"
@@ -300,7 +301,7 @@ msgstr "Ukjente strømdata"
#: ../include/svn_error_codes.h:294
#, fuzzy
-msgid "Stream doesn't support resetting"
+msgid "Stream doesn't support seeking"
msgstr "Tjeneren støtter ikke datobaserte operasjoner"
#: ../include/svn_error_codes.h:300
@@ -451,796 +452,845 @@ msgstr "Løsing av konflikt feilet"
msgid "Failed to locate 'copyfrom' path in working copy"
msgstr "Klarte ikke å lokalisere «copyfrom»-sti i arbeidskopien"
-#: ../include/svn_error_codes.h:471
+#: ../include/svn_error_codes.h:473
msgid "Moving a path from one changelist to another"
msgstr "Flytter en sti fra en forandringsliste til en annen"
-#: ../include/svn_error_codes.h:476
+#: ../include/svn_error_codes.h:478
#, fuzzy
msgid "Cannot delete a file external"
msgstr "Kan ikke få tak i filnavn"
-#: ../include/svn_error_codes.h:481
+#: ../include/svn_error_codes.h:483
#, fuzzy
msgid "Cannot move a file external"
msgstr "Kan ikke flytte «%s» inn i seg selv"
-#: ../include/svn_error_codes.h:486
+#: ../include/svn_error_codes.h:488
msgid "Something's amiss with the wc sqlite database"
msgstr "Noe er galt med SQLite-databasen for arbeidskopien"
-#: ../include/svn_error_codes.h:491
+#: ../include/svn_error_codes.h:493
msgid "The working copy is missing"
msgstr "Arbeidskopien mangler"
-#: ../include/svn_error_codes.h:496
+#: ../include/svn_error_codes.h:498
msgid "The specified node is not a symlink"
msgstr "Den spesifiserte noden er ikke en symbolsk lenke"
-#: ../include/svn_error_codes.h:501
+#: ../include/svn_error_codes.h:503
msgid "The specified path has an unexpected status"
msgstr "Den spesifiserte stien har uventet status"
-#: ../include/svn_error_codes.h:506
+#: ../include/svn_error_codes.h:508
msgid "The working copy needs to be upgraded"
msgstr "Arbeidskopien må oppgraderes"
-#: ../include/svn_error_codes.h:511
+#: ../include/svn_error_codes.h:513
msgid "Previous operation was interrupted; run 'svn cleanup'"
msgstr "Forrige operasjon ble avbrutt; kjør «svn cleanup»"
-#: ../include/svn_error_codes.h:517
+#: ../include/svn_error_codes.h:518
+msgid "This operation can not be performed with just this depth."
+msgstr ""
+
+#: ../include/svn_error_codes.h:524
msgid "General filesystem error"
msgstr "Generell filsystemsfeil"
-#: ../include/svn_error_codes.h:521
+#: ../include/svn_error_codes.h:528
msgid "Error closing filesystem"
msgstr "Feil under lukking av filsystem"
-#: ../include/svn_error_codes.h:525
+#: ../include/svn_error_codes.h:532
msgid "Filesystem is already open"
msgstr "Filsystemet er allerede åpent"
-#: ../include/svn_error_codes.h:529
+#: ../include/svn_error_codes.h:536
msgid "Filesystem is not open"
msgstr "Filsystemet er ikke åpent"
-#: ../include/svn_error_codes.h:533
+#: ../include/svn_error_codes.h:540
msgid "Filesystem is corrupt"
msgstr "Filsystemet er ødelagt"
-#: ../include/svn_error_codes.h:537
+#: ../include/svn_error_codes.h:544
msgid "Invalid filesystem path syntax"
msgstr "Filstiens sammensetning er ugyldig"
-#: ../include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:548
msgid "Invalid filesystem revision number"
msgstr "Filsystemet har ugyldig revisjonsnummer"
-#: ../include/svn_error_codes.h:545
+#: ../include/svn_error_codes.h:552
msgid "Invalid filesystem transaction name"
msgstr "Filsystemet har ugyldig transaksjonsnavn"
-#: ../include/svn_error_codes.h:549
+#: ../include/svn_error_codes.h:556
msgid "Filesystem directory has no such entry"
msgstr "Filsystemets katalog har ingen slik post"
-#: ../include/svn_error_codes.h:553
+#: ../include/svn_error_codes.h:560
msgid "Filesystem has no such representation"
msgstr "Filsystemet har ingen slik representasjon"
-#: ../include/svn_error_codes.h:557
+#: ../include/svn_error_codes.h:564
msgid "Filesystem has no such string"
msgstr "Filsystemet har ingen slik streng"
-#: ../include/svn_error_codes.h:561
+#: ../include/svn_error_codes.h:568
msgid "Filesystem has no such copy"
msgstr "Filsystemet har ingen slik kopi"
-#: ../include/svn_error_codes.h:565
+#: ../include/svn_error_codes.h:572
msgid "The specified transaction is not mutable"
msgstr "Transaksjonen kan ikke endres"
-#: ../include/svn_error_codes.h:569
+#: ../include/svn_error_codes.h:576
msgid "Filesystem has no item"
msgstr "Filsystemet har ingen objekt"
-#: ../include/svn_error_codes.h:573
+#: ../include/svn_error_codes.h:580
msgid "Filesystem has no such node-rev-id"
msgstr "Filsystemet har ingen slik node-rev-id"
-#: ../include/svn_error_codes.h:577
+#: ../include/svn_error_codes.h:584
msgid "String does not represent a node or node-rev-id"
msgstr "Tekststrengen representerer ikke en node eller node-rev-id"
-#: ../include/svn_error_codes.h:581
+#: ../include/svn_error_codes.h:588
msgid "Name does not refer to a filesystem directory"
msgstr "Navnet refererer ikke til noen katalog i filsystemet"
-#: ../include/svn_error_codes.h:585
+#: ../include/svn_error_codes.h:592
msgid "Name does not refer to a filesystem file"
msgstr "Navnet refererer ikke til noen fil i filsystemet"
-#: ../include/svn_error_codes.h:589
+#: ../include/svn_error_codes.h:596
msgid "Name is not a single path component"
msgstr "Navnet er ikke en enkelt filstidel"
-#: ../include/svn_error_codes.h:593
+#: ../include/svn_error_codes.h:600
msgid "Attempt to change immutable filesystem node"
msgstr "Forsøk på å endre node i filsystemet som ikke kan endres"
-#: ../include/svn_error_codes.h:597
+#: ../include/svn_error_codes.h:604
msgid "Item already exists in filesystem"
msgstr "Objektet finnes allerede i filsystemet"
-#: ../include/svn_error_codes.h:601
+#: ../include/svn_error_codes.h:608
msgid "Attempt to remove or recreate fs root dir"
msgstr "Forsøk på å fjerne eller lage roten i filsystemet på nytt"
-#: ../include/svn_error_codes.h:605
+#: ../include/svn_error_codes.h:612
msgid "Object is not a transaction root"
msgstr "Objektet er ikke en transaksjonsrot"
-#: ../include/svn_error_codes.h:609
+#: ../include/svn_error_codes.h:616
msgid "Object is not a revision root"
msgstr "Objektet er ikke en revisjonsrot"
-#: ../include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:620
msgid "Merge conflict during commit"
msgstr "Flettekonflikt under innsending"
-#: ../include/svn_error_codes.h:617
+#: ../include/svn_error_codes.h:624
msgid "A representation vanished or changed between reads"
msgstr "En representasjon forsvant eller ble endret mellom lesninger"
-#: ../include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:628
msgid "Tried to change an immutable representation"
msgstr "Forsøkte å endre en uforanderlig representasjon"
-#: ../include/svn_error_codes.h:625
+#: ../include/svn_error_codes.h:632
msgid "Malformed skeleton data"
msgstr "Misdannede skjelettdata"
-#: ../include/svn_error_codes.h:629
+#: ../include/svn_error_codes.h:636
msgid "Transaction is out of date"
msgstr "Transaksjonen er utdatert"
-#: ../include/svn_error_codes.h:633
+#: ../include/svn_error_codes.h:640
msgid "Berkeley DB error"
msgstr "Berkeley DB-feil"
-#: ../include/svn_error_codes.h:637
+#: ../include/svn_error_codes.h:644
msgid "Berkeley DB deadlock error"
msgstr "Vranglås-feil i Berkeley DB"
-#: ../include/svn_error_codes.h:641
+#: ../include/svn_error_codes.h:648
msgid "Transaction is dead"
msgstr "Transaksjonen er død"
-#: ../include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:652
msgid "Transaction is not dead"
msgstr "Transaksjonen er ikke død"
-#: ../include/svn_error_codes.h:650
+#: ../include/svn_error_codes.h:657
msgid "Unknown FS type"
msgstr "Ukjent filsystemtype"
-#: ../include/svn_error_codes.h:655
+#: ../include/svn_error_codes.h:662
msgid "No user associated with filesystem"
msgstr "Ingen bruker assosiert med filsystem"
-#: ../include/svn_error_codes.h:660
+#: ../include/svn_error_codes.h:667
msgid "Path is already locked"
msgstr "Stien er allerede låst"
-#: ../include/svn_error_codes.h:665 ../include/svn_error_codes.h:821
+#: ../include/svn_error_codes.h:672 ../include/svn_error_codes.h:834
msgid "Path is not locked"
msgstr "Stien er ikke låst"
-#: ../include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:677
msgid "Lock token is incorrect"
msgstr "Låsnøkkel er feil"
-#: ../include/svn_error_codes.h:675
+#: ../include/svn_error_codes.h:682
msgid "No lock token provided"
msgstr "Ingen låsnøkkel skaffet"
-#: ../include/svn_error_codes.h:680
+#: ../include/svn_error_codes.h:687
msgid "Username does not match lock owner"
msgstr "Brukernavn samsvarer ikke med eier av lås"
-#: ../include/svn_error_codes.h:685
+#: ../include/svn_error_codes.h:692
msgid "Filesystem has no such lock"
msgstr "Filsystemet har ingen slik lås"
-#: ../include/svn_error_codes.h:690
+#: ../include/svn_error_codes.h:697
msgid "Lock has expired"
msgstr "Låsen er utgått"
-#: ../include/svn_error_codes.h:695 ../include/svn_error_codes.h:808
+#: ../include/svn_error_codes.h:702 ../include/svn_error_codes.h:821
msgid "Item is out of date"
msgstr "Elementet er utdatert"
-#: ../include/svn_error_codes.h:707
+#: ../include/svn_error_codes.h:714
msgid "Unsupported FS format"
msgstr "Filsystemformatet er ikke støttet"
-#: ../include/svn_error_codes.h:712
+#: ../include/svn_error_codes.h:719
msgid "Representation is being written"
msgstr "Representasjonen skrives"
-#: ../include/svn_error_codes.h:717
+#: ../include/svn_error_codes.h:724
msgid "The generated transaction name is too long"
msgstr "Det genererte transaksjonsnavnet er for langt"
# FIXME: Den kan skrues litt på, men funker foreløpig.
-#: ../include/svn_error_codes.h:722
+#: ../include/svn_error_codes.h:729
msgid "Filesystem has no such node origin record"
msgstr "Filsystemet har ingen slik post for nodeopprinnelse"
-#: ../include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:734
msgid "Filesystem upgrade is not supported"
msgstr "Oppgradering av filsystemet støttes ikke"
-#: ../include/svn_error_codes.h:732
+#: ../include/svn_error_codes.h:739
#, fuzzy
msgid "Filesystem has no such checksum-representation index record"
msgstr "Filsystemet har ingen slik representasjon"
-#: ../include/svn_error_codes.h:738
+#: ../include/svn_error_codes.h:744
+msgid "Property value in filesystem differs from the provided base value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:751
msgid "The repository is locked, perhaps for db recovery"
msgstr "Depotet er låst, muligens på grunn av gjenopprettelse av databasen"
-#: ../include/svn_error_codes.h:742
+#: ../include/svn_error_codes.h:755
msgid "A repository hook failed"
msgstr "En påhakning i depotet feilet"
-#: ../include/svn_error_codes.h:746
+#: ../include/svn_error_codes.h:759
msgid "Incorrect arguments supplied"
msgstr "Feilaktige argumenter angitt"
-#: ../include/svn_error_codes.h:750
+#: ../include/svn_error_codes.h:763
msgid "A report cannot be generated because no data was supplied"
msgstr "En rapport kan ikke genereres fordi data ikke ble gitt"
-#: ../include/svn_error_codes.h:754
+#: ../include/svn_error_codes.h:767
msgid "Bogus revision report"
msgstr "Ugyldig revisjonsrapport"
-#: ../include/svn_error_codes.h:763
+#: ../include/svn_error_codes.h:776
msgid "Unsupported repository version"
msgstr "Depotets versjon støttes ikke"
-#: ../include/svn_error_codes.h:767
+#: ../include/svn_error_codes.h:780
msgid "Disabled repository feature"
msgstr "Avslått funksjon i depotet"
-#: ../include/svn_error_codes.h:771
+#: ../include/svn_error_codes.h:784
msgid "Error running post-commit hook"
msgstr "Feil ved kjøring av post-innsendingshake"
-#: ../include/svn_error_codes.h:776
+#: ../include/svn_error_codes.h:789
msgid "Error running post-lock hook"
msgstr "Feil ved kjøring av «post-lock»-påhakningen"
-#: ../include/svn_error_codes.h:781
+#: ../include/svn_error_codes.h:794
msgid "Error running post-unlock hook"
msgstr "Feil ved kjøring av «post-unlock»-påhakningen»"
-#: ../include/svn_error_codes.h:786
+#: ../include/svn_error_codes.h:799
msgid "Repository upgrade is not supported"
msgstr "Oppgradering av depotet støttes ikke"
-#: ../include/svn_error_codes.h:792
+#: ../include/svn_error_codes.h:805
msgid "Bad URL passed to RA layer"
msgstr "Feilaktig nettadresse sendt til RA-lag"
-#: ../include/svn_error_codes.h:796
+#: ../include/svn_error_codes.h:809
msgid "Authorization failed"
msgstr "Autorisasjonen feilet"
-#: ../include/svn_error_codes.h:800
+#: ../include/svn_error_codes.h:813
msgid "Unknown authorization method"
msgstr "Autorisasjonsmetoden er ukjent"
-#: ../include/svn_error_codes.h:804
+#: ../include/svn_error_codes.h:817
msgid "Repository access method not implemented"
msgstr "Depotet er ikke forberedt for denne tilgangsmetoden"
-#: ../include/svn_error_codes.h:812
+#: ../include/svn_error_codes.h:825
msgid "Repository has no UUID"
msgstr "Depotet har ingen UUID"
-#: ../include/svn_error_codes.h:816
+#: ../include/svn_error_codes.h:829
msgid "Unsupported RA plugin ABI version"
msgstr "RA-programtilleggets ABI-versjon støttes ikke"
-#: ../include/svn_error_codes.h:826
+#: ../include/svn_error_codes.h:839
msgid "Server can only replay from the root of a repository"
msgstr "Tjeneren kan bare spille av fra roten av et depot"
-#: ../include/svn_error_codes.h:831
+#: ../include/svn_error_codes.h:844
msgid "Repository UUID does not match expected UUID"
msgstr "Depot-UUID samsvarer ikke med forventet UUID"
-#: ../include/svn_error_codes.h:836
+#: ../include/svn_error_codes.h:849
msgid "Repository root URL does not match expected root URL"
msgstr "Rot-URL for depotet samsvarer ikke med forventet rot-URL"
-#: ../include/svn_error_codes.h:842
+#: ../include/svn_error_codes.h:854
+#, fuzzy
+msgid "Session URL does not match expected session URL"
+msgstr "Rot-URL for depotet samsvarer ikke med forventet rot-URL"
+
+#: ../include/svn_error_codes.h:860
msgid "RA layer failed to init socket layer"
msgstr "RA-laget kunne ikke igangsette sokkel-lag"
-#: ../include/svn_error_codes.h:846
+#: ../include/svn_error_codes.h:864
msgid "RA layer failed to create HTTP request"
msgstr "RA-lag kunne ikke utføre HTTP-forespørsel"
-#: ../include/svn_error_codes.h:850
+#: ../include/svn_error_codes.h:868
msgid "RA layer request failed"
msgstr "Forespørsel feilet i RA-lag"
-#: ../include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:872
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA-laget mottok ikke informasjon om forespurte valg"
-#: ../include/svn_error_codes.h:858
+#: ../include/svn_error_codes.h:876
msgid "RA layer failed to fetch properties"
msgstr "RA-laget kunne ikke hente egenskapene"
-#: ../include/svn_error_codes.h:862
+#: ../include/svn_error_codes.h:880
msgid "RA layer file already exists"
msgstr "RA-lagets fil finnes allerede"
-#: ../include/svn_error_codes.h:876
+#: ../include/svn_error_codes.h:894
msgid "HTTP Path Not Found"
msgstr "Finner ikke HTTP-sti"
-#: ../include/svn_error_codes.h:880
+#: ../include/svn_error_codes.h:898
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Kunne ikke kjøre WebDAV PROPPATCH"
-#: ../include/svn_error_codes.h:885 ../include/svn_error_codes.h:936
-#: ../libsvn_ra_svn/marshal.c:656 ../libsvn_ra_svn/marshal.c:774
-#: ../libsvn_ra_svn/marshal.c:801
+#: ../include/svn_error_codes.h:903 ../include/svn_error_codes.h:954
+#: ../libsvn_ra_svn/marshal.c:714 ../libsvn_ra_svn/marshal.c:832
+#: ../libsvn_ra_svn/marshal.c:859
msgid "Malformed network data"
msgstr "Feilaktig nettverksdata"
-#: ../include/svn_error_codes.h:890
+#: ../include/svn_error_codes.h:908
msgid "Unable to extract data from response header"
msgstr "Klarte ikke å hente data fra responsheader"
-#: ../include/svn_error_codes.h:895
+#: ../include/svn_error_codes.h:913
msgid "Repository has been moved"
msgstr "Depotet er flyttet"
-#: ../include/svn_error_codes.h:900 ../libsvn_ra_serf/replay.c:808
-#: ../libsvn_ra_serf/update.c:2235 ../libsvn_ra_serf/util.c:599
+#: ../include/svn_error_codes.h:918 ../libsvn_ra_serf/replay.c:844
+#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:689
msgid "Connection timed out"
msgstr "Tidsavbrudd for forbindelsen"
-#: ../include/svn_error_codes.h:905
+#: ../include/svn_error_codes.h:923
msgid "URL access forbidden for unknown reason"
msgstr "URL-tilgang nektes, ukjent grunn"
-#: ../include/svn_error_codes.h:911 ../include/svn_error_codes.h:940
+#: ../include/svn_error_codes.h:929 ../include/svn_error_codes.h:958
msgid "Couldn't find a repository"
msgstr "Kunne ikke finne depotet"
-#: ../include/svn_error_codes.h:915
+#: ../include/svn_error_codes.h:933
msgid "Couldn't open a repository"
msgstr "Kunne ikke åpne depotet"
-#: ../include/svn_error_codes.h:920
+#: ../include/svn_error_codes.h:938
msgid "Special code for wrapping server errors to report to client"
msgstr "Spesialkode for innkapsling av feilmeldinger for tjener som rapporteres til klient"
-#: ../include/svn_error_codes.h:924
+#: ../include/svn_error_codes.h:942
msgid "Unknown svn protocol command"
msgstr "svn-protokollen kjenner ikke kommandoen"
-#: ../include/svn_error_codes.h:928
+#: ../include/svn_error_codes.h:946
msgid "Network connection closed unexpectedly"
msgstr "Nettverkstilkoblingen brøt plutselig"
-#: ../include/svn_error_codes.h:932
+#: ../include/svn_error_codes.h:950
msgid "Network read/write error"
msgstr "Lese-/skrivefeil i nettverket"
-#: ../include/svn_error_codes.h:944
+#: ../include/svn_error_codes.h:962
msgid "Client/server version mismatch"
msgstr "Versjon for klient/tjener samsvarer ikke"
-#: ../include/svn_error_codes.h:949
+#: ../include/svn_error_codes.h:967
msgid "Cannot negotiate authentication mechanism"
msgstr "Kan ikke utveksle autentiseringsmekanisme"
-#: ../include/svn_error_codes.h:954
+#: ../include/svn_error_codes.h:972
msgid "Editor drive was aborted"
msgstr ""
-#: ../include/svn_error_codes.h:960
+#: ../include/svn_error_codes.h:978
msgid "Initialization of SSPI library failed"
msgstr "Initialisering av SSPI-biblioteket feilet"
-#: ../include/svn_error_codes.h:964
+#: ../include/svn_error_codes.h:982
msgid "Server SSL certificate untrusted"
msgstr "SSL-sertifikat fra tjeneren er ikke godkjent"
-#: ../include/svn_error_codes.h:968
+#: ../include/svn_error_codes.h:986
#, fuzzy
msgid "Initialization of the GSSAPI context failed"
msgstr "Initialisering av SSPI-biblioteket feilet"
-#: ../include/svn_error_codes.h:976
+#: ../include/svn_error_codes.h:991
+msgid "While handling serf response:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:999
msgid "Credential data unavailable"
msgstr "Legitimasjonsdata er utilgjengelig"
-#: ../include/svn_error_codes.h:980
+#: ../include/svn_error_codes.h:1003
msgid "No authentication provider available"
msgstr "Ingen autentiseringsinstans er tilgjengelig"
-#: ../include/svn_error_codes.h:984
+#: ../include/svn_error_codes.h:1007
msgid "All authentication providers exhausted"
msgstr "Alle autentiseringsinstanser er brukt opp"
-#: ../include/svn_error_codes.h:988
+#: ../include/svn_error_codes.h:1011
msgid "Credentials not saved"
msgstr "Legitimasjonsdata er ikke lagret"
-#: ../include/svn_error_codes.h:993
+#: ../include/svn_error_codes.h:1016
msgid "Authentication failed"
msgstr "Autentisering feilet"
-#: ../include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1022
msgid "Read access denied for root of edit"
msgstr "Lesetilgang er nektet for redigeringens opphav"
-#: ../include/svn_error_codes.h:1004
+#: ../include/svn_error_codes.h:1027
msgid "Item is not readable"
msgstr "Element er ikke lesbart"
-#: ../include/svn_error_codes.h:1009
+#: ../include/svn_error_codes.h:1032
msgid "Item is partially readable"
msgstr "Element er delvis lesbart"
-#: ../include/svn_error_codes.h:1013
+#: ../include/svn_error_codes.h:1036
msgid "Invalid authz configuration"
msgstr "Ugyldig authz-oppsett"
-#: ../include/svn_error_codes.h:1018
+#: ../include/svn_error_codes.h:1041
msgid "Item is not writable"
msgstr "Elementet er ikke skrivbart"
-#: ../include/svn_error_codes.h:1024
+#: ../include/svn_error_codes.h:1047
msgid "Svndiff data has invalid header"
msgstr "Svndiff-data har ugyldig hode"
-#: ../include/svn_error_codes.h:1028
+#: ../include/svn_error_codes.h:1051
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff-data inneholder ødelagt vindu"
-#: ../include/svn_error_codes.h:1032
+#: ../include/svn_error_codes.h:1055
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff-data inneholder kildevisning med forflytninger baklengs"
-#: ../include/svn_error_codes.h:1036
+#: ../include/svn_error_codes.h:1059
msgid "Svndiff data contains invalid instruction"
msgstr "Svndiff-data inneholder ugyldig instruksjon"
-#: ../include/svn_error_codes.h:1040
+#: ../include/svn_error_codes.h:1063
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff-data sluttet uventet"
-#: ../include/svn_error_codes.h:1044
+#: ../include/svn_error_codes.h:1067
msgid "Svndiff compressed data is invalid"
msgstr "Komprimerte svndiff-data er ugyldig"
-#: ../include/svn_error_codes.h:1050
+#: ../include/svn_error_codes.h:1073
msgid "Diff data source modified unexpectedly"
msgstr "Uventet forandring i diff-datakilde"
-#: ../include/svn_error_codes.h:1056
+#: ../include/svn_error_codes.h:1079
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache har ingen sti til et SVN-filsystem"
-#: ../include/svn_error_codes.h:1060
+#: ../include/svn_error_codes.h:1083
msgid "Apache got a malformed URI"
msgstr "Apache fikk en ugyldig oppsettsadresse"
-#: ../include/svn_error_codes.h:1064
+#: ../include/svn_error_codes.h:1087
msgid "Activity not found"
msgstr "Fant ikke aktivitet"
-#: ../include/svn_error_codes.h:1068
+#: ../include/svn_error_codes.h:1091
msgid "Baseline incorrect"
msgstr "Grunnlinjen er feil"
-#: ../include/svn_error_codes.h:1072
+#: ../include/svn_error_codes.h:1095
msgid "Input/output error"
msgstr "Feil på inndata/utdata"
-#: ../include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1101
msgid "A path under version control is needed for this operation"
msgstr "For denne operasjonen kreves en filsti under versjonskontroll"
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1105
msgid "Repository access is needed for this operation"
msgstr "For denne operasjonen kreves tilgang til depotet"
-#: ../include/svn_error_codes.h:1086
+#: ../include/svn_error_codes.h:1109
msgid "Bogus revision information given"
msgstr "Angitt revisjonsinformasjon er ugyldig"
-#: ../include/svn_error_codes.h:1090
+#: ../include/svn_error_codes.h:1113
msgid "Attempting to commit to a URL more than once"
msgstr "Forsøk på å sende inn til en nettadresse mer enn en gang"
-#: ../include/svn_error_codes.h:1094
+#: ../include/svn_error_codes.h:1117
msgid "Operation does not apply to binary file"
msgstr "Operasjonen gjelder ikke for binære filer"
-#: ../include/svn_error_codes.h:1100
+#: ../include/svn_error_codes.h:1123
msgid "Format of an svn:externals property was invalid"
msgstr "Formatet på egenskapen svn:externals var ugyldig"
-#: ../include/svn_error_codes.h:1104
+#: ../include/svn_error_codes.h:1127
msgid "Attempting restricted operation for modified resource"
msgstr "Forsøkte en begrenset operasjon på en endret ressurs"
-#: ../include/svn_error_codes.h:1108
+#: ../include/svn_error_codes.h:1131
msgid "Operation does not apply to directory"
msgstr "Operasjonen gjelder ikke for kataloger"
-#: ../include/svn_error_codes.h:1112
+#: ../include/svn_error_codes.h:1135
msgid "Revision range is not allowed"
msgstr "Ugyldig revisjonsområde"
-#: ../include/svn_error_codes.h:1116
+#: ../include/svn_error_codes.h:1139
msgid "Inter-repository relocation not allowed"
msgstr "Flytting mellom kodearkiv er ikke tillatt"
-#: ../include/svn_error_codes.h:1120
+#: ../include/svn_error_codes.h:1143
msgid "Author name cannot contain a newline"
msgstr "Forfatternavn kan ikke inneholde linjeskift"
-#: ../include/svn_error_codes.h:1124
+#: ../include/svn_error_codes.h:1147
msgid "Bad property name"
msgstr "Feil navn på egenskap"
-#: ../include/svn_error_codes.h:1129
+#: ../include/svn_error_codes.h:1152
msgid "Two versioned resources are unrelated"
msgstr "To versjonerte ressurser er urelaterte"
-#: ../include/svn_error_codes.h:1134
+#: ../include/svn_error_codes.h:1157
msgid "Path has no lock token"
msgstr "Stien har ingen låsnøkkel"
-#: ../include/svn_error_codes.h:1139
+#: ../include/svn_error_codes.h:1162
msgid "Operation does not support multiple sources"
msgstr "Operasjonen støtter ikke flere kilder"
-#: ../include/svn_error_codes.h:1144
+#: ../include/svn_error_codes.h:1167
msgid "No versioned parent directories"
msgstr "Ingen versjonerte foreldrekataloger"
-#: ../include/svn_error_codes.h:1149
+#: ../include/svn_error_codes.h:1172
msgid "Working copy and merge source not ready for reintegration"
msgstr "Arbeidskopien og flettekilden er ikke klar for tilbakeføring"
-#: ../include/svn_error_codes.h:1154
+#: ../include/svn_error_codes.h:1177
msgid "A file external cannot overwrite an existing versioned item"
msgstr ""
-#: ../include/svn_error_codes.h:1159
+#: ../include/svn_error_codes.h:1182
#, fuzzy
msgid "Invalid path component strip count specified"
msgstr "Ugyldig revisjonsspesifikator"
-#: ../include/svn_error_codes.h:1165
+#: ../include/svn_error_codes.h:1187
+msgid "Detected a cycle while processing the operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1193
msgid "A problem occurred; see other errors for details"
msgstr "Et problem har oppstått; sjekk andre feilmeldinger for detaljer"
-#: ../include/svn_error_codes.h:1169
+#: ../include/svn_error_codes.h:1197
msgid "Failure loading plugin"
msgstr "Feil ved innlasting av programtillegg"
-#: ../include/svn_error_codes.h:1173
+#: ../include/svn_error_codes.h:1201
msgid "Malformed file"
msgstr "Feil i fil"
-#: ../include/svn_error_codes.h:1177
+#: ../include/svn_error_codes.h:1205
msgid "Incomplete data"
msgstr "Ufullstendige data"
-#: ../include/svn_error_codes.h:1181
+#: ../include/svn_error_codes.h:1209
msgid "Incorrect parameters given"
msgstr "Feil parameter er oppgitt"
-#: ../include/svn_error_codes.h:1185
+#: ../include/svn_error_codes.h:1213
msgid "Tried a versioning operation on an unversioned resource"
msgstr "Forsøkte en versjonert operasjon på en ikke-versjonert ressurs"
-#: ../include/svn_error_codes.h:1189
+#: ../include/svn_error_codes.h:1217
msgid "Test failed"
msgstr "Testen feilet"
-#: ../include/svn_error_codes.h:1193
+#: ../include/svn_error_codes.h:1221
msgid "Trying to use an unsupported feature"
msgstr "Forsøker å bruke en funksjonalitet som ikke støttes"
-#: ../include/svn_error_codes.h:1197
+#: ../include/svn_error_codes.h:1225
msgid "Unexpected or unknown property kind"
msgstr "Uventet eller ukjent egenskapstype"
-#: ../include/svn_error_codes.h:1201
+#: ../include/svn_error_codes.h:1229
msgid "Illegal target for the requested operation"
msgstr "Den forespurte operasjonen har ulovlig mål"
-#: ../include/svn_error_codes.h:1205
+#: ../include/svn_error_codes.h:1233
msgid "MD5 checksum is missing"
msgstr "Mangler MD5-kontrollsum"
-#: ../include/svn_error_codes.h:1209
+#: ../include/svn_error_codes.h:1237
msgid "Directory needs to be empty but is not"
msgstr "Katalogen må være tom, men den er ikke det"
-#: ../include/svn_error_codes.h:1213
+#: ../include/svn_error_codes.h:1241
msgid "Error calling external program"
msgstr "Feil under anrop til eksternt program"
-#: ../include/svn_error_codes.h:1217
+#: ../include/svn_error_codes.h:1245
msgid "Python exception has been set with the error"
msgstr "Et Python-unntak er satt for feilen"
-#: ../include/svn_error_codes.h:1221
+#: ../include/svn_error_codes.h:1249
msgid "A checksum mismatch occurred"
msgstr "Kontrollsummene stemmer ikke"
-#: ../include/svn_error_codes.h:1225
+#: ../include/svn_error_codes.h:1253
msgid "The operation was interrupted"
msgstr "Operasjonen ble avbrutt"
-#: ../include/svn_error_codes.h:1229
+#: ../include/svn_error_codes.h:1257
msgid "The specified diff option is not supported"
msgstr "Det angitte diff-valget er ikke støttet"
-#: ../include/svn_error_codes.h:1233
+#: ../include/svn_error_codes.h:1261
msgid "Property not found"
msgstr "Fant ikke egenskap"
-#: ../include/svn_error_codes.h:1237
+#: ../include/svn_error_codes.h:1265
msgid "No auth file path available"
msgstr "Søkesti til autentiseringsfil er utilgjengelig"
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1270
msgid "Incompatible library version"
msgstr "Bibliotekversjonen er ikke kompatibel"
-#: ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1275
msgid "Mergeinfo parse error"
msgstr "Feil under tolking av fletteinformasjon"
-#: ../include/svn_error_codes.h:1252
+#: ../include/svn_error_codes.h:1280
msgid "Cease invocation of this API"
msgstr "Avslutt oppkall av dette programmeringsgrensesnittet"
-#: ../include/svn_error_codes.h:1257
+#: ../include/svn_error_codes.h:1285
msgid "Error parsing revision number"
msgstr "Feil under tolking av revisjonsnummer"
-#: ../include/svn_error_codes.h:1262
+#: ../include/svn_error_codes.h:1290
msgid "Iteration terminated before completion"
msgstr "Gjentakelse avsluttet før den ble fullført"
-#: ../include/svn_error_codes.h:1267
+#: ../include/svn_error_codes.h:1295
msgid "Unknown changelist"
msgstr "Ukjent forandringsliste"
-#: ../include/svn_error_codes.h:1272
+#: ../include/svn_error_codes.h:1300
msgid "Reserved directory name in command line arguments"
msgstr "Reservert katalognavn i kommandolinjeargumenter"
-#: ../include/svn_error_codes.h:1277
+#: ../include/svn_error_codes.h:1305
msgid "Inquiry about unknown capability"
msgstr "Forespørsel om ukjent evne"
-#: ../include/svn_error_codes.h:1282
+#: ../include/svn_error_codes.h:1310
msgid "Test skipped"
msgstr "Test droppet"
-#: ../include/svn_error_codes.h:1287
+#: ../include/svn_error_codes.h:1315
msgid "apr memcache library not available"
msgstr "Bibliotek for APR-minnehurtiglager er ikke tilgjengelig"
-#: ../include/svn_error_codes.h:1292
+#: ../include/svn_error_codes.h:1320
msgid "Couldn't perform atomic initialization"
msgstr "Klarte ikke å utføre atomisk initialisering"
-#: ../include/svn_error_codes.h:1297
+#: ../include/svn_error_codes.h:1325
msgid "SQLite error"
msgstr "SQLite-feil"
-#: ../include/svn_error_codes.h:1302
+#: ../include/svn_error_codes.h:1330
msgid "Attempted to write to readonly SQLite db"
msgstr "Forsøkte å skrive til skrivebeskyttet SQLite-database"
-#: ../include/svn_error_codes.h:1307
+#: ../include/svn_error_codes.h:1335
msgid "Unsupported schema found in SQLite db"
msgstr "Fant skjema som ikke er støttet i SQLite-database"
-#: ../include/svn_error_codes.h:1313
+#: ../include/svn_error_codes.h:1340
+msgid "The SQLite db is busy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1345
+msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1352
msgid "Error parsing arguments"
msgstr "Feil under tolking av argumenter"
-#: ../include/svn_error_codes.h:1317
+#: ../include/svn_error_codes.h:1356
msgid "Not enough arguments provided"
msgstr "Ikke nok argumenter angitt"
-#: ../include/svn_error_codes.h:1321
+#: ../include/svn_error_codes.h:1360
msgid "Mutually exclusive arguments specified"
msgstr "Disse argumentene kan ikke brukes samtidig"
-#: ../include/svn_error_codes.h:1325
+#: ../include/svn_error_codes.h:1364
msgid "Attempted command in administrative dir"
msgstr "Forsøk på kommando i administrativ katalog"
-#: ../include/svn_error_codes.h:1329
+#: ../include/svn_error_codes.h:1368
msgid "The log message file is under version control"
msgstr "Loggmeldingen er under versjonskontroll"
-#: ../include/svn_error_codes.h:1333
+#: ../include/svn_error_codes.h:1372
msgid "The log message is a pathname"
msgstr "Loggmeldingen er en søkesti"
-#: ../include/svn_error_codes.h:1337
+#: ../include/svn_error_codes.h:1376
msgid "Committing in directory scheduled for addition"
msgstr "Sender inn katalog som er planlagt for tilføying"
-#: ../include/svn_error_codes.h:1341
+#: ../include/svn_error_codes.h:1380
msgid "No external editor available"
msgstr "Ingen ekstern redigerer er tilgjengelig"
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1384
msgid "Something is wrong with the log message's contents"
msgstr "Noe er galt i loggmeldingens innhold"
-#: ../include/svn_error_codes.h:1349
+#: ../include/svn_error_codes.h:1388
msgid "A log message was given where none was necessary"
msgstr "En loggmelding ble gitt der ingen var nødvendig"
-#: ../include/svn_error_codes.h:1353
+#: ../include/svn_error_codes.h:1392
msgid "No external merge tool available"
msgstr "Ingen eksterne fletteverktøy er tilgjengelig"
-#: ../include/svn_error_codes.h:1359
+#: ../include/svn_error_codes.h:1396
+#, fuzzy
+msgid "Failed processing one or more externals definitions"
+msgstr "ignorer «externals»-definisjon"
+
+#: ../include/svn_error_codes.h:1402
msgid "Assertion failure"
msgstr "Forutsetning feilet"
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:398
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:453
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:560
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:616
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:392
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:447
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:554
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:610
msgid "GNOME Keyring is locked and we are non-interactive"
msgstr "GNOME-nøkkelringen er låst og vi er ikke interaktiv"
-#: ../libsvn_client/add.c:407
+#: ../libsvn_client/add.c:488 ../libsvn_wc/adm_ops.c:881
+#: ../libsvn_wc/workqueue.c:1658 ../libsvn_wc/workqueue.c:1740
#, c-format
-msgid "Can't close directory '%s'"
-msgstr "Kan ikke lukke katalogen «%s»"
+msgid "'%s' not found"
+msgstr "Fant ikke «%s»"
-#: ../libsvn_client/add.c:415
+#: ../libsvn_client/add.c:493 ../libsvn_wc/adm_ops.c:572
+#: ../libsvn_wc/adm_ops.c:886
#, c-format
-msgid "Error during add of '%s'"
-msgstr "Feil under tillegging av «%s»"
+msgid "Unsupported node kind for path '%s'"
+msgstr "Nodetypen i filstien «%s» er ikke støttet"
-#: ../libsvn_client/add.c:543 ../libsvn_client/cmdline.c:258
-#: ../libsvn_subr/opt.c:828
+#: ../libsvn_client/add.c:534 ../libsvn_client/cmdline.c:268
+#: ../libsvn_subr/opt.c:878
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "«%s» slutter med et reservert navn"
-#: ../libsvn_client/add.c:685 ../libsvn_ra/ra_loader.c:367
-#: ../libsvn_ra_serf/serf.c:356 ../libsvn_ra_serf/serf.c:470
+#: ../libsvn_client/add.c:580 ../libsvn_client/changelist.c:116
+#: ../libsvn_client/changelist.c:168 ../libsvn_client/cleanup.c:56
+#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:701
+#: ../libsvn_client/export.c:952 ../libsvn_client/resolved.c:54
+#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:274
+#: ../svn/add-cmd.c:76 ../svn/changelist-cmd.c:84 ../svn/cleanup-cmd.c:69
+#: ../svn/export-cmd.c:91 ../svn/import-cmd.c:106 ../svn/resolve-cmd.c:106
+#: ../svn/resolved-cmd.c:76 ../svn/revert-cmd.c:77 ../svn/status-cmd.c:260
+#: ../svn/upgrade-cmd.c:72
+#, fuzzy, c-format
+msgid "'%s' is not a local path"
+msgstr "«%s» er ikke en fil"
+
+#: ../libsvn_client/add.c:683 ../libsvn_ra/ra_loader.c:373
+#: ../libsvn_ra_serf/serf.c:366 ../libsvn_ra_serf/serf.c:482
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "Ulovlig depot-URL «%s»"
@@ -1250,51 +1300,57 @@ msgstr "Ulovlig depot-URL «%s»"
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "Kan ikke beregne «blame»-informasjon for binær fil «%s»"
-#: ../libsvn_client/blame.c:629
+#: ../libsvn_client/blame.c:627
msgid "Start revision must precede end revision"
msgstr "Startrevisjonen må angis før sluttrevisjonen"
-#: ../libsvn_client/cat.c:76 ../libsvn_client/delete.c:64
-#: ../libsvn_client/prop_commands.c:380 ../libsvn_client/prop_commands.c:864
-#: ../libsvn_client/prop_commands.c:1181 ../libsvn_wc/adm_ops.c:2601
-#: ../libsvn_wc/adm_ops.c:2635 ../libsvn_wc/entries.c:1307
-#: ../libsvn_wc/entries.c:1388 ../libsvn_wc/entries.c:2832
-#: ../libsvn_wc/entries.c:3429 ../libsvn_wc/entries.c:3460
-#: ../libsvn_wc/update_editor.c:4301
+#: ../libsvn_client/cat.c:74 ../libsvn_client/commit_util.c:1038
+#: ../libsvn_client/delete.c:64 ../libsvn_client/prop_commands.c:429
+#: ../libsvn_client/prop_commands.c:947 ../libsvn_client/prop_commands.c:1264
+#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2008
+#: ../libsvn_wc/adm_ops.c:2042 ../libsvn_wc/copy.c:596
+#: ../libsvn_wc/entries.c:1405 ../libsvn_wc/entries.c:2450
+#: ../libsvn_wc/entries.c:2481 ../libsvn_wc/node.c:1247
+#: ../libsvn_wc/update_editor.c:4171
#, c-format
msgid "'%s' is not under version control"
msgstr "«%s» er ikke under versjonskontroll"
-#: ../libsvn_client/cat.c:81
+#: ../libsvn_client/cat.c:79
#, c-format
msgid "'%s' refers to a directory"
msgstr "«%s» refererer til en katalog"
-#: ../libsvn_client/cat.c:150 ../libsvn_client/export.c:221
+#: ../libsvn_client/cat.c:89
+#, c-format
+msgid "'%s' has no base revision until it is committed"
+msgstr ""
+
+#: ../libsvn_client/cat.c:153 ../libsvn_client/export.c:234
msgid "(local)"
msgstr "(lokal)"
-#: ../libsvn_client/cat.c:228
+#: ../libsvn_client/cat.c:236
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL-en «%s» refererer til en katalog"
-#: ../libsvn_client/checkout.c:147 ../libsvn_client/export.c:1032
+#: ../libsvn_client/checkout.c:164 ../libsvn_client/export.c:1116
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL-en «%s» finnes ikke"
-#: ../libsvn_client/checkout.c:151
+#: ../libsvn_client/checkout.c:168
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL-en «%s» refererer til en fil, ikke en katalog"
-#: ../libsvn_client/checkout.c:207
+#: ../libsvn_client/checkout.c:204
#, c-format
msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
msgstr "«%s» er allerede en arbeidskopi for en annen URL; bruk «svn update» for å oppdatere den"
-#: ../libsvn_client/checkout.c:214
+#: ../libsvn_client/checkout.c:212
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "«%s» finnes allerede og er ikke en katalog"
@@ -1304,74 +1360,72 @@ msgstr "«%s» finnes allerede og er ikk
msgid "Improper relative URL '%s'"
msgstr "Uriktig relativ URL «%s»"
-#: ../libsvn_client/cmdline.c:139
+#: ../libsvn_client/cmdline.c:149
#, c-format
msgid "All non-relative targets must have the same root URL"
msgstr "Alle mål som ikke er relative må ha samme rot-URL"
-#: ../libsvn_client/commit.c:434
+#: ../libsvn_client/commit.c:433
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr "Ukjent eller ikke-versjonabel type for «%s»"
-#: ../libsvn_client/commit.c:539
+#: ../libsvn_client/commit.c:538
msgid "New entry name required when importing a file"
msgstr "Nytt tilgangsnavn påkrevd ved import av en fil"
-#: ../libsvn_client/commit.c:574 ../libsvn_wc/adm_ops.c:987
-#: ../libsvn_wc/lock.c:130 ../libsvn_wc/wc_db.c:612
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:567
+#: ../libsvn_wc/lock.c:140 ../libsvn_wc/wc_db_pdh.c:64
#, c-format
msgid "'%s' does not exist"
msgstr "«%s» finnes ikke"
-#: ../libsvn_client/commit.c:632 ../libsvn_client/copy.c:422
-#: ../svnlook/main.c:1386
+#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:471
+#: ../libsvn_client/merge.c:8975 ../libsvn_client/merge.c:10231
+#: ../libsvn_client/merge.c:10506 ../svnlook/main.c:1407
#, c-format
msgid "Path '%s' does not exist"
msgstr "Filstien «%s» finnes ikke"
-#: ../libsvn_client/commit.c:764 ../libsvn_client/copy.c:431
-#: ../libsvn_client/copy.c:899 ../libsvn_client/copy.c:1144
-#: ../libsvn_client/copy.c:1569
+#: ../libsvn_client/commit.c:795 ../libsvn_client/copy.c:482
+#: ../libsvn_client/copy.c:1021 ../libsvn_client/copy.c:1245
+#: ../libsvn_client/copy.c:1860
#, c-format
msgid "Path '%s' already exists"
msgstr "Filstien «%s» finnes allerede"
-#: ../libsvn_client/commit.c:779
+#: ../libsvn_client/commit.c:810
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "«%s» er et reservert navn og kan ikke importeres"
-#: ../libsvn_client/commit.c:854 ../libsvn_client/copy.c:1309
+#: ../libsvn_client/commit.c:848 ../libsvn_client/copy.c:1402
msgid "Commit failed (details follow):"
msgstr "Innsending feilet (detaljer følger):"
-#: ../libsvn_client/commit.c:862
+#: ../libsvn_client/commit.c:856
msgid "Commit succeeded, but other errors follow:"
msgstr "Innsending var vellykket, men andre feil følger:"
-#: ../libsvn_client/commit.c:869
+#: ../libsvn_client/commit.c:863
msgid "Error unlocking locked dirs (details follow):"
msgstr "Feil ved opplåsing av låste kataloger (detaljer følger):"
-#: ../libsvn_client/commit.c:880
+#: ../libsvn_client/commit.c:874
msgid "Error bumping revisions post-commit (details follow):"
msgstr "Feil ved økning av revisjoner etter innsending (detaljer følger):"
-#: ../libsvn_client/commit.c:891
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "Feil i opprydding etter innsending (detaljer følger):"
-
-#: ../libsvn_client/commit.c:1239
-msgid "Are all the targets part of the same working copy?"
+#: ../libsvn_client/commit.c:968
+#, fuzzy
+msgid "Are all targets part of the same working copy?"
msgstr "Er alle målene del av samme arbeidskopi?"
-#: ../libsvn_client/commit.c:1282
+#: ../libsvn_client/commit.c:1007
#, fuzzy
msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
msgstr "Kan ikke sende inn ikke-rekursiv sletting av en katalog"
-#: ../libsvn_client/commit.c:1333
+#: ../libsvn_client/commit.c:1057 ../svn/commit-cmd.c:71
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "«%s» er en URL, men URL-er kan ikke være mål for innsending"
@@ -1386,165 +1440,143 @@ msgstr "Katalogen «%s» er utdatert"
msgid "File '%s' is out of date"
msgstr "Filen «%s» er utdatert"
-#: ../libsvn_client/commit_util.c:271 ../libsvn_client/commit_util.c:464
-#: ../libsvn_client/commit_util.c:1005
+#: ../libsvn_client/commit_util.c:288 ../libsvn_client/commit_util.c:479
+#: ../libsvn_client/commit_util.c:1032
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Avbryter innsending: «%s» er fortsatt i konflikt"
-#: ../libsvn_client/commit_util.c:313
+#: ../libsvn_client/commit_util.c:330
#, c-format
msgid "Aborting commit: '%s' remains in tree-conflict"
msgstr "Avbryter innsending: «%s» har fortsatt tre-konflikt"
-#: ../libsvn_client/commit_util.c:400 ../libsvn_client/commit_util.c:411
+#: ../libsvn_client/commit_util.c:424 ../libsvn_client/commit_util.c:440
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Ukjent posttype for «%s»"
-#: ../libsvn_client/commit_util.c:428
+#: ../libsvn_client/commit_util.c:457
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "Posten «%s» har uventet forandret spesialstatus"
-#: ../libsvn_client/commit_util.c:542
-#, c-format
-msgid "Did not expect '%s' to be a working copy root"
-msgstr "Forventet ikke at «%s» skulle være roten på en arbeidskopi"
-
-#: ../libsvn_client/commit_util.c:560 ../libsvn_client/commit_util.c:1325
-#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "Objekt «%s» for innsending har kopimerke satt, men ingen copyfrom-URL"
-
-#: ../libsvn_client/commit_util.c:579
+#: ../libsvn_client/commit_util.c:654
#, c-format
msgid "'%s' is scheduled for addition, but is missing"
msgstr "«%s» er klarert for å legges til, men den mangler"
-#: ../libsvn_client/commit_util.c:904
+#: ../libsvn_client/commit_util.c:935
#, c-format
msgid "'%s' is not under version control and is not part of the commit, yet its child '%s' is part of the commit"
msgstr ""
"«%s» er ikke under versjonskontroll og er ikke en del av innsendingen,\n"
"men dens barn «%s» er del av innsendingen"
-#: ../libsvn_client/commit_util.c:1013 ../libsvn_client/url.c:153
+#: ../libsvn_client/commit_util.c:1052 ../libsvn_client/url.c:198
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "Innslaget for «%s» mangler URL"
-#: ../libsvn_client/commit_util.c:1031
+#: ../libsvn_client/commit_util.c:1069
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "«%s» er klarert for å legges til i en ikke-versjonert forelder"
-#: ../libsvn_client/commit_util.c:1051
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition. Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
-msgstr ""
-"Innslaget for «%s» er merket som «kopiert», men er ikke selv angitt å\n"
-"skulle legges til. Kanskje du prøver å sende inn et mål som ligger i\n"
-"en ikke-versjonert (eller ikke enda versjonert) katalog?"
-
-#: ../libsvn_client/commit_util.c:1174
+#: ../libsvn_client/commit_util.c:1210
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr "Kan ikke sende inn både «%s» og «%s» siden de refererer til samme URL"
-#: ../libsvn_client/commit_util.c:1330
+#: ../libsvn_client/commit_util.c:1367
+#, c-format
+msgid "Commit item '%s' has copy flag but no copyfrom URL"
+msgstr "Objekt «%s» for innsending har kopimerke satt, men ingen copyfrom-URL"
+
+#: ../libsvn_client/commit_util.c:1372
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "Objekt «%s» for innsending har kopimerke satt, men har en ugyldig revisjon"
-#: ../libsvn_client/commit_util.c:2077
+#: ../libsvn_client/commit_util.c:2080
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "Standardegenskaper kan ikke bli eksplisitt satt som revisjonsegenskaper"
-#: ../libsvn_client/copy.c:447 ../libsvn_client/copy.c:1585
-#: ../libsvn_client/update.c:149
+#: ../libsvn_client/copy.c:500 ../libsvn_client/copy.c:1876
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Stien «%s» er ikke en katalog"
-#: ../libsvn_client/copy.c:620 ../libsvn_client/copy.c:660
+#: ../libsvn_client/copy.c:669 ../libsvn_client/copy.c:710
#, c-format
msgid "Path '%s' already exists, but is not a directory"
msgstr "«%s» finnes allerede, men er ikke en katalog"
-#: ../libsvn_client/copy.c:765
-#, c-format
-msgid "Source and dest appear not to be in the same repository (src: '%s'; dst: '%s')"
+#: ../libsvn_client/copy.c:775
+#, fuzzy
+msgid "Source and destination URLs appear not to all point to the same repository."
msgstr "Kilde og mål ser ut til å ikke være i samme depot (kilde: «%s»; mål: «%s»)"
-#: ../libsvn_client/copy.c:880
+#: ../libsvn_client/copy.c:985
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Kan ikke flytte URL «%s» inn i seg selv"
-#: ../libsvn_client/copy.c:889 ../libsvn_client/prop_commands.c:227
+#: ../libsvn_client/copy.c:1007 ../libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Filstien «%s» finnes ikke i revisjon %ld"
-#: ../libsvn_client/copy.c:1408
+#: ../libsvn_client/copy.c:1536
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr "Kilde-URL «%s» er fra et fremmed depot; beholder det som adskilt arbeidskopi"
-#: ../libsvn_client/copy.c:1556
-#, c-format
-msgid "Path '%s' not found in revision %ld"
-msgstr "Filstien «%s» ble ikke funnet i revisjon %ld"
-
-#: ../libsvn_client/copy.c:1561
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "Filstien «%s» ble ikke funnet i hode-revisjonen"
-
-#: ../libsvn_client/copy.c:1621 ../libsvn_wc/adm_ops.c:1560
-#: ../libsvn_wc/copy.c:866
+#: ../libsvn_client/copy.c:1638 ../libsvn_client/copy.c:1650
+#: ../libsvn_wc/adm_ops.c:941 ../libsvn_wc/copy.c:691
#, c-format
msgid "'%s' is already under version control"
msgstr "«%s» er allerede under versjonskontroll"
-#: ../libsvn_client/copy.c:1629
+#: ../libsvn_client/copy.c:1671
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "Innslag for «%s» finnes (men arbeidskopi-filen mangler)"
-#: ../libsvn_client/copy.c:1723 ../libsvn_client/diff.c:1766
-#: ../libsvn_client/log.c:342 ../libsvn_client/log.c:402
-msgid "Revision type requires a working copy path, not a URL"
-msgstr "Revisjonstype krever en sti i arbeidskopien, ikke en URL"
+#: ../libsvn_client/copy.c:1844
+#, c-format
+msgid "Path '%s' not found in revision %ld"
+msgstr "Filstien «%s» ble ikke funnet i revisjon %ld"
+
+#: ../libsvn_client/copy.c:1849
+#, c-format
+msgid "Path '%s' not found in head revision"
+msgstr "Filstien «%s» ble ikke funnet i hode-revisjonen"
-#: ../libsvn_client/copy.c:1769
+#: ../libsvn_client/copy.c:1970
msgid "Cannot mix repository and working copy sources"
msgstr "Kan ikke blande depot- og arbeidskopikilder"
-#: ../libsvn_client/copy.c:1814
+#: ../libsvn_client/copy.c:2022
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Kan ikke kopiere filsti «%s» inn i dens eget barn «%s»"
-#: ../libsvn_client/copy.c:1849
+#: ../libsvn_client/copy.c:2054
#, c-format
msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
msgstr ""
-#: ../libsvn_client/copy.c:1870
+#: ../libsvn_client/copy.c:2069
+msgid "Moves between the working copy and the repository are not supported"
+msgstr "Flyttinger mellom arbeidskopien og depotet er ikke støttet"
+
+#: ../libsvn_client/copy.c:2083
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Kan ikke flytte «%s» inn i seg selv"
-#: ../libsvn_client/copy.c:1879
-msgid "Moves between the working copy and the repository are not supported"
-msgstr "Flyttinger mellom arbeidskopien og depotet er ikke støttet"
-
-#: ../libsvn_client/copy.c:1941
+#: ../libsvn_client/copy.c:2152
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "«%s» har ingen URL tilknyttet seg"
@@ -1564,14 +1596,25 @@ msgstr "«%s» er endret lokalt, send in
msgid "Cannot remove the file external at '%s'; please propedit or propdel the svn:externals description that created it"
msgstr ""
-#: ../libsvn_client/deprecated.c:583 ../svn/move-cmd.c:66
+#: ../libsvn_client/delete.c:339 ../libsvn_client/locking_commands.c:200
+#: ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288 ../svn/lock-cmd.c:116
+#, fuzzy, c-format
+msgid "Cannot mix repository and working copy targets"
+msgstr "Kan ikke blande depot- og arbeidskopikilder"
+
+#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "Kan ikke angi revisjoner (unntatt HEAD) ved flytteoperasjoner"
-#: ../libsvn_client/deprecated.c:1163
+#: ../libsvn_client/deprecated.c:1331
msgid "No commits in repository"
msgstr "Ingen innsendinger i depotet"
+#: ../libsvn_client/deprecated.c:2094 ../libsvn_wc/deprecated.c:3370
+#, fuzzy
+msgid "Non-recursive relocation not supported"
+msgstr "Flytting mellom kodearkiv er ikke tillatt"
+
#: ../libsvn_client/diff.c:136
#, c-format
msgid " Reverse-merged %s:r%s%s"
@@ -1582,75 +1625,65 @@ msgstr " Tilbakeflettet %s:r%s%s"
msgid " Merged %s:r%s%s"
msgstr " Flettet %s:r%s%s"
-#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1179
-#: ../libsvn_diff/diff_file.c:1194
+#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1226
+#: ../libsvn_diff/diff_file.c:1242
#, c-format
msgid "Path '%s' must be an immediate child of the directory '%s'"
msgstr "Stien «%s» må ligge like under katalogen «%s»"
-#: ../libsvn_client/diff.c:222
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%sEgenskapsforandringer på: %s%s"
-
-#: ../libsvn_client/diff.c:251
-#, c-format
-msgid "Added: %s%s"
-msgstr "Lagt til: %s%s"
-
-#: ../libsvn_client/diff.c:253
-#, c-format
-msgid "Deleted: %s%s"
-msgstr "Slettet: %s%s"
-
-#: ../libsvn_client/diff.c:255
-#, c-format
-msgid "Modified: %s%s"
-msgstr "Endret: %s%s"
-
-#: ../libsvn_client/diff.c:381
+#: ../libsvn_client/diff.c:359
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revisjon %ld)"
-#: ../libsvn_client/diff.c:383
+#: ../libsvn_client/diff.c:361
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(arbeidskopi)"
-#: ../libsvn_client/diff.c:540
+#: ../libsvn_client/diff.c:637
+#, c-format
+msgid "%sProperty changes on: %s%s"
+msgstr "%sEgenskapsforandringer på: %s%s"
+
+#: ../libsvn_client/diff.c:921
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Kan ikke vises: Filen er merket som binær type.%s"
-#: ../libsvn_client/diff.c:960 ../libsvn_client/merge.c:5940
-#: ../libsvn_client/merge.c:8191
+#: ../libsvn_client/diff.c:1326
+#, fuzzy, c-format
+msgid "Path '%s' has no URL"
+msgstr "«%s» har ingen nettadresse"
+
+#: ../libsvn_client/diff.c:1395 ../libsvn_client/merge.c:6304
+#: ../libsvn_client/merge.c:8984
msgid "Not all required revisions are specified"
msgstr "Noen nødvendige revisjoner er ikke spesifisert"
-#: ../libsvn_client/diff.c:975
+#: ../libsvn_client/diff.c:1410
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Minst én revisjon må være ikke-lokal for en knagg-diff"
-#: ../libsvn_client/diff.c:1103 ../libsvn_client/diff.c:1115
+#: ../libsvn_client/diff.c:1518 ../libsvn_client/diff.c:1530
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "«%s» ble ikke funnet i depotet ved revisjon %ld"
-#: ../libsvn_client/diff.c:1174
+#: ../libsvn_client/diff.c:1588
msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
msgstr "svn_client_diff5 ble kalt på en måte som foreløpig ikke er støttet"
-#: ../libsvn_client/diff.c:1214
+#: ../libsvn_client/diff.c:1630
msgid "Only diffs between a path's text-base and its working files are supported at this time"
msgstr "For øyeblikket støttes kun forskjeller mellom filstiers tekstbase og deres arbeidsfiler"
-#: ../libsvn_client/diff.c:1365 ../libsvn_client/switch.c:174
+#: ../libsvn_client/diff.c:1816 ../libsvn_client/switch.c:132
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Katalogen «%s» mangler adresse"
-#: ../libsvn_client/diff.c:1573
+#: ../libsvn_client/diff.c:2064
msgid "Summarizing diff can only compare repository to repository"
msgstr "Oppsummeringsdiff kan bare sammenligne depot med depot"
@@ -1659,22 +1692,21 @@ msgstr "Oppsummeringsdiff kan bare samme
msgid "'%s' is not a valid EOL value"
msgstr "«%s» er ikke en gyldig EOL-verdi"
-#: ../libsvn_client/export.c:333
+#: ../libsvn_client/export.c:377
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "Målkatalogen finnes allerede og vil ikke bli overskrevet uten tvang"
-#: ../libsvn_client/export.c:481 ../libsvn_client/export.c:624
+#: ../libsvn_client/export.c:532 ../libsvn_client/export.c:678
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "«%s» finnes og er ikke en katalog"
-#: ../libsvn_client/export.c:485 ../libsvn_client/export.c:628
+#: ../libsvn_client/export.c:536 ../libsvn_client/export.c:682
#, c-format
msgid "'%s' already exists"
msgstr "«%s» finnes allerede"
-#: ../libsvn_client/export.c:806 ../libsvn_wc/adm_crawler.c:1304
-#: ../libsvn_wc/update_editor.c:4703
+#: ../libsvn_client/export.c:866 ../libsvn_wc/update_editor.c:4161
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -1685,137 +1717,155 @@ msgstr ""
" forventet: %s\n"
" faktisk: %s\n"
-#: ../libsvn_client/externals.c:346
+#: ../libsvn_client/externals.c:364
#, c-format
msgid "Cannot insert a file external from '%s' into a working copy from a different repository rooted at '%s'"
msgstr ""
-#: ../libsvn_client/externals.c:380
+#: ../libsvn_client/externals.c:401
#, c-format
msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
msgstr ""
-#: ../libsvn_client/externals.c:403
+#: ../libsvn_client/externals.c:427
#, c-format
msgid "The file external from '%s' cannot be written to '%s' while '%s' remains in conflict"
msgstr ""
-#: ../libsvn_client/externals.c:520
+#: ../libsvn_client/externals.c:536
#, c-format
msgid "URL '%s' does not begin with a scheme"
msgstr "URL-en «%s» starter ikke med et skjema"
-#: ../libsvn_client/externals.c:587
+#: ../libsvn_client/externals.c:603
#, c-format
msgid "Illegal parent directory URL '%s'"
msgstr "Ulovlig URL for foreldrekatalog: «%s»"
-#: ../libsvn_client/externals.c:623
+#: ../libsvn_client/externals.c:639
#, c-format
msgid "Illegal repository root URL '%s'"
msgstr "Ulovlig URL for depotrot: «%s»"
-#: ../libsvn_client/externals.c:670
+#: ../libsvn_client/externals.c:686
#, c-format
msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
msgstr "Den eksterne relative URL-en «%s» kan ikke inneholde bakoverstier, dvs. «..»"
-#: ../libsvn_client/externals.c:698
+#: ../libsvn_client/externals.c:714
#, c-format
msgid "Unrecognized format for the relative external URL '%s'"
msgstr "Ukjent format for den relative eksterne URL-en «%s»"
-#: ../libsvn_client/externals.c:789
+#: ../libsvn_client/externals.c:806
#, c-format
msgid "URL '%s' at revision %ld doesn't exist"
msgstr "URL-en «%s» i revisjon %ld finnes ikke"
-#: ../libsvn_client/externals.c:795
+#: ../libsvn_client/externals.c:812
#, c-format
msgid "URL '%s' at revision %ld is not a file or a directory"
msgstr "URL-en «%s» i revisjon %ld er ikke en fil eller katalog"
-#: ../libsvn_client/externals.c:1126
+#: ../libsvn_client/externals.c:1111
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr ""
-#: ../libsvn_client/externals.c:1258
+#: ../libsvn_client/externals.c:1262
#, c-format
msgid "'%s' is not a URL"
msgstr "«%s» er ikke en URL"
-#: ../libsvn_client/info.c:509
+#: ../libsvn_client/info.c:103 ../libsvn_wc/crop.c:353
+#: ../libsvn_wc/props.c:271 ../libsvn_wc/update_editor.c:5358
+#: ../libsvn_wc/wc_db.c:596 ../libsvn_wc/wc_db.c:2039
+#: ../libsvn_wc/wc_db.c:2132 ../libsvn_wc/wc_db.c:2191
+#: ../libsvn_wc/wc_db.c:2215 ../libsvn_wc/wc_db.c:5456
+#: ../libsvn_wc/wc_db.c:5884 ../libsvn_wc/wc_db.c:6834
+#: ../libsvn_wc/wc_db.c:6952 ../libsvn_wc/wc_db.c:7016
+#: ../libsvn_wc/wc_db.c:7228 ../libsvn_wc/wc_db.c:8277
+#: ../libsvn_wc/wc_db.c:8457 ../libsvn_wc/wc_db.c:8795
+#, c-format
+msgid "The node '%s' was not found."
+msgstr "Fant ikke noden «%s»."
+
+#: ../libsvn_client/info.c:565
#, c-format
msgid "Server does not support retrieving information about the repository root"
msgstr "Tjeneren støtter ikke henting av informasjon om depotroten"
-#: ../libsvn_client/info.c:516 ../libsvn_client/info.c:531
-#: ../libsvn_client/info.c:541
+#: ../libsvn_client/info.c:572 ../libsvn_client/info.c:587
+#: ../libsvn_client/info.c:597
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URLen «%s» finnes ikke i revisjon %ld"
-#: ../libsvn_client/list.c:240
+#: ../libsvn_client/list.c:249
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL-en «%s» finnes ikke i den revisjonen"
-#: ../libsvn_client/locking_commands.c:220
+#: ../libsvn_client/locking_commands.c:237
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "Ingen felles forelder funnet, klarer ikke å operere på usammenhengende argumenter"
-#: ../libsvn_client/locking_commands.c:265 ../libsvn_client/merge.c:8208
-#: ../libsvn_client/merge.c:8214 ../libsvn_client/merge.c:9099
-#: ../libsvn_client/merge.c:9296 ../libsvn_client/ra.c:410
-#: ../libsvn_client/ra.c:610 ../libsvn_client/update.c:184
+#: ../libsvn_client/locking_commands.c:282 ../libsvn_client/merge.c:9006
+#: ../libsvn_client/merge.c:9013 ../libsvn_client/merge.c:10240
+#: ../libsvn_client/merge.c:10515 ../libsvn_client/ra.c:484
+#: ../libsvn_client/ra.c:678 ../libsvn_client/update.c:99
#, c-format
msgid "'%s' has no URL"
msgstr "«%s» har ingen nettadresse"
-#: ../libsvn_client/locking_commands.c:288
+#: ../libsvn_client/locking_commands.c:305
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Kan ikke låse/låse opp på tvers av flere depoter"
-#: ../libsvn_client/locking_commands.c:329
+#: ../libsvn_client/locking_commands.c:346
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "«%s» er ikke låst i denne arbeidskopien"
-#: ../libsvn_client/locking_commands.c:374
+#: ../libsvn_client/locking_commands.c:391
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» er ikke låst"
-#: ../libsvn_client/locking_commands.c:407 ../libsvn_fs/fs-loader.c:1224
-#: ../libsvn_ra/ra_loader.c:932
+#: ../libsvn_client/locking_commands.c:425 ../libsvn_fs/fs-loader.c:1269
+#: ../libsvn_ra/ra_loader.c:1056
msgid "Lock comment contains illegal characters"
msgstr "Låsekommentaren inneholder ulovlige tegn"
-#: ../libsvn_client/log.c:331 ../libsvn_client/log.c:393
+#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
msgid "Missing required revision specification"
msgstr "Mangler påkrevet revisjonsspesifikasjon"
-#: ../libsvn_client/log.c:458
+#: ../libsvn_client/log.c:401
+#, fuzzy, c-format
+msgid "'%s' is not a relative path"
+msgstr "«%s» er ikke en fil"
+
+#: ../libsvn_client/log.c:422
msgid "When specifying working copy paths, only one target may be given"
msgstr "Ved spesifisering av arbeidskopistier kan bare ett mål bli angitt"
-#: ../libsvn_client/log.c:479 ../libsvn_client/status.c:365
+#: ../libsvn_client/log.c:448 ../libsvn_client/status.c:388
#, c-format
msgid "Entry '%s' has no URL"
msgstr "Posten «%s» mangler nettadresse"
-#: ../libsvn_client/merge.c:180
+#: ../libsvn_client/merge.c:179
#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "Nettadressene er uten skjema («%s» og «%s»)"
-#: ../libsvn_client/merge.c:186 ../libsvn_client/merge.c:192
+#: ../libsvn_client/merge.c:185 ../libsvn_client/merge.c:191
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "Nettadressen er uten skjema: «%s»"
-#: ../libsvn_client/merge.c:199
+#: ../libsvn_client/merge.c:198
#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
msgstr "Blanding av tilgangsskjemaer er foreløpig ikke støttet («%s» og «%s»)"
@@ -1823,25 +1873,25 @@ msgstr "Blanding av tilgangsskjemaer er
#. 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:1455
+#: ../libsvn_client/merge.c:1482
msgid ".working"
msgstr ".working"
-#: ../libsvn_client/merge.c:1457
+#: ../libsvn_client/merge.c:1484
#, c-format
msgid ".merge-left.r%ld"
msgstr ".merge-left.r%ld"
-#: ../libsvn_client/merge.c:1460
+#: ../libsvn_client/merge.c:1487
#, c-format
msgid ".merge-right.r%ld"
msgstr ".merge-right.r%ld"
-#: ../libsvn_client/merge.c:3788
+#: ../libsvn_client/merge.c:3957
msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
msgstr "Kan ikke tilbakeflette et område fra den framtidige historien til en sti; prøv en oppdatering først"
-#: ../libsvn_client/merge.c:4442
+#: ../libsvn_client/merge.c:4661
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1854,96 +1904,86 @@ msgstr ""
"løs alle konflikter og kjør flettingen på nytt for å legge til de\n"
"resterende uflettede revisjonene"
+#: ../libsvn_client/merge.c:5820
+msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
+msgstr ""
+
# ### FIXME: Tungvint setning
-#: ../libsvn_client/merge.c:7868
+#: ../libsvn_client/merge.c:8502
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "Bruken av to URL-er er ikke kompatibel med modifisering av fletteinformasjon"
# ### FIXME: Tungvint setning
-#: ../libsvn_client/merge.c:7875 ../libsvn_client/merge.c:8123
+#: ../libsvn_client/merge.c:8509 ../libsvn_client/merge.c:8793
msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "Fletting fra et fremmed depot er ikke kompatibel med modifisering av fletteinformasjon"
-#: ../libsvn_client/merge.c:8251 ../libsvn_ra/ra_loader.c:519
-#, c-format
-msgid "'%s' isn't in the same repository as '%s'"
-msgstr "«%s» er ikke det samme depotet som «%s»"
+#: ../libsvn_client/merge.c:8522 ../libsvn_client/merge.c:9021
+#: ../libsvn_client/merge.c:10523
+#, fuzzy, c-format
+msgid "Merge target '%s' does not exist in the working copy"
+msgstr "Stien «%s» er ikke i arbeidskopien"
-#: ../libsvn_client/merge.c:8422
-msgid "Cannot reintegrate into a working copy with a switched subtree"
+#: ../libsvn_client/merge.c:8896
+#, fuzzy
+msgid "Cannot merge into a working copy with a switched subtree"
msgstr "Kan ikke tilbakeføre til en arbeidskopi med et byttet katalogtre"
-#: ../libsvn_client/merge.c:8427
-msgid "Cannot reintegrate into a working copy not entirely at infinite depth"
-msgstr "Kan ikke tilbakeføre til en arbeidskopi som ikke er satt til uendelig dybde"
-
-#: ../libsvn_client/merge.c:8432
-msgid "Cannot reintegrate into a working copy that has local modifications"
+#: ../libsvn_client/merge.c:8901
+#, fuzzy
+msgid "Cannot merge into a working copy that has local modifications"
msgstr "Kan ikke tilbakeføre til en arbeidskopi som har lokale forandringer"
-#: ../libsvn_client/merge.c:8438
+#: ../libsvn_client/merge.c:8918
msgid "Cannot determine revision of working copy"
msgstr "Kan ikke anslå revisjonen for arbeidskopien"
-#: ../libsvn_client/merge.c:8442
-msgid "Cannot reintegrate into mixed-revision working copy; try updating first"
+#: ../libsvn_client/merge.c:8924
+#, fuzzy, c-format
+msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
msgstr "Kan ikke tilbakeføre inn i en arbeidskopi med blandede revisjoner; prøv oppdatering først"
-#: ../libsvn_client/merge.c:8510
+#: ../libsvn_client/merge.c:8987 ../svn/merge-cmd.c:348
+msgid "Merge sources must both be either paths or URLs"
+msgstr ""
+
+#: ../libsvn_client/merge.c:9059 ../libsvn_ra/ra_loader.c:539
#, c-format
-msgid "At least one revision (r%ld) not yet merged from '%s'"
-msgstr "Minst en revisjon {r%ld} er fortsatt ikke flettet fra «%s»"
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr "«%s» er ikke det samme depotet som «%s»"
-#: ../libsvn_client/merge.c:8974 ../libsvn_client/merge.c:9181
+#: ../libsvn_client/merge.c:10057 ../libsvn_client/merge.c:10348
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "«%s@%ld» må være slektsmessig forbundet med «%s@%ld»"
-#: ../libsvn_client/merge.c:9117
+#: ../libsvn_client/merge.c:10258
#, c-format
msgid "'%s' must be from the same repository as '%s'"
msgstr "«%s» må være fra det samme depotet som «%s»"
-#: ../libsvn_client/merge.c:9143
+#: ../libsvn_client/merge.c:10290
#, fuzzy, c-format
msgid "Neither the reintegrate source nor target can be the root of the repository"
msgstr "«%s» er ikke roten i depotet"
-#: ../libsvn_client/merge.c:9207
+#: ../libsvn_client/merge.c:10376
#, c-format
msgid ""
"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
"%s"
msgstr ""
-#: ../libsvn_client/mergeinfo.c:1638
+#: ../libsvn_client/mergeinfo.c:1721
msgid "Only depths 'infinity' and 'empty' are currently supported"
msgstr "Kun dybdene «infinity» og «empty» er for tiden støttet"
-#: ../libsvn_client/patch.c:151
+#: ../libsvn_client/patch.c:243
#, c-format
msgid "Cannot strip %u components from '%s'"
msgstr "Kan ikke strippe %u komponenter fra «%s»"
-#: ../libsvn_client/patch.c:626
-#, c-format
-msgid "Error writing to '%s'"
-msgstr "Feil under skriving til «%s»"
-
-#: ../libsvn_client/patch.c:991
-msgid ".svnpatch.original"
-msgstr ".svnpatch.original"
-
-#: ../libsvn_client/patch.c:992
-msgid ".svnpatch.modified"
-msgstr ".svnpatch.modifisert"
-
-#: ../libsvn_client/patch.c:993
-#, fuzzy
-msgid ".svnpatch.working"
-msgstr "svnpatch.working"
-
-#: ../libsvn_client/patch.c:1096
+#: ../libsvn_client/patch.c:2754
#, fuzzy
msgid "strip count must be positive"
msgstr "Argumentet til --limit må være et positivt tall"
@@ -1953,116 +1993,125 @@ msgstr "Argumentet til --limit må være
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "«%s» er en arbeidskopiegenskap (wcprop), og er derfor ikke tilgjengelig for klienter"
-#: ../libsvn_client/prop_commands.c:214
+#: ../libsvn_client/prop_commands.c:216
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "Egenskapen «%s» er ikke en vanlig egenskap"
-#: ../libsvn_client/prop_commands.c:314
+#: ../libsvn_client/prop_commands.c:363
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Revisjonsegenskapen «%s» er ikke tillatt i denne sammenhengen"
-#: ../libsvn_client/prop_commands.c:321 ../libsvn_client/prop_commands.c:438
+#: ../libsvn_client/prop_commands.c:370 ../libsvn_client/prop_commands.c:524
#, c-format
msgid "Bad property name: '%s'"
msgstr "Ugyldig navn på egenskap: «%s»"
-#: ../libsvn_client/prop_commands.c:331
+#: ../libsvn_client/prop_commands.c:380
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr "Setting av egenskap på ikke-lokalt mål «%s» trenger en baserevisjon"
-#: ../libsvn_client/prop_commands.c:336
+#: ../libsvn_client/prop_commands.c:385
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr "Rekursiv setting av egenskap på ikke-lokalt mål «%s» er ikke støttet"
-#: ../libsvn_client/prop_commands.c:351
+#: ../libsvn_client/prop_commands.c:400
#, c-format
msgid "Setting property '%s' on non-local target '%s' is not supported"
msgstr "Setting av egenskap «%s» på ikke-lokalt mål «%s» er ikke støttet"
-#: ../libsvn_client/prop_commands.c:433
-msgid "Author name should not contain a newline; value will not be set unless forced"
-msgstr "Forfatternavn kan ikke inneholde linjeskift, verdien blir ikke satt uten tvang"
-
-#: ../libsvn_client/prop_commands.c:460
+#: ../libsvn_client/prop_commands.c:471
#, c-format
msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)"
msgstr "revisjonsegenskapen «%s» i r%ld er plutselig borte fra depotet (kanskje noen andre slettet den?)"
-#: ../libsvn_client/prop_commands.c:469
+#: ../libsvn_client/prop_commands.c:480
#, c-format
msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)"
msgstr "revisjonsegenskapen «%s» i r%ld har en ukjent verdi i depotet (kanskje noen andre forandret den?)"
-#: ../libsvn_client/prop_commands.c:477
+#: ../libsvn_client/prop_commands.c:488
#, c-format
msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)"
msgstr "revisjonsegenskapen «%s» i r%ld oppsto plutselig i depotet (kanskje noen andre opprettet den?)"
-#: ../libsvn_client/prop_commands.c:681
+#: ../libsvn_client/prop_commands.c:519
+msgid "Author name should not contain a newline; value will not be set unless forced"
+msgstr "Forfatternavn kan ikke inneholde linjeskift, verdien blir ikke satt uten tvang"
+
+#: ../libsvn_client/prop_commands.c:764
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "«%s» finnes ikke i revisjon %ld"
-#: ../libsvn_client/prop_commands.c:688 ../libsvn_client/prop_commands.c:999
-#: ../libsvn_wc/crop.c:179
+#: ../libsvn_client/prop_commands.c:771 ../libsvn_client/prop_commands.c:1089
+#: ../libsvn_wc/crop.c:183
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Ukjent nodetype for «%s»"
-#: ../libsvn_client/ra.c:147
+#: ../libsvn_client/ra.c:145
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr "Forsøk på å sette arbeidskopi-egenskap «%s» på «%s» under en operasjon som ikke er en innsending"
-#: ../libsvn_client/ra.c:681 ../libsvn_ra/compat.c:376
+#: ../libsvn_client/ra.c:378
+#, c-format
+msgid "Redirect cycle detected for URL '%s'"
+msgstr ""
+
+#: ../libsvn_client/ra.c:750 ../libsvn_ra/compat.c:376
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Kan ikke finne depotplassering for «%s» i revisjon %ld"
-#: ../libsvn_client/ra.c:688
+#: ../libsvn_client/ra.c:757
#, c-format
msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object"
msgstr "Plasseringen for «%s» i revisjon %ld finnes ikke i depotet, eller refererer til et urelatert objekt"
-#: ../libsvn_client/relocate.c:104
+#: ../libsvn_client/relocate.c:115
#, c-format
msgid "'%s' is not the root of the repository"
msgstr "«%s» er ikke roten i depotet"
-#: ../libsvn_client/relocate.c:111
+#: ../libsvn_client/relocate.c:122
#, c-format
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "Depotet på «%s» har uuid «%s», men arbeidskopien har «%s»"
-#: ../libsvn_client/revisions.c:113
+#: ../libsvn_client/revisions.c:113 ../libsvn_client/revisions.c:136
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "Filstien «%s» har ingen innlagte revisjoner"
-#: ../libsvn_client/revisions.c:139
+#: ../libsvn_client/revisions.c:162
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Det ble bedt om en ukjent revisjonstype for «%s»"
-#: ../libsvn_client/status.c:279 ../libsvn_client/status.c:308
-#: ../libsvn_client/status.c:317 ../libsvn_client/status.c:487
-#: ../libsvn_wc/lock.c:394 ../libsvn_wc/lock.c:761 ../libsvn_wc/lock.c:1657
-#: ../libsvn_wc/wc_db.c:930 ../libsvn_wc/wc_db.c:4700
+#: ../libsvn_client/revisions.c:185
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
+msgstr ""
+
+#: ../libsvn_client/status.c:302 ../libsvn_client/status.c:331
+#: ../libsvn_client/status.c:340 ../libsvn_client/status.c:533
+#: ../libsvn_wc/lock.c:539 ../libsvn_wc/lock.c:899 ../libsvn_wc/lock.c:1598
+#: ../libsvn_wc/wc_db.c:7808 ../libsvn_wc/wc_db_pdh.c:485
#, c-format
msgid "'%s' is not a working copy"
msgstr "«%s» er ikke en arbeidskopi"
-#: ../libsvn_client/switch.c:108
+#: ../libsvn_client/switch.c:102
#, c-format
msgid "Cannot both exclude and switch a path"
msgstr "Kan ikke både ekskludere og bytte ut en sti"
-#: ../libsvn_client/switch.c:190 ../libsvn_ra_local/ra_plugin.c:199
-#: ../libsvn_ra_local/ra_plugin.c:274 ../libsvn_wc/update_editor.c:4884
+#: ../libsvn_client/switch.c:175 ../libsvn_ra_local/ra_plugin.c:199
+#: ../libsvn_ra_local/ra_plugin.c:275 ../libsvn_wc/update_editor.c:5032
#, c-format
msgid ""
"'%s'\n"
@@ -2073,114 +2122,119 @@ msgstr ""
"er ikke samme depot som\n"
"«%s»"
-#: ../libsvn_client/util.c:217
+#: ../libsvn_client/util.c:215
#, c-format
msgid "URL '%s' is not a child of repository root URL '%s'"
msgstr "URL-en «%s» er ikke underlagt depotrotURL-en «%s»"
-#: ../libsvn_delta/svndiff.c:164
+#: ../libsvn_delta/svndiff.c:165
msgid "Compression of svndiff data failed"
msgstr "Komprimering av svndiff-data feilet"
-#: ../libsvn_delta/svndiff.c:414
+#: ../libsvn_delta/svndiff.c:432
msgid "Decompression of svndiff data failed: no size"
msgstr "Dekomprimering av svndiff-data feilet: ingen størrelse"
-#: ../libsvn_delta/svndiff.c:417
+#: ../libsvn_delta/svndiff.c:435
msgid "Decompression of svndiff data failed: size too large"
msgstr "Dekomprimering av svndiff-data feilet: størrelsen er for stor"
-#: ../libsvn_delta/svndiff.c:438
+#: ../libsvn_delta/svndiff.c:456
msgid "Decompression of svndiff data failed"
msgstr "Dekomprimering av svndiff-data feilet"
-#: ../libsvn_delta/svndiff.c:445
+#: ../libsvn_delta/svndiff.c:463
msgid "Size of uncompressed data does not match stored original length"
msgstr "Størrelsen på ukomprimerte data stemmer ikke med original lengde"
-#: ../libsvn_delta/svndiff.c:515
+#: ../libsvn_delta/svndiff.c:538
#, c-format
msgid "Invalid diff stream: insn %d cannot be decoded"
msgstr "Ugyldig diff-strøm: Instruksjon %d kan ikke dekodes"
-#: ../libsvn_delta/svndiff.c:519
+#: ../libsvn_delta/svndiff.c:542
#, c-format
msgid "Invalid diff stream: insn %d has length zero"
msgstr "Ugyldig diff-strøm: Instruksjon %d har lengde null"
-#: ../libsvn_delta/svndiff.c:523
+#: ../libsvn_delta/svndiff.c:546
#, c-format
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "Ugyldig diff-strøm: Instruksjon %d oversvømmer målvisning"
-#: ../libsvn_delta/svndiff.c:532
+#: ../libsvn_delta/svndiff.c:555
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Ugyldig diff-strøm: [kilde] Instruksjon %d oversvømmer kildevisning"
-#: ../libsvn_delta/svndiff.c:539
+#: ../libsvn_delta/svndiff.c:562
#, c-format
msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
msgstr "Ugyldig diff-strøm: [mål] Instruksjon %d starter utenfor målvisningsposisjonen"
-#: ../libsvn_delta/svndiff.c:546
+#: ../libsvn_delta/svndiff.c:569
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr "Ugyldig diff-strøm: [ny] Instruksjon %d oversvømmer den nye dataseksjonen"
-#: ../libsvn_delta/svndiff.c:556
+#: ../libsvn_delta/svndiff.c:579
msgid "Delta does not fill the target window"
msgstr "Delta fyller ikke målvindu"
-#: ../libsvn_delta/svndiff.c:559
+#: ../libsvn_delta/svndiff.c:582
msgid "Delta does not contain enough new data"
msgstr "Delta inneholder ikke nok nye data"
-#: ../libsvn_delta/svndiff.c:665
+#: ../libsvn_delta/svndiff.c:688
msgid "Svndiff has invalid header"
msgstr "Svndiff har ugyldig header"
-#: ../libsvn_delta/svndiff.c:721 ../libsvn_delta/svndiff.c:885
+#: ../libsvn_delta/svndiff.c:744 ../libsvn_delta/svndiff.c:908
msgid "Svndiff contains a too-large window"
msgstr "Svndiff inneholder et vindu som er for stort"
-#: ../libsvn_delta/svndiff.c:728 ../libsvn_delta/svndiff.c:892
+#: ../libsvn_delta/svndiff.c:751 ../libsvn_delta/svndiff.c:915
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff inneholder ødelagt header for vindu"
-#: ../libsvn_delta/svndiff.c:737
+#: ../libsvn_delta/svndiff.c:760
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff inneholder kildevisning med forflytninger baklengs"
-#: ../libsvn_delta/svndiff.c:786 ../libsvn_delta/svndiff.c:833
-#: ../libsvn_delta/svndiff.c:914
+#: ../libsvn_delta/svndiff.c:809 ../libsvn_delta/svndiff.c:856
+#: ../libsvn_delta/svndiff.c:937
msgid "Unexpected end of svndiff input"
msgstr "Uventet slutt på svndiff-inndata"
-#: ../libsvn_diff/diff_file.c:458
+#: ../libsvn_diff/diff_file.c:466
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "Uventet forandring i filen «%s» under diff"
-#: ../libsvn_diff/diff_file.c:582
-#, c-format
-msgid "Error parsing diff options"
-msgstr "Feil under tolking av diff-valg"
+#: ../libsvn_diff/diff_file.c:630
+#, fuzzy
+msgid "Error in options to internal diff"
+msgstr "Feil under normalisering av redigert innhold til intert format"
-#: ../libsvn_diff/diff_file.c:608
+#: ../libsvn_diff/diff_file.c:656
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "Ugyldig argument «%s» i diff-valg"
+#: ../libsvn_diff/diff_file.c:942
+#, fuzzy
+msgid "No newline at end of file"
+msgstr "%s\\ Ingen linjeslutt på slutten av filen%s"
+
# Use "YYYY-MM-DD HH:MM" for both. It’s consistent, the list can be
# sorted by date, and it’s default in the Norwegian locale of many Linux
# distros.
#. Order of date components can be different in different languages
-#: ../libsvn_diff/diff_file.c:1102
+#: ../libsvn_diff/diff_file.c:1149
msgid "%a %b %e %H:%M:%S %Y"
msgstr "%a %Y-%m-%d %H:%M:%S"
-#: ../libsvn_diff/diff_file.c:1717
+#: ../libsvn_diff/diff_file.c:1766
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "Klarte ikke å slette mmap «%s»"
@@ -2231,12 +2285,12 @@ msgstr "Filstien «%s» er ikke i UTF-8"
msgid "Path '%s' contains '.' or '..' element"
msgstr "Stien «%s» inneholder et «.»- eller «..»-element"
-#: ../libsvn_fs/fs-loader.c:1206
+#: ../libsvn_fs/fs-loader.c:1251
#, c-format
msgid "Malformed UUID '%s'"
msgstr "Misdannet UUID «%s»"
-#: ../libsvn_fs/fs-loader.c:1230
+#: ../libsvn_fs/fs-loader.c:1275
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Negativ utgått-dato gitt til svn_fs_lock"
@@ -2253,36 +2307,41 @@ msgstr "forandring opprettes"
msgid "deleting changes"
msgstr "forandringer slettes"
-#: ../libsvn_fs_base/bdb/changes-table.c:148 ../libsvn_fs_fs/fs_fs.c:3692
+#: ../libsvn_fs_base/bdb/changes-table.c:148 ../libsvn_fs_fs/fs_fs.c:4012
msgid "Missing required node revision ID"
msgstr "Mangler påkrevet noderevisjonsidentifikator"
-#: ../libsvn_fs_base/bdb/changes-table.c:159 ../libsvn_fs_fs/fs_fs.c:3702
+#: ../libsvn_fs_base/bdb/changes-table.c:159 ../libsvn_fs_fs/fs_fs.c:4022
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Ugyldig endringsrekkefølge: Ny node-revisjons-ID uten sletting"
-#: ../libsvn_fs_base/bdb/changes-table.c:169 ../libsvn_fs_fs/fs_fs.c:3713
+#: ../libsvn_fs_base/bdb/changes-table.c:169 ../libsvn_fs_fs/fs_fs.c:4033
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Ugyldig endringsrekkefølge: Annen endring enn tillegg på slettet filsti"
-#: ../libsvn_fs_base/bdb/changes-table.c:261
-#: ../libsvn_fs_base/bdb/changes-table.c:384
+#: ../libsvn_fs_base/bdb/changes-table.c:178 ../libsvn_fs_fs/fs_fs.c:4042
+#, fuzzy
+msgid "Invalid change ordering: add change on preexisting path"
+msgstr "Ugyldig endringsrekkefølge: Annen endring enn tillegg på slettet filsti"
+
+#: ../libsvn_fs_base/bdb/changes-table.c:270
+#: ../libsvn_fs_base/bdb/changes-table.c:393
msgid "creating cursor for reading changes"
msgstr "oppretter databasepeker for lesing av forandringer"
-#: ../libsvn_fs_base/bdb/changes-table.c:286
-#: ../libsvn_fs_base/bdb/changes-table.c:405
+#: ../libsvn_fs_base/bdb/changes-table.c:295
+#: ../libsvn_fs_base/bdb/changes-table.c:414
#, c-format
msgid "Error reading changes for key '%s'"
msgstr "Feil under lesing av forandringer for nøkkelen «%s»"
-#: ../libsvn_fs_base/bdb/changes-table.c:345
-#: ../libsvn_fs_base/bdb/changes-table.c:428
+#: ../libsvn_fs_base/bdb/changes-table.c:354
+#: ../libsvn_fs_base/bdb/changes-table.c:437
msgid "fetching changes"
msgstr "henter forandringer"
-#: ../libsvn_fs_base/bdb/changes-table.c:358
-#: ../libsvn_fs_base/bdb/changes-table.c:441
+#: ../libsvn_fs_base/bdb/changes-table.c:367
+#: ../libsvn_fs_base/bdb/changes-table.c:450
msgid "closing changes cursor"
msgstr "lukker databasepeker for forandringer"
@@ -2306,9 +2365,9 @@ msgid "allocating new representation reu
msgstr "reserverer ny gjenbruks-ID for representasjon (henter «next-key»)"
#: ../libsvn_fs_base/bdb/checksum-reps-table.c:207
-#: ../libsvn_fs_base/bdb/copies-table.c:133
-msgid "bumping next copy key"
-msgstr "øker neste kopinøkkel"
+#, fuzzy
+msgid "bumping next representation reuse ID"
+msgstr "øker neste representasjonsnøkkel"
#: ../libsvn_fs_base/bdb/copies-table.c:92
msgid "storing copy record"
@@ -2318,6 +2377,10 @@ msgstr "lagrer kopieringspost"
msgid "allocating new copy ID (getting 'next-key')"
msgstr "reserverer ny kopi-ID (henter «next-key»)"
+#: ../libsvn_fs_base/bdb/copies-table.c:133
+msgid "bumping next copy key"
+msgstr "øker neste kopinøkkel"
+
#: ../libsvn_fs_base/bdb/copies-table.c:171
msgid "deleting entry from 'copies' table"
msgstr "sletter post fra «copies»-tabell"
@@ -2410,156 +2473,160 @@ msgstr "hent depot-uuid"
msgid "set repository uuid"
msgstr "sett depot-uuid"
-#: ../libsvn_fs_base/dag.c:225
+#: ../libsvn_fs_base/dag.c:227
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "Ødelagt database: Innledende transaksjons-ID er ikke «0» i filsystem «%s»"
-#: ../libsvn_fs_base/dag.c:233
+#: ../libsvn_fs_base/dag.c:235
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "Ødelagt database: Innledende kopi-ID er ikke «0» i filsystem «%s»"
-#: ../libsvn_fs_base/dag.c:242
+#: ../libsvn_fs_base/dag.c:244
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "Ødelagt database: Innledende revisjonsnummer er ikke «0» i filsystem «%s»"
-#: ../libsvn_fs_base/dag.c:291 ../libsvn_fs_base/dag.c:464
-#: ../libsvn_fs_fs/dag.c:382
-msgid "Attempted to create entry in non-directory parent"
-msgstr "Forsøkte å opprette post i forelder som ikke er en katalog"
+#: ../libsvn_fs_base/dag.c:293
+#, fuzzy
+msgid "Attempted to get entries of a non-directory node"
+msgstr "Forsøkte å sette post i node som ikke er en katalog"
-#: ../libsvn_fs_base/dag.c:458 ../libsvn_fs_fs/dag.c:376
+#: ../libsvn_fs_base/dag.c:460 ../libsvn_fs_fs/dag.c:380
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Forsøkte å opprette en node med ulovlig navn «%s»"
-#: ../libsvn_fs_base/dag.c:470 ../libsvn_fs_base/dag.c:734
-#: ../libsvn_fs_fs/dag.c:388
+#: ../libsvn_fs_base/dag.c:466 ../libsvn_fs_fs/dag.c:386
+msgid "Attempted to create entry in non-directory parent"
[... 11420 lines stripped ...]