Mercurial > hg
changeset 9983:46c6bac41dc6
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 01 Dec 2009 14:37:57 -0600 |
| parents | ddc899096b7b (diff) 2e67734e1453 (current diff) |
| children | 279282ca42f0 |
| files | mercurial/commands.py |
| diffstat | 6 files changed, 113 insertions(+), 87 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Tue Dec 01 01:43:46 2009 +0100 +++ b/i18n/da.po Tue Dec 01 14:37:57 2009 -0600 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-11-22 21:02+0100\n" -"PO-Revision-Date: 2009-11-22 21:33+0100\n" +"POT-Creation-Date: 2009-11-29 20:24+0100\n" +"PO-Revision-Date: 2009-11-29 20:27+0100\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -1986,15 +1986,14 @@ msgid "" "use %(path)s to diff repository (or selected files)\n" "\n" -" Show differences between revisions for the specified files, using the\n" -" %(path)s program.\n" -"\n" -" When two revision arguments are given, then changes are shown between\n" -" those revisions. If only one revision is specified then that revision " -"is\n" -" compared to the working directory, and, when no revisions are " -"specified,\n" -" the working directory files are compared to its parent." +" Show differences between revisions for the specified files, using\n" +" the %(path)s program.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent." msgstr "" #, python-format @@ -2454,23 +2453,23 @@ msgid "hg inserve [OPTION]..." msgstr "hg inserve [TILVALG]..." -msgid "(found dead inotify server socket; removing it)\n" -msgstr "(fandt død inotify server sokkel; fjerner den)\n" - -#, python-format -msgid "could not start inotify server: %s\n" -msgstr "kunne ikke starte inotify server: %s\n" - -#, python-format -msgid "could not talk to new inotify server: %s\n" -msgstr "kunne ikke snakke med ny inotify server: %s\n" - -#, python-format -msgid "failed to contact inotify server: %s\n" -msgstr "kontakt med inotify server miskykkedes: %s\n" - -msgid "received empty answer from inotify server" -msgstr "modtog tomt svar fra inotify server" +msgid "inotify-client: found dead inotify server socket; removing it\n" +msgstr "inotify-klient: fandt død inotify server sokkel; fjerner den\n" + +#, python-format +msgid "inotify-client: could not start inotify server: %s\n" +msgstr "inotify-klient: kunne ikke starte inotify server: %s\n" + +#, python-format +msgid "inotify-client: could not talk to new inotify server: %s\n" +msgstr "inotify-klient: kunne ikke snakke med ny inotify server: %s\n" + +#, python-format +msgid "inotify-client: failed to contact inotify server: %s\n" +msgstr "inotify-klient: kontakt med inotify server mislykkedes: %s\n" + +msgid "inotify-client: received empty answer from inotify server" +msgstr "inotify-klient: modtog tomt svar fra inotify server" #, python-format msgid "(inotify: received response from incompatible server version %d)\n" @@ -2526,21 +2525,6 @@ msgstr "overvåger kataloger under %r\n" #, python-format -msgid "status: %r %s -> %s\n" -msgstr "status: %r %s -> %s\n" - -#, python-format -msgid "%s dirstate reload\n" -msgstr "%s genindlæsning af dirstate\n" - -#, python-format -msgid "%s end dirstate reload\n" -msgstr "%s genindlæsning af dirstate afsluttet\n" - -msgid "rescanning due to .hgignore change\n" -msgstr "genskanner på grund af ændring af .hgignore\n" - -#, python-format msgid "%s event: created %s\n" msgstr "%s hændelse: oprettede %s\n" @@ -2572,9 +2556,23 @@ msgid "%s hooking back up with %d bytes readable\n" msgstr "" -#, python-format -msgid "could not start server: %s" -msgstr "kunne ikke starte server: %s" +msgid "finished setup\n" +msgstr "afsluttede opsætning\n" + +#, python-format +msgid "status: %r %s -> %s\n" +msgstr "status: %r %s -> %s\n" + +msgid "rescanning due to .hgignore change\n" +msgstr "genskanner på grund af ændring af .hgignore\n" + +msgid "cannot start: socket is already bound" +msgstr "" + +msgid "" +"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" +"inotify.sock already exists" +msgstr "" #, python-format msgid "answering query for %r\n" @@ -2588,9 +2586,6 @@ msgid "unrecognized query type: %s\n" msgstr "genkendte ikke forespørgselstype: %s\n" -msgid "finished setup\n" -msgstr "afsluttede opsætning\n" - msgid "" "expand expressions into changelog and summaries\n" "\n" @@ -8705,6 +8700,10 @@ msgstr "deponerer underdepot %s\n" #, python-format +msgid "note: commit message saved in %s\n" +msgstr "bemærk: deponeringsbesked er gemt i %s\n" + +#, python-format msgid "trouble committing %s!\n" msgstr "problem ved deponering %s!\n"
--- a/i18n/de.po Tue Dec 01 01:43:46 2009 +0100 +++ b/i18n/de.po Tue Dec 01 14:37:57 2009 -0600 @@ -6377,9 +6377,9 @@ "\n" " See 'hg help urls' for valid source format details.\n" "\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" +" It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ssh:// URLs.\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" "\n" " If the -U/--noupdate option is specified, the new clone will contain\n" " only a repository (.hg) and no working copy (the working copy parent\n" @@ -6437,9 +6437,9 @@ "\n" " Siehe 'hg help urls' für Details gültiger Quellformate.\n" "\n" -" Es ist möglich eine ssh:// URL als Ziel anzugeben, aber es werden weder\n" +" Es ist möglich eine ``ssh://`` URL als Ziel anzugeben, aber es werden weder\n" " .hg/hgrc noch Arbeitsverzeichnis auf der entfernten Seite angelegt.\n" -" Wichtige Details zu URLs mit ssh:// finden sich unter 'hg help urls'.\n" +" Wichtige Details zu URLs mit ``ssh://`` finden sich unter 'hg help urls'.\n" "\n" " Wenn der Schalter -U/--noupdate angegeben ist, wird der Klon nur das\n" " Archiv (.hg-Verzeichnis) aber keine Arbeitskopie enthalten. Der\n" @@ -7281,7 +7281,7 @@ "\n" " If no directory is given, the current directory is used.\n" "\n" -" It is possible to specify an ssh:// URL as the destination.\n" +" It is possible to specify an ``ssh://`` URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -7292,7 +7292,7 @@ "\n" " Ist kein Zielverzeichnis angegeben, wird das aktuelle genutzt.\n" "\n" -" Es ist möglich eine ssh:// URL als Ziel anzugeben.\n" +" Es ist möglich eine ``ssh://`` URL als Ziel anzugeben.\n" " Siehe 'hg help urls' für mehr Informationen.\n" " " @@ -7615,7 +7615,7 @@ " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Please see 'hg help urls' for important details about ssh://\n" +" Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" @@ -7636,7 +7636,7 @@ "Vorgängern\n" " in das entfernte Archiv übertragen.\n" "\n" -" Für wichtige Details zu ssh://-URLS kann die URL-Hilfe zu Rate gezogen\n" +" Für wichtige Details zu ``ssh://``-URLS kann die URL-Hilfe zu Rate gezogen\n" " werden. Beim Weglassen des ZIELs wird standardmäßig der 'default'-Pfad\n" " genutzt. Weitere Hilfe gibt unter 'hg help urls'.\n" " "
--- a/i18n/it.po Tue Dec 01 01:43:46 2009 +0100 +++ b/i18n/it.po Tue Dec 01 14:37:57 2009 -0600 @@ -5328,9 +5328,9 @@ "\n" " See 'hg help urls' for valid source format details.\n" "\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" +" It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ssh:// URLs.\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" "\n" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" @@ -5989,7 +5989,7 @@ "\n" " If no directory is given, the current directory is used.\n" "\n" -" It is possible to specify an ssh:// URL as the destination.\n" +" It is possible to specify an ``ssh://`` URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -6000,7 +6000,7 @@ "\n" " Se nessuna directory è specificata si usa la directory corrente.\n" "\n" -" E' possibile specificare un URL ssh:// come destinazione.\n" +" E' possibile specificare un URL ``ssh://`` come destinazione.\n" " Vedere 'hg help urls' per maggiorni informazioni.\n" " " @@ -6281,7 +6281,7 @@ " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Please see 'hg help urls' for important details about ssh://\n" +" Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" @@ -6303,7 +6303,7 @@ " verso il repository remoto.\n" "\n" " Vedere il testo di aiuto per gli url per importanti dettagli sugli\n" -" URL ssh://.\n" +" URL ``ssh://``.\n" " Se viene omessa DESTINATION, verrà usato il percorso di default.\n" " Vedere 'hg help urls' per maggiori informazioni.\n" " "
--- a/i18n/ja.po Tue Dec 01 01:43:46 2009 +0100 +++ b/i18n/ja.po Tue Dec 01 14:37:57 2009 -0600 @@ -6519,9 +6519,9 @@ "\n" " See 'hg help urls' for valid source format details.\n" "\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" +" It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ssh:// URLs.\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" "\n" " If the -U/--noupdate option is specified, the new clone will contain\n" " only a repository (.hg) and no working copy (the working copy parent\n" @@ -6579,9 +6579,9 @@ "\n" " リポジトリ位置指定に関する詳細は、'hg help urls' を参照してください。\n" "\n" -" 複製先として ssh:// URL 形式を指定することも可能ですが、遠隔ホスト\n" +" 複製先として ``ssh://`` URL 形式を指定することも可能ですが、遠隔ホスト\n" " 上では、.hg/hgrc の作成も、作業領域の更新も行われません。\n" -" ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" +" ``ssh://`` URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" "\n" " -U/--noupdate が指定された場合、新規複製先は、\n" " 管理領域(.hg)のみを保持し、作業領域の更新は行われません\n" @@ -7397,7 +7397,7 @@ "\n" " If no directory is given, the current directory is used.\n" "\n" -" It is possible to specify an ssh:// URL as the destination.\n" +" It is possible to specify an ``ssh://`` URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -7408,7 +7408,7 @@ "\n" " ディレクトリが指定されない場合、現ディレクトリが初期化されます。\n" "\n" -" 複製先として ssh:// URL 形式を指定することも可能です。\n" +" 複製先として ``ssh://`` URL 形式を指定することも可能です。\n" " 詳細に関しては、'hg help urls' を参照してください。\n" " " @@ -7720,7 +7720,7 @@ " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Please see 'hg help urls' for important details about ssh://\n" +" Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" @@ -7740,7 +7740,7 @@ " -r/--rev が指定された場合、指定されたものと、その祖先となる\n" " リビジョンが連携先リポジトリへと反映されます。\n" "\n" -" ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" +" ``ssh://`` URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" " 連携先が省略された場合、'default' パスが連携先として使用されます。\n" " "
--- a/i18n/pt_BR.po Tue Dec 01 01:43:46 2009 +0100 +++ b/i18n/pt_BR.po Tue Dec 01 14:37:57 2009 -0600 @@ -7390,6 +7390,12 @@ " Use o comando 'hg update' para trocar para um ramo existente.\n" " " +msgid " (closed)" +msgstr " (fechado)" + +msgid " (inactive)" +msgstr " (inativo)" + msgid "" "create a changegroup file\n" "\n" @@ -7490,9 +7496,9 @@ "\n" " See 'hg help urls' for valid source format details.\n" "\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" +" It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ssh:// URLs.\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" "\n" " If the -U/--noupdate option is specified, the new clone will contain\n" " only a repository (.hg) and no working copy (the working copy parent\n" @@ -7551,10 +7557,10 @@ "\n" " Veja 'hg help urls' para formatos válidos da origem.\n" "\n" -" É possível especificar uma URL ssh:// como destino, mas o\n" +" É possível especificar uma URL ``ssh://`` como destino, mas o\n" " .hg/hgrc e a cópia de trabalho não serão criados do lado remoto.\n" " Por favor veja 'hg help URLs' para detalhes importantes sobre\n" -" URLs ssh:// .\n" +" URLs ``ssh://`` .\n" "\n" " Se a opção -U/--noupdate for especificada, o novo clone irá conter\n" " apenas um repositório (diretório .hg) e nenhuma cópia de trabalho\n" @@ -8392,7 +8398,7 @@ "\n" " If no directory is given, the current directory is used.\n" "\n" -" It is possible to specify an ssh:// URL as the destination.\n" +" It is possible to specify an ``ssh://`` URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -8403,7 +8409,7 @@ "\n" " Se o diretório não for dado, o diretório atual será usado.\n" "\n" -" É possível especificar uma URL ssh:// como destino.\n" +" É possível especificar uma URL ``ssh://`` como destino.\n" " Veja 'hg help urls' para mais informações.\n" " " @@ -8724,7 +8730,7 @@ " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Please see 'hg help urls' for important details about ssh://\n" +" Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" @@ -8746,7 +8752,7 @@ " ancestrais serão enviados para o repositório remoto.\n" "\n" " Por favor veja 'hg help urls' para detalhes importantes sobre\n" -" URLs ssh:// . Se DESTINO for omitido, um caminho padrão será\n" +" URLs ``ssh://`` . Se DESTINO for omitido, um caminho padrão será\n" " usado.\n" " " @@ -9727,6 +9733,9 @@ msgid "[-gbsr] [-c CMD] [REV]" msgstr "[-gbsr] [-c CMD] [REV]" +msgid "[-gbsr] [-U] [-c CMD] [REV]" +msgstr "[-gbsr] [-U] [-c CMD] [REV]" + msgid "set branch name even if it shadows an existing branch" msgstr "especifica nome do ramo mesmo se ocultar um ramo existente" @@ -9745,6 +9754,9 @@ msgid "[-a]" msgstr "[-a]" +msgid "[-ac]" +msgstr "[-ac]" + msgid "run even when remote repository is unrelated" msgstr "execute mesmo se o repositório remoto não for relacionado" @@ -9763,6 +9775,9 @@ msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" msgstr "[-f] [-a] [-r REV]... [--base REV]... ARQUIVO [DEST]" +msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "[-f] [-t TIPO] [-a] [-r REV]... [--base REV]... ARQUIVO [DEST]" + msgid "print output to file with formatted name" msgstr "imprime a saída para o arquivo com o nome formatado" @@ -9902,6 +9917,9 @@ msgid "[-r STARTREV] [REV]..." msgstr "[-r REVINICIAL] [REV]..." +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r REVINICIAL] [REV]..." + msgid "[TOPIC]" msgstr "[TÓPICO]" @@ -10023,6 +10041,9 @@ msgid "[-f] [[-r] REV]" msgstr "[-f] [[-r] REV]" +msgid "[-P] [-f] [[-r] REV]" +msgstr "[-P] [-f] [[-r] REV]" + msgid "a specific revision up to which you would like to push" msgstr "uma revisão específica até a qual você gostaria de enviar" @@ -10184,9 +10205,15 @@ msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." msgstr "[-l] [-m TEXTO] [-d DATA] [-u USUÁRIO] [-r REV] NOME..." +msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "[-f] [-l] [-m TEXTO] [-d DATA] [-u USUÁRIO] [-r REV] NOME..." + msgid "[-p]" msgstr "[-p]" +msgid "[-p] [-g]" +msgstr "[-p] [-g]" + msgid "update to new tip if changesets were unbundled" msgstr "atualiza para nova tip se revisões forem extraídas do bundle"
--- a/i18n/sv.po Tue Dec 01 01:43:46 2009 +0100 +++ b/i18n/sv.po Tue Dec 01 14:37:57 2009 -0600 @@ -5259,9 +5259,9 @@ "\n" " See 'hg help urls' for valid source format details.\n" "\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" +" It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ssh:// URLs.\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" "\n" " If the -U/--noupdate option is specified, the new clone will contain\n" " only a repository (.hg) and no working copy (the working copy parent\n" @@ -5319,9 +5319,9 @@ "\n" " Se 'hg help urls' för detaljer om giltiga källformat.\n" "\n" -" Det är möjligt att specificera en ssh://-URL som destination, men ingen\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men ingen\n" " .hg/hgrc och arbetskatalog skapas på fjärrsidan. Se 'hg help urls' för\n" -" viktiga detaljer om ssh://-URLer.\n" +" viktiga detaljer om ``ssh://``-URLer.\n" "\n" " Om alternativet -U/--noupdate är angivet, kommer den nya klonen bara\n" " att innehålla ett arkiv (.hg) och ingen arbetskopia (arbetskopians\n" @@ -6005,7 +6005,7 @@ "\n" " If no directory is given, the current directory is used.\n" "\n" -" It is possible to specify an ssh:// URL as the destination.\n" +" It is possible to specify an ``ssh://`` URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -6016,7 +6016,7 @@ "\n" " Om ingen katalog anges, används den nuvarande katalogen.\n" "\n" -" Det är möjligt att specificera en URL med ssh:// som destination. Se\n" +" Det är möjligt att specificera en URL med ``ssh://`` som destination. Se\n" " 'hg help urls' för mer information.\n" " " @@ -6277,7 +6277,7 @@ " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Please see 'hg help urls' for important details about ssh://\n" +" Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" @@ -6296,7 +6296,7 @@ " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" " tryckas till det andra arkivet.\n" "\n" -" Se 'hg help urls' för viktiga detaljer om URL:er med ssh://. Om\n" +" Se 'hg help urls' för viktiga detaljer om URL:er med ``ssh://``. Om\n" " DESTINATION inte är angivet, används standardsökvägen." #, python-format