Mercurial > hg
changeset 11723:870844a6daed
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 01 Aug 2010 08:54:30 -0500 |
| parents | 3e979f47a4c9 (current diff) bf1774d95bde (diff) |
| children | b6f72d8d77ae |
| files | |
| diffstat | 2 files changed, 181 insertions(+), 96 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/pt_BR.po Sat Jul 31 18:27:03 2010 -0500 +++ b/i18n/pt_BR.po Sun Aug 01 08:54:30 2010 -0500 @@ -478,6 +478,9 @@ msgid "bookmark name cannot contain newlines" msgstr "o nome do marcador não pode conter novas linhas" +msgid "bookmark names cannot consist entirely of whitespace" +msgstr "nomes de marcadores não podem conter apenas espaços em branco" + msgid "a bookmark cannot have the name of an existing branch" msgstr "um marcador não pode ter o mesmo nome de um ramo existente" @@ -3854,9 +3857,8 @@ msgid "patch series already fully applied\n" msgstr "série de patches já completamente aplicada\n" -#, python-format -msgid "patch '%s' not found" -msgstr "patch '%s' não encontrado" +msgid "please specify the patch to move" +msgstr "por favor especifique o patch a ser movido" msgid "cleaning up working directory..." msgstr "limpando diretório de trabalho..." @@ -3994,6 +3996,10 @@ msgstr "--name é necessário ao importar um patch de -" #, python-format +msgid "unable to read file %s" +msgstr "incapaz de ler arquivo %s" + +#, python-format msgid "adding %s to series file\n" msgstr "adicionando %s ao arquivo series\n" @@ -9843,6 +9849,9 @@ msgid "tag names must be unique" msgstr "nomes de etiqueta devem ser únicos" +msgid "tag names cannot consist entirely of whitespace" +msgstr "nomes de etiqueta não podem conter apenas espaços em branco" + msgid "--rev and --remove are incompatible" msgstr "--rev e --remove são incompatíveis" @@ -9926,12 +9935,12 @@ " pedida." msgid "" -" If no changeset is specified, attempt to update to the head of the\n" -" current branch. If this head is a descendant of the working\n" +" If no changeset is specified, attempt to update to the tip of the\n" +" current branch. If this changeset is a descendant of the working\n" " directory's parent, update to it, otherwise abort." msgstr "" -" Se nenhuma revisão for especificada, tenta atualizar para a cabeça\n" -" do ramo atual. Se esta cabeça for uma descendente do pai do\n" +" Se nenhuma revisão for especificada, tenta atualizar para a tip\n" +" do ramo atual. Se esta revisão for uma descendente do pai do\n" " diretório de trabalho, atualiza para ela, e aborta caso contrário." msgid "" @@ -11050,6 +11059,10 @@ msgstr "opção --config mal formada: %r (use --config seção.nome=valor)" #, python-format +msgid "error getting current working directory: %s" +msgstr "erro obtendo diretório de trabalho atual: %s" + +#, python-format msgid "extension '%s' overrides commands: %s\n" msgstr "a extensão '%s' sobrepõe o comando: %s\n" @@ -11070,6 +11083,9 @@ msgid "repository '%s' is not local" msgstr "o repositório '%s' não é local" +msgid "warning: --repository ignored\n" +msgstr "aviso: opção --repository ignorada\n" + msgid "invalid arguments" msgstr "argumentos inválidos" @@ -14181,6 +14197,9 @@ msgid "&Deleted" msgstr "(&D) apagada" +msgid "updating" +msgstr "atualizando" + #, python-format msgid "update failed to remove %s: %s!\n" msgstr "update falhou ao remover %s: %s!\n" @@ -14323,6 +14342,14 @@ msgstr "adicionando ramo\n" #, python-format +msgid "strip failed, full bundle stored in '%s'\n" +msgstr "strip falhou, bundle completo armazenado em '%s'\n" + +#, python-format +msgid "strip failed, partial bundle stored in '%s'\n" +msgstr "strip falhou, bundle parcial armazenado em '%s'\n" + +#, python-format msgid "cannot %s; remote repository does not support the %r capability" msgstr "impossível %s; repositório remoto não suporta a funcionalidade '%r'" @@ -14654,6 +14681,10 @@ msgid "username %s contains a newline\n" msgstr "nome de usuário %s contém quebra de linha\n" +#, python-format +msgid "(deprecated '%%' in path %s=%s from %s)\n" +msgstr "('%%' obsoleto em caminho %s=%s de %s)\n" + msgid "response expected" msgstr "resposta esperada"
--- a/i18n/sv.po Sat Jul 31 18:27:03 2010 -0500 +++ b/i18n/sv.po Sun Aug 01 08:54:30 2010 -0500 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-06-29 09:07+0200\n" -"PO-Revision-Date: 2010-06-29 09:10+0200\n" +"POT-Creation-Date: 2010-07-25 09:57+0200\n" +"PO-Revision-Date: 2010-07-25 10:50+0200\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "Language: Swedish\n" @@ -1022,17 +1022,24 @@ msgid "" " The filemap is a file that allows filtering and remapping of files\n" -" and directories. Comment lines start with '#'. Each line can\n" -" contain one of the following directives::" -msgstr "" - -msgid " include path/to/file" -msgstr "" - -msgid " exclude path/to/file" -msgstr "" - -msgid " rename from/file to/file" +" and directories. Each line can contain one of the following\n" +" directives::" +msgstr "" + +msgid " include path/to/file-or-dir" +msgstr " include sökväg/till/fil-eller-katalog" + +msgid " exclude path/to/file-or-dir" +msgstr " exclude sökväg/till/fil-eller-katalog" + +msgid " rename path/to/source path/to/destination" +msgstr " rename sökväg/till/källa sökväg/till/destination" + +msgid "" +" Comment lines start with '#'. A specificed path matches if it\n" +" equals the full relative name of a file or one of its parent\n" +" directories. The 'include' or 'exclude' directive with the longest\n" +" matching path applies, so line order does not matter." msgstr "" msgid "" @@ -1040,9 +1047,9 @@ " directory, to be included in the destination repository, and the\n" " exclusion of all other files and directories not explicitly\n" " included. The 'exclude' directive causes files or directories to\n" -" be omitted. The 'rename' directive renames a file or directory. To\n" -" rename from a subdirectory into the root of the repository, use\n" -" '.' as the path to rename to." +" be omitted. The 'rename' directive renames a file or directory if\n" +" is converted. To rename from a subdirectory into the root of the\n" +" repository, use '.' as the path to rename to." msgstr "" msgid "" @@ -5508,14 +5515,14 @@ msgstr "" msgid "" -"Zeroconf enabled repositories will be announced in a network without\n" +"Zeroconf-enabled repositories will be announced in a network without\n" "the need to configure a server or a service. They can be discovered\n" "without knowing their actual IP address." msgstr "" msgid "" -"To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository::" +"To allow other people to discover your repository using run\n" +":hg:`serve` in your repository::" msgstr "" msgid "" @@ -5524,7 +5531,8 @@ msgstr "" msgid "" -"You can discover zeroconf enabled repositories by running \"hg paths\"::" +"You can discover Zeroconf-enabled repositories by running\n" +":hg:`paths`::" msgstr "" msgid "" @@ -5572,11 +5580,11 @@ msgstr "" msgid "empty username" -msgstr "" +msgstr "tomt användarnamn" #, python-format msgid "username %s contains a newline" -msgstr "" +msgstr "användarnamnet %s innehåller en radbrytning" #, python-format msgid "the name '%s' is reserved" @@ -5596,7 +5604,7 @@ msgstr "" msgid "too many revisions specified" -msgstr "" +msgstr "för många revisioner angivna" #, python-format msgid "invalid format spec '%%%s' in output filename" @@ -5604,11 +5612,11 @@ #, python-format msgid "adding %s\n" -msgstr "" +msgstr "lägger till %s\n" #, python-format msgid "removing %s\n" -msgstr "" +msgstr "tar bort %s\n" #, python-format msgid "recording removal of %s as rename to %s (%d%% similar)\n" @@ -5829,17 +5837,22 @@ " $ hg add\n" " adding foo.c\n" " $ hg status\n" -" A foo.c\n" -" " +" A foo.c" msgstr "" " $ ls\n" " foo.c\n" " $ hg status\n" " ? foo.c\n" " $ hg add\n" -" adding foo.c\n" +" lägger till foo.c\n" " $ hg status\n" -" A foo.c\n" +" A foo.c" + +msgid "" +" Returns 0 if all files are successfully added.\n" +" " +msgstr "" +" Returnerar 0 om alla filer kunde läggas till.\n" " " msgid "add all new files, delete all missing files" @@ -5866,21 +5879,17 @@ " every added file and records those similar enough as renames. This\n" " option takes a percentage between 0 (disabled) and 100 (files must\n" " be identical) as its parameter. Detecting renamed files this way\n" -" can be expensive." +" can be expensive. After using this option, :hg:`status -C` can be\n" +" used to check which files were identified as moved or renamed." msgstr "" " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" " parameter större än 0, kommer varje borttagen fil att jämföras med\n" " varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" " namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" " (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" -" på det här sättet kan ta lång tid." - -msgid "" -" Returns 0 if all files are successfully added.\n" -" " -msgstr "" -" Returnerar 0 om alla filer kunde läggas till.\n" -" " +" på det här sättet kan ta lång tid. Efter att denna flagga har använts,\n" +" kan :hg:`status -C` användas för att kontrollera vilka filer som\n" +" identifierades som flyttade eller omdöpta." msgid "similarity must be a number" msgstr "likhet måste vara ett nummer" @@ -7481,6 +7490,15 @@ " anges." msgid "" +" To undo an uncommitted merge, use :hg:`update --clean .` which\n" +" will check out a clean copy of the original merge parent, losing\n" +" all changes." +msgstr "" +" För att ångra en oarkiverad sammanfogning, använd\n" +" :hg:`update --clean .` som kommer att hämta ut en ren kopia av den\n" +" ursprungliga föräldern till sammanfogningen, och ta bort ändringarna." + +msgid "" " Returns 0 on success, 1 if there are unresolved files.\n" " " msgstr "" @@ -7592,12 +7610,8 @@ " :hg:`bundle`) operations." msgstr "" -msgid "" -" See :hg:`help urls` for more information.\n" -" " -msgstr "" -" Se :hg:`help urls` för mer information.\n" -" " +msgid " See :hg:`help urls` for more information." +msgstr " Se :hg:`help urls` för mer information." msgid "not found!\n" msgstr "hittades inte!\n" @@ -7668,6 +7682,8 @@ " This operation is symmetrical to pull: it is identical to a pull\n" " in the destination repository from the current one." msgstr "" +" Denna operation är symmetrisk med pull: den är identisk med en pull i\n" +" destinationsarkivet från det aktuella arkivet." msgid "" " By default, push will not allow creation of new heads at the\n" @@ -7675,17 +7691,26 @@ " to use. In this situation, it is recommended to pull and merge\n" " before pushing." msgstr "" +" Som standard tillåter inte push att nya huvuden skapas i\n" +" destinationen, eftersom multipla huvuden skulle göra det oklart vilket\n" +" huvud som skulle användas. I dessa situationer är det rekommenderat\n" +" att dra och sammanfoga innan tryckning." msgid "" " Use --new-branch if you want to allow push to create a new named\n" " branch that is not present at the destination. This allows you to\n" " only create a new branch without forcing other changes." msgstr "" +" Använd --new-branch om du vill tillåta push att skapa en ny namngiven\n" +" gren som inte finns i destinationen. Detta ger dig möjligheten att\n" +" bara skapa en ny gren utan att tvinga andra ändringar." msgid "" " Use -f/--force to override the default behavior and push all\n" " changesets on all branches." msgstr "" +" Använd -f/--force för att upphäva det vanliga beteendet och trycka\n" +" alla ändringar på alla grenar." msgid "" " If -r/--rev is used, the specified revision and all its ancestors\n" @@ -7731,6 +7756,9 @@ " Returns 0 if successful, 1 if nothing to recover or verify fails.\n" " " msgstr "" +" Returns 0 om kommandot lyckades, 1 om inget fanns att återställa eller\n" +" verifiering misslyckades.\n" +" " msgid "remove the specified files on the next commit" msgstr "ta bort de specificerade filerna vid nästa arkivering" @@ -7903,11 +7931,19 @@ msgstr "återställ filer eller kataloger till ett tidigare tillstånd" msgid "" -" (Use update -r to check out earlier revisions, revert does not\n" -" change the working directory parents.)" -msgstr "" -" (Använd update -r för att hämta ut tidigare revisioner, revert ändrar\n" -" inte arbetskatalogens föräldrar.)" +" NOTE: This command is most likely not what you are looking for. revert\n" +" will partially overwrite content in the working directory without " +"changing\n" +" the working directory parents. Use :hg:`update -r rev` to check out " +"earlier\n" +" revisions, or :hg:`update --clean .` to undo a merge which has added\n" +" another parent." +msgstr "" +" NOTERA: Det här kommandot är troligtvis inte det du letar efter.\n" +" revert kommer att delvis skriva över innehåll i arbetskatalogen utan\n" +" att ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för\n" +" att hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n" +" ångra en sammanfogning som har lagt till fler föräldrar." msgid "" " With no revision specified, revert the named files or directories\n" @@ -8419,13 +8455,13 @@ msgstr " Uppdatera arkivets arbetskatalog till den specificerade ändringen." msgid "" -" If no changeset is specified, attempt to update to the head of the\n" -" current branch. If this head is a descendant of the working\n" +" If no changeset is specified, attempt to update to the tip of the\n" +" current branch. If this changeset is a descendant of the working\n" " directory's parent, update to it, otherwise abort." msgstr "" -" Om ingen ändring specificeras, kommer ett försök att göras för att\n" -" hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n" -" den nuvarande grenen, uppdatera till det, annars avbryt." +" Om ingen ändring anges, kommer ett försök att göras för att hämta ut\n" +" toppen på den nuvarande grenen. Om ändringen är en ättling till\n" +" arbetskatalogens föräldrar, uppdatera till det, annars avbryt." msgid "" " The following rules apply when the working directory contains\n" @@ -9112,7 +9148,7 @@ msgstr "tvinga tryckning" msgid "allow pushing a new branch" -msgstr "" +msgstr "tillåt att trycka en ny gren" msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]" @@ -9563,6 +9599,9 @@ msgid "repository '%s' is not local" msgstr "" +msgid "warning: --repository ignored\n" +msgstr "varning: --repository ignorerades\n" + msgid "invalid arguments" msgstr "" @@ -10390,7 +10429,7 @@ " Mercurial, that will be recorded in the next commit. The working\n" " directory initially corresponds to the snapshot at an existing\n" " changeset, known as the parent of the working directory. See\n" -" 'Parents, working directory'. The state may be modified by changes\n" +" 'Parent, working directory'. The state may be modified by changes\n" " to the files introduced manually or by a merge. The repository\n" " metadata exists in the .hg directory inside the working directory." msgstr "" @@ -10952,7 +10991,7 @@ " A DAG range, meaning all changesets that are descendants of x and\n" " ancestors of y, including x and y themselves. If the first endpoint\n" " is left out, this is equivalent to ``ancestors(y)``, if the second\n" -" is left out it is equivalent to ``descendents(x)``." +" is left out it is equivalent to ``descendants(x)``." msgstr "" msgid " An alternative syntax is ``x..y``." @@ -11791,14 +11830,17 @@ msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" +msgid "can't commit subrepos without .hgsub" +msgstr "kan inte arkivera underarkiv utan .hgsub" + msgid "file not found!" -msgstr "" +msgstr "filen hittades inte!" msgid "no match under directory!" msgstr "" msgid "file not tracked!" -msgstr "" +msgstr "filen spåras inte!" msgid "unresolved merge conflicts (see hg resolve)" msgstr "" @@ -12142,6 +12184,14 @@ msgstr "" #, python-format +msgid "strip failed, full bundle stored in '%s'\n" +msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n" + +#, python-format +msgid "strip failed, partial bundle stored in '%s'\n" +msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n" + +#, python-format msgid "cannot %s; remote repository does not support the %r capability" msgstr "" @@ -12200,92 +12250,92 @@ msgid "missing argument" msgstr "" -msgid "can't negate that" -msgstr "" - #, python-format msgid "can't use %s here" -msgstr "" +msgstr "kan inte använda %s här" msgid "can't use a list in this context" -msgstr "" +msgstr "kan inte använda en lista i detta sammanhang" #, python-format msgid "not a function: %s" -msgstr "" +msgstr "inte en funktion: %s" msgid "limit wants two arguments" -msgstr "" +msgstr "limit vill ha två argument" msgid "limit wants a number" -msgstr "" +msgstr "limit vill ha ett nummer" msgid "limit expects a number" -msgstr "" +msgstr "limit förväntar sig ett nummer" msgid "ancestor wants two arguments" -msgstr "" +msgstr "ancestor vill ha två argument" msgid "ancestor arguments must be single revisions" -msgstr "" +msgstr "argument till ancestor måste vara singelrevisioner" msgid "follow takes no arguments" -msgstr "" +msgstr "follow tar inga argument" msgid "date wants a string" -msgstr "" +msgstr "date vill ha en sträng" msgid "keyword wants a string" -msgstr "" +msgstr "keyword vill ha en sträng" msgid "grep wants a string" -msgstr "" +msgstr "grep vill ha en sträng" msgid "author wants a string" -msgstr "" +msgstr "author vill ha ett mönster" msgid "file wants a pattern" -msgstr "" +msgstr "file vill ha ett mönster" msgid "contains wants a pattern" -msgstr "" +msgstr "contains vill ha ett mönster" msgid "modifies wants a pattern" -msgstr "" +msgstr "modifies vill ha ett mönster" msgid "adds wants a pattern" -msgstr "" +msgstr "adds vill ha ett mönster" msgid "removes wants a pattern" -msgstr "" +msgstr "removes vill ha ett mänster" msgid "merge takes no arguments" -msgstr "" +msgstr "merge tar inga argument" msgid "closed takes no arguments" -msgstr "" +msgstr "closed tar inga argument" msgid "head takes no arguments" -msgstr "" +msgstr "head tar inga argument" msgid "sort wants one or two arguments" -msgstr "" +msgstr "sort vill ha ett eller två argument" msgid "sort spec must be a string" -msgstr "" +msgstr "sort-spec måste vara en sträng" #, python-format msgid "unknown sort key %r" -msgstr "" +msgstr "okänd sorteringsnyckel %r" msgid "all takes no arguments" -msgstr "" +msgstr "all tar inga argument" msgid "outgoing wants a repository path" -msgstr "" +msgstr "outgoing vill ha en arkivsökväg" msgid "tagged takes no arguments" -msgstr "" +msgstr "tagged tar inga argument" + +msgid "can't negate that" +msgstr "kan inte negera det" msgid "not a symbol" msgstr "inte en symbol" @@ -12467,6 +12517,10 @@ msgid "username %s contains a newline\n" msgstr "" +#, python-format +msgid "(deprecated '%%' in path %s=%s from %s)\n" +msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" + msgid "response expected" msgstr ""