Mercurial > hg
changeset 11037:c1c534d62b05
Merge with main
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Thu, 29 Apr 2010 23:47:07 +0200 |
| parents | 4efdccaca21d (current diff) 0179840ab0d3 (diff) |
| children | 323557524006 |
| files | |
| diffstat | 2 files changed, 213 insertions(+), 152 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/pt_BR.po Wed Apr 28 21:00:07 2010 +0200 +++ b/i18n/pt_BR.po Thu Apr 29 23:47:07 2010 +0200 @@ -198,7 +198,6 @@ "branching.\n" msgstr "" "rastreia uma linha de desenvolvimento com marcadores móveis\n" -"marcadores do Mercurial\n" "\n" "Marcadores são ponteiros locais móveis para revisões. Todo\n" "marcador aponta para uma revisão identificada por seu hash. Se você\n" @@ -1422,6 +1421,13 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [OPÇÃO]... [CAMINHO]..." +#, python-format +msgid "%s does not look like a Bazaar repository" +msgstr "%s não parece ser um repositório do Bazaar" + +msgid "Bazaar modules could not be loaded" +msgstr "os módulos do Bazaar não puderam ser carregados" + msgid "" "warning: lightweight checkouts may cause conversion failures, try with a " "regular branch instead.\n" @@ -1535,6 +1541,10 @@ msgstr "--sourcesort não é suportado para esta origem de dados" #, python-format +msgid "%s does not look like a CVS checkout" +msgstr "%s não parece ser uma cópia de trabalho do CVS" + +#, python-format msgid "revision %s is not a patchset number" msgstr "revisão %s não é um número de patchset" @@ -1555,6 +1565,9 @@ msgid "%d bytes missing from remote file" msgstr "%d bytes faltando no arquivo remoto" +msgid "malformed response from CVS" +msgstr "resposta malformada do CVS" + #, python-format msgid "cvs server: %s\n" msgstr "servidor cvs: %s\n" @@ -1566,6 +1579,9 @@ msgid "collecting CVS rlog\n" msgstr "coletando rlog do CVS\n" +msgid "not a CVS sandbox" +msgstr "não é uma sandbox do CVS" + #, python-format msgid "reading cvs log cache %s\n" msgstr "lendo cache de log do CVS %s\n" @@ -1594,6 +1610,11 @@ msgid "revision must be followed by date line" msgstr "revisão deve ser seguida por uma linha de data" +msgid "log cache overlaps with new log entries, re-run without cache." +msgstr "" +"o cache do log se sobrepõe a novas entradas do log, execute " +"novamente sem o cache." + #, python-format msgid "writing cvs log cache %s\n" msgstr "escrevendo cache do log do CVS %s\n" @@ -1621,6 +1642,10 @@ msgstr "%d entradas de revisão\n" #, python-format +msgid "%s does not look like a darcs repository" +msgstr "%s não parece ser um repositório do darcs" + +#, python-format msgid "darcs version 2.1 or newer needed (found %r)" msgstr "necessária versão do darcs 2.1 ou posterior (%r encontrada)" @@ -1645,7 +1670,11 @@ msgstr "repositório de origem não suporta --filemap" #, python-format -msgid "%s does not look like a GNU Arch repo" +msgid "%s does not look like a Git repository" +msgstr "%s não parece ser um repositório do Git" + +#, python-format +msgid "%s does not look like a GNU Arch repository" msgstr "%s não parece ser um repositório do GNU Arch" msgid "cannot find a GNU Arch tool" @@ -1666,7 +1695,7 @@ msgstr "não foi possível decodificar cat-log de %s" #, python-format -msgid "%s is not a local Mercurial repo" +msgid "%s is not a local Mercurial repository" msgstr "%s não é um repositório local do Mercurial" #, python-format @@ -1674,6 +1703,10 @@ msgstr "iniciando repositório de destino %s\n" #, python-format +msgid "could not create hg repository %s as sink" +msgstr "não foi possível criar repositório hg %s como destino" + +#, python-format msgid "pulling from %s into %s\n" msgstr "trazendo de %s para %s\n" @@ -1692,13 +1725,17 @@ msgstr "ignorando: %s\n" #, python-format -msgid "%s does not look like a monotone repo" -msgstr "%s não parece um repositório do Monotone" +msgid "%s does not look like a monotone repository" +msgstr "%s não parece ser um repositório do Monotone" #, python-format msgid "copying file in renamed directory from '%s' to '%s'" msgstr "copiando arquivo em diretório renomeado de '%s' para '%s'" +#, python-format +msgid "%s does not look like a P4 repository" +msgstr "%s não parece ser um repositório do P4" + msgid "reading p4 views\n" msgstr "lendo 'p4 views'\n" @@ -1717,6 +1754,10 @@ "svn: não é possível sondar o repositório remoto; a conversão irá assumir que " "é um repositório remoto do Subversion. Use --source-type se necessário.\n" +#, python-format +msgid "%s does not look like a Subversion repository" +msgstr "%s não parece ser um repositório do Subversion" + msgid "Subversion python bindings could not be loaded" msgstr "Os módulos Python para o Subversion não puderam ser carregados" @@ -1787,12 +1828,12 @@ msgstr "svn: ramo não tem a revisão %s" #, python-format -msgid "initializing svn repo %r\n" +msgid "initializing svn repository %r\n" msgstr "iniciando repositório svn %r\n" #, python-format -msgid "initializing svn wc %r\n" -msgstr "iniciando svn wc %r\n" +msgid "initializing svn working copy %r\n" +msgstr "iniciando cópia de trabalho do svn %r\n" msgid "unexpected svn output:\n" msgstr "saída do svn inesperada:\n" @@ -4159,8 +4200,8 @@ msgid "add \"Date: <given date>\" to patch" msgstr "adiciona \"Date: <data fornecida>\" ao patch" -msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -msgstr "hg qnew [-e] [-m TEXTO] [-l ARQUIVO] [-f] PATCH [ARQUIVO]..." +msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." +msgstr "hg qnew [-e] [-m TEXTO] [-l ARQUIVO] PATCH [ARQUIVO]..." msgid "hg qnext [-s]" msgstr "hg qnext [-s]" @@ -5628,40 +5669,6 @@ " exista (por exemplo, a tip).\n" " " -msgid "" -"create a new shared repository (experimental)\n" -"\n" -" Initialize a new repository and working directory that shares its\n" -" history with another repository.\n" -"\n" -" NOTE: using rollback or extensions that destroy/modify history\n" -" (mq, rebase, etc.) can cause considerable confusion with shared\n" -" clones. In particular, if two shared clones are both updated to\n" -" the same changeset, and one of them destroys that changeset with\n" -" rollback, the other clone will suddenly stop working: all\n" -" operations will fail with \"abort: working directory has unknown\n" -" parent\". The only known workaround is to use debugsetparents on\n" -" the broken clone to reset it to a changeset that still exists\n" -" (e.g. tip).\n" -" " -msgstr "" -"cria um novo repositório compartilhado (experimental)\n" -"\n" -" Inicializa um novo repositório e diretório de trabalho que\n" -" compartilha seu histórico com outro repositório.\n" -"\n" -" NOTA: o uso de rollback ou extensões que destroem ou modificam\n" -" o histórico (mq, rebase, etc) pode causar confusão considerável\n" -" com clones compartilhados. Em particular, se dois clones\n" -" compartilhados forem atualizados para a mesma revisão, e um\n" -" deles destruir essa revisão usando rollback, o outro clone irá\n" -" deixar de funcionar: todas as operações irão falhar com\n" -" \"abortado: diretório de trabalho tem pai desconhecido\". A\n" -" única correção conhecida é o uso do comando debugsetparents no\n" -" clone quebrado para reposicioná-lo para uma revisão que ainda\n" -" exista (por exemplo, a tip).\n" -" " - msgid "do not create a working copy" msgstr "não cria uma cópia de trabalho" @@ -8092,6 +8099,11 @@ " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" "\n" +" The names 'default' and 'default-push' have a special meaning.\n" +" They are the locations used when pulling and pushing respectively\n" +" unless a location is specified. When cloning a repository, the\n" +" clone source is written as 'default' in .hg/hgrc.\n" +"\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -8104,6 +8116,11 @@ " /etc/mercurial/hgrc e $HOME/.hgrc. Se executado em um\n" " repositório, .hg/hgrc também será usado.\n" "\n" +" Os nomes 'default' e 'default-push' têm significado especial. Eles\n" +" são as localizações usadas nos comandos pull e push respectivamente\n" +" a não ser que uma localização seja especificada. Ao clonar um\n" +" repositório, a origem do clone é escrita como 'default' no .hg/hgrc.\n" +"\n" " Veja 'hg help urls' para mais informações.\n" " " @@ -11477,12 +11494,12 @@ msgid "abort: push creates new remote heads!\n" msgstr "abortado: push cria novas cabeças remotas!\n" +msgid "(you should pull and merge or use push -f to force)\n" +msgstr "(você deve fazer o pull e mesclar ou usar push -f para forçar)\n" + msgid "(did you forget to merge? use push -f to force)\n" msgstr "(você esqueceu de mesclar? Use push -f para forçar)\n" -msgid "(you should pull and merge or use push -f to force)\n" -msgstr "(você deve fazer o pull e mesclar ou usar push -f para forçar)\n" - #, python-format msgid "abort: push creates new remote branches: %s!\n" msgstr "abortado: push cria novos ramos remotos: '%s'!\n"
--- a/i18n/sv.po Wed Apr 28 21:00:07 2010 +0200 +++ b/i18n/sv.po Thu Apr 29 23:47:07 2010 +0200 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-03-28 19:48+0200\n" -"PO-Revision-Date: 2010-03-28 20:26+0100\n" +"POT-Creation-Date: 2010-04-19 18:58+0200\n" +"PO-Revision-Date: 2010-04-19 19:49+0200\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -411,9 +411,8 @@ msgid "Revision %d is a merge, ignoring...\n" msgstr "" -#, python-format -msgid "generating stats: %d%%" -msgstr "" +msgid "analyzing" +msgstr "analyserar" msgid "" "histogram of changes to the repository\n" @@ -476,11 +475,8 @@ msgid "file with email aliases" msgstr "" -msgid "show progress" -msgstr "" - -msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" -msgstr "" +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" +msgstr "hg churn [-d DATUM] [-r REV] [--aliases FIL] [FIL]" msgid "" "colorize output from some commands\n" @@ -529,6 +525,15 @@ " resolve.resolved = green bold\n" "\n" " bookmarks.current = green\n" +"\n" +"The color extension will try to detect whether to use ANSI codes or\n" +"Win32 console APIs, unless it is made explicit::\n" +"\n" +" [color]\n" +" mode = ansi\n" +"\n" +"Any value other than 'ansi', 'win32', or 'auto' will disable color.\n" +"\n" msgstr "" "färglägg utmatning från vissa kommandon\n" "\n" @@ -575,17 +580,26 @@ " resolve.resolved = green bold\n" "\n" " bookmarks.current = green\n" +"\n" +"Utökningen color försöker att upptäcka om ANSI-koder eller APIer för\n" +"konsolen i Win32 om det inte anges explicit::\n" +"\n" +" [color]\n" +" mode = ansi\n" +"\n" +"Ett värde skilt från 'ansi', 'win32', eller 'auto' stänger av färg.\n" +"\n" + +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "ignorerar okänd färg/effekt %r (konfigurerad i color.%s)\n" + +msgid "win32console not found, please install pywin32\n" +msgstr "win32console hittades inte, installera pywin32\n" msgid "when to colorize (always, auto, or never)" msgstr "när färgläggning ska ske (always, auto eller never)" -msgid "don't colorize output (DEPRECATED)" -msgstr "färglägg inte utmatning (FÖRLEGAD)" - -#, python-format -msgid "ignoring unknown color/effect %r (configured in color.%s)\n" -msgstr "" - msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" @@ -1020,6 +1034,9 @@ msgid "%d bytes missing from remote file" msgstr "" +msgid "malformed response from CVS" +msgstr "förvrängt svar från CVS" + #, python-format msgid "cvs server: %s\n" msgstr "" @@ -2052,9 +2069,6 @@ "keywords written to %s:\n" msgstr "" -msgid "unhooked all commit hooks\n" -msgstr "" - msgid "hg keyword configuration and expansion example" msgstr "exempel på nyckelordskonfiguration och -expansion i hg" @@ -2126,12 +2140,6 @@ msgid "only show unknown (not tracked) files" msgstr "visa bara okända (ospårade) filer" -msgid "show keyword status flags of all files (DEPRECATED)" -msgstr "visa statusflaggor för alla filer (FÖRLEGAD)" - -msgid "only show untracked files (DEPRECATED)" -msgstr "visa bara ospårade filer (FÖRLEGAD)" - msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "" @@ -2624,9 +2632,8 @@ "create a new patch\n" "\n" " qnew creates a new patch on top of the currently-applied patch (if\n" -" any). It will refuse to run if there are any outstanding changes\n" -" unless -f/--force is specified, in which case the patch will be\n" -" initialized with them. You may also use -I/--include,\n" +" any). The patch will be initialized with any outstanding changes\n" +" in the working directory. You may also use -I/--include,\n" " -X/--exclude, and/or a list of files after the patch name to add\n" " only changes to matching files to the new patch, leaving the rest\n" " as uncommitted modifications.\n" @@ -3584,6 +3591,8 @@ " # (that is, min(width, term width) will be used)\n" " clear-complete = True # clear the progress bar after it's done\n" " disable = False # if true, don't show a progress bar\n" +" assume-tty = False # if true, ALWAYS show a progress bar, unless\n" +" # disable is given\n" "\n" "Valid entries for the format field are topic, bar, number, unit, and\n" "item. item defaults to the last 20 characters of the item, but this\n" @@ -4017,6 +4026,7 @@ " bb = https://bitbucket.org/\n" " bb+ssh = ssh://hg@bitbucket.org/\n" " gcode = https://{1}.googlecode.com/hg/\n" +" kiln = https://{1}.kilnhg.com/Repo/\n" "\n" "You can override a predefined scheme by defining a new scheme with the\n" "same name.\n" @@ -4026,7 +4036,7 @@ msgstr "" msgid "" -"create a new shared repository (experimental)\n" +"create a new shared repository\n" "\n" " Initialize a new repository and working directory that shares its\n" " history with another repository.\n" @@ -4412,6 +4422,9 @@ msgid "invalid format spec '%%%s' in output filename" msgstr "" +msgid "searching" +msgstr "söker" + #, python-format msgid "adding %s\n" msgstr "" @@ -4543,12 +4556,8 @@ msgstr "" #, python-format -msgid "%s: %s" -msgstr "" - -#, python-format msgid "Found revision %s from %s\n" -msgstr "" +msgstr "Hittade revision %s från %s\n" msgid "revision matching date not found" msgstr "" @@ -4733,8 +4742,10 @@ " By default, the revision used is the parent of the working\n" " directory; use -r/--rev to specify a different revision.\n" "\n" -" To specify the type of archive to create, use -t/--type. Valid\n" -" types are:\n" +" The archive type is automatically detected based on file\n" +" extension (or override using -t/--type).\n" +"\n" +" Valid types are:\n" "\n" " :``files``: a directory full of files (default)\n" " :``tar``: tar archive, uncompressed\n" @@ -4757,8 +4768,10 @@ " Som standard används revisonen för arbetskatalogens förälder; använd\n" " -r/--rev för att specificera en annan revision.\n" "\n" -" För att definiera vilken typ av arkiv som ska skapas, använd -t/--type.\n" -" Giltiga typer är::\n" +" Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n" +" med hjälp av -t/--type).\n" +"\n" +" Giltiga typer är:\n" "\n" " :``files``: en katalog fylld med filer (standard)\n" " :``tar``: tar-arkiv, okomprimerad\n" @@ -6227,6 +6240,11 @@ " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" "\n" +" The names 'default' and 'default-push' have a special meaning.\n" +" They are the locations used when pulling and pushing respectively\n" +" unless a location is specified. When cloning a repository, the\n" +" clone source is written as 'default' in .hg/hgrc.\n" +"\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -6238,6 +6256,10 @@ " Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n" " $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också.\n" "\n" +" Namnen 'default' och 'default-push' har en särskild innebörd. De är\n" +" platserna som används vid push eller pull om ingen plats anges. När\n" +" ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc.\n" +"\n" " Se 'hg help urls' för mer information.\n" " " @@ -6616,7 +6638,7 @@ msgstr "inga ändringar behövs för %s\n" msgid "" -"roll back the last transaction\n" +"roll back the last transaction (dangerous)\n" "\n" " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" @@ -6643,7 +6665,7 @@ " may fail if a rollback is performed.\n" " " msgstr "" -"återgång från den senaste transaktionen\n" +"återgång från den senaste transaktionen (farligt)\n" "\n" " Detta kommando bör användas med försiktighet. Det finns bara en nivå\n" " av återgång, och det finns inget sätt att ångra en återgång.\n" @@ -6682,22 +6704,29 @@ " " msgid "" -"export the repository via HTTP\n" +"start stand-alone webserver\n" "\n" " Start a local HTTP repository browser and pull server.\n" "\n" " By default, the server logs accesses to stdout and errors to\n" " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" " files.\n" -" " -msgstr "" -"exportera arkivet via HTTP\n" +"\n" +" To have the server choose a free port number to listen on, specify\n" +" a port number of 0; in this case, the server will print the port\n" +" number it uses.\n" +" " +msgstr "" +"starta fristående webbserver\n" "\n" " Startar en lokal HTTP-arkivbläddrare och pull-server.\n" "\n" " Som standard loggar servern anslutningar till stdout och fel till\n" " stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n" " till filer.\n" +"\n" +" För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" +" som portnummer; då visar servern det portnummer som används.\n" " " #, python-format @@ -6791,6 +6820,10 @@ " för att hitta inkommande och utgående ändringar. Detta kan ta lång tid.\n" " " +#, python-format +msgid "parent: %d:%s " +msgstr "förälder: %d:%s " + msgid " (empty repository)" msgstr " (tomt arkiv)" @@ -6798,22 +6831,18 @@ msgstr " (ingen revision uthämtad)" #, python-format -msgid "parent: %d:%s %s\n" -msgstr "förälder: %d:%s %s\n" - -#, python-format msgid "branch: %s\n" msgstr "gren: %s\n" #, python-format +msgid "%d modified" +msgstr "%d modifierad" + +#, python-format msgid "%d added" msgstr "%d tillagd" #, python-format -msgid "%d modified" -msgstr "%d modifierad" - -#, python-format msgid "%d removed" msgstr "%d borttagen" @@ -6822,14 +6851,14 @@ msgstr "%d raderad" #, python-format +msgid "%d unknown" +msgstr "%d okänd" + +#, python-format msgid "%d ignored" msgstr "%d ignorerad" #, python-format -msgid "%d unknown" -msgstr "%d okänd" - -#, python-format msgid "%d unresolved" msgstr "%d olöst" @@ -6988,7 +7017,7 @@ " " msgid "" -"update working directory\n" +"update working directory (or switch revisions)\n" "\n" " Update the repository's working directory to the specified\n" " changeset.\n" @@ -7024,7 +7053,7 @@ " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -"uppdatera arbetskatalogen\n" +"uppdatera arbetskatalogen (eller växla mellan revisioner)\n" "\n" " Uppdatera arkivets arbetskatalog till den specificerade ändringen.\n" "\n" @@ -8782,40 +8811,42 @@ msgstr "" msgid "dirstate branch not accessible" -msgstr "" +msgstr "dirstate-grenen inte åtkomlig" msgid "can only share local repositories" -msgstr "" +msgstr "kan bara dela lokala arkiv" msgid "destination already exists" -msgstr "" +msgstr "destinationen finns redan" msgid "updating working directory\n" -msgstr "" +msgstr "uppdaterar arbetskatalog\n" #, python-format msgid "destination directory: %s\n" -msgstr "" +msgstr "destinationskatalog: %s\n" #, python-format msgid "destination '%s' already exists" -msgstr "" +msgstr "destinationen '%s' finns redan" #, python-format msgid "destination '%s' is not empty" -msgstr "" +msgstr "destinationen '%s är inte tom" msgid "" "src repository does not support revision lookup and so doesn't support clone " "by revision" msgstr "" +"källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning " +"av angivna revisioner" msgid "clone from remote to remote not supported" -msgstr "" +msgstr "kloning från fjärr till fjärr stödjs inte" #, python-format msgid "updating to branch %s\n" -msgstr "" +msgstr "uppdaterar till grenen %s\n" #, python-format msgid "" @@ -9016,8 +9047,16 @@ msgid "no interrupted transaction available\n" msgstr "" -msgid "rolling back last transaction\n" -msgstr "återkallar den senaste transaktionen\n" +#, python-format +msgid "rolling back to revision %s (undo %s: %s)\n" +msgstr "återgår till revisionen %s (ångra %s: %s)\n" + +#, python-format +msgid "rolling back to revision %s (undo %s)\n" +msgstr "återgår till revisionen %s (ångra %s)\n" + +msgid "rolling back unknown transaction\n" +msgstr "återkallar okänd transaktion\n" #, python-format msgid "Named branch could not be reset, current branch still is: %s\n" @@ -9111,9 +9150,6 @@ msgid "queries" msgstr "frågor" -msgid "searching" -msgstr "söker" - msgid "already have changeset " msgstr "har redan ändringen " @@ -9140,13 +9176,12 @@ msgid "abort: push creates new remote heads!\n" msgstr "avbryter: push skapar nya fjärrhuvuden!\n" +msgid "(you should pull and merge or use push -f to force)\n" +msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" + msgid "(did you forget to merge? use push -f to force)\n" msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" -msgid "(you should pull and merge or use push -f to force)\n" -msgstr "" -"(du kan dra och sammanfoga eller eller använda push -f för att tvinga)\n" - #, python-format msgid "abort: push creates new remote branches: %s!\n" msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" @@ -9448,6 +9483,15 @@ msgid "Unsupported line endings type: %s" msgstr "" +msgid "" +"internal patcher failed\n" +"please report details to http://mercurial.selenic.com/bts/\n" +"or mercurial@selenic.com\n" +msgstr "" +"den interna patcharen misslyckades\n" +"rapportera detaljer till http://mercurial.selenic.com/bts/\n" +"eller mercurial@selenic.com\n" + #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "" @@ -9595,8 +9639,8 @@ msgstr "" #, python-format -msgid "pulling subrepo %s\n" -msgstr "" +msgid "pulling subrepo %s from %s\n" +msgstr "drar subarkivet %s från %s\n" #, python-format msgid "pushing subrepo %s\n" @@ -9871,26 +9915,23 @@ msgid "checking changesets\n" msgstr "kontrollerar ändringar\n" -msgid "checking" -msgstr "kontrollerar" - #, python-format msgid "unpacking changeset %s" -msgstr "" +msgstr "packar upp ändringen %s" msgid "checking manifests\n" msgstr "kontrollerar manifest\n" #, python-format msgid "%s not in changesets" -msgstr "" +msgstr "%s inte i ändringarna" msgid "file without name in manifest" -msgstr "" +msgstr "fil utan namn i manifest" #, python-format msgid "reading manifest delta %s" -msgstr "" +msgstr "läser manifestdelta %s" msgid "crosschecking files in changesets and manifests\n" msgstr "korskontrollerar filer i ändringar och manifest\n" @@ -9900,63 +9941,66 @@ #, python-format msgid "changeset refers to unknown manifest %s" -msgstr "" +msgstr "ändring refererar till okänt manifest %s" msgid "in changeset but not in manifest" -msgstr "" +msgstr "i ändring men inte i manifest" msgid "in manifest but not in changeset" -msgstr "" +msgstr "i manifest men inte i ändring" msgid "checking files\n" msgstr "kontrollerar filer\n" #, python-format msgid "cannot decode filename '%s'" -msgstr "" +msgstr "kan inte avkoda filnamnet '%s'" + +msgid "checking" +msgstr "kontrollerar" #, python-format msgid "broken revlog! (%s)" -msgstr "" +msgstr "skadad revlog! (%s)" msgid "missing revlog!" -msgstr "" +msgstr "saknad revlog!" #, python-format msgid "%s not in manifests" -msgstr "" +msgstr "%s inte i manifest" #, python-format msgid "unpacked size is %s, %s expected" -msgstr "" +msgstr "uppackad storlek är %s, %s förväntades" #, python-format msgid "unpacking %s" -msgstr "" +msgstr "packar upp %s" #, python-format msgid "warning: copy source of '%s' not in parents of %s" -msgstr "" +msgstr "varning: kopieringskällan för '%s' inte i föräldrar till %s" #, python-format msgid "empty or missing copy source revlog %s:%s" -msgstr "" +msgstr "tom eller saknar kopieringskälla för revlog %s:%s" #, python-format msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" -msgstr "" +msgstr "varning: %s@%s: kopieringskällrevision är nullid %s:%s\n" #, python-format msgid "checking rename of %s" -msgstr "" +msgstr "kontrollerar namnbytet på %s" #, python-format msgid "%s in manifests not found" -msgstr "" +msgstr "%s i manifest hittades inte" #, python-format msgid "warning: orphan revlog '%s'" -msgstr "" +msgstr "varning: övergiven revlog '%s'" #, python-format msgid "%d files, %d changesets, %d total revisions\n" @@ -9964,15 +10008,15 @@ #, python-format msgid "%d warnings encountered!\n" -msgstr "" +msgstr "%d varningar påträffades!\n" #, python-format msgid "%d integrity errors encountered!\n" -msgstr "" +msgstr "%d integritetsfel påträffades!\n" #, python-format msgid "(first damaged changeset appears to be %d)\n" -msgstr "" +msgstr "(första skadade ändringen verkar vara %d)\n" msgid "user name not available - set USERNAME environment variable" -msgstr "" +msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME"