Mercurial > hg
changeset 11496:52762189c382
Merge with stable (again)
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 02 Jul 2010 11:41:43 +0200 |
| parents | 6ee107782018 (current diff) 239f3210c970 (diff) |
| children | f5a8d85df06a |
| files | |
| diffstat | 15 files changed, 6660 insertions(+), 2837 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Wed Jun 30 17:23:16 2010 +0200 +++ b/.hgsigs Fri Jul 02 11:41:43 2010 +0200 @@ -23,3 +23,4 @@ 39f725929f0c48c5fb3b90c071fc3066012456ca 0 iEYEABECAAYFAkvclvsACgkQywK+sNU5EO9FSwCeL9i5x8ALW/LE5+lCX6MFEAe4MhwAn1ev5o6SX6GrNdDfKweiemfO2VBk fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 0 iEYEABECAAYFAkvsKTkACgkQywK+sNU5EO9qEACgiSiRGvTG2vXGJ65tUSOIYihTuFAAnRzRIqEVSw8M8/RGeUXRps0IzaCO 24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy +f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
--- a/.hgtags Wed Jun 30 17:23:16 2010 +0200 +++ b/.hgtags Fri Jul 02 11:41:43 2010 +0200 @@ -35,3 +35,4 @@ 39f725929f0c48c5fb3b90c071fc3066012456ca 1.5.2 fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 1.5.3 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4 +f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
--- a/contrib/wix/guids.wxi Wed Jun 30 17:23:16 2010 +0200 +++ b/contrib/wix/guids.wxi Fri Jul 02 11:41:43 2010 +0200 @@ -15,7 +15,7 @@ <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?> <!-- help.wxs --> - <?define helpFolder.guid = {FA1546C1-5730-4e55-8542-76F5830841EE} ?> + <?define helpFolder.guid = {9B541469-9C9E-4F25-B88B-048487AA582D} ?> <!-- i18n.wxs --> <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
--- a/contrib/wix/help.wxs Wed Jun 30 17:23:16 2010 +0200 +++ b/contrib/wix/help.wxs Fri Jul 02 11:41:43 2010 +0200 @@ -12,9 +12,12 @@ <File Name="diffs.txt" /> <File Name="environment.txt" /> <File Name="extensions.txt" /> + <File Name="glossary.txt" /> + <File Name="hgweb.txt" /> <File Name="multirevs.txt" /> <File Name="patterns.txt" /> <File Name="revisions.txt" /> + <File Name="revsets.txt" /> <File Name="templates.txt" /> <File Name="urls.txt" /> </Component>
--- a/i18n/da.po Wed Jun 30 17:23:16 2010 +0200 +++ b/i18n/da.po Fri Jul 02 11:41:43 2010 +0200 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-06-20 16:37+0200\n" -"PO-Revision-Date: 2010-06-20 20:01+0200\n" +"POT-Creation-Date: 2010-07-01 14:56+0200\n" +"PO-Revision-Date: 2010-07-01 15:23+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -146,8 +146,10 @@ msgid "" " # Use this if you want to check access restrictions at commit time\n" -" pretxncommit.acl = python:hgext.acl.hook\n" -" \n" +" pretxncommit.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" " # Use this if you want to check access restrictions for pull, push,\n" " # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" @@ -163,28 +165,40 @@ " sources = serve" msgstr "" -msgid "" -" [acl.deny.branches] \n" -" \n" -" # Everyone is denied to the frozen branch: \n" -" frozen-branch = * \n" -" \n" -" # A bad user is denied on all branches: \n" -" * = bad-user \n" -" \n" -" [acl.allow.branches] \n" -" \n" -" # A few users are allowed on branch-a: \n" -" branch-a = user-1, user-2, user-3 \n" -" \n" -" # Only one user is allowed on branch-b: \n" -" branch-b = user-1 \n" -" \n" -" # The super user is allowed on any branch: \n" -" * = super-user \n" -" \n" -" # Everyone is allowed on branch-for-tests: \n" -" branch-for-tests = * " +msgid " [acl.deny.branches]" +msgstr " [acl.deny.branches]" + +msgid "" +" # Everyone is denied to the frozen branch:\n" +" frozen-branch = *" +msgstr "" + +msgid "" +" # A bad user is denied on all branches:\n" +" * = bad-user" +msgstr "" + +msgid " [acl.allow.branches]" +msgstr " [acl.allow.branches]" + +msgid "" +" # A few users are allowed on branch-a:\n" +" branch-a = user-1, user-2, user-3" +msgstr "" + +msgid "" +" # Only one user is allowed on branch-b:\n" +" branch-b = user-1" +msgstr "" + +msgid "" +" # The super user is allowed on any branch:\n" +" * = super-user" +msgstr "" + +msgid "" +" # Everyone is allowed on branch-for-tests:\n" +" branch-for-tests = *" msgstr "" msgid "" @@ -250,7 +264,9 @@ #, python-format msgid "" "config error - hook type \"%s\" cannot stop incoming changesets nor commits" -msgstr "konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer eller deponeringer" +msgstr "" +"konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer " +"eller deponeringer" #, python-format msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" @@ -344,8 +360,8 @@ msgstr "" #, python-format -msgid "failed to update bookmark %s!\n" -msgstr "kunne ikke opdatere bogmærke %s!\n" +msgid "updating bookmark %s failed!\n" +msgstr "opdatering af bogmærke %s fejlede!\n" #, python-format msgid "remote bookmark %s not found!" @@ -363,9 +379,15 @@ msgid "deleting remote bookmark %s\n" msgstr "sletter fjern-bogmærke %s\n" -#, python-format -msgid "updating bookmark %s failed!\n" -msgstr "opdatering af bogmærke %s fejlede!\n" +msgid "searching for changes\n" +msgstr "leder efter ændringer\n" + +msgid "no changes found\n" +msgstr "fandt ingen ændringer\n" + +#, python-format +msgid "comparing with %s\n" +msgstr "sammenligner med %s\n" msgid "bookmark to import" msgstr "bogmærke der skal importeres" @@ -373,6 +395,9 @@ msgid "bookmark to export" msgstr "bogmærke der skal eksporteres" +msgid "compare bookmark" +msgstr "sammenlign bogmærke" + msgid "force" msgstr "gennemtving" @@ -714,7 +739,7 @@ msgstr "Revision %d er en sammenføjning; ignorerer...\n" msgid "analyzing" -msgstr "" +msgstr "analyserer" msgid "histogram of changes to the repository" msgstr "histogram over ændringer i depotet" @@ -795,19 +820,19 @@ msgstr "lav statistik for de specificerede revisioner" msgid "DATE" -msgstr "" +msgstr "DATO" msgid "count rate for revisions matching date spec" msgstr "lav statistik for revisioner som matcher dato specifikationen" msgid "TEMPLATE" -msgstr "" +msgstr "MØNSTER" msgid "template to group changesets" msgstr "skabelon for gruppering af ændringer" msgid "FORMAT" -msgstr "" +msgstr "FORMAT" msgid "strftime-compatible format for grouping by date" msgstr "strftime-kompatibelt format til gruppering efter dato" @@ -949,7 +974,7 @@ msgstr "ignorerer ukendt farve/effekt %r (konfigureret i color.%s)\n" msgid "win32console not found, please install pywin32\n" -msgstr "" +msgstr "win32console blev ikke fundet, installer venligst pywin32\n" msgid "when to colorize (always, auto, or never)" msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" @@ -1605,19 +1630,19 @@ msgstr "%s ser ikke ud som et Git depot" msgid "cannot retrieve git heads" -msgstr "" +msgstr "kan ikke hente hoveder fra git" #, python-format msgid "cannot read %r object at %s" -msgstr "" +msgstr "kan ikke læse %r objekt ved %s" #, python-format msgid "cannot read changes in %s" -msgstr "" +msgstr "kan ikke læse ændringer i %s" #, python-format msgid "cannot read tags from %s" -msgstr "" +msgstr "kan ikke læse mærkater fra %s" #, python-format msgid "%s does not look like a GNU Arch repository" @@ -1781,7 +1806,7 @@ msgstr "XXX MÆRKATER ER IKKE IMPLEMENTERET ENDNU\n" msgid "automatically manage newlines in repository files" -msgstr "" +msgstr "automatisk håndtering af linieskift i depotfiler" msgid "" "This extension allows you to manage the type of line endings (CRLF or\n" @@ -1789,6 +1814,10 @@ "directory. That way you can get CRLF line endings on Windows and LF on\n" "Unix/Mac, thereby letting everybody use their OS native line endings." msgstr "" +"Denne udvidelse lader dig håndtere linieskifttypen (CRLF eller LF) som\n" +"bruges i depotet og i det lokale arbejdskatalog. På den måde kan du få\n" +"CRLF linieskift på Windows og LF på Linux/Mac, og således lade alle\n" +"bruge de linieskift der passer til deres OS." msgid "" "The extension reads its configuration from a versioned ``.hgeol``\n" @@ -1797,6 +1826,11 @@ "configuration files. It uses two sections, ``[patterns]`` and\n" "``[repository]``." msgstr "" +"Udvidelsen læser sin konfiguration fra en versioneret ``.hgeol``\n" +"konfigurationsfil hver gang du udfører en ``hg`` kommando. Denne\n" +"``.hgeol`` fil bruger samme syntaks som alle andre Mercurial\n" +"konfigurationsfiler. Den bruger to sektioner: ``[patterns]`` og\n" +"``[repository]``." msgid "" "The ``[patterns]`` section specifies the line endings used in the\n" @@ -1804,6 +1838,10 @@ "first match is used, so put more specific patterns first. The\n" "available line endings are ``LF``, ``CRLF``, and ``BIN``." msgstr "" +"Sektionen ``[patterns]`` angiver hvilken type linieskift der skal\n" +"bruges i arbejdskataloget. Typen er angivet ved et filmønster. Den\n" +"første træffer bliver brugt, så skriv mere specifikke mønstre først.\n" +"De mulige linieskifttyper er ``LF``, ``CRLF`` og ``BIN``." msgid "" "Files with the declared format of ``CRLF`` or ``LF`` are always\n" @@ -1814,6 +1852,13 @@ "endings) is Mercurial's default behaviour; it is only needed if you\n" "need to override a later, more general pattern." msgstr "" +"Filer deklareret som ``CRLF`` eller ``LF`` bliver altid hentet ud i\n" +"dette format og filer deklareret som binære (``BIN``) bliver ikke\n" +"ændret. Desuden er ``native`` et alias for platforms normale\n" +"linieskift: ``LF`` på Unix (samt Mac OS X) og ``CRLF`` på Windows.\n" +"Bemærk at ``BIN`` (gør ingenting ved linieskift) er Mercurials\n" +"standardopførsel; det er kun nødvendigt at bruge den hvis du skal\n" +"overskrive et senere og mere generelt mønster." msgid "" "The optional ``[repository]`` section specifies the line endings to\n" @@ -1826,9 +1871,18 @@ "declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n" "are always stored as-is in the repository." msgstr "" +"Den valgfrie ``[repository]`` sektion angiver linieskifttypen der\n" +"bruges når filer gemmes i depotet. Den har en enkelt indstilling,\n" +"``native``, som bestemmer typen af linieskift for filer som er\n" +"deklareret som ``native`` i ``[patterns]`` sektionen. Den kan sættes\n" +"til ``LF`` eller ``CRLF``. Standardindstillingen er ``LF``. Som et\n" +"eksempel betyder dette på Windows, at filer konfigureret som\n" +"``native`` vil blive konverteret fra ``CRLF`` til ``LF`` når de gemmes\n" +"i depotet. Filer som er deklareret som ``LF``, ``CRLF`` eller ``BIN``\n" +"i ``[patterns]`` sektionen bliver altid gemt uden ændring i depotet." msgid "Example versioned ``.hgeol`` file::" -msgstr "" +msgstr "Et eksempel på en versioneret ``.hgeol`` fil::" msgid "" " [patterns]\n" @@ -1857,6 +1911,9 @@ "(not the ``.hgeol`` file) for settings that control the overall\n" "behavior. There are two settings:" msgstr "" +"Udvidelsen bruger en valgfri ``[eol]`` sektion i den hgrc fil (ikke\n" +"``.hgeol`` filen) til at bestemme den overordnede opførsel. Der er to\n" +"indstillinger:" msgid "" "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" @@ -1864,6 +1921,11 @@ " checkout. This can be used with :hg:`archive` on Unix, say, to\n" " generate an archive where files have line endings for Windows." msgstr "" +"- ``eol.native`` (standard er ``os.linesep``) kan sættes til ``LF``\n" +" eller ``CRLF`` for at overskrive den sædvanlige fortolkning af\n" +" ``native`` når filer hentes ud. Dette kan f.eks. bruges med\n" +" :hg:`archive` på Unix til at lave et arkiv hvor filerne har\n" +" linieskift til Windows." msgid "" "- ``eol.only-consistent`` (default True) can be set to False to make\n" @@ -1872,30 +1934,37 @@ " Such files are normally not touched under the assumption that they\n" " have mixed EOLs on purpose." msgstr "" +"- ``eol.only-consistent`` (standard er True) kan sættes til False for\n" +" at lade udvidelsen konvertere filer med inkonsistente linieskift.\n" +" Inkonsistent betyder at der er både ``CRLF`` og ``LF`` linieskift\n" +" til stedet i filen. Sådanne filer bliver normalt ikke rørt under\n" +" antagelse af at de har miksede linieskift med vilje." msgid "" "See :hg:`help patterns` for more information about the glob patterns\n" "used.\n" msgstr "" +"Se :hg:`help patterns` for mere information on de brugte\n" +"glob-mønstre.\n" #, python-format msgid "%s should not have CRLF line endings" -msgstr "" +msgstr "%s skulle ikke have CRLF linieskift" #, python-format msgid "%s should not have LF line endings" -msgstr "" +msgstr "%s skulle ikke have LF linieskift" msgid "the eol extension is incompatible with the win32text extension" -msgstr "" +msgstr "eol-udvidelsen er inkompatibel med win32text-udvidelsen" #, python-format msgid "ignoring unknown EOL style '%s' from %s\n" -msgstr "" +msgstr "ignorerer ukendt linieskifttype '%s' fra %s\n" #, python-format msgid "inconsistent newline style in %s\n" -msgstr "" +msgstr "inkonsistent linieskift i %s\n" msgid "command to allow external programs to compare revisions" msgstr "" @@ -2015,7 +2084,7 @@ msgstr "" msgid "CMD" -msgstr "" +msgstr "KMD" msgid "comparison program to run" msgstr "sammenligningsprogram der skal køres" @@ -2271,18 +2340,11 @@ " Knuder udskrevet med et @-tegn er forældre til arbejdskataloget.\n" " " -#, python-format -msgid "comparing with %s\n" -msgstr "sammenligner med %s\n" - -msgid "no changes found\n" -msgstr "fandt ingen ændringer\n" - msgid "show the revision DAG" msgstr "vis revisionsgrafen" msgid "NUM" -msgstr "" +msgstr "TAL" msgid "limit number of changes displayed" msgstr "begræns antaln viste ændringer" @@ -2762,6 +2824,9 @@ " svnutcdate \"2006-09-18 15:13:13Z\"\n" " svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" msgstr "" +" utcdate \"2006/09/18 15:13:13\"\n" +" svnutcdate \"2006-09-18 15:13:13Z\"\n" +" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" msgid "" "The default template mappings (view with :hg:`kwdemo -d`) can be\n" @@ -4061,7 +4126,7 @@ msgstr "%d ikke-anvendte" msgid "mq: (empty queue)\n" -msgstr "" +msgstr "mq: (tom kø)\n" msgid "operate on patch repository" msgstr "arbejd på rettelsesdepot" @@ -4085,7 +4150,7 @@ msgstr "brug ukomprimeret overførsel (hurtig over LAN)" msgid "REPO" -msgstr "" +msgstr "DEPOT" msgid "location of source patch repository" msgstr "placering af kilde rettelse-depotet" @@ -4169,7 +4234,7 @@ msgstr "tilføj \"From: <aktuel bruger>\" til rettelsen" msgid "USER" -msgstr "" +msgstr "BRUGER" msgid "add \"From: <USER>\" to patch" msgstr "tilføj \"From: <BRUGER>\" til rettelsen" @@ -5203,7 +5268,8 @@ " rapporteret af :hg:`status` være kandidater til at blive optaget." msgid " See :hg:`help dates` for a list of formats valid for -d/--date." -msgstr " Se :hg:`help dates` for en liste af gyldige formater til -d/--date." +msgstr "" +" Se :hg:`help dates` for en liste af gyldige formater til -d/--date." msgid "" " You will be prompted for whether to record changes to each\n" @@ -7684,6 +7750,12 @@ " skal en eksplicit revision angives." 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 "" + +msgid "" " Returns 0 on success, 1 if there are unresolved files.\n" " " msgstr "" @@ -7693,7 +7765,8 @@ "branch '%s' has %d heads - please merge with an explicit rev\n" "(run 'hg heads .' to see heads)" msgstr "" -"afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit revision\n" +"afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit " +"revision\n" "(kør 'hg heads .' for se hovederne)" #, python-format @@ -7701,7 +7774,8 @@ "branch '%s' has one head - please merge with an explicit rev\n" "(run 'hg heads' to see all heads)" msgstr "" -"afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit revision\n" +"afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit " +"revision\n" "(kør 'hg heads' for at se alle hoveder)" msgid "there is nothing to merge" @@ -8062,8 +8136,13 @@ msgstr "" msgid "" -" (Use update -r to check out earlier revisions, revert does not\n" -" change the working directory parents.)" +" 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 "" msgid "" @@ -9469,9 +9548,6 @@ msgid "unsupported file type (type is %s)" msgstr "usupporteret filtype (typen er %s)" -msgid "searching for changes\n" -msgstr "leder efter ændringer\n" - msgid "queries" msgstr "" @@ -9846,6 +9922,27 @@ "- ``<install-root>/etc/mercurial/hgrc.d/*.rc``" msgid "" +"If there is a per-repository configuration file which is not owned by\n" +"the active user, Mercurial will warn you that the file is skipped::" +msgstr "" + +msgid "" +" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" +msgstr " stoler ikke på filen <depot>/.hg/hgrc fra ubetroet bruger BRUGER, gruppe GRUPPE" + +msgid "" +"If this bothers you, the warning can be silenced (the file would still\n" +"be ignored) or trust can be established. Use one of the following\n" +"settings, the syntax is explained below:" +msgstr "" + +msgid "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" +msgstr "" + +msgid "" "The configuration files for Mercurial use a simple ini-file format. A\n" "configuration file consists of sections, led by a ``[section]`` header\n" "and followed by ``name = value`` entries::" @@ -10197,7 +10294,7 @@ "Branch\n" " (Noun) A child changeset that has been created from a parent that\n" " is not a head. These are known as topological branches, see\n" -" 'Branch, topological'.If a topological branch is named, it becomes\n" +" 'Branch, topological'. If a topological branch is named, it becomes\n" " a named branch. If a topological branch is not named, it becomes\n" " an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." msgstr "" @@ -10262,8 +10359,8 @@ " collection of disjoint subsets. A named branch is not necessarily\n" " a topological branch. If a new named branch is created from the\n" " head of another named branch, or the default branch, but no\n" -" further changesets are added to that previous branch, then the new\n" -" named branch will be a branch in name only." +" further changesets are added to that previous branch, then that\n" +" previous branch will be a branch in name only." msgstr "" msgid "" @@ -10403,7 +10500,7 @@ " consisting of nodes and edges, where nodes correspond to\n" " changesets and edges imply a parent -> child relation. This graph\n" " can be visualized by graphical tools such as :hg:`glog`\n" -" (graphlog). In mercurial, the DAG is limited by the requirement\n" +" (graphlog). In Mercurial, the DAG is limited by the requirement\n" " for children to have at most two parents." msgstr "" @@ -10645,7 +10742,7 @@ msgid "" "Rewriting history\n" -" See 'History, rewriting'." +" See 'History, rewriting'." msgstr "" msgid "" @@ -10674,7 +10771,7 @@ " (Noun) Another synonym of changeset." msgstr "" -msgid " Example: \"I've pushed an update\"." +msgid " Example: \"I've pushed an update\"." msgstr "" msgid "" @@ -10693,7 +10790,7 @@ msgid "" "Working directory parent\n" -" See 'Parent, working directory'.\n" +" See 'Parent, working directory'.\n" msgstr "" msgid "" @@ -10923,10 +11020,10 @@ msgid "" "Identifiers such as branch names must be quoted with single or double\n" -"quotes if they contain characters outside of ``[a-zA-Z0-9]`` or if\n" -"they match one of the predefined predicates. Special characters can be\n" -"used in the identifiers by quoting them, e.g., ``\\n`` is interpreted\n" -"as a newline." +"quotes if they contain characters outside of\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" +"predicates. Special characters can be used in quoted identifiers by\n" +"escaping them, e.g., ``\\n`` is interpreted as a newline." msgstr "" msgid "There is a single prefix operator:" @@ -10945,7 +11042,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``." @@ -12040,8 +12137,8 @@ msgid "branch %s not found" msgstr "gren %s blev ikke fundet" -msgid "can't merge with ancestor" -msgstr "kan ikke sammenføje med forfader" +msgid "merging with a working directory ancestor has no effect" +msgstr "sammenføjning med en forfader til arbejdskataloget har ingen effekt" msgid "nothing to merge (use 'hg update' or check 'hg heads')" msgstr "intet at sammenføje (brug 'hg update' eller kontroller 'hg heads')" @@ -12783,3 +12880,9 @@ msgid "user name not available - set USERNAME environment variable" msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel" + +#~ msgid "failed to update bookmark %s!\n" +#~ msgstr "kunne ikke opdatere bogmærke %s!\n" + +#~ msgid "can't merge with ancestor" +#~ msgstr "kan ikke sammenføje med forfader"
--- a/i18n/ja.po Wed Jun 30 17:23:16 2010 +0200 +++ b/i18n/ja.po Fri Jul 02 11:41:43 2010 +0200 @@ -1,13 +1,13 @@ # Japanese translation for Mercurial # Mercurial 日本語翻訳 -# +# # Copyright (C) 2009-2010 the Mercurial team -# +# # ======================================== # 【翻訳用語集】 -# +# # 言い回し: -# +# # no XXXX avairable XXXX がありません # XXXX found XXXX が存在します # XXXX exists XXXX が存在します @@ -22,11 +22,11 @@ # option --XXXX --XXXX ※ 「オプション」であることが自明なので # invalid XXXX XXXX が不正です or 不正な XXXX # malformed XXXX XXXX が不正です or 不正な XXXX -# +# # 単語: -# +# # Distributed SCM 分散構成管理ツール -# +# # abort 中断 # add (構成管理への)追加登録 # apply 適用 @@ -94,12 +94,12 @@ # working copy(of xxx) 作業領域(中の xxx) # working directory 作業領域 # ======================================== -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-03-04 11:38+0900\n" +"POT-Creation-Date: 2010-06-28 11:35+0900\n" "PO-Revision-Date: 2009-11-16 21:24+0100\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" @@ -130,8 +130,9 @@ msgstr "" msgid "" -"This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets." +"This hook makes it possible to allow or deny write access to given\n" +"branches and paths of a repository when receiving incoming changesets\n" +"via pretxnchangegroup and pretxncommit." msgstr "" msgid "" @@ -142,61 +143,222 @@ msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" -"preventing authenticating users from doing anything other than\n" -"pushing or pulling. The hook is not safe to use if users have\n" -"interactive shell access, as they can then disable the hook.\n" -"Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them." -msgstr "" - -msgid "To use this hook, configure the acl extension in your hgrc like this::" -msgstr "" - -msgid "" -" [extensions]\n" -" acl =" -msgstr "" - -msgid "" -" [hooks]\n" +"preventing authenticating users from doing anything other than pushing\n" +"or pulling. The hook is not safe to use if users have interactive\n" +"shell access, as they can then disable the hook. Nor is it safe if\n" +"remote users share an account, because then there is no way to\n" +"distinguish them." +msgstr "" + +msgid "The order in which access checks are performed is:" +msgstr "" + +msgid "" +"1) Deny list for branches (section ``acl.deny.branches``)\n" +"2) Allow list for branches (section ``acl.allow.branches``)\n" +"3) Deny list for paths (section ``acl.deny``)\n" +"4) Allow list for paths (section ``acl.allow``)" +msgstr "" + +msgid "The allow and deny sections take key-value pairs." +msgstr "" + +msgid "" +"Branch-based Access Control\n" +"---------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" +"have branch-based access control. Keys in these sections can be\n" +"either:" +msgstr "" + +msgid "" +"- a branch name, or\n" +"- an asterisk, to match any branch;" +msgstr "" + +msgid "The corresponding values can be either:" +msgstr "" + +msgid "" +"- a comma-separated list containing users and groups, or\n" +"- an asterisk, to match anyone;" +msgstr "" + +msgid "" +"Path-based Access Control\n" +"-------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" +"access control. Keys in these sections accept a subtree pattern (with\n" +"a glob syntax by default). The corresponding values follow the same\n" +"syntax as the other sections above." +msgstr "" + +msgid "" +"Groups\n" +"------" +msgstr "" + +msgid "" +"Group names must be prefixed with an ``@`` symbol. Specifying a group\n" +"name has the same effect as specifying all the users in that group." +msgstr "" + +msgid "" +"You can define group members in the ``acl.groups`` section.\n" +"If a group name is not defined there, and Mercurial is running under\n" +"a Unix-like system, the list of users will be taken from the OS.\n" +"Otherwise, an exception will be raised." +msgstr "" + +msgid "" +"Example Configuration\n" +"---------------------" +msgstr "" + +msgid "::" +msgstr "" + +msgid " [hooks]" +msgstr " [hooks]" + +msgid "" +" # Use this if you want to check access restrictions at commit time\n" +" pretxncommit.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" +" # Use this if you want to check access restrictions for pull, push,\n" +" # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" msgstr "" msgid "" " [acl]\n" -" # Check whether the source of incoming changes is in this list\n" -" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" # Allow or deny access for incoming changes only if their source is\n" +" # listed here, let them pass otherwise. Source is \"serve\" for all\n" +" # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n" +" # related commands are run locally.\n" +" # Default: serve\n" " sources = serve" msgstr "" -msgid "" -"The allow and deny sections take a subtree pattern as key (with a glob\n" -"syntax by default), and a comma separated list of users as the\n" -"corresponding value. The deny list is checked before the allow list\n" -"is. ::" +msgid " [acl.deny.branches]" +msgstr "" + +msgid "" +" # Everyone is denied to the frozen branch:\n" +" frozen-branch = *" +msgstr "" + +msgid "" +" # A bad user is denied on all branches:\n" +" * = bad-user" +msgstr "" + +msgid " [acl.allow.branches]" +msgstr "" + +msgid "" +" # A few users are allowed on branch-a:\n" +" branch-a = user-1, user-2, user-3" +msgstr "" + +msgid "" +" # Only one user is allowed on branch-b:\n" +" branch-b = user-1" +msgstr "" + +msgid "" +" # The super user is allowed on any branch:\n" +" * = super-user" +msgstr "" + +msgid "" +" # Everyone is allowed on branch-for-tests:\n" +" branch-for-tests = *" +msgstr "" + +msgid "" +" [acl.deny]\n" +" # This list is checked first. If a match is found, acl.allow is not\n" +" # checked. All users are granted access if acl.deny is not present.\n" +" # Format for both lists: glob pattern = user, ..., @group, ..." +msgstr "" + +msgid "" +" # To match everyone, use an asterisk for the user:\n" +" # my/glob/pattern = *" +msgstr "" + +msgid "" +" # user6 will not have write access to any file:\n" +" ** = user6" +msgstr "" + +msgid "" +" # Group \"hg-denied\" will not have write access to any file:\n" +" ** = @hg-denied" +msgstr "" + +msgid "" +" # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n" +" # everyone being able to change all other files. See below.\n" +" src/main/resources/DONT-TOUCH-THIS.txt = *" msgstr "" msgid "" " [acl.allow]\n" -" # If acl.allow is not present, all users are allowed by default.\n" -" # An empty acl.allow section means no users allowed.\n" -" docs/** = doc_writer\n" -" .hgtags = release_engineer" -msgstr "" - -msgid "" -" [acl.deny]\n" -" # If acl.deny is not present, no users are refused by default.\n" -" # An empty acl.deny section means all users allowed.\n" -" glob pattern = user4, user5\n" -" ** = user6\n" -msgstr "" - -#, python-format -msgid "config error - hook type \"%s\" cannot stop incoming changesets" +" # if acl.allow is not present, all users are allowed by default\n" +" # empty acl.allow = no users allowed" +msgstr "" + +msgid "" +" # User \"doc_writer\" has write access to any file under the \"docs\"\n" +" # folder:\n" +" docs/** = doc_writer" +msgstr "" + +msgid "" +" # User \"jack\" and group \"designers\" have write access to any file\n" +" # under the \"images\" folder:\n" +" images/** = jack, @designers" +msgstr "" + +msgid "" +" # Everyone (except for \"user6\" - see acl.deny above) will have write\n" +" # access to any file under the \"resources\" folder (except for 1\n" +" # file. See acl.deny):\n" +" src/main/resources/** = *" +msgstr "" + +msgid " .hgtags = release_engineer" +msgstr "" + +#, python-format +msgid "group '%s' is undefined" +msgstr "" + +#, python-format +msgid "" +"config error - hook type \"%s\" cannot stop incoming changesets nor commits" msgstr "設定エラー - フック種別 \"%s\" は履歴の取り込みを抑止できません" #, python-format +msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" +msgstr "" +"acl: ユーザ \"%s\" はブランチ \"%s\" で拒否されました(リビジョン \"%s\")" + +#, python-format +msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" +msgstr "" + +#, python-format msgid "acl: access denied for changeset %s" msgstr "acl: チェンジセット %s のアクセスは拒否されました" @@ -211,8 +373,8 @@ msgstr "" msgid "" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update)." +"It is possible to use bookmark names in every revision lookup (e.g.\n" +":hg:`merge`, :hg:`update`)." msgstr "" msgid "" @@ -236,12 +398,12 @@ msgid "" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark." -msgstr "" - -msgid "" -" You can use 'hg bookmark NAME' to set a bookmark on the working\n" +" deleted. It is possible to use bookmark names in :hg:`merge` and\n" +" :hg:`update` to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" +" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" " the bookmark is assigned to that revision.\n" @@ -269,15 +431,68 @@ msgid "no bookmarks set\n" msgstr "ブックマークは存在しません\n" +#, python-format +msgid "updating bookmark %s\n" +msgstr "ブックマーク %s の更新中\n" + +#, python-format +msgid "not updating divergent bookmark %s\n" +msgstr "" + +#, python-format +msgid "updating bookmark %s failed!\n" +msgstr "ブックマーク %s の更新に失敗!\n" + +#, python-format +msgid "remote bookmark %s not found!" +msgstr "連携先にはブックマーク %s がありません!" + +#, python-format +msgid "importing bookmark %s\n" +msgstr "ブックマーク %s の取り込み中\n" + +#, python-format +msgid "exporting bookmark %s\n" +msgstr "ブックマーク %s の反映中\n" + +#, python-format +msgid "deleting remote bookmark %s\n" +msgstr "連携先のブックマーク %s の削除中\n" + +msgid "searching for changes\n" +msgstr "変更点を探索中\n" + +msgid "no changes found\n" +msgstr "差分はありません\n" + +#, python-format +msgid "comparing with %s\n" +msgstr "%s と比較中\n" + +msgid "bookmark to import" +msgstr "ブックマークの取り込み" + +msgid "bookmark to export" +msgstr "ブックマークの反映" + +msgid "compare bookmark" +msgstr "ブックマークの比較" + msgid "force" msgstr "強制実施" +msgid "REV" +msgstr "リビジョン" + msgid "revision" msgstr "リビジョン" msgid "delete a given bookmark" msgstr "指定ブックマークの削除" +msgid "NAME" +msgstr "名前" + msgid "rename a given bookmark" msgstr "指定ブックマークの改名" @@ -590,9 +805,8 @@ msgid "Revision %d is a merge, ignoring...\n" msgstr "マージ実施リビジョン %d を無視...\n" -#, python-format -msgid "generating stats: %d%%" -msgstr "統計作業中: %d%%" +msgid "analyzing" +msgstr "解析中" msgid "histogram of changes to the repository" msgstr "リポジトリにおける変更の統計分布表示" @@ -656,8 +870,8 @@ " 以下の形式のファイルを指定することで、リビジョンに記録された電子\n" " メールアドレスを別のものに変換することが可能です::" -msgid " <alias email> <actual email>" -msgstr " <別名> <実名>" +msgid " <alias email> = <actual email>" +msgstr " <別名> = <実名>" msgid "" " Such a file may be specified with the --aliases option, otherwise\n" @@ -672,12 +886,21 @@ msgid "count rate for the specified revision or range" msgstr "処理対象とする特定リビジョン／範囲の指定" +msgid "DATE" +msgstr "日時" + msgid "count rate for revisions matching date spec" msgstr "指定日時と一致したリビジョンを処理対象とする" +msgid "TEMPLATE" +msgstr "テンプレート" + msgid "template to group changesets" msgstr "表示をグループ化するためのテンプレート" +msgid "FORMAT" +msgstr "書式" + msgid "strftime-compatible format for grouping by date" msgstr "日時グループ化のための strftime 互換形式フォーマット" @@ -690,20 +913,21 @@ msgid "display added/removed lines separately" msgstr "追加／削除行表示の分離" +msgid "FILE" +msgstr "FILE" + msgid "file with email aliases" msgstr "ユーザ名変換用ファイル" -msgid "show progress" -msgstr "進捗状況の表示" - -msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" -msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" +msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" msgid "colorize output from some commands" msgstr "" msgid "" -"This extension modifies the status and resolve commands to add color to their\n" +"This extension modifies the status and resolve commands to add color to " +"their\n" "output to reflect file status, the qseries command to add color to reflect\n" "patch status (applied, unapplied, missing), and to diff-related\n" "commands to highlight additions, removals, diff headers, and trailing\n" @@ -759,24 +983,40 @@ " resolve.resolved = green bold" msgstr "" -msgid " bookmarks.current = green\n" +msgid " bookmarks.current = green" +msgstr "" + +msgid "" +"The color extension will try to detect whether to use ANSI codes or\n" +"Win32 console APIs, unless it is made explicit::" +msgstr "" + +msgid "" +" [color]\n" +" mode = ansi" +msgstr "" + +msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color." +msgstr "" + +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "未知の色/効果指定 %r を無視(color.%s で設定記述)\n" + +msgid "win32console not found, please install pywin32\n" msgstr "" msgid "when to colorize (always, auto, or never)" msgstr "色づけ実施種別。always(常時), auto(自動)ないし never(禁止)" -msgid "don't colorize output (DEPRECATED)" -msgstr "出力を色付けしない(非推奨)" - -#, python-format -msgid "ignoring unknown color/effect %r (configured in color.%s)\n" -msgstr "未知の色/効果指定 %r を無視(color.%s で設定記述)\n" +msgid "TYPE" +msgstr "種別" msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "他の構成管理ツールから Mercurial への履歴取り込み" msgid "convert a foreign SCM repository to a Mercurial one." -msgstr "" +msgstr "別 SCM のリポジトリから Mercurial リポジトリへの変換" msgid " Accepted source formats [identifiers]:" msgstr "" @@ -1155,7 +1395,16 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [OPTION]... [PATH]..." -msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" +#, python-format +msgid "%s does not look like a Bazaar repository" +msgstr "%s は Bazaar 形式ではないと思われます" + +msgid "Bazaar modules could not be loaded" +msgstr "Bazaar モジュールが読み込めません" + +msgid "" +"warning: lightweight checkouts may cause conversion failures, try with a " +"regular branch instead.\n" msgstr "警告: 簡易チェックアウトは失敗要因となるため通常ブランチを使います\n" msgid "bzr source type could not be determined\n" @@ -1209,6 +1458,15 @@ msgid "%s: unknown repository type" msgstr "%s: 未知のリポジトリ形式" +msgid "retrieving file" +msgstr "ファイルの回収中" + +msgid "revisions" +msgstr "リビジョン" + +msgid "scanning" +msgstr "走査中" + #, python-format msgid "unknown sort mode: %s" msgstr "未知の整列方式 %s" @@ -1253,6 +1511,9 @@ msgid "source: %s\n" msgstr "変換元: %s\n" +msgid "converting" +msgstr "変換中" + #, python-format msgid "assuming destination %s\n" msgstr "変換先として %s を想定\n" @@ -1264,6 +1525,10 @@ msgstr "指定の変換元では --sourcesort を指定できません" #, python-format +msgid "%s does not look like a CVS checkout" +msgstr "%s は CVS 作業領域ではないと思われます" + +#, python-format msgid "revision %s is not a patchset number" msgstr "リビジョン %s はパッチセット番号ではありません" @@ -1275,13 +1540,17 @@ msgstr "CVS pserver の認証に失敗" #, python-format -msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "CVS サーバの予期せぬ応答(期待値 \"Valid-requests\" に対して %r)" #, python-format msgid "%d bytes missing from remote file" msgstr "リモートファイルと %d バイト違います" +msgid "malformed response from CVS" +msgstr "CVS からの想定外の応答" + #, python-format msgid "cvs server: %s\n" msgstr "cvs サーバ: %s\n" @@ -1293,6 +1562,9 @@ msgid "collecting CVS rlog\n" msgstr "CVS rlog 収集中\n" +msgid "not a CVS sandbox" +msgstr "CVS サンドボックスではありません" + #, python-format msgid "reading cvs log cache %s\n" msgstr "CVS ログキャッシュ %s 読み込み中\n" @@ -1321,6 +1593,9 @@ msgid "revision must be followed by date line" msgstr "リビジョン情報は日付情報を伴う筈です" +msgid "log cache overlaps with new log entries, re-run without cache." +msgstr "" + #, python-format msgid "writing cvs log cache %s\n" msgstr "cvs ログキャッシュ %s の書き込み中\n" @@ -1348,6 +1623,10 @@ msgstr "%d 件のチェンジセットエントリ\n" #, python-format +msgid "%s does not look like a darcs repository" +msgstr "%s は darcs 形式ではないと思われます" + +#, python-format msgid "darcs version 2.1 or newer needed (found %r)" msgstr "バージョン 2.1 以降の darcs が必要です(検出されたのは %r)" @@ -1372,7 +1651,26 @@ msgstr "変換元リポジトリは --filemap をサポートしていません" #, python-format -msgid "%s does not look like a GNU Arch repo" +msgid "%s does not look like a Git repository" +msgstr "%s は Git 形式ではないと思われます" + +msgid "cannot retrieve git heads" +msgstr "" + +#, python-format +msgid "cannot read %r object at %s" +msgstr "" + +#, python-format +msgid "cannot read changes in %s" +msgstr "%s の変更を読み込めません" + +#, python-format +msgid "cannot read tags from %s" +msgstr "" + +#, python-format +msgid "%s does not look like a GNU Arch repository" msgstr "%s は GNU Arch 形式ではないと思われます" msgid "cannot find a GNU Arch tool" @@ -1383,7 +1681,8 @@ msgstr "ツリーバージョン %s の解析中...\n" #, python-format -msgid "tree analysis stopped because it points to an unregistered archive %s...\n" +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "未登録アーカイブ %s の参照によりツリー解析を中断...\n" #, python-format @@ -1391,7 +1690,7 @@ msgstr "リビジョン %s の cat-log の解析に失敗" #, python-format -msgid "%s is not a local Mercurial repo" +msgid "%s is not a local Mercurial repository" msgstr "%s はローカルの Mercurial リポジトリではありません" #, python-format @@ -1399,6 +1698,10 @@ msgstr "変換先リポジトリ %s の初期化中\n" #, python-format +msgid "could not create hg repository %s as sink" +msgstr "" + +#, python-format msgid "pulling from %s into %s\n" msgstr "%s から %s に取り込み中\n" @@ -1417,13 +1720,17 @@ msgstr "例外を無視します: %s\n" #, python-format -msgid "%s does not look like a monotone repo" -msgstr "%s は monotone のリポジトリとは思われません" +msgid "%s does not look like a monotone repository" +msgstr "%s は monotone 形式ではないと思われます" #, python-format msgid "copying file in renamed directory from '%s' to '%s'" msgstr "改名先ディレクトリの '%s' から '%s' へファイルを複製中" +#, python-format +msgid "%s does not look like a P4 repository" +msgstr "%s は P4 形式ではないと思われます" + msgid "reading p4 views\n" msgstr "p4 ビューの読み込み中\n" @@ -1433,8 +1740,16 @@ msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "Mercurial 自身の実行に失敗。PATH 設定と hg コマンドを確認してください" -msgid "svn: cannot probe remote repository, assume it could be a subversion repository. Use --source-type if you know better.\n" -msgstr "svn: subversion の遠隔リポジトリの確認に失敗しました。--source-type の使用を検討してください。\n" +msgid "" +"svn: cannot probe remote repository, assume it could be a subversion " +"repository. Use --source-type if you know better.\n" +msgstr "" +"svn: subversion の遠隔リポジトリの確認に失敗しました。--source-type の使用を" +"検討してください。\n" + +#, python-format +msgid "%s does not look like a Subversion repository" +msgstr "%s は Subversion 形式ではないと思われます" msgid "Subversion python bindings could not be loaded" msgstr "Subversion python バインディングが読み込めません" @@ -1482,13 +1797,12 @@ msgstr "svn: 開始リビジョン %d 以降にリビジョンはありません" #, python-format -msgid "no tags found at revision %d\n" -msgstr "リビジョン %d にタグはありません\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "リビジョン %s は %d までのりビジョンに見当たりません" +msgid "scanning paths" +msgstr "パスの走査中" + #, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "ブランチ %s の親を %d:%s で検出\n" @@ -1502,12 +1816,12 @@ msgstr "svn: ブランチにはリビジョン %s がありません" #, python-format -msgid "initializing svn repo %r\n" +msgid "initializing svn repository %r\n" msgstr "svn リポジトリ %r の初期化中\n" #, python-format -msgid "initializing svn wc %r\n" -msgstr "svn ワーキングコピー %r を初期化しています\n" +msgid "initializing svn working copy %r\n" +msgstr "svn ワーキングコピー %r の初期化中\n" msgid "unexpected svn output:\n" msgstr "予期せぬ svn の出力:\n" @@ -1518,6 +1832,117 @@ msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "XXX タグ付けはまだ実装されていません\n" +msgid "automatically manage newlines in repository files" +msgstr "" + +msgid "" +"This extension allows you to manage the type of line endings (CRLF or\n" +"LF) that are used in the repository and in the local working\n" +"directory. That way you can get CRLF line endings on Windows and LF on\n" +"Unix/Mac, thereby letting everybody use their OS native line endings." +msgstr "" + +msgid "" +"The extension reads its configuration from a versioned ``.hgeol``\n" +"configuration file every time you run an ``hg`` command. The\n" +"``.hgeol`` file use the same syntax as all other Mercurial\n" +"configuration files. It uses two sections, ``[patterns]`` and\n" +"``[repository]``." +msgstr "" + +msgid "" +"The ``[patterns]`` section specifies the line endings used in the\n" +"working directory. The format is specified by a file pattern. The\n" +"first match is used, so put more specific patterns first. The\n" +"available line endings are ``LF``, ``CRLF``, and ``BIN``." +msgstr "" + +msgid "" +"Files with the declared format of ``CRLF`` or ``LF`` are always\n" +"checked out in that format and files declared to be binary (``BIN``)\n" +"are left unchanged. Additionally, ``native`` is an alias for the\n" +"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" +"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" +"endings) is Mercurial's default behaviour; it is only needed if you\n" +"need to override a later, more general pattern." +msgstr "" + +msgid "" +"The optional ``[repository]`` section specifies the line endings to\n" +"use for files stored in the repository. It has a single setting,\n" +"``native``, which determines the storage line endings for files\n" +"declared as ``native`` in the ``[patterns]`` section. It can be set to\n" +"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n" +"that on Windows, files configured as ``native`` (``CRLF`` by default)\n" +"will be converted to ``LF`` when stored in the repository. Files\n" +"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n" +"are always stored as-is in the repository." +msgstr "" + +msgid "Example versioned ``.hgeol`` file::" +msgstr "" + +msgid "" +" [patterns]\n" +" **.py = native\n" +" **.vcproj = CRLF\n" +" **.txt = native\n" +" Makefile = LF\n" +" **.jpg = BIN" +msgstr "" + +msgid "" +" [repository]\n" +" native = LF" +msgstr "" +" [repository]\n" +" native = LF" + +msgid "" +"The extension uses an optional ``[eol]`` section in your hgrc file\n" +"(not the ``.hgeol`` file) for settings that control the overall\n" +"behavior. There are two settings:" +msgstr "" + +msgid "" +"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" +" ``CRLF`` override the default interpretation of ``native`` for\n" +" checkout. This can be used with :hg:`archive` on Unix, say, to\n" +" generate an archive where files have line endings for Windows." +msgstr "" + +msgid "" +"- ``eol.only-consistent`` (default True) can be set to False to make\n" +" the extension convert files with inconsistent EOLs. Inconsistent\n" +" means that there is both ``CRLF`` and ``LF`` present in the file.\n" +" Such files are normally not touched under the assumption that they\n" +" have mixed EOLs on purpose." +msgstr "" + +msgid "" +"See :hg:`help patterns` for more information about the glob patterns\n" +"used.\n" +msgstr "パターン合致に関する詳細は :hg:`help patterns` を参照してください。\n" + +#, python-format +msgid "%s should not have CRLF line endings" +msgstr "" + +#, python-format +msgid "%s should not have LF line endings" +msgstr "" + +msgid "the eol extension is incompatible with the win32text extension" +msgstr "eol エクステンションと win32text エクステンションは併用できません" + +#, python-format +msgid "ignoring unknown EOL style '%s' from %s\n" +msgstr "" + +#, python-format +msgid "inconsistent newline style in %s\n" +msgstr "" + msgid "command to allow external programs to compare revisions" msgstr "" @@ -1531,7 +1956,7 @@ msgid "" "The extdiff extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +"you do not need to type :hg:`extdiff -p kdiff3` always. ::" msgstr "" msgid "" @@ -1561,11 +1986,38 @@ " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" msgstr "" -msgid "" -"You can use -I/-X and list of file or directory names like normal \"hg\n" -"diff\" command. The extdiff extension makes snapshots of only needed\n" -"files, so running the external diff program will actually be pretty\n" -"fast (at least faster than having to compare the entire tree).\n" +msgid "Tool arguments can include variables that are expanded at runtime::" +msgstr "" + +msgid "" +" $parent1, $plabel1 - filename, descriptive label of first parent\n" +" $child, $clabel - filename, descriptive label of child revision\n" +" $parent2, $plabel2 - filename, descriptive label of second parent\n" +" $parent is an alias for $parent1." +msgstr "" + +msgid "" +"The extdiff extension will look in your [diff-tools] and [merge-tools]\n" +"sections for diff tool arguments, when none are specified in [extdiff]." +msgstr "" + +msgid "" +" [extdiff]\n" +" kdiff3 =" +msgstr "" +" [extdiff]\n" +" kdiff3 =" + +msgid "" +" [diff-tools]\n" +" kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child" +msgstr "" + +msgid "" +"You can use -I/-X and list of file or directory names like normal\n" +":hg:`diff` command. The extdiff extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" msgstr "" #, python-format @@ -1605,10 +2057,20 @@ " revisions are specified, the working directory files are compared\n" " to its parent." msgstr "" +" 2つのリビジョンが指定された場合、リビジョン間の差分が表示されます。\n" +" 1つのリビジョンが指定された場合、指定リビジョンと作業領域間の差分が\n" +" 表示されます。何もリビジョンが指定されない場合、作業領域とその\n" +" 親リビジョン間の差分が表示されます。" + +msgid "CMD" +msgstr "コマンド" msgid "comparison program to run" msgstr "比較実行用プログラム" +msgid "OPT" +msgstr "" + msgid "pass option to comparison program" msgstr "比較実行用プログラムへのオプション指定" @@ -1658,12 +2120,17 @@ msgstr "" msgid "" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " -msgstr "" - -msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" -msgstr "作業領域はブランチ tip ではありません(\"hg update\" でブランチ tip に更新可能)" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" " +msgstr "" +" -d/--date での日時表記は :he:`help dates` を参照してください。\n" +" " + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" +"作業領域はブランチ tip ではありません(\"hg update\" でブランチ tip に更新可" +"能)" msgid "outstanding uncommitted merge" msgstr "マージが未コミットです" @@ -1674,19 +2141,28 @@ msgid "working directory is missing some files" msgstr "作業領域に存在しないファイルがあります" -msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" -msgstr "このブランチには複数のヘッドがあります(\"hg heads .\" と \"hg merge\" でマージしてください)" +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" +"このブランチには複数のヘッドがあります(\"hg heads .\" と \"hg merge\" でマー" +"ジしてください)" #, python-format msgid "pulling from %s\n" msgstr "%s から取り込み中\n" -msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." msgstr "連携先でリビジョンが特定出来ないため、リビジョンは指定できません" #, python-format -msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" -msgstr "%d 個の新規ブランチヘッドとはマージされません(\"hg heads .\" と \"hg merge\" でマージしてください)\n" +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" +msgstr "" +"%d 個の新規ブランチヘッドとはマージされません(\"hg heads .\" と \"hg merge\" " +"でマージしてください)\n" #, python-format msgid "updating to %d:%s\n" @@ -1765,8 +2241,12 @@ msgid "Error while signing" msgstr "署名処理の失敗" -msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" -msgstr "作業領域の .hgsigs は変更されています(.hgsigs を手動コミットするか、--force を使用してください)" +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" +"作業領域の .hgsigs は変更されています(.hgsigs を手動コミットするか、--force " +"を使用してください)" msgid "unknown signature version" msgstr "未知の署名バージョン" @@ -1780,9 +2260,15 @@ msgid "do not commit the sigfile after signing" msgstr "署名後の署名ファイルのコミットを抑止" +msgid "ID" +msgstr "ID" + msgid "the key id to sign with" msgstr "署名に使用する鍵ID" +msgid "TEXT" +msgstr "テキスト" + msgid "commit message" msgstr "コミットメッセージ" @@ -1827,16 +2313,12 @@ " @ 文字で表示されるリビジョンは、作業領域の親リビジョンです。\n" " " -#, python-format -msgid "comparing with %s\n" -msgstr "%s と比較中\n" - -msgid "no changes found\n" -msgstr "差分はありません\n" - msgid "show the revision DAG" msgstr "リビジョングラフの表示" +msgid "NUM" +msgstr "数値" + msgid "limit number of changes displayed" msgstr "最大表示リビジョン数" @@ -1922,7 +2404,7 @@ msgstr "" msgid "" -"The hg view command will launch the hgk Tcl script. For this command\n" +"The :hg:`view` command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" "the path to hgk in your .hgrc file::" msgstr "" @@ -2193,8 +2675,11 @@ 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 "一時ソケットに使用する .hg/inotify.sock が既に存在するため開始できません" +msgid "" +"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" +"inotify.sock already exists" +msgstr "" +"一時ソケットに使用する .hg/inotify.sock が既に存在するため開始できません" #, python-format msgid "answering query for %r\n" @@ -2229,12 +2714,14 @@ msgid "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" #, python-format @@ -2264,11 +2751,11 @@ "現行ユーザやアーカイブ配布者に配慮しています。" msgid "" -"Configuration is done in the [keyword] and [keywordmaps] sections of\n" -"hgrc files." -msgstr "" -"設定は、設定ファイル中の [keyword] および [keywordmaps] セクションに\n" -"記述します。" +"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" +"sections of hgrc files." +msgstr "" +"設定は、設定ファイル中の [keyword] [keywordset] および [keywordmaps]\n" +"セクションに記述します。" msgid "Example::" msgstr "記述例::" @@ -2285,6 +2772,12 @@ " x* = ignore" msgid "" +" [keywordset]\n" +" # prefer svn- over cvs-like default keywordmaps\n" +" svn = True" +msgstr "" + +msgid "" "NOTE: the more specific you are in your filename patterns the less you\n" "lose speed in huge repositories." msgstr "" @@ -2293,56 +2786,50 @@ msgid "" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" "available templates and filters." msgstr "" -"[keywordmaps] でのテンプレート設定の展開を実演するには、\"hg kwdemo\" を\n" -"実行します。使用可能なテンプレートやフィルタに関しては\n" -"\"hg help templates\" を参照してください。" - -msgid "" -"An additional date template filter {date|utcdate} is provided. It\n" -"returns a date like \"2006/09/18 15:13:13\"." -msgstr "" -"日時情報用フィルタとして {date|utcdate} も使用可能です。\n" -"このフィルタは日時情報を \"2006/09/18 15:13:13\" 形式に変換します。" - -msgid "" -"The default template mappings (view with \"hg kwdemo -d\") can be\n" -"replaced with customized keywords and templates. Again, run \"hg\n" -"kwdemo\" to control the results of your config changes." -msgstr "" -"無指定時のテンプレート設定(\"hg kwdemo -d\" で閲覧可能)は、キーワード及び\n" -"テンプレートのカスタマイズで置き換えることが可能です。繰り返しますが\n" -"設定変更の確認は \"hg kwdemo\" で行うことができます。" - -msgid "" -"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +"[keywordmaps] でのテンプレート設定の展開を実演するには、:hg:`kwdemo`\n" +"を実行します。使用可能なテンプレートやフィルタに関しては\n" +":hg:`help templates` を参照してください。" + +msgid "Three additional date template filters are provided::" +msgstr "テンプレートでの日時用フィルタが 3 つ追加されます::" + +msgid "" +" utcdate \"2006/09/18 15:13:13\"\n" +" svnutcdate \"2006-09-18 15:13:13Z\"\n" +" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" +msgstr "" +" utcdate \"2006/09/18 15:13:13\"\n" +" svnutcdate \"2006-09-18 15:13:13Z\"\n" +" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" + +msgid "" +"The default template mappings (view with :hg:`kwdemo -d`) can be\n" +"replaced with customized keywords and templates. Again, run\n" +":hg:`kwdemo` to control the results of your config changes." +msgstr "" +"無指定時のテンプレート設定(:hg:`kwdemo -d` で閲覧可能)は、キーワード\n" +"及びテンプレートのカスタマイズで置き換えることが可能です。\n" +"繰り返しますが設定変更の確認は :hg:`kwdemo` で行うことができます。" + +msgid "" +"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" "history." msgstr "" "展開済みキーワードが意図せず履歴に記録されてしまうことを防ぐために、\n" -"キーワードの設定変更/無効化の前には \"hg kwshrink\" を実行してください。" +"キーワードの設定変更/無効化の前には :hg:`kwshrink` を実行してください。" msgid "" "To force expansion after enabling it, or a configuration change, run\n" -"\"hg kwexpand\"." -msgstr "" -"キーワードの設定変更/有効化後に、強制的に展開する場合は \"hg kwexpand\"\n" +":hg:`kwexpand`." +msgstr "" +"キーワードの設定変更/有効化後に、強制的に展開する場合は :hg:`kwexpand`\n" "を実行してください。" msgid "" -"Also, when committing with the record extension or using mq's qrecord,\n" -"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" -"the files in question to update keyword expansions after all changes\n" -"have been checked in." -msgstr "" -"record エクステンション併用時のコミット、ないし MQ の qrecord コマンドを\n" -"使用する場合、キーワードは更新されない点に注意してください。\n" -"全ての変更内容を確認した上で、当該ファイルに対して \"hg kwexpand\" を\n" -"実行することでキーワード展開を行ってください。" - -msgid "" "Expansions spanning more than one line and incremental expansions,\n" "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" "{desc}\" expands to the first line of the changeset description.\n" @@ -2388,11 +2875,11 @@ " 一時的に無効化することもできます。" msgid "" -" See \"hg help templates\" for information on templates and filters.\n" -" " -msgstr "" -" テンプレートやフィルタ機能に関しては \"hg help templates\" を参照\n" -" してください。\n" +" See :hg:`help templates` for information on templates and filters.\n" +" " +msgstr "" +" テンプレートやフィルタ機能に関しては :hg:`help templates`\n" +" を参照してください。\n" " " #, python-format @@ -2437,9 +2924,6 @@ "\n" "キーワードを %s に書き込みました:\n" -msgid "unhooked all commit hooks\n" -msgstr "全ての commit フックを無効化\n" - msgid "hg keyword configuration and expansion example" msgstr "" @@ -2482,9 +2966,10 @@ " 埋め込み対象となるファイルのみを設定することをお勧めします。" msgid "" -" See \"hg help keyword\" on how to construct patterns both for\n" +" See :hg:`help keyword` on how to construct patterns both for\n" " inclusion and exclusion of files." -msgstr " パターン合致に関する詳細は、\"hg help keyword\" を参照してください。" +msgstr "" +" パターン合致に関する詳細は、:hg:`help keyword` を参照してください。" msgid "" " With -A/--all and -v/--verbose the codes used to show the status\n" @@ -2511,9 +2996,9 @@ msgid "" " Run before changing/disabling active keywords or if you experience\n" -" problems with \"hg import\" or \"hg merge\"." -msgstr "" -" キーワード設定の変更前や、'hg import' ないし 'hg merge' で問題が\n" +" problems with :hg:`import` or :hg:`merge`." +msgstr "" +" キーワード設定の変更前や、:hg:`import` ないし :hg:`merge` で問題が\n" " 発生した経験がある場合に実行してください。" msgid "" @@ -2544,12 +3029,6 @@ msgid "only show unknown (not tracked) files" msgstr "構成管理対象外のファイルを表示" -msgid "show keyword status flags of all files (DEPRECATED)" -msgstr "全ファイルのキーワード状態フラグを表示(非推奨)" - -msgid "only show untracked files (DEPRECATED)" -msgstr "未登録ファイルの表示(非推奨)" - msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "hg kwfiles [OPTION]... [FILE]..." @@ -2577,15 +3056,13 @@ "に相当します。「適用中のパッチ」は、「既知のパッチ」のうち、対応する\n" "リビジョンがリポジトリの履歴に(一時的に)記録されているものを指します。" -msgid "Common tasks (use \"hg help command\" for more details)::" -msgstr "良く使用される機能(詳細は \"hg help コマンド名\" を参照)::" - -msgid "" -" prepare repository to work with patches qinit\n" +msgid "Common tasks (use :hg:`help command` for more details)::" +msgstr "良く使用される機能 (詳細は :hg:`help コマンド名` を参照)::" + +msgid "" " create new patch qnew\n" " import existing patch qimport" msgstr "" -" パッチ管理領域の初期化 qinit\n" " 新規パッチの作成 qnew\n" " 外部からのパッチファイルの取り込み qimport" @@ -2625,13 +3102,21 @@ "If set to 'keep', mq will obey the [diff] section configuration while\n" "preserving existing git patches upon qrefresh. If set to 'yes' or\n" "'no', mq will override the [diff] section and always generate git or\n" -"regular patches, possibly losing data in the second case.\n" +"regular patches, possibly losing data in the second case." msgstr "" "'keep' が指定された場合、既存の qrefresh 対象となるパッチが git 形式\n" -"パッチである間は、mq は [diff] セクションの設定に従います。\n" -"'yes' ないし 'no' が指定された場合、mq は [diff] セクションの設定を無視\n" +"パッチである間は、MQ は [diff] セクションの設定に従います。\n" +"'yes' ないし 'no' が指定された場合、MQ は [diff] セクションの設定を無視\n" "して、git パッチないし通常パッチを生成します。通常パッチを生成する場合、\n" -"情報が失われる可能性があります。\n" +"情報が失われる可能性があります。" + +msgid "" +"You will by default be managing a patch queue named \"patches\". You can\n" +"create other, independent patch queues with the :hg:`qqueue` command.\n" +msgstr "" +"特に指定が無い場合、パッチは \"patches\" という名前のキューで管理\n" +"されます。 :hg:`qqueue` を使うことで、相互に独立した別の管理キューを\n" +"作成することができます。\n" #, python-format msgid "mq.git option can be auto/keep/yes/no got %s" @@ -2821,6 +3306,10 @@ msgid "patch series already fully applied\n" msgstr "全てのパッチが適用中です\n" +#, python-format +msgid "patch '%s' not found" +msgstr "パッチ `%s` はありません" + msgid "cleaning up working directory..." msgstr "作業領域の整理中..." @@ -2866,7 +3355,9 @@ msgid "cannot refresh a revision with children" msgstr "ヘッド以外は qrefresh の対象に指定できません" -msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" msgstr "パッチ解除中に中断されました!(revert --all および qpush で復旧)\n" msgid "patch queue directory already exists" @@ -2964,7 +3455,8 @@ msgstr "管理対象からのパッチ除外" msgid "" -" The patches must not be applied, and at least one patch is required. With\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" " -k/--keep, the patch files are preserved in the patch directory." msgstr "" " 対象パッチは未適用でなければならず、最低1つのパッチ名の指定が\n" @@ -2973,10 +3465,10 @@ msgid "" " To stop managing a patch and move it into permanent history,\n" -" use the qfinish command." -msgstr "" -" 管理対象外となったパッチを通常リビジョン化する場合は qfinish を\n" -" 使用してください。" +" use the :hg:`qfinish` command." +msgstr "" +" 管理対象外となったパッチを通常リビジョン化する場合は :hg:`qfinish`\n" +" を使用してください。" msgid "print the patches already applied" msgstr "適用中のパッチ一覧の表示" @@ -3063,11 +3555,11 @@ msgid "" " This command is deprecated. Without -c, it's implied by other relevant\n" -" commands. With -c, use hg init -Q instead." +" commands. With -c, use :hg:`init --mq` instead." msgstr "" " 本コマンドは推奨されません。-c 指定無しでの作成なら、他の関連コマンド\n" -" によって作成されます。-c 指定有りでの作成ならば、hg init -Q を使用\n" -" してください。" +" によって作成されます。-c 指定有りでの作成ならば、:hg:`init --mq`\n" +" を使用してください。" msgid "clone main and patch repository at same time" msgstr "リポジトリとパッチ管理領域の同時複製" @@ -3094,15 +3586,15 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by qinit -c.\n" -" " -msgstr "" -" パッチ管理領域は、'qinit -c' によって生成された、入れ子になった\n" +" would be created by :hg:`init --mq`.\n" +" " +msgstr "" +" パッチ管理領域は、:hg:`init --mq` によって生成された、入れ子状の\n" " Mercurial リポジトリでなければなりません。\n" " " -msgid "versioned patch repository not found (see qinit -c)" -msgstr "構成管理されたパッチ領域が見つかりません(qinit -c 参照)" +msgid "versioned patch repository not found (see init --mq)" +msgstr "構成管理されたパッチ領域が見つかりません(init --mq 参照)" msgid "cloning main repository\n" msgstr "主リポジトリを複製中\n" @@ -3119,8 +3611,8 @@ msgid "commit changes in the queue repository (DEPRECATED)" msgstr "パッチ管理領域の変更をコミット(非推奨)" -msgid " This command is deprecated; use hg -Q commit instead." -msgstr " 本コマンドは非推奨です。`hg -Q commit` を使用してください。" +msgid " This command is deprecated; use :hg:`commit --mq` instead." +msgstr " 本コマンドは非推奨です。:hg:`commit --mq` を使用してください。" msgid "print the entire series file" msgstr "既知のパッチ一覧の表示" @@ -3139,20 +3631,18 @@ msgid "" " 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." msgstr "" " 本コマンドは、(パッチ適用中の場合は)適用中パッチの最上位の位置に\n" -" 新規パッチを作成します。作業領域に変更がある場合、本コマンドは実行を\n" -" 中断しますが、-f/--force が指定された場合、作業領域中の変更を取り\n" -" 込んで新規パッチが作成されます。-I/--include、-X/--exclude および\n" -" ファイル名指定の組み合わせによって、変更を新規パッチに取り込む\n" -" ファイルが限定され、それ以外のファイルに対する変更は未コミットな\n" -" 変更のままとなります。" +" 新規パッチを作成します。新規のパッチは、作業領域中の全ての変更を\n" +" 保持します。-I/--include、-X/--exclude と、パッチ名に続けて指定\n" +" するファイル名の組み合わせによって、新規パッチに変更が取り込まれる\n" +" ファイルを限定することができます。取り込み対象外のファイルにおける\n" +" 変更は未コミットなまま残ります。" msgid "" " -u/--user and -d/--date can be used to set the (given) user and\n" @@ -3234,15 +3724,15 @@ " 更新結果)を表示します。" msgid "" -" Use 'hg diff' if you only want to see the changes made since the\n" -" last qrefresh, or 'hg export qtip' if you want to see changes made\n" -" by the current patch without including changes made since the\n" +" Use :hg:`diff` if you only want to see the changes made since the\n" +" last qrefresh, or :hg:`export qtip` if you want to see changes\n" +" made by the current patch without including changes made since the\n" " qrefresh.\n" " " msgstr "" -" 前回の qrefresh 実施以後の作業領域における変更内容を見たい場合は\n" -" 'hg diff' を、作業領域の変更内容を含まない現行パッチの内容のみを\n" -" 見たい場合は 'hg export qtip' を使用してください。\n" +" 前回の :hg:`qrefresh` 実施以後の作業領域における変更内容を見たい\n" +" 場合は :hg:`diff` を、作業領域の変更内容を含まない現行パッチの内容\n" +" のみを見たい場合は :hg:`export qtip` を使用してください。\n" " " msgid "fold the named patches into the current patch" @@ -3296,15 +3786,16 @@ msgid "" " Guards control whether a patch can be pushed. A patch with no\n" " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" -" pushed only if the qselect command has activated it. A patch with\n" -" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" pushed only if the :hg:`qselect` command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the :hg:`qselect` " +"command\n" " has activated it." msgstr "" " 「ガード」はパッチ適用の可否を制御します。ガードが設定されていない\n" " パッチは常に適用されます。「正」のガード(例: \"+foo\")が設定された\n" -" パッチは、qselect によって当該ガードが設定されている場合にのみ適用\n" -" されます。「負」のガード(例: \"-foo\")が設定されているパッチは、\n" -" qselect によって当該ガードが設定されている場合には適用されません。" +" パッチは、:hg:`qselect` によって当該ガードが設定されている場合に限り\n" +" 適用されます。「負」のガード(例: \"-foo\")が設定されているパッチは、\n" +" :hg:`qselect` によって当該ガードが設定されている場合は適用されません。" msgid "" " With no arguments, print the currently active guards.\n" @@ -3418,34 +3909,70 @@ msgid "copy %s to %s\n" msgstr "%s から %s に複製します\n" -msgid "strip a revision and all its descendants from the repository" +msgid "strip a changeset and all its descendants from the repository" msgstr "リポジトリからの、特定リビジョンおよびその子孫の除外" msgid "" -" If one of the working directory's parent revisions is stripped, the\n" -" working directory will be updated to the parent of the stripped\n" -" revision.\n" -" " -msgstr "" -" 作業領域の親リビジョンが除外対象になった場合、作業領域は除外対象の\n" -" 親リビジョンの内容で更新されます。\n" +" The strip command removes all changesets whose local revision\n" +" number is greater than or equal to REV, and then restores any\n" +" changesets that are not descendants of REV. If the working\n" +" directory has uncommitted changes, the operation is aborted unless\n" +" the --force flag is supplied." +msgstr "" +" :hg:`strip` は指定のリビジョンと同じか、それ以上のリビジョン番号を\n" +" 持つリビジョンを一旦取り除き、指定リビジョンの子孫以外を復旧します。\n" +" 作業領域に未コミットの変更がある場合、--force が指定されない限りは\n" +" 処理を中断します。" + +msgid "" +" If a parent of the working directory is stripped, then the working\n" +" directory will automatically be updated to the most recent\n" +" available ancestor of the stripped parent after the operation\n" +" completes." +msgstr "" +" 作業領域の親リビジョンが除外対象になった場合、除外操作の完了後に、\n" +" 除外された親リビジョンの先祖の中で最も近い有効なリビジョンを使用して\n" +" 作業領域を更新します。" + +msgid "" +" Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" +" bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n" +" be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n" +" where BUNDLE is the bundle file created by the strip. Note that\n" +" the local revision numbers will in general be different after the\n" +" restore." +msgstr "" +" 除外されたリビジョンは、bundle 形式で ``.hg/strip-backup`` 配下に\n" +" 退避されます(bundle 形式に関しては :hg:`help bundle` および\n" +" :hg:`help unbundle` 参照)。除外の際に作成された BUNDLE ファイルで\n" +" :hg:`unbundle .hg/strip-backup/BUNDLE` を実施することで\n" +" 除外されたリビジョンを復旧させることができます。通常、復旧の際には\n" +" リビジョン番号が変更されますので注意してください。" + +msgid "" +" Use the --nobackup option to discard the backup bundle once the\n" +" operation completes.\n" +" " +msgstr "" +" 除外処理完了時点で bundle ファイルを破棄する場合は --nobackup を\n" +" 指定してください。\n" " " msgid "set or print guarded patches to push" msgstr "作業領域におけるガード選択の設定ないし表示" msgid "" -" Use the qguard command to set or print guards on patch, then use\n" +" Use the :hg:`qguard` command to set or print guards on patch, then use\n" " qselect to tell mq which guards to use. A patch will be pushed if\n" " it has no guards or any positive guards match the currently\n" " selected guard, but will not be pushed if any negative guards\n" " match the current guard. For example::" msgstr "" -" パッチ毎のガード設定ないし表示には qguard を使用しますが、作業領域に\n" -" おけるガード選択ないし表示には qselect を使用します。ガードが設定\n" -" されていないか、いずれかの「正」のガードがガード選択に合致する場合、\n" -" パッチは適用されますが、いずれかの「負」のガードがガード選択に合致\n" -" する場合、パッチは適用されません。例えば::" +" パッチ毎のガード設定ないし表示には :hg:`qguard` を、作業領域における\n" +" ガードの選択ないし表示には :hg:`qselect` を使用します。ガードが設定\n" +" されていないか、何らかの「正」のガードがガード選択に合致する場合には\n" +" パッチが適用されますが、何らかの「負」のガードがガード選択に合致する\n" +" 場合にはパッチは適用されません。例えば::" msgid "" " qguard foo.patch -stable (negative guard)\n" @@ -3567,6 +4094,71 @@ msgid "no revisions specified" msgstr "リビジョン指定がありません" +msgid "manage multiple patch queues" +msgstr "複数のパッチキューの管理" + +msgid "" +" Supports switching between different patch queues, as well as creating\n" +" new patch queues and deleting existing ones." +msgstr "" +" 複数の異なるパッチキューの間での切り替え、新規パッチキューの作成\n" +" および既存パッチキューの削除を行います。" + +msgid "" +" Omitting a queue name or specifying -l/--list will show you the " +"registered\n" +" queues - by default the \"normal\" patches queue is registered. The " +"currently\n" +" active queue will be marked with \"(active)\"." +msgstr "" +" キュー名称を指定しないか、-l/--list が指定された場合、登録済みの\n" +" キューの一覧が表示されます - 通常は \"normal\" パッチキューが登録\n" +" 済みです。当該時点でアクティブなキューには \"(アクティブ)\" が表示\n" +" されます。" + +msgid "" +" To create a new queue, use -c/--create. The queue is automatically made\n" +" active, except in the case where there are applied patches from the\n" +" currently active queue in the repository. Then the queue will only be\n" +" created and switching will fail." +msgstr "" +" -c/--create が指定された場合、新規キューを作成します。当該時点で\n" +" アクティブなキューからパッチが適用中の場合を除き、新規作成された\n" +" キューが自動的にアクティブなキューとなります。この場合、\n" +" 新規キューは生成されますがキューの切り替えは実施されません。" + +msgid "" +" To delete an existing queue, use --delete. You cannot delete the " +"currently\n" +" active queue.\n" +" " +msgstr "" +" --delete が指定された場合、既存のキューを削除します。当該時点で\n" +" アクティブなキューは削除できません。\n" +" " + +msgid "patches applied - cannot set new queue active" +msgstr "パッチ適用中 - 新規キューはアクティブにできません" + +msgid " (active)\n" +msgstr " (アクティブ)\n" + +msgid "invalid queue name, may not contain the characters \":\\/.\"" +msgstr "\":\\/.\" を含む不正なキュー名称です" + +#, python-format +msgid "queue \"%s\" already exists" +msgstr "キュー \"%s\" は既に存在します" + +msgid "cannot delete queue that does not exist" +msgstr "存在しないキューは削除できません" + +msgid "cannot delete currently active queue" +msgstr "現時点でアクティブなキューは削除できません" + +msgid "use --create to create a new queue" +msgstr "新規キューの作成には --create を指定してください" + msgid "cannot commit over an applied mq patch" msgstr "MQ パッチ適用中はコミットを実施できません" @@ -3584,6 +4176,26 @@ msgid "cannot import over an applied patch" msgstr "パッチ適用中の import による取り込みはできません" +msgid "only a local queue repository may be initialized" +msgstr "手元のキューのリポジトリしか初期化できません" + +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)" + +msgid "no queue repository" +msgstr "キューのリポジトリがありません" + +#, python-format +msgid "%d applied" +msgstr "適用パッチ数 %d" + +#, python-format +msgid "%d unapplied" +msgstr "未適用パッチ数 %d" + +msgid "mq: (empty queue)\n" +msgstr "mq: (空キュー)\n" + msgid "operate on patch repository" msgstr "パッチ管理リポジトリへの操作" @@ -3605,6 +4217,9 @@ msgid "use uncompressed transfer (fast over LAN)" msgstr "非圧縮での転送(LAN での高速転送用)" +msgid "REPO" +msgstr "リポジトリ" + msgid "location of source patch repository" msgstr "複製元パッチ管理領域位置" @@ -3686,17 +4301,20 @@ msgid "add \"From: <current user>\" to patch" msgstr "\"From: <現ユーザ名>\" をパッチに追加" -msgid "add \"From: <given user>\" to patch" -msgstr "\"From: <指定ユーザ名>\" をパッチに追加" +msgid "USER" +msgstr "ユーザ" + +msgid "add \"From: <USER>\" to patch" +msgstr "\"From: <ユーザ>\" をパッチに追加" msgid "add \"Date: <current date>\" to patch" msgstr "\"Date: <現在時刻>\" をパッチに追加" -msgid "add \"Date: <given date>\" to patch" -msgstr "\"Date: <指定日時>\" をパッチに追加" - -msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -msgstr "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." +msgid "add \"Date: <DATE>\" to patch" +msgstr "\"Date: <日時>\" をパッチに追加" + +msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." +msgstr "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." msgid "hg qnext [-s]" msgstr "hg qnext [-s]" @@ -3731,8 +4349,11 @@ msgid "merge queue name (DEPRECATED)" msgstr "マージ対象のパッチ管理領域名(非推奨)" -msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" +msgid "reorder patch series and apply only the patch" +msgstr "パッチ一覧の順序変更とパッチ適用" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" msgid "refresh only files already in the patch and specified files" msgstr "パッチ対象か、明示指定のあったファイルのみを処理対象にする" @@ -3800,17 +4421,23 @@ msgid "hg qseries [-ms]" msgstr "hg qseries [-ms]" -msgid "force removal with local changes" -msgstr "作業領域に変更があっても削除を強行" - -msgid "bundle unrelated changesets" -msgstr "無関係のリビジョンをバンドル化" +msgid "" +"force removal of changesets even if the working directory has uncommitted " +"changes" +msgstr "作業領域に未コミット修正があっても強制的にリビジョンを除外" + +msgid "" +"bundle only changesets with local revision number greater than REV which are " +"not descendants of REV (DEPRECATED)" +msgstr "" +"指定リビジョンより大きなリビジョン番号のもので、子孫以外を bundleファイル化 " +"(非推奨)" msgid "no backups" msgstr "バックアップ作成の抑止" -msgid "hg strip [-f] [-b] [-n] REV" -msgstr "hg strip [-f] [-b] [-n] REV" +msgid "hg strip [-f] [-n] REV" +msgstr "hg strip [-f] [-n] REV" msgid "hg qtop [-s]" msgstr "hg qtop [-s]" @@ -3827,6 +4454,18 @@ msgid "hg qfinish [-a] [REV]..." msgstr "hg qfinish [-a] [REV]..." +msgid "list all available queues" +msgstr "有効なキューの一覧表示" + +msgid "create new queue" +msgstr "新規キューの作成" + +msgid "delete reference to queue" +msgstr "キューの削除" + +msgid "[OPTION] [QUEUE]" +msgstr "[OPTION] [QUEUE]" + msgid "hooks for sending email notifications at commit/push time" msgstr "" @@ -3878,7 +4517,8 @@ " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this list\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" " # (serve == ssh or http, push, pull, bundle)\n" " merge = False # send notification for merges (default True)\n" " [email]\n" @@ -3893,9 +4533,6 @@ "handier for you." msgstr "" -msgid "::" -msgstr "" - msgid "" " [usersubs]\n" " # key is subscriber email, value is \",\"-separated list of glob patterns\n" @@ -3999,8 +4636,8 @@ msgstr "" msgid "" -"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" -"specify them in the global .hgrc\n" +"To ignore global commands like :hg:`version` or :hg:`help`, you have\n" +"to specify them in the global .hgrc\n" msgstr "" msgid "interpret suffixes to refer to ancestor revisions" @@ -4051,11 +4688,11 @@ msgid "" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by \"hg export\"." +"- The patch itself, as generated by :hg:`export`." msgstr "" "- コミットメッセージ\n" "- パッチの差分統計(diffstat)結果 [省略可能]\n" -"- \"hg export\" 形式と同様のパッチ内容" +"- :hg:`export` 形式と同様のパッチ内容" msgid "" "Each message refers to the first in the series using the In-Reply-To\n" @@ -4086,13 +4723,15 @@ " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ..." +" bcc = bcc1, bcc2, ...\n" +" reply-to = address1, address2, ..." msgstr "" " [email]\n" " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ..." +" bcc = bcc1, bcc2, ...\n" +" reply-to = address1, address2, ..." msgid "" "Use ``[patchbomb]`` as configuration section name if you need to\n" @@ -4102,15 +4741,15 @@ "設定がある場合には、``[patchbomb]`` セクションを使って記述してください。" msgid "" -"Then you can use the \"hg email\" command to mail a series of changesets\n" -"as a patchbomb." -msgstr "" -"ここまで設定できたなら、\"hg email\" コマンドを使用して、一連の\n" +"Then you can use the :hg:`email` command to mail a series of\n" +"changesets as a patchbomb." +msgstr "" +"ここまで設定できたなら、:hg:`email` コマンドを使用して、一連の\n" "リビジョンをパッチ爆弾(patchbomb)としてメール送信することができます。" msgid "" "To avoid sending patches prematurely, it is a good idea to first run\n" -"the \"email\" command with the \"-n\" option (test only). You will be\n" +"the :hg:`email` command with the \"-n\" option (test only). You will be\n" "prompted for an email recipient address, a subject and an introductory\n" "message describing the patches of your patchbomb. Then when all is\n" "done, patchbomb messages are displayed. If the PAGER environment\n" @@ -4118,7 +4757,7 @@ "message, so you can verify everything is alright." msgstr "" "不完全なパッチの送信を防ぐ上で、まずは \"-n\"(＝「表示のみ」)指定付きで\n" -"\"email\" コマンドを実行するのがお勧めです。これを指定した実行の際には、\n" +":hg:`email` コマンドを実行するのがお勧めです。これを指定した実行の際には\n" "送信先アドレスや、一連のパッチから成るパッチ爆弾の説明文等の入力が促され\n" "ます。必要な入力が完了すると、送信されるメールの内容が表示されます。\n" "PAGER 環境変数が設定されている場合、パッチ爆弾を構成するメールごとに、\n" @@ -4185,11 +4824,11 @@ msgstr "電子メールによる変更内容のパッチ送付" msgid "" -" By default, diffs are sent in the format generated by hg export,\n" -" one per message. The series starts with a \"[PATCH 0 of N]\"\n" -" introduction, which describes the series as a whole." -msgstr "" -" 特に指定の無い場合、'hg export' の生成する差分形式で、リビジョン毎に\n" +" By default, diffs are sent in the format generated by\n" +" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" +" of N]\" introduction, which describes the series as a whole." +msgstr "" +" 特に指定の無い場合、:hg:`export` の生成する差分形式でリビジョン毎に\n" " メールが送信されます。一連のメールは、\"[PATCH 0 of N]\" を Subject\n" " ヘッダに持つ、説明メールから始まります。" @@ -4200,14 +4839,14 @@ " description. Next, (optionally) if the diffstat program is\n" " installed and -d/--diffstat is used, the result of running\n" " diffstat on the patch. Finally, the patch itself, as generated by\n" -" \"hg export\"." -msgstr "" -" 個々のメールの Subject ヘッダは、\"[PATCH M of N]\" で始まり、対応\n" -" するリビジョンのコミットメッセージの最初の行の内容が記載されます。\n" +" :hg:`export`." +msgstr "" +" 個々のメールの Subject ヘッダは、\"[PATCH M of N]\" で始まり、\n" +" 対応するリビジョンのコミットメッセージの1行目が記載されます。\n" " メール本文は、2ないし3の部位から構成されます。最初の部位にはコミット\n" -" メッセージの続きが配置されます。次の部位には、diffstat コマンドが\n" -" 利用可能で且つ -d/--diffstat が指定された場合に、パッチの差分統計が\n" -" 配置されます。最後の部位には、'hg export' の生成する差分による\n" +" メッセージの続きが配置されます。diffstat コマンドが利用可能で\n" +" 且つ -d/--diffstat が指定された場合、次の部位にはパッチの差分統計が\n" +" 配置されます。最後の部位には、:hg:`export` の生成する差分による\n" " パッチが配置されます。" msgid "" @@ -4263,7 +4902,8 @@ msgid "" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" msgstr "" " hg email -b # default に無いものを bundle 形式で\n" @@ -4346,6 +4986,9 @@ msgid "write messages to mbox file instead of sending them" msgstr "メール送信の代わりに、mbox ファイルに書き出す" +msgid "email addresses replies should be sent to" +msgstr "返信メールの送付先アドレス" + msgid "subject of first message (intro or single patch)" msgstr "説明文ないし単一パッチ送信メールの Subject ヘッダ値" @@ -4405,7 +5048,10 @@ " format = topic bar number # format of the progress bar\n" " width = <none> # if set, the maximum width of the progress information\n" " # (that is, min(width, term width) will be used)\n" -" clear-complete = True # clear the progress bar after it's done" +" 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" msgstr "" msgid "" @@ -4430,7 +5076,7 @@ msgstr "" msgid "" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Unknown files: files marked with \"?\" by :hg:`status`\n" " - Empty directories: in fact Mercurial ignores directories unless\n" " they contain files under source control management" msgstr "" @@ -4441,7 +5087,7 @@ msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")" +" - New files added to the repository (with :hg:`add`)" msgstr "" msgid "" @@ -4510,21 +5156,95 @@ msgid "" " Rebase uses repeated merging to graft changesets from one part of\n" -" history onto another. This can be useful for linearizing local\n" -" changes relative to a master development tree." -msgstr "" -" ある履歴位置から別な位置へとリビジョンを移植するため、本コマンドは\n" -" 反復的なマージを行ないます。この機能は、作業領域における成果を開発\n" -" 用のマスターリポジトリに反映する際に、枝分かれの無い状態にするような\n" -" 場合に有用です。" +" history (the source) onto another (the destination). This can be\n" +" useful for linearizing *local* changes relative to a master\n" +" development tree." +msgstr "" +" ある履歴位置(移動元)から別な位置(移動先)へとリビジョンを移動するため\n" +" 本コマンドは反復的なマージを行ないます。この機能は、手元のリポジトリ\n" +" における成果を、開発用のマスターリポジトリに反映する際に、枝分かれの\n" +" 無い状態にしたい場合などで有用です。" + +msgid "" +" You should not rebase changesets that have already been shared\n" +" with others. Doing so will force everybody else to perform the\n" +" same rebase or they will end up with duplicated changesets after\n" +" pulling in your rebased changesets." +msgstr "" +" 他の利用者に公開済みのリビジョンは、移動すべきではありません。\n" +" 公開済みリビジョンの移動は、他の利用者に同様の移動操作を強制する\n" +" ことになったり、あなたが移動した後のリビジョンを取り込むことで、\n" +" 同一リビジョンが重複した状態になってしまったりします。" + +msgid "" +" If you don't specify a destination changeset (``-d/--dest``),\n" +" rebase uses the tipmost head of the current named branch as the\n" +" destination. (The destination changeset is not modified by\n" +" rebasing, but new changesets are added as its descendants.)" +msgstr "" +" 移動先リビジョン (``-d/--dest``) が指定されない場合、現行ブランチの\n" +" 最新ヘッドを移動先とみなします。(移動先リビジョンが改変されることは\n" +" ありませんが、移動先の子孫として新規リビジョンが追加されます)" + +msgid "" +" You can specify which changesets to rebase in two ways: as a\n" +" \"source\" changeset or as a \"base\" changeset. Both are shorthand\n" +" for a topologically related set of changesets (the \"source\n" +" branch\"). If you specify source (``-s/--source``), rebase will\n" +" rebase that changeset and all of its descendants onto dest. If you\n" +" specify base (``-b/--base``), rebase will select ancestors of base\n" +" back to but not including the common ancestor with dest. Thus,\n" +" ``-b`` is less precise but more convenient than ``-s``: you can\n" +" specify any changeset in the source branch, and rebase will select\n" +" the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n" +" uses the parent of the working directory as the base." +msgstr "" +" 移動対象リビジョンは、\"source\" 指定と \"base\" 指定の2つの方法で\n" +" 指定可能です。どちらも履歴ツリー上から「移動元ブランチ」リビジョンを\n" +" 抽出するための簡略表現です。 \"source\" (``-s/--source``) を指定した\n" +" 場合、指定リビジョンおよびその子孫全てを移動します。 \"base\" \n" +" (``-b/--base``) を指定した場合、移動先リビジョンと共通となる先祖を\n" +" 含まない範囲で指定リビジョンの先祖へと遡り、移動対象を選択します。\n" +" そのため、``-s`` での指定と比較して、 ``-b`` での指定は精密さでは\n" +" 劣りますが、その分便利です。移動元のブランチで任意のリビジョンを\n" +" 選択することで、ブランチ全体から対象が自動的に選択されます。\n" +" ``-s`` も ``-b`` も指定しない場合、作業領域の親リビジョンを \n" +" \"base\" とみなします。" + +msgid "" +" By default, rebase recreates the changesets in the source branch\n" +" as descendants of dest and then destroys the originals. Use\n" +" ``--keep`` to preserve the original source changesets. Some\n" +" changesets in the source branch (e.g. merges from the destination\n" +" branch) may be dropped if they no longer contribute any change." +msgstr "" +" 特に指定が無い場合、本コマンドは移動元ブランチのリビジョンを、\n" +" 移動先の子孫として再生成し、その後に元リビジョンを破棄します。\n" +" 移動元リビジョンを残す場合、``--keep`` を指定してください。\n" +" 移動元ブランチのリビジョンのうち、何も貢献の無いリビジョン\n" +" (例: 移動先ブランチとのマージ実施リビジョン等) は無視されます。" + +msgid "" +" One result of the rules for selecting the destination changeset\n" +" and source branch is that, unlike ``merge``, rebase will do\n" +" nothing if you are at the latest (tipmost) head of a named branch\n" +" with two heads. You need to explicitly specify source and/or\n" +" destination (or ``update`` to the other head, if it's the head of\n" +" the intended source branch)." +msgstr "" msgid "" " If a rebase is interrupted to manually resolve a merge, it can be\n" -" continued with --continue/-c or aborted with --abort/-a.\n" -" " +" continued with --continue/-c or aborted with --abort/-a." msgstr "" " 手動マージによる衝突解消の必要から中断された場合、--continue/-c で\n" -" 処理を継続したり、--abort/-a で処理を終了させたりできます。\n" +" 処理を継続したり、--abort/-a で処理を終了させたりできます。" + +msgid "" +" Returns 0 on success, 1 if nothing to rebase.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、移植が実施されない場合は 1 です。\n" " " msgid "cannot use both abort and continue" @@ -4584,8 +5304,8 @@ msgid "no rebase in progress" msgstr "進行中のリベース状態はありません" -msgid "warning: new changesets detected on target branch, not stripping\n" -msgstr "警告: 新規リビジョンが対象ブランチに検出されたので、破棄しません\n" +msgid "warning: new changesets detected on target branch, can't abort\n" +msgstr "警告: 新規リビジョンが対象ブランチに検出されたので終了できません\n" msgid "rebase aborted\n" msgstr "リベースが中断されました\n" @@ -4602,14 +5322,16 @@ msgid "rebase working directory to branch head" msgstr "作業領域をブランチヘッドにリベース" -msgid "rebase from a given revision" -msgstr "指定リビジョンをリベース" - -msgid "rebase from the base of a given revision" -msgstr "指定リビジョンから先をリベース" - -msgid "rebase onto a given revision" -msgstr "リベース先リビジョンの指定" +msgid "rebase from the specified changeset" +msgstr "指定リビジョンから移動" + +msgid "" +"rebase from the base of the specified changeset (up to greatest common " +"ancestor of base and dest)" +msgstr "指定リビジョンの先祖から移動 (移動先との共通祖先まで遡ります)" + +msgid "rebase onto the specified changeset" +msgstr "複製先リビジョン" msgid "collapse the rebased changesets" msgstr "リベース後に移動リビジョンを単一化" @@ -4629,8 +5351,12 @@ msgid "abort an interrupted rebase" msgstr "中断されたリベースを中止" -msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]" -msgstr "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]" +msgid "" +"hg rebase [-s REV | -b REV] [-d REV] [options]\n" +"hg rebase {-a|-c}" +msgstr "" +"hg rebase [-s REV | -b REV] [-d REV] [options]\n" +"hg rebase {-a|-c}" msgid "commands to interactively select changes for commit/qrefresh" msgstr "commit または qrefresh 実行時に対話的な変更選択を行うコマンド" @@ -4672,9 +5398,6 @@ msgid "&?" msgstr "&?" -msgid "y - record this change" -msgstr "y - この変更を記録します" - msgid "user quit" msgstr "ユーザの指示により終了します" @@ -4697,14 +5420,14 @@ msgstr "コミットする内容を対話的に選択します" msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be candidates for recording." msgstr "" -" ファイル一覧が指定されなかった場合は \"hg status\" で表示される\n" +" ファイル一覧が指定されなかった場合は :hg:`status` で表示される\n" " 全てのファイルが記録の対象となります。" -msgid " See 'hg help dates' for a list of formats valid for -d/--date." -msgstr " -d/--date で使用する日時表記は 'he help dates' を参照してください。" +msgid " See :hg:`help dates` for a list of formats valid for -d/--date." +msgstr " -d/--date での日時表記は :hg:`help dates` を参照してください。" msgid "" " You will be prompted for whether to record changes to each\n" @@ -4741,12 +5464,18 @@ msgid " ? - display help" msgstr " ? - ヘルプを表示します" +msgid " This command is not available when committing a merge." +msgstr " 本コマンドをマージのコミットに使用することはできません。" + msgid "'mq' extension not loaded" msgstr "'mq' エクステンションが読み込まれていません" msgid "running non-interactively, use commit instead" msgstr "非対話的に実行する場合は commit を使用してください" +msgid "cannot partially commit a merge (use hg commit instead)" +msgstr "マージの部分コミットはできません ('hg commit' を使用してください)" + msgid "no changes to record\n" msgstr "記録可能な変更がありません\n" @@ -4808,6 +5537,16 @@ msgstr "%s から %s にハードリンク中\n" #, python-format +msgid "tip has %d files, estimated total number of files: %s\n" +msgstr "" + +msgid "collecting" +msgstr "収集中" + +msgid "files" +msgstr "ファイル" + +#, python-format msgid "collected %d candidate storage files\n" msgstr "%d 個の候補ファイルの領域を回収\n" @@ -4818,15 +5557,18 @@ msgid "not linkable: %s\n" msgstr "リンク不可ファイル: %s\n" +msgid " files" +msgstr " ファイル" + +msgid "pruning" +msgstr "刈り込み中" + #, python-format msgid "pruned down to %d probably relinkable files\n" msgstr "ハードリンク可能と思われる %d のファイルを除外\n" -msgid " files" -msgstr " ファイル" - -msgid "relink" -msgstr "再リンク" +msgid "relinking" +msgstr "再リンク中" #, python-format msgid "relinked %d files (%d bytes reclaimed)\n" @@ -4880,7 +5622,8 @@ " py = http://hg.python.org/\n" " bb = https://bitbucket.org/\n" " bb+ssh = ssh://hg@bitbucket.org/\n" -" gcode = https://{1}.googlecode.com/hg/" +" gcode = https://{1}.googlecode.com/hg/\n" +" kiln = https://{1}.kilnhg.com/Repo/" msgstr "" msgid "" @@ -4891,8 +5634,8 @@ msgid "share a common history between several working directories" msgstr "複数作業領域による履歴情報領域の共有" -msgid "create a new shared repository (experimental)" -msgstr "" +msgid "create a new shared repository" +msgstr "新規共有リポジトリの作成" msgid "" " Initialize a new repository and working directory that shares its\n" @@ -5041,13 +5784,12 @@ " チェンジセットの問い合わせがあります。" msgid "" -" hg transplant --branch REVISION --all will rebase the selected\n" +" :hg:`transplant --branch REVISION --all` will rebase the selected\n" " branch (up to the named revision) onto your current working\n" " directory." msgstr "" -" hg transplant --branch REVISION --all 形式での起動の場合、指定された\n" -" REVISION が属するブランチ中の全てのチェンジセットが、現在の作業領域\n" -" 上に移植されます。" +" :hg:`transplant --branch REVISION --all` 形式での起動の場合、\n" +" 指定 REVISION までのブランチ全体が、現在の作業領域上に移植されます。" msgid "" " You can optionally mark selected transplanted changesets as merge\n" @@ -5060,20 +5802,20 @@ " 後の移植元の子孫に対しては、移植ではなく通常のマージが可能です。" msgid "" -" If no merges or revisions are provided, hg transplant will start\n" -" an interactive changeset browser." -msgstr "" -" マージ対象もリビジョン指定もない場合、本コマンドは対話的に移植を\n" -" 行ないます。" +" If no merges or revisions are provided, :hg:`transplant` will\n" +" start an interactive changeset browser." +msgstr "" +" マージ対象もリビジョン指定もない場合、:hg:`transplant` は対話的に\n" +" 移植を行ないます。" msgid "" " If a changeset application fails, you can fix the merge by hand\n" -" and then resume where you left off by calling hg transplant\n" -" --continue/-c.\n" -" " -msgstr "" -" 移植に失敗した場合、手動での衝突解消後に --continue/-c を指定して\n" -" 本コマンドを再実行することで、中断された移植を再開可能ですす。\n" +" and then resume where you left off by calling :hg:`transplant\n" +" --continue/-c`.\n" +" " +msgstr "" +" 移植に失敗した場合、手動での衝突解消後に :hg:`transplant\n" +" --continue/-c` を実行することで、中断された移植を再開可能です。\n" " " msgid "--continue is incompatible with branch, all or merge" @@ -5097,9 +5839,12 @@ msgid "outstanding local changes" msgstr "未コミットの変更があります" -msgid "pull patches from REPOSITORY" +msgid "pull patches from REPO" msgstr "パッチ取り込み元リポジトリの指定" +msgid "BRANCH" +msgstr "ブランチ" + msgid "pull patches from branch BRANCH" msgstr "パッチ取り込み元ブランチの指定" @@ -5118,11 +5863,11 @@ msgid "continue last transplant session after repair" msgstr "中断された直前の移植作業の再開" -msgid "filter changesets through FILTER" +msgid "filter changesets through command" msgstr "チェンジセットのフィルタ指定" -msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." -msgstr "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgid "allow the use of MBCS paths with problematic encodings" msgstr "問題のある文字コードでの多バイト符号化文字を使用したパス名の有効化" @@ -5201,6 +5946,24 @@ msgid "perform automatic newline conversion" msgstr "改行形式の自動変換" +msgid "" +" Deprecation: The win32text extension requires each user to configure\n" +" the extension again and again for each clone since the configuration\n" +" is not copied when cloning." +msgstr "" +" 非推奨: リポジトリの複製の際に設定は複製されないため、 win32text\n" +" エクステンションは個々の複製／個々のユーザごとに都度設定する必要が\n" +" あります。" + +msgid "" +" We have therefore made the ``eol`` as an alternative. The ``eol``\n" +" uses a version controlled file for its configuration and each clone\n" +" will therefore use the right settings from the start." +msgstr "" +" そのため、代替手段として ``eol`` エクステンションが提供されています。\n" +" ``eol`` エクステンションでは、構成管理可能なファイルによる設定が\n" +" 可能ですので、複製したリポジトリは最初から適切な状態で使用できます。" + msgid "To perform automatic newline conversion, use::" msgstr "改行形式の自動変換を行う場合、以下のように設定します::" @@ -5226,7 +5989,8 @@ " ** = cleverdecode:\n" " # ないし ** = macdecode:" -msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" +msgid "" +"If not doing conversion, to make sure you do not commit CRLF/CR by accident::" msgstr "変換はしないものの、間違った改行形式でのコミットを防止したい場合は::" msgid "" @@ -5329,7 +6093,8 @@ " $ hg serve" msgstr "" -msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" +msgid "" +"You can discover zeroconf enabled repositories by running \"hg paths\"::" msgstr "" msgid "" @@ -5436,6 +6201,14 @@ msgstr "%s: 上書きしません - ファイルが存在します\n" #, python-format +msgid "%s: not recording move - %s does not exist\n" +msgstr "%s: 移動は記録されていません - %s は存在しません\n" + +#, python-format +msgid "%s: not recording copy - %s does not exist\n" +msgstr "%s: 複製は記録されていません - %s は存在しません\n" + +#, python-format msgid "%s: deleted in working copy\n" msgstr "%s: 作業コピーから削除しました\n" @@ -5538,10 +6311,6 @@ msgstr "%s: '%s' というキーはありません" #, python-format -msgid "%s: %s" -msgstr "%s: %s" - -#, python-format msgid "Found revision %s from %s\n" msgstr "リビジョン %s を %s で見つけました\n" @@ -5556,7 +6325,8 @@ msgstr "ファイル名が明示された場合のみ複製/改名を追跡可能です" msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." -msgstr "HG: コミットメッセージを入力してください。 HG: で始まる行は無視されます。" +msgstr "" +"HG: コミットメッセージを入力してください。 HG: で始まる行は無視されます。" msgid "HG: Leave message empty to abort commit." msgstr "HG: メッセージが空だとコミットできません。" @@ -5604,10 +6374,10 @@ msgid "" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg forget." +" undo an add before that, see :hg:`forget`." msgstr "" " 指定されたファイルは次回のコミットから構成管理対象となります。\n" -" コミット前の追加登録の取り消しは、'hg help revert' を参照して\n" +" 追加登録のコミット前取り消しは、:hg:`help revert` を参照して\n" " ください。" msgid " If no names are given, add all files to the repository." @@ -5618,9 +6388,9 @@ msgid "" " An example showing how new (unknown) files are added\n" -" automatically by ``hg add``::" -msgstr "" -" 以下の実行例は、``hg add`` 実行における(未知のファイルの)自動的な\n" +" automatically by :hg:`add`::" +msgstr "" +" 以下の実行例は、:hg:`add` 実行における(未知のファイルの)自動的な\n" " 追加の例です::" msgid "" @@ -5660,7 +6430,7 @@ " commit." msgstr "" " .hgignore に記述されたパターンに合致する新規ファイルは無視されます。\n" -" 'hg add' と同様に、実行効果が発揮されるのは次回コミット時点です。" +" :hg:`add` と同様に、実行効果が発揮されるのは次回コミット時点です。" msgid "" " Use the -s/--similarity option to detect renamed files. With a\n" @@ -5668,14 +6438,20 @@ " 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.\n" -" " +" can be expensive." msgstr "" " ファイルの改名を検知するには -s/--similarity を使用します。0 より\n" " 大きな値が指定された場合、追加・除外ファイルの全てが比較され、改名と\n" -" みなせるか否かが判定されます。このオプションには、0(改名比較無効)\n" -" から 100 (完全一致)までの範囲でパーセンテージを指定します。改名判定\n" -" には実行時間を要する可能性があります。\n" +" みなせるか否かが判定されます。このオプションには、0(改名比較無し)\n" +" から 100 (完全一致で判定)までの範囲でパーセンテージを指定します。\n" +" 改名判定には実行時間を要する可能性があります。\n" +" " + +msgid "" +" Returns 0 if all files are successfully added.\n" +" " +msgstr "" +" 全てのファイルの登録が成功した場合のコマンド終了値は 0 です。\n" " " msgid "similarity must be a number" @@ -5701,12 +6477,18 @@ " Without the -a/--text option, annotate will avoid processing files\n" " it detects as binary. With -a, annotate will annotate the file\n" " anyway, although the results will probably be neither useful\n" -" nor desirable.\n" -" " +" nor desirable." msgstr "" " -a/--text 指定が無い場合、バイナリと思しきファイルは処理対象から\n" -" 除外されます。-a 指定が有る場合、結果に関わらず全てのファイルが\n" -" 処理対象となります。\n" +" 除外されます。-a 指定が有る場合、結果の有用性の有無に関わらず\n" +" 全てのファイルが処理対象となります。\n" +" " + +msgid "" +" Returns 0 on success.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0 です。\n" " " msgid "at least one filename or pattern is required" @@ -5730,11 +6512,14 @@ " 他のリビジョンを指定する場合は -r/--rev を使用します。" msgid "" -" To specify the type of archive to create, use -t/--type. Valid\n" -" types are:" -msgstr "" -" 生成するアーカイブの種別を指定する場合は、-t/--type を使用します。\n" -" 使用可能な種別は:" +" The archive type is automatically detected based on file\n" +" extension (or override using -t/--type)." +msgstr "" +" アーカイブ種別は、出力先ファイルの拡張子から自動的に判定されますが\n" +" -t/--type で強制することも可能です。" + +msgid " Valid types are:" +msgstr " 有効種別一覧:" msgid "" " :``files``: a directory full of files (default)\n" @@ -5753,18 +6538,17 @@ msgid "" " The exact name of the destination archive or directory is given\n" -" using a format string; see 'hg help export' for details." +" using a format string; see :hg:`help export` for details." msgstr "" " アーカイブ生成先となるファイル名ないしディレクトリ名の指定には\n" " 置換指定を使用することができます。置換指定に関する詳細は \n" -" 'hg help export' を参照してください。" +" :hg:`help export` を参照してください。" msgid "" " Each member added to an archive file has a directory prefix\n" " prepended. Use -p/--prefix to specify a format string for the\n" " prefix. The default is the basename of the archive, with suffixes\n" -" removed.\n" -" " +" removed." msgstr "" " アーカイブ生成の際には、展開時の格納先ディレクトリ名が記録されます。\n" " -p/--prefix によりディレクトリ名を指定できます(置換指定可能)。特に\n" @@ -5880,15 +6664,13 @@ " Its exit status will be used to mark revisions as good or bad:\n" " status 0 means good, 125 means to skip the revision, 127\n" " (command not found) will abort the bisection, and any other\n" -" non-zero exit status means the revision is bad.\n" -" " +" non-zero exit status means the revision is bad." msgstr "" " コマンドが指定された場合、自動的なリビジョン検証に使用されます。\n" -" コマンドの終了コードはリビジョンに対する bad ないし good のマーク付け\n" -" に使用されます。終了コード 0 は good、125 はスキップ、127(コマンドが\n" -" 見つからない場合)は分割探索中断、それ以外の 0 より大きい終了コードは\n" -" bad のマーク付けとみなされます。\n" -" " +" コマンドの終了コードはリビジョンに対する bad ないし good のマーク\n" +" 付けに使用されます。終了コード 0 は good、125 はリビジョンのスキップ\n" +" 127(コマンドが見つからない場合)は分割探索中断、それ以外の 0 より\n" +" 大きい終了コードは bad のマーク付けとみなされます。" msgid "The first good revision is:\n" msgstr "最初の good なリビジョンは:\n" @@ -5961,21 +6743,20 @@ " 領域の親リビジョンのブランチ名に戻します。" msgid "" -" Use the command 'hg update' to switch to an existing branch. Use\n" -" 'hg commit --close-branch' to mark this branch as closed.\n" -" " -msgstr "" -" 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n" +" Use the command :hg:`update` to switch to an existing branch. Use\n" +" :hg:`commit --close-branch` to mark this branch as closed." +msgstr "" +" 作業領域の内容を既存ブランチのもので更新する場合は :hg:`update` を\n" " 使用してください。現ブランチを閉鎖する場合は\n" -" 'hg commit --close-branch' を使用してください。\n" -" " +" :hg:`commit --close-branch` を使用してください。" #, python-format msgid "reset working directory to branch %s\n" msgstr "作業領域のブランチを %s にリセット\n" -msgid "a branch of the same name already exists (use --force to override)" -msgstr "同名のブランチが存在します(強行する場合は --force 指定が必要です)" +msgid "" +"a branch of the same name already exists (use 'hg update' to switch to it)" +msgstr "同名のブランチが存在します(ブランチの切り替えは :hg:`update`)" #, python-format msgid "marked working directory as branch %s\n" @@ -5987,11 +6768,11 @@ msgid "" " List the repository's named branches, indicating which ones are\n" " inactive. If -c/--closed is specified, also list branches which have\n" -" been marked closed (see hg commit --close-branch)." +" been marked closed (see :hg:`commit --close-branch`)." msgstr "" " リポジトリ中の名前付きブランチを、非活性(inactive)か否かと共に\n" " 一覧表示します。-c/--closed 指定時には、閉鎖済みのブランチ\n" -" ('hg commit' への --close-branch 指定で実施)も表示されます。" +" (:hg:`commit --close-branch` 参照)も表示されます。" msgid "" " If -a/--active is specified, only show active branches. A branch\n" @@ -6000,12 +6781,16 @@ " -a/--active 指定時には、活性(active)ブランチのみが表示されます。\n" " リポジトリ中にヘッドを持つものが活性ブランチとみなされます。" -msgid "" -" Use the command 'hg update' to switch to an existing branch.\n" -" " -msgstr "" -" 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n" -" 使用してください。\n" +msgid " Use the command :hg:`update` to switch to an existing branch." +msgstr "" +" 作業領域の内容を既存ブランチのもので更新する場合は :hg:`update` を\n" +" 使用してください。" + +msgid "" +" Returns 0.\n" +" " +msgstr "" +" コマンドの終了値は 0 です。\n" " " msgid " (closed)" @@ -6056,11 +6841,16 @@ msgid "" " Applying bundles preserves all changeset contents including\n" -" permissions, copy/rename information, and revision history.\n" -" " +" permissions, copy/rename information, and revision history." msgstr "" " バンドルの適用では、権限設定、複製／改名、変更履歴といった情報を\n" -" 含む全ての更新内容が取り込まれます。\n" +" 含む全ての更新内容が取り込まれます。" + +msgid "" +" Returns 0 on success, 1 if no changes found.\n" +" " +msgstr "" +" 成功時のコマンドの終了値は 0、変更が検出できない場合は 1 です。\n" " " msgid "--base is incompatible with specifying a destination" @@ -6093,11 +6883,10 @@ msgid "" " :``%s``: basename of file being printed\n" " :``%d``: dirname of file being printed, or '.' if in repository root\n" -" :``%p``: root-relative path name of file being printed\n" -" " +" :``%p``: root-relative path name of file being printed" msgstr "" " :``%s``: 対象ファイルのベース名\n" -" :``%d``: 対象ファイルの格納ディレクトリ、ないし '.'\n" +" :``%d``: 対象ファイルの格納ディレクトリ、ないし '.'(ルートの場合)\n" " :``%p``: 対象ファイルのリポジトリルートからの相対パス\n" " " @@ -6121,50 +6910,17 @@ " 将来的な 'hg pull' 実施に備えて、複製先リポジトリの .hg/hgrc \n" " ファイルには、複製元リポジトリ位置が default 名義で記録されます。" -msgid " See 'hg help urls' for valid source format details." -msgstr " リポジトリ位置指定に関する詳細は、'hg help urls' を参照してください。" +msgid " See :hg:`help urls` for valid source format details." +msgstr " リポジトリ位置指定の詳細は、:hg:`help urls` を参照してください。" msgid "" " 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." -msgstr "" -" 複製先として ``ssh://`` URL 形式を指定することも可能ですが、遠隔ホスト\n" -" 上では、.hg/hgrc の作成も、作業領域の更新も行われません。\n" -" ``ssh://`` URL 形式の詳細は、'hg help urls' を参照してください。" - -msgid "" -" 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" -" will be the null changeset). Otherwise, clone will initially check\n" -" out (in order of precedence):" -msgstr "" -" -U/--noupdate が指定された場合、新規複製先は、\n" -" 管理領域(.hg)のみを保持し、作業領域の更新は行われません\n" -" (作業領域の親リビジョンは null リビジョンとなります)。\n" -" それ以外の場合は、以下の優先順位で定まるリビジョン時点の内容で\n" -" 作業領域を更新します:" - -msgid "" -" a) the changeset, tag or branch specified with -u/--updaterev\n" -" b) the changeset, tag or branch given with the first -r/--rev\n" -" c) the branch given with the first -b/--branch\n" -" d) the branch given with the url#branch source syntax\n" -" e) the head of the default branch" -msgstr "" -" a) -u/--updaterev で指定されたリビジョン(タグやブランチ名も可)\n" -" b) 最初の -r/--rev で指定されたリビジョン(タグやブランチ名も可)\n" -" c) 最初の -b/--branch で指定されたブランチ\n" -" d) 複製元指定において url#branch 形式で指定されたブランチ\n" -" e) 'default' ブランチのヘッドリビジョン" - -msgid "" -" Use 'hg clone -u . src dst' to checkout the source repository's\n" -" parent changeset (applicable for local source repositories only)." -msgstr "" -" 複製元の作業領域における親リビジョンで、複製先リポジトリの作業領域を\n" -" 更新するには、'hg clone -u . 複製元 複製先' と指定します\n" -" (ローカルホスト上の複製元限定)。" +" Please see :hg:`help urls` for important details about ``ssh://`` URLs." +msgstr "" +" 複製先として ``ssh://`` URL 形式を指定することも可能ですが、\n" +" 遠隔ホスト上では、.hg/hgrc の作成も、作業領域の更新も行われません。\n" +" ``ssh://`` URL 形式の詳細は、:hg:`help urls` を参照してください。" msgid "" " A set of changesets (tags, or branch names) to pull may be specified\n" @@ -6196,24 +6952,23 @@ msgid "" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" -" to the repository data, not to the checked out files). Some\n" +" to the repository data, not to the working directory). Some\n" " filesystems, such as AFS, implement hardlinking incorrectly, but\n" " do not report errors. In these cases, use the --pull option to\n" " avoid hardlinking." msgstr "" -" 複製元／複製先が同一ファイルシステム上にある場合、\n" -" 資源効率等の理由から(リポジトリの内部データに対してのみ)\n" -" ハードリンクが使用されます。\n" -" AFS を含む幾つかのファイルシステムは、ハードリンク実装が不適切である\n" -" にも関わらず、エラー通知がありません。このような場合には --pull を\n" -" 指定することで、ハードリンクを抑止します。" - -msgid "" -" In some cases, you can clone repositories and checked out files\n" +" 複製元／複製先が同一ファイルシステム上にある場合、資源効率等の\n" +" 理由から(リポジトリの内部管理データに対してのみ)ハードリンクが使用\n" +" されます。AFS を含む幾つかのファイルシステムは、ハードリンク実装が\n" +" 不適切であるにも関わらず、エラー通知がありません。このような場合には\n" +" --pull を指定することで、ハードリンクを抑止します。" + +msgid "" +" In some cases, you can clone repositories and the working directory\n" " using full hardlinks with ::" msgstr "" -" リポジトリの内部データと作業領域中のファイル全てに対して、ハード\n" -" リンクによる複製を作成するには、以下の方法が使えるかも知れません::" +" リポジトリの内部管理データと作業領域中のファイル全てに対する、\n" +" ハードリンクによる複製の作成には、以下の方法が使えるかも知れません::" msgid " $ cp -al REPO REPOCLONE" msgstr " $ cp -al REPO REPOCLONE" @@ -6224,17 +6979,44 @@ " the operation is up to you) and you have to make sure your editor\n" " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" -" metadata under the .hg directory, such as mq.\n" -" " +" metadata under the .hg directory, such as mq." msgstr "" " この方法は最速の複製方法かもしれませんが、常に安全とは限りません。\n" -" 操作の単一性は保障されません(REPO の複製中改変の防止は利用者責務)し、\n" -" 利用するエディタのファイル改変時の振る舞いが、\n" -" ハードリンクを破棄するものである必要があります\n" -" (Emacs および多くの Linux 系ツールはそのように振舞います)。この制約は\n" -" .hg ディレクトリ配下にメタデータを配置する、MQ のような\n" -" エクステンションとは相容れないものです。\n" -" " +" 操作の単一性は保障されません(リポジトリの複製中改変の防止は利用者\n" +" 責務)し、利用するエディタのファイル改変時の振る舞いが、ハードリンク\n" +" を破棄するものである必要があります(Emacs および多くの Linux 系\n" +" ツールはそのように振舞います)。この制約は .hg ディレクトリ配下に\n" +" メタデータを配置する、MQ などのエクステンションとは相容れません。" + +msgid "" +" Mercurial will update the working directory to the first applicable\n" +" revision from this list:" +msgstr "" +" Mercurial は、以下の一覧中で最初に利用可能なリビジョンを用いて\n" +" 作業領域を更新します:" + +msgid "" +" a) null if -U or the source repository has no changesets\n" +" b) if -u . and the source repository is local, the first parent of\n" +" the source repository's working directory\n" +" c) the changeset specified with -u (if a branch name, this means the\n" +" latest head of that branch)\n" +" d) the changeset specified with -r\n" +" e) the tipmost head specified with -b\n" +" f) the tipmost head specified with the url#branch source syntax\n" +" g) the tipmost head of the default branch\n" +" h) tip" +msgstr "" +" a) -U が指定されるか、元リポジトリ履歴が空の場合は null リビジョン\n" +" b) -u . が指定され、且つ元リポジトリが同一ホストの場合、\n" +" 元リポジトリの作業領域の第1親リビジョン\n" +" c) -u で指定されたリビジョン(ブランチ名が指定された場合、\n" +" 当該ブランチの最新ヘッドリビジョン)\n" +" d) -r で指定されたリビジョン\n" +" e) -b で指定sれたブランチの最新ヘッドリビジョン\n" +" f) url#branch 形式で指定されたブランチの最新ヘッドリビジョン\n" +" g) default ブランチの最新ヘッドリビジョン\n" +" h) tip" msgid "cannot specify both --noupdate and --updaterev" msgstr "--noupdate と --updaterev は併用できません" @@ -6244,19 +7026,19 @@ msgid "" " Commit changes to the given files into the repository. Unlike a\n" -" centralized RCS, this operation is a local operation. See hg push\n" -" for a way to actively distribute your changes." +" centralized RCS, this operation is a local operation. See\n" +" :hg:`push` for a way to actively distribute your changes." msgstr "" " 指定されたファイルの変更内容を管理領域に記録(コミット)します。\n" " RCS のような中央集権的なツールと異なり、この操作は手元の管理領域に\n" " 対する記録しか行いません。変更を能動的に公開する方法に関しては\n" -" 'hg help push' を参照してください。" - -msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" :hg:`help push` を参照してください。" + +msgid "" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be committed." msgstr "" -" ファイル指定が省略された場合、'hg status' により検出される全ての\n" +" ファイル指定が省略された場合、:hg:`status` により検出される全ての\n" " 変更内容がコミットされます。" msgid "" @@ -6273,6 +7055,16 @@ " コミットメッセージが指定されない場合、設定に従ってメッセージ入力用の\n" " プログラムが起動されます。" +msgid "" +" Returns 0 on success, 1 if nothing changed.\n" +" " +msgstr "" +" 成功時のコマンドの終了値は 0、変更が検出できない場合は 1 です。\n" +" " + +msgid "can only close branch heads" +msgstr "ブランチヘッドのみ閉鎖できます" + msgid "nothing changed\n" msgstr "変更なし\n" @@ -6280,6 +7072,10 @@ msgstr "新規ヘッドが増えました\n" #, python-format +msgid "reopening closed branch head %d\n" +msgstr "閉鎖済みブランチヘッド %d の再開中\n" + +#, python-format msgid "committed changeset %d:%s\n" msgstr "コミット対象リビジョン %d:%s\n" @@ -6306,25 +7102,92 @@ msgid "" " This command takes effect with the next commit. To undo a copy\n" -" before that, see hg revert.\n" -" " -msgstr "" -" 本コマンドの実行結果は次回のコミットの際に効果を発揮します。コミット\n" -" 前に複製操作を取り消す方法は 'hg help revert' を参照してください。\n" +" before that, see :hg:`revert`." +msgstr "" +" 本コマンドの実行結果は次回のコミットの際に効果を発揮します。\n" +" 複製操作のコミット前取り消しは、:hg:`help revert` を参照して\n" +" ください。" + +msgid "" +" Returns 0 on success, 1 if errors are encountered.\n" +" " +msgstr "" +" 成功時のコマンドの終了値は 0、エラー発生時は 1 です。\n" " " msgid "find the ancestor revision of two revisions in a given index" msgstr "指定範囲における2つのリビジョンの祖先リビジョンの検索" -msgid "There is no Mercurial repository here (.hg not found)" -msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)" - msgid "either two or three arguments required" msgstr "2ないし3の引数が必要です" +msgid "builds a repo with a given dag from scratch in the current empty repo" +msgstr "空リポジトリから指定された記号に基くリポジトリの生成" + +msgid " Elements:" +msgstr " 表記:" + +msgid "" +" - \"+n\" is a linear run of n nodes based on the current default " +"parent\n" +" - \".\" is a single node based on the current default parent\n" +" - \"$\" resets the default parent to null (implied at the start);\n" +" otherwise the default parent is always the last node created\n" +" - \"<p\" sets the default parent to the backref p\n" +" - \"*p\" is a fork at parent p, which is a backref\n" +" - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n" +" - \"/p2\" is a merge of the preceding node and p2\n" +" - \":tag\" defines a local tag for the preceding node\n" +" - \"@branch\" sets the named branch for subsequent nodes\n" +" - \"!command\" runs the command using your shell\n" +" - \"!!my command\\n\" is like \"!\", but to the end of the line\n" +" - \"#...\\n\" is a comment up to the end of the line" +msgstr "" + +msgid " Whitespace between the above elements is ignored." +msgstr " 記号間の空白は無視されます。" + +msgid " A backref is either" +msgstr "" + +msgid "" +" - a number n, which references the node curr-n, where curr is the " +"current\n" +" node, or\n" +" - the name of a local tag you placed earlier using \":tag\", or\n" +" - empty to denote the default parent." +msgstr "" + +msgid "" +" All string valued-elements are either strictly alphanumeric, or must\n" +" be enclosed in double quotes (\"...\"), with \"\" as escape character." +msgstr "" + +msgid "" +" Note that the --overwritten-file and --appended-file options imply the\n" +" use of \"HGMERGE=internal:local\" during DAG buildup.\n" +" " +msgstr "" + +msgid "need at least one of -m, -a, -o, -n" +msgstr "-m, -a, -o, -n のいずれか1つは必須です" + +msgid "repository is not empty" +msgstr "リポジトリが空ではありません" + +#, python-format +msgid "%s command %s" +msgstr "" + +msgid "list all available commands and options" +msgstr "利用可能なコマンドおよびオプション一覧の表示" + msgid "returns the completion list associated with the given command" msgstr "指定コマンドの補完リストの作成" +msgid "show information detected about current filesystem" +msgstr "ファイルシステムに関する情報の表示" + msgid "rebuild the dirstate as it would look like for the given revision" msgstr "指定リビジョン時点相当の dirstate の再構築" @@ -6372,27 +7235,43 @@ msgid "" " With --debug, the source (filename and line number) is printed\n" -" for each config item.\n" -" " +" for each config item." msgstr "" " --debug 指定がある場合、設定項目毎に記述位置(ファイル名と行番号)が\n" " 表示されます。\n" " " +#, python-format +msgid "read config from: %s\n" +msgstr "設定読み込み元: %s\n" + msgid "only one config item permitted" msgstr "複数の設定項目指定は無効です" +msgid "access the pushkey key/value protocol" +msgstr "" + +msgid " With two args, list the keys in the given namespace." +msgstr "" + +msgid "" +" With five args, set a key to new if it currently is set to old.\n" +" Reports success or failure.\n" +" " +msgstr "" + +msgid "parse and apply a revision specification" +msgstr "リビジョン指定記述の解析／適用" + msgid "manually set the parents of the current working directory" msgstr "作業領域の親リビジョンの手動設定" msgid "" " This is useful for writing repository conversion tools, but should\n" -" be used with care.\n" -" " +" be used with care." msgstr "" " 本コマンドはリポジトリ変換ツールの作成に有用ですが、利用には注意が\n" -" 必要です。\n" -" " +" 必要です。" msgid "show the contents of the current dirstate" msgstr "現時点の dirstate 内容の表示" @@ -6401,6 +7280,22 @@ msgid "copy: %s -> %s\n" msgstr "%s から %s に複製\n" +msgid "format the changelog or an index DAG as a concise textual description" +msgstr "" + +msgid "" +" If you pass a revlog index, the revlog's DAG is emitted. If you list\n" +" revision numbers, they get labelled in the output as rN." +msgstr "" + +msgid "" +" Otherwise, the changelog DAG of the current repo is emitted.\n" +" " +msgstr "" + +msgid "need repo for changelog dag" +msgstr "" + msgid "dump the contents of a data file revision" msgstr "データファイルリビジョンの内容表示" @@ -6454,10 +7349,14 @@ msgid " patch test failed!\n" msgstr " パッチ適用試験が失敗\n" -msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" msgstr " (ツールが未対応なパッチ形式か、設定ミスです。設定確認が必要です)\n" -msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" +msgid "" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" " 内部パッチツールが機能しません。\n" "http://mercurial.selenic.com/bts へのエラー報告にご協力ください\n" @@ -6537,18 +7436,17 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. For more information, read 'hg help diffs'.\n" -" " +" format. For more information, read :hg:`help diffs`." msgstr "" " git 拡張差分形式で表示するには -g/--git を指定します。詳細は\n" -" 'hg help diffs' を参照してください。\n" -" " +" :hg:`help diffs` を参照してください。" msgid "dump the header and diffs for one or more changesets" msgstr "1つ以上のリビジョンに対するヘッダおよび変更内容の出力" msgid " Print the changeset header and diffs for one or more revisions." -msgstr " 1つ以上のリビジョンに対して、ヘッダ情報および変更内容を表示します。" +msgstr "" +" 1つ以上のリビジョンに対して、ヘッダ情報および変更内容を表示します。" msgid "" " The information shown in the changeset header is: author, date,\n" @@ -6603,19 +7501,17 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See 'hg help diffs' for more information." +" format. See :hg:`help diffs` for more information." msgstr "" " git 拡張差分形式で出力するには -g/--git を指定します。詳細は\n" -" 'hg help diffs' を参照してください。" +" :hg:`help diffs` を参照してください。" msgid "" " With the --switch-parent option, the diff will be against the\n" -" second parent. It can be useful to review a merge.\n" -" " +" second parent. It can be useful to review a merge." msgstr "" " --switch-parent を指定することで、比較対象が第2親になります。\n" -" これはマージのレビューの際などに有効です。\n" -" " +" これはマージのレビューの際などに有効です。" msgid "export requires at least one changeset" msgstr "最低1つのリビジョン指定が必要です" @@ -6642,12 +7538,10 @@ " 本コマンドでの登録除外は、現ブランチにおける登録除外のみを意味し、\n" " 履歴そのものは保持され続けますし、作業領域からも削除されません。" -msgid "" -" To undo a forget before the next commit, see hg add.\n" -" " -msgstr "" -" コミット前の登録除外の取り消しは 'hg help add' を参照してください。\n" -" " +msgid " To undo a forget before the next commit, see :hg:`add`." +msgstr "" +" 登録除外操作のコミット前取り消しは、:hg:`help add` を参照して\n" +" ください。" msgid "no files specified" msgstr "ファイル名指定がありません" @@ -6678,13 +7572,18 @@ " file in which it finds a match. To get it to print every revision\n" " that contains a change in match status (\"-\" for a match that\n" " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" -" use the --all flag.\n" -" " -msgstr "" -" 指定が無い場合本コマンドは、パターンに合致する内容が最初に現れた\n" +" use the --all flag." +msgstr "" +" 特に指定が無い場合、本コマンドはパターンに合致する内容が最初に現れた\n" " リビジョンを各ファイル毎に表示します。パターンに合致する変更のあった\n" -" 全てのリビジョンを表示する場合、--all を指定します(パターン合致部分に\n" -" 対する削除は \"-\"、追加は \"+\" を検索結果に表示することで区別)。\n" +" 全てのリビジョンを表示する場合、--all を指定します(パターン合致部が\n" +" 削除操作なら \"-\"、追加操作なら \"+\" が検索結果に表示)。" + +msgid "" +" Returns 0 if a match is found, 1 otherwise.\n" +" " +msgstr "" +" パターン合致がある場合のコマンドの終了値は 0、それ以外は 1 です。\n" " " #, python-format @@ -6695,7 +7594,8 @@ msgstr "現時点でのリポジトリ(ないしブランチ)のヘッド表示" msgid " With no arguments, show all repository branch heads." -msgstr " 引数指定が無い場合、リポジトリ中の全てのブランチヘッドを表示します。" +msgstr "" +" 引数指定が無い場合、リポジトリ中の全てのブランチヘッドを表示します。" msgid "" " Repository \"heads\" are changesets with no child changesets. They are\n" @@ -6717,10 +7617,10 @@ msgid "" " If -c/--closed is specified, also show branch heads marked closed\n" -" (see hg commit --close-branch)." +" (see :hg:`commit --close-branch`)." msgstr "" " -c/--closed 指定時には、閉鎖済みのブランチ\n" -" ('hg commit' への --close-branch 指定で実施)も表示されます。" +" (:hg:`commit --close-branch` 参照)も表示されます。" msgid "" " If STARTREV is specified, only those heads that are descendants of\n" @@ -6730,12 +7630,18 @@ " 指定リビジョンの子孫となるヘッドのみが表示されます。" msgid "" -" If -t/--topo is specified, named branch mechanics will be ignored and only\n" -" changesets without children will be shown.\n" -" " +" If -t/--topo is specified, named branch mechanics will be ignored and " +"only\n" +" changesets without children will be shown." msgstr "" " -t/--topo 指定時には、名前付きブランチに関する判定は無視され、\n" -" 単に子リビジョンを持たないリビジョンが表示されます。\n" +" 単に子リビジョンを持たないリビジョンが表示されます。" + +msgid "" +" Returns 0 if matching heads are found, 1 if not.\n" +" " +msgstr "" +" 合致するヘッドがある場合のコマンドの終了値は 0、それ以外は 1 です。\n" " " #, python-format @@ -6749,13 +7655,22 @@ msgid "show help for a given topic or a help overview" msgstr "指定されたトピックのヘルプや、ヘルプ概要の表示" -msgid " With no arguments, print a list of commands with short help messages." +msgid "" +" With no arguments, print a list of commands with short help messages." msgstr " 引数指定が無い場合、コマンドの一覧と概要を表示します。" msgid "" " Given a topic, extension, or command name, print help for that\n" " topic." -msgstr " トピックやコマンド名が指定された場合、指定対象のヘルプを表示します。" +msgstr "" +" トピックやコマンド名が指定された場合、指定対象のヘルプを表示します。" + +msgid "" +" Returns 0 if successful.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0 です。\n" +" " msgid "global options:" msgstr "グローバルオプション:" @@ -6764,7 +7679,8 @@ msgstr "全コマンドの一覧は \"hg help\" で表示されます" msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "全コマンドの一覧は \"hg help\" で、コマンド詳細は \"hg -v\" で表示されます" +msgstr "" +"全コマンドの一覧は \"hg help\" で、コマンド詳細は \"hg -v\" で表示されます" #, python-format msgid "use \"hg -v help%s\" to show aliases and global options" @@ -6833,11 +7749,21 @@ msgid "enabled extensions:" msgstr "有効化されているエクステンション:" +msgid "VALUE" +msgstr "値" + msgid "DEPRECATED" msgstr "非推奨" msgid "" "\n" +"[+] marked option can be specified multiple times" +msgstr "" +"\n" +"[+] 印付きのオプションは複数回指定可能です" + +msgid "" +"\n" "additional help topics:" msgstr "" "\n" @@ -6862,15 +7788,13 @@ " This summary identifies the repository state using one or two\n" " parent hash identifiers, followed by a \"+\" if there are\n" " uncommitted changes in the working directory, a list of tags for\n" -" this revision and a branch name for non-default branches.\n" -" " +" this revision and a branch name for non-default branches." msgstr "" " 本コマンドの出力する要約情報は、1つないし2つの親リビジョンのハッシュ\n" " 値を使用して、作業領域の状態を識別します。作業領域に未コミットの\n" " 変更がある場合は \"+\"、当該リビジョンにタグが付いている場合はタグの\n" " 一覧、default 以外のブランチの場合にはブランチ名が、ハッシュ値の後に\n" -" 続きます。\n" -" " +" 続きます。" msgid "import an ordered set of patches" msgstr "パッチの順次取り込み" @@ -6905,15 +7829,15 @@ " されます。" msgid "" -" If the imported patch was generated by hg export, user and\n" +" If the imported patch was generated by :hg:`export`, user and\n" " description from patch override values from message headers and\n" " body. Values given on command line with -m/--message and -u/--user\n" " override these." msgstr "" -" 'hg export' により生成されたパッチを取り込む場合、電子メールの\n" +" :hg:`export` により生成されたパッチを取り込む場合、電子メールの\n" " ヘッダやボディの情報よりも、パッチに含まれる情報の方が優先します。\n" " コマンドラインでの -m/--message ないし -u/--user 指定はこれらよりも\n" -" 優先します。" +" 更に優先します。" msgid "" " If --exact is specified, import will set the working directory to\n" @@ -6938,13 +7862,11 @@ msgid "" " To read a patch from standard input, use \"-\" as the patch name. If\n" " a URL is specified, the patch will be downloaded from it.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" See :hg:`help dates` for a list of formats valid for -d/--date." msgstr "" " 標準入力からパッチを取り込むには、パッチ名に \"-\" を指定します。\n" " URL が指定された場合、パッチを当該 URL からダウンロードします。\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -" " +" -d/--date での日時表記は :hg:`help dates` を参照してください。" msgid "to working directory" msgstr "作業領域" @@ -6984,11 +7906,14 @@ " 遠隔ホストのリポジトリの場合、--bundle を使用することで、本コマンド\n" " 実行後の 'hg pull' 実施の際に、再度のリビジョン検索を抑止できます。" -msgid "" -" See pull for valid source format details.\n" -" " -msgstr "" -" 対象リポジトリの指定形式は 'hg help pull' を参照してください。\n" +msgid " See pull for valid source format details." +msgstr " 対象リポジトリの指定形式は :hg:`help pull` を参照してください。" + +msgid "" +" Returns 0 if there are incoming changes, 1 otherwise.\n" +" " +msgstr "" +" 取り込み対象がある場合のコマンド終了値は 0、それ以外は 1 です。\n" " " msgid "create a new repository in the given directory" @@ -7006,12 +7931,10 @@ msgid "" " It is possible to specify an ``ssh://`` URL as the destination.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " 複製先として ``ssh://`` URL 形式を指定することも可能です。\n" -" 詳細に関しては、'hg help urls' を参照してください。\n" -" " +" 詳細に関しては、:hg:`help urls` を参照してください。" msgid "locate files matching specific patterns" msgstr "指定されたパターンに合致する名前を持つファイルの特定" @@ -7043,84 +7966,21 @@ " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" -" contain whitespace as multiple filenames.\n" -" " +" contain whitespace as multiple filenames." msgstr "" " 本コマンドの出力を \"xargs\" コマンドへと渡す場合、本コマンドと\n" -" \"xargs\" コマンドの両方に \"-0\" を指定することをお勧めします。\n" -" 空白文字を含む単一のファイル名を、\"xargs\" が複数のファイル名に解釈\n" -" してしまう問題は、このオプションにより解消されます。\n" -" " - -#, fuzzy +" \"xargs\" コマンドの両方に \"-0\" を指定してください。空白文字を\n" +" 含む単一のファイル名を、\"xargs\" が複数のファイル名に解釈して\n" +" しまう問題は、このオプションにより解消されます。" + msgid "show revision history of entire repository or files" -msgstr "" -"リポジトリ全体ないしファイルの変更履歴の表示\n" -"\n" -" 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" -"\n" -" ファイルの履歴表示では、改名／複製時の元ファイルにまでさかのぼった\n" -" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル\n" -" 名と一緒に -f/--follow を使用します。--follow 指定の際にファイル\n" -" 名が指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" -" します。--follow-first 指定は、マージリビジョンにおいて第1親の履歴\n" -" のみをさかのぼります。\n" -"\n" -" 特に指定されない場合、対象となるリビジョンの範囲はtip:0 とみなされ\n" -" ますが、--follow が指定された場合は、作業領域の親リビジョンが開始\n" -" リビジョンとみなされます。\n" -"\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -"\n" -" 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" -"\n" -" リビジョン番号、ハッシュ値、タグ、(リビジョン番号の離れた)\n" -" 親リビジョン、作成者、作成日時およびコミットログの1行目\n" -"\n" -" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミット\n" -" ログの全文も表示されます。\n" -"\n" -" 備考: マージ実施リビジョンに対する -p/--patch が予期せぬ出力を生成\n" -" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期\n" -" せぬ内容となるのは、両方の親と異なるファイルが列挙されるためです。\n" -" " - -#, fuzzy +msgstr "リポジトリ全体ないしファイルの変更履歴の表示" + msgid "" " Print the revision history of the specified files or the entire\n" " project." -msgstr "" -"リポジトリ全体ないしファイルの変更履歴の表示\n" -"\n" -" 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" -"\n" -" ファイルの履歴表示では、改名／複製時の元ファイルにまでさかのぼった\n" -" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル\n" -" 名と一緒に -f/--follow を使用します。--follow 指定の際にファイル\n" -" 名が指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" -" します。--follow-first 指定は、マージリビジョンにおいて第1親の履歴\n" -" のみをさかのぼります。\n" -"\n" -" 特に指定されない場合、対象となるリビジョンの範囲はtip:0 とみなされ\n" -" ますが、--follow が指定された場合は、作業領域の親リビジョンが開始\n" -" リビジョンとみなされます。\n" -"\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -"\n" -" 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" -"\n" -" リビジョン番号、ハッシュ値、タグ、(リビジョン番号の離れた)\n" -" 親リビジョン、作成者、作成日時およびコミットログの1行目\n" -"\n" -" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミット\n" -" ログの全文も表示されます。\n" -"\n" -" 備考: マージ実施リビジョンに対する -p/--patch が予期せぬ出力を生成\n" -" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期\n" -" せぬ内容となるのは、両方の親と異なるファイルが列挙されるためです。\n" -" " - -#, fuzzy +msgstr " 特定のファイルないしリポジトリ全体の変更履歴を表示します。" + msgid "" " File history is shown without following rename or copy history of\n" " files. Use -f/--follow with a filename to follow history across\n" @@ -7128,142 +7988,42 @@ " ancestors or descendants of the starting revision. --follow-first\n" " only follows the first parent of merge revisions." msgstr "" -"リポジトリ全体ないしファイルの変更履歴の表示\n" -"\n" -" 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" -"\n" " ファイルの履歴表示では、改名／複製時の元ファイルにまでさかのぼった\n" -" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル\n" -" 名と一緒に -f/--follow を使用します。--follow 指定の際にファイル\n" -" 名が指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" +" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル名\n" +" と一緒に -f/--follow を使用します。--follow 指定の際にファイル名が\n" +" 指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" " します。--follow-first 指定は、マージリビジョンにおいて第1親の履歴\n" -" のみをさかのぼります。\n" -"\n" -" 特に指定されない場合、対象となるリビジョンの範囲はtip:0 とみなされ\n" -" ますが、--follow が指定された場合は、作業領域の親リビジョンが開始\n" -" リビジョンとみなされます。\n" -"\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -"\n" -" 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" -"\n" -" リビジョン番号、ハッシュ値、タグ、(リビジョン番号の離れた)\n" -" 親リビジョン、作成者、作成日時およびコミットログの1行目\n" -"\n" -" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミット\n" -" ログの全文も表示されます。\n" -"\n" -" 備考: マージ実施リビジョンに対する -p/--patch が予期せぬ出力を生成\n" -" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期\n" -" せぬ内容となるのは、両方の親と異なるファイルが列挙されるためです。\n" -" " - -#, fuzzy +" のみをさかのぼります。" + msgid "" " If no revision range is specified, the default is tip:0 unless\n" " --follow is set, in which case the working directory parent is\n" -" used as the starting revision." -msgstr "" -"リポジトリ全体ないしファイルの変更履歴の表示\n" -"\n" -" 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" -"\n" -" ファイルの履歴表示では、改名／複製時の元ファイルにまでさかのぼった\n" -" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル\n" -" 名と一緒に -f/--follow を使用します。--follow 指定の際にファイル\n" -" 名が指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" -" します。--follow-first 指定は、マージリビジョンにおいて第1親の履歴\n" -" のみをさかのぼります。\n" -"\n" -" 特に指定されない場合、対象となるリビジョンの範囲はtip:0 とみなされ\n" +" used as the starting revision. You can specify a revision set for\n" +" log, see :hg:`help revsets` for more information." +msgstr "" +" 特に指定されない場合、対象となるリビジョンの範囲は tip:0 とみなされ\n" " ますが、--follow が指定された場合は、作業領域の親リビジョンが開始\n" -" リビジョンとみなされます。\n" -"\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -"\n" -" 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" -"\n" -" リビジョン番号、ハッシュ値、タグ、(リビジョン番号の離れた)\n" -" 親リビジョン、作成者、作成日時およびコミットログの1行目\n" -"\n" -" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミット\n" -" ログの全文も表示されます。\n" -"\n" -" 備考: マージ実施リビジョンに対する -p/--patch が予期せぬ出力を生成\n" -" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期\n" -" せぬ内容となるのは、両方の親と異なるファイルが列挙されるためです。\n" -" " - -#, fuzzy +" リビジョンとみなされます。複数のリビジョンのログを一括して表示させる\n" +" 方法は :hg:`help revsets` を参照してください。" + msgid "" " By default this command prints revision number and changeset id,\n" " tags, non-trivial parents, user, date and time, and a summary for\n" " each commit. When the -v/--verbose switch is used, the list of\n" " changed files and full commit message are shown." msgstr "" -"リポジトリ全体ないしファイルの変更履歴の表示\n" -"\n" -" 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" -"\n" -" ファイルの履歴表示では、改名／複製時の元ファイルにまでさかのぼった\n" -" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル\n" -" 名と一緒に -f/--follow を使用します。--follow 指定の際にファイル\n" -" 名が指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" -" します。--follow-first 指定は、マージリビジョンにおいて第1親の履歴\n" -" のみをさかのぼります。\n" -"\n" -" 特に指定されない場合、対象となるリビジョンの範囲はtip:0 とみなされ\n" -" ますが、--follow が指定された場合は、作業領域の親リビジョンが開始\n" -" リビジョンとみなされます。\n" -"\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -"\n" -" 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" -"\n" -" リビジョン番号、ハッシュ値、タグ、(リビジョン番号の離れた)\n" -" 親リビジョン、作成者、作成日時およびコミットログの1行目\n" -"\n" +" 特に指定が無い場合、本コマンドが出力する情報は -\n" +" リビジョン番号、識別用ハッシュ値、タグ、(リビジョン番号の離れた)\n" +" 親リビジョン、作成者、作成日時およびコミットログの1行目 - です。\n" " -v/--verbose が指定された場合、変更対象ファイル一覧と、コミット\n" -" ログの全文も表示されます。\n" -"\n" -" 備考: マージ実施リビジョンに対する -p/--patch が予期せぬ出力を生成\n" -" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期\n" -" せぬ内容となるのは、両方の親と異なるファイルが列挙されるためです。\n" -" " - -#, fuzzy +" ログの全文も表示されます。" + msgid "" " NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" -" will appear in files:.\n" -" " -msgstr "" -"リポジトリ全体ないしファイルの変更履歴の表示\n" -"\n" -" 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" -"\n" -" ファイルの履歴表示では、改名／複製時の元ファイルにまでさかのぼった\n" -" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル\n" -" 名と一緒に -f/--follow を使用します。--follow 指定の際にファイル\n" -" 名が指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" -" します。--follow-first 指定は、マージリビジョンにおいて第1親の履歴\n" -" のみをさかのぼります。\n" -"\n" -" 特に指定されない場合、対象となるリビジョンの範囲はtip:0 とみなされ\n" -" ますが、--follow が指定された場合は、作業領域の親リビジョンが開始\n" -" リビジョンとみなされます。\n" -"\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -"\n" -" 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" -"\n" -" リビジョン番号、ハッシュ値、タグ、(リビジョン番号の離れた)\n" -" 親リビジョン、作成者、作成日時およびコミットログの1行目\n" -"\n" -" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミット\n" -" ログの全文も表示されます。\n" -"\n" +" will appear in files:." +msgstr "" " 備考: マージ実施リビジョンに対する -p/--patch が予期せぬ出力を生成\n" " するのは、常に第1親との差分を表示するためです。ファイル一覧が予期\n" " せぬ内容となるのは、両方の親と異なるファイルが列挙されるためです。\n" @@ -7283,14 +8043,12 @@ msgid "" " With -v, print file permissions, symlink and executable bits.\n" -" With --debug, print file revision hashes.\n" -" " +" With --debug, print file revision hashes." msgstr "" " -v が指定された場合、ファイルアクセス権やシンボリックリンク、\n" " 実行可能ビットといったものも表示されます。\n" " --debug が指定された場合、各ファイルのリビジョンのハッシュ値が\n" -" 表示されます。\n" -" " +" 表示されます。" msgid "merge working directory with another revision" msgstr "作業領域の内容と他のリビジョンのマージ" @@ -7317,27 +8075,34 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided.\n" -" " +" explicit revision with which to merge with must be provided." msgstr "" " マージ対象リビジョンの指定が無く、作業領域の親リビジョンがヘッドで、\n" -" 且つ現行ブランチがもう1つだけヘッドを持つ場合、そのヘッドがマージ対象\n" -" となります。それ以外の場合は、明示的なリビジョン指定が必要です。\n" -" " - -#, python-format -msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" -msgstr "中断: ブランチ '%s' には %d ヘッドあります - 対象を明示してください\n" - -msgid "(run 'hg heads .' to see heads)\n" -msgstr "(ヘッド一覧は 'hg heads' で表示されます)\n" - -#, python-format -msgid "abort: branch '%s' has one head - please merge with an explicit rev\n" -msgstr "中断: ブランチ '%s' は単一ヘッドです - 対象を明示してください\n" - -msgid "(run 'hg heads' to see all heads)\n" -msgstr "(ヘッド一覧は 'hg heads' で表示されます)\n" +" 且つ現行ブランチがもう1つだけヘッドを持つ場合、そのヘッドがマージ\n" +" 対象となります。それ以外の場合は、明示的なリビジョン指定が必要です。" + +msgid "" +" Returns 0 on success, 1 if there are unresolved files.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、未解決ファイルがある場合は 1 です。\n" +" " + +#, python-format +msgid "" +"branch '%s' has %d heads - please merge with an explicit rev\n" +"(run 'hg heads .' to see heads)" +msgstr "" +"ブランチ '%s' には %d 個のヘッドあります - 対象を明示してください\n" +"('hg heads' でヘッド一覧が表示されます)" + +#, python-format +msgid "" +"branch '%s' has one head - please merge with an explicit rev\n" +"(run 'hg heads' to see all heads)" +msgstr "" +"ブランチ '%s' は単一ヘッドです - 対象を明示してください\n" +"('hg heads' でヘッド一覧が表示されます)" msgid "there is nothing to merge" msgstr "マージの必要がありません" @@ -7346,7 +8111,9 @@ msgid "%s - use \"hg update\" instead" msgstr "%s - \"hg update\" を使用してください" -msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" msgstr "" "作業領域の親リビジョンはヘッドではありません。\n" "リビジョンを明示しての \"hg update\" ないしマージを実施してください。" @@ -7363,11 +8130,15 @@ " 含まれないチェンジセットを表示します。ここで表示されるチェンジセットは\n" " hg push 実施の際に、連携先リポジトリへと反映されるチェンジセットです。" -msgid "" -" See pull for details of valid destination formats.\n" -" " -msgstr "" -" 指定可能なリポジトリ指定形式は hg pull のヘルプを参照してください。\n" +msgid " See pull for details of valid destination formats." +msgstr " 有効なリポジトリ指定形式は :hg:`pull` を参照してください。" + +msgid "" +" Returns 0 if there are outgoing changes, 1 otherwise.\n" +" " +msgstr "" +" 反映可能リビジョンがある場合のコマンド終了値は 0、それ以外は\n" +" 1 です。\n" " " msgid "show the parents of the working directory or revision" @@ -7378,14 +8149,12 @@ " given via -r/--rev, the parent of that revision will be printed.\n" " If a file argument is given, the revision in which the file was\n" " last changed (before the working directory revision or the\n" -" argument to --rev if given) is printed.\n" -" " +" argument to --rev if given) is printed." msgstr "" " 作業領域の親リビジョンを表示します。-r/--rev でのリビジョン指定が\n" " ある場合、指定リビジョンの親リビジョンを表示します。ファイルが指定\n" " された場合、(作業領域の親リビジョン、ないし --rev 指定のリビジョン\n" -" 以前のもので)そのファイルを最後に更新したリビジョンを表示します。\n" -" " +" 以前のもので)そのファイルを最後に更新したリビジョンを表示します。" msgid "can only specify an explicit filename" msgstr "明示的なファイル名以外は指定できません" @@ -7405,18 +8174,42 @@ " シンボル名が指定されない場合、全ての別名定義が表示されます。" msgid "" -" 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." -msgstr "" -" シンボル定義は、/etc/mercurial/hgrc および $HOME/.hgrc 等の [paths]\n" -" セクションに記述されます。作業領域での実行の場合は .hg/hgrc にも記述\n" -" 可能です。" - -msgid "" -" See 'hg help urls' for more information.\n" -" " -msgstr "" -" 詳細は 'hg help urls' を参照してください。\n" +" Path names are defined in the [paths] section of\n" +" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" +" repository, ``.hg/hgrc`` is used, too." +msgstr "" +" シンボル定義は、``/etc/mercurial/hgrc`` および ``$HOME/.hgrc`` 等の\n" +" [paths] セクションに記述されます。作業領域での実行の場合は\n" +" ``.hg/hgrc`` にも記述可能です。" + +msgid "" +" The path names ``default`` and ``default-push`` have a special\n" +" meaning. When performing a push or pull operation, they are used\n" +" as fallbacks if no location is specified on the command-line.\n" +" When ``default-push`` is set, it will be used for push and\n" +" ``default`` will be used for pull; otherwise ``default`` is used\n" +" as the fallback for both. When cloning a repository, the clone\n" +" source is written as ``default`` in ``.hg/hgrc``. Note that\n" +" ``default`` and ``default-push`` apply to all inbound (e.g.\n" +" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" +" :hg:`bundle`) operations." +msgstr "" +" ``default`` および ``default-push`` は特別な意味を持ちます。\n" +" push/pull の際にコマンド行で連携先リポジトリが指定されない場合、\n" +" これらのパスが使用されます。``default-push`` が設定されている場合、\n" +" ``default-push`` は :hg:`push` で使用され、``default`` は\n" +" :hg:`pull` で使用されます。``default-push`` が未設定であれば、\n" +" push/pull 共に ``default`` を使用します。リポジトリの複製では、\n" +" 複製元リポジトリが ``default`` として ``.hg/hgrc`` に記録されます。\n" +" ``default`` および ``default-push`` は全ての取り込み (例: \n" +" :hg:`incoming`) および反映 (例: :hg:`outgoing`、:hg:`email` および\n" +" :hg:`bundle`) 操作において適用されます。" + +msgid "" +" See :hg:`help urls` for more information.\n" +" " +msgstr "" +" 詳細は :hg:`help urls` を参照してください。\n" " " msgid "not found!\n" @@ -7449,65 +8242,92 @@ " されません。" msgid "" -" Use hg incoming if you want to see what would have been added by a\n" -" pull at the time you issued this command. If you then decide to\n" -" added those changes to the repository, you should use pull -r X\n" -" where X is the last changeset listed by hg incoming." -msgstr "" -" 'hg incoming' を使用することで、実際の取り込みをせずに、'hg pull' に\n" -" よる取り込み対象を確認することができます。表示された内容の取り込みを\n" -" 決断したならば、先に表示された最後のリビジョンを '-r' の引数にして\n" -" 'hg pull' を実行しましょう。" +" Use :hg:`incoming` if you want to see what would have been added\n" +" by a pull at the time you issued this command. If you then decide\n" +" to add those changes to the repository, you should use :hg:`pull\n" +" -r X` where ``X`` is the last changeset listed by :hg:`incoming`." +msgstr "" +" :hg:`incoming` を使用することで、実際の取り込みをせずに、\n" +" :hg:`pull` による取り込み対象を確認することができます。表示された\n" +" 内容の取り込みを決断したならば、:hg:`incoming` 実行で表示された\n" +" 最後のリビジョンを ``-r`` の引数にして :hg:`pull -r X` を実行します。" msgid "" " If SOURCE is omitted, the 'default' path will be used.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " 連携先が省略された場合、'default' パスが連携先として使用されます。\n" -" 詳細は 'hg help urls' を参照してください。\n" +" 詳細は :hg:`help urls` を参照してください。" + +msgid "" +" Returns 0 on success, 1 if an update had unresolved files.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、更新で未解決ファイルが検出された場合は\n" +" 1 です。\n" " " msgid "push changes to the specified destination" msgstr "指定リポジトリへの変更履歴の反映" -msgid " Push changes from the local repository to the specified destination." -msgstr " 手元のリポジトリから指定の連携先リポジトリに変更履歴を反映します。" - -msgid "" -" This is the symmetrical operation for pull. It moves changes from\n" -" the current repository to a different one. If the destination is\n" -" local this is identical to a pull in that directory from the\n" -" current one." -msgstr "" -" これは 'hg pull' と対称的な操作です。現在のリポジトリから連携先へと\n" -" 変更履歴を反映させることができます。連携先が同一ホスト上のリポジトリ\n" -" であれば、連携先リポジトリにおいて、現リポジトリに対する 'hg pull'\n" -" を行った場合と同一の効果を持ちます。" - -msgid "" -" By default, push will refuse to run if it detects the result would\n" -" increase the number of remote heads. This generally indicates the\n" -" user forgot to pull and merge before pushing." -msgstr "" -" 連携先リポジトリにヘッドが増える実行は、通常は拒絶されます。\n" -" このような場合、大概は 'hg push' 前の 'hg pull' および 'hg merge'\n" -" 実行を忘れていることが殆どです。" - -msgid "" -" If -r/--rev is used, the named revision and all its ancestors will\n" -" be pushed to the remote repository." -msgstr "" -" -r/--rev が指定された場合、指定されたものと、その祖先となる\n" +msgid "" +" Push changesets from the local repository to the specified\n" +" destination." +msgstr " 手元のリポジトリから指定連携先リポジトリに変更履歴を反映します。" + +msgid "" +" This operation is symmetrical to pull: it is identical to a pull\n" +" in the destination repository from the current one." +msgstr "" +" これは :hg:`pull` と対称的な操作です:連携先リポジトリにおいて、\n" +" 現リポジトリに対する :hg:`pull` を行った場合と同一の効果を持ちます。" + +msgid "" +" By default, push will not allow creation of new heads at the\n" +" destination, since multiple heads would make it unclear which head\n" +" to use. In this situation, it is recommended to pull and merge\n" +" before pushing." +msgstr "" +" 特に指定の無い場合、複数ヘッド状態は、どのヘッドが妥当なものであるか\n" +" 混乱するため、連携先に新規ヘッドが作成される反映は許可されません。\n" +" このような場合、:hg:`push` 実施前に、:hg:`pull` および :hg:`merge`\n" +" を実施することをお勧めします。" + +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 "" +" 連携先に存在しない名前付きブランチを新規作成する場合は --new-branch\n" +" を使用します。このオプション指定は、新規ブランチの作成のみを許可\n" +" します。" + +msgid "" +" Use -f/--force to override the default behavior and push all\n" +" changesets on all branches." +msgstr "" +" 通常挙動における制約を無視して、全てのブランチにおける全ての変更を\n" +" 反映する場合は、-f/--force を使用します。" + +msgid "" +" If -r/--rev is used, the specified revision and all its ancestors\n" +" will be pushed to the remote repository." +msgstr "" +" -r/--rev が指定された場合、指定されたリビジョンと、その祖先となる\n" " リビジョンが連携先リポジトリへと反映されます。" msgid "" -" Please see 'hg help urls' for important details about ``ssh://``\n" -" URLs. If DESTINATION is omitted, a default path will be used.\n" -" " -msgstr "" -" ``ssh://`` URL 形式の詳細は、'hg help urls' を参照してください。\n" -" 連携先が省略された場合、'default' パスが連携先として使用されます。\n" +" Please see :hg:`help urls` for important details about ``ssh://``\n" +" URLs. If DESTINATION is omitted, a default path will be used." +msgstr "" +" ``ssh://`` URL 形式の詳細は、:hg:`help urls` を参照してください。\n" +" 連携先が省略された場合、'default' パスが連携先として使用されます。" + +msgid "" +" Returns 0 if push was successful, 1 if nothing to push.\n" +" " +msgstr "" +" 反映成功時のコマンド終了値は 0、何も反映されなかった場合は 1 です。\n" " " #, python-format @@ -7523,11 +8343,16 @@ msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" -" suggests it.\n" -" " +" suggests it." msgstr "" " 本コマンドは、操作が中断された際のリポジトリ状態の修復を行います。\n" -" 本コマンドの実行は、Mercurial が実行を促した場合のみで十分です。\n" +" 本コマンドの実行は、Mercurial が実行を促した場合のみで十分です。" + +msgid "" +" Returns 0 if successful, 1 if nothing to recover or verify fails.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、修復不要ないし修復失敗時は 1 です。\n" " " msgid "remove the specified files on the next commit" @@ -7552,12 +8377,12 @@ " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" -" reported by hg status). The actions are Warn, Remove (from branch)\n" -" and Delete (from disk)::" +" reported by :hg:`status`). The actions are Warn, Remove (from\n" +" branch) and Delete (from disk)::" msgstr "" " ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動は、\n" -" 以下の一覧を参照してください。ファイルの状態は、'hg status' の表示に\n" -" 倣い、追加(Added)[A]、改変無し(Clean)[C]、改変有り(Modified)[M] \n" +" 以下の一覧を参照してください。ファイルの状態は、:hg:`status` の表示\n" +" に倣い、追加(Added)[A]、改変無し(Clean)[C]、改変有り(Modified)[M] \n" " および不在(Missing)[!] で表します。\n" " 挙動は、警告(Warn)[W]、構成管理からの登録除外(Remove)[R] および\n" " 作業領域からの削除(Delete)[D] で表します::" @@ -7577,11 +8402,16 @@ msgid "" " This command schedules the files to be removed at the next commit.\n" -" To undo a remove before that, see hg revert.\n" -" " -msgstr "" -" 指定ファイルは、次回のコミットの際に登録除外されます。コミット前に\n" -" 登録除外を取り消す方法は 'hg help revert' を参照してください。\n" +" To undo a remove before that, see :hg:`revert`." +msgstr "" +" 指定ファイルは、次回のコミットの際に登録除外されます。登録除外の\n" +" コミット前取り消しは :hg:`help revert` を参照してください。" + +msgid "" +" Returns 0 on success, 1 if any warnings encountered.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、警告検出時は 1 です。\n" " " #, python-format @@ -7617,12 +8447,10 @@ msgid "" " This command takes effect at the next commit. To undo a rename\n" -" before that, see hg revert.\n" -" " -msgstr "" -" 本コマンドの実行結果は次回のコミットの際に効果を発揮します。コミット\n" -" 前に改名操作を取り消す方法は 'hg help revert' を参照してください。\n" -" " +" before that, see :hg:`revert`." +msgstr "" +" 本コマンドの実行結果は次回のコミットの際に効果を発揮します。改名\n" +" 操作のコミット前取り消しは :hg:`help revert` を参照してください。" msgid "various operations to help finish a merge" msgstr "マージ作業完了を補助する種々の操作" @@ -7670,11 +8498,16 @@ msgid "" " Note that Mercurial will not let you commit files with unresolved merge\n" " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" -" after a conflicting merge.\n" -" " +" after a conflicting merge." msgstr "" " 衝突未解消のファイルがある間はコミットできません。マージにおける\n" -" 衝突解消の際には、コミット前に ``hg resolve -m ...`` してください。\n" +" 衝突解消の際には、コミット前に :hg:`resolve -m ...` してください。" + +msgid "" +" Returns 0 on success, 1 if any files fail a resolve attempt.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、衝突解消失敗がある場合は 1 です。\n" " " msgid "too many options specified" @@ -7713,13 +8546,13 @@ msgid "" " Using the -r/--rev option, revert the given files or directories\n" " to their contents as of a specific revision. This can be helpful\n" -" to \"roll back\" some or all of an earlier change. See 'hg help\n" -" dates' for a list of formats valid for -d/--date." +" to \"roll back\" some or all of an earlier change. See :hg:`help\n" +" dates` for a list of formats valid for -d/--date." msgstr "" " -r/--rev が指定された場合、指定されたファイル／ディレクトリを、\n" " 指定されたリビジョン時点の内容へと復旧します。以前の変更内容の一部\n" -" ないし全部を取り消す用途にも使用できます。-d/--date の指定に関しては\n" -" 'hg help dates' を参照してください。" +" ないし全部を取り消す用途にも使用できます。-d/--date での日時表記は\n" +" :hg:`help dates` を参照してください。" msgid "" " Revert modifies the working directory. It does not commit any\n" @@ -7750,12 +8583,10 @@ msgid "" " Modified files are saved with a .orig suffix before reverting.\n" -" To disable these backups, use --no-backup.\n" -" " -msgstr "" -" 改変されたファイルの復旧では、復旧前の内容が .orig 拡張子を付けた\n" -" ファイルに保存されます。この保存は --no-backup で無効化されます。\n" -" " +" To disable these backups, use --no-backup." +msgstr "" +" 改変ファイルの復旧の際には、復旧前の内容が .orig 拡張子を付けた\n" +" ファイルに保存されます。この保存は --no-backup で無効化されます。" msgid "you can't specify a revision and a date" msgstr "リビジョンと日時は同時には指定出来ません" @@ -7787,8 +8618,8 @@ msgid "no changes needed to %s\n" msgstr "%s には改変の必要がありません\n" -msgid "roll back the last transaction" -msgstr "直前のトランザクションの巻き戻し" +msgid "roll back the last transaction (dangerous)" +msgstr "直前のトランザクションの巻き戻し(要注意)" msgid "" " This command should be used with care. There is only one level of\n" @@ -7832,43 +8663,71 @@ " back locally is ineffective (someone else may already have pulled\n" " the changes). Furthermore, a race is possible with readers of the\n" " repository; for example an in-progress pull from the repository\n" -" may fail if a rollback is performed.\n" -" " -msgstr "" -" 本コマンドは、公開リポジトリでの実行を想定していません。他のユーザ\n" -" から 'hg pull' 可能な状態になってしまったなら、公開リポジトリでの\n" -" rollback は(既に他のユーザによって複製されている可能性があるので)\n" -" 効果を持ちません。その上、リポジトリからの情報読み取りに際して、\n" -" 競合が発生し得ます。例えば、進行中のリポジトリからの取り込みが、\n" -" 巻き戻しによって失敗してしまう可能性があります。\n" +" may fail if a rollback is performed." +msgstr "" +" 本コマンドは、公開リポジトリでの実行を想定していません。一旦他の\n" +" ユーザから :hg:`pull` 可能な状態になってしまったなら、公開リポジトリ\n" +" でトランザクションを巻き戻しても(既に他のユーザが複製している可能性\n" +" があるので)効果を持ちません。その上、リポジトリからの情報読み取りに\n" +" 際して、競合が発生し得ます。例えば、併走している :hg:`pull` 処理が\n" +" 巻き戻しによって失敗してしまう可能性があります。" + +msgid "" +" Returns 0 on success, 1 if no rollback data is available.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、巻き戻せるデータが無い場合は 1 です。\n" " " msgid "print the root (top) of the current working directory" msgstr "作業領域のルート(最上位)ディレクトリ位置の表示" -msgid "" -" Print the root directory of the current repository.\n" -" " -msgstr "" -" 作業領域のルートディレクトリ位置を表示します。\n" -" " - -msgid "export the repository via HTTP" -msgstr "HTTP 経由でのリポジトリの公開" - -msgid " Start a local HTTP repository browser and pull server." -msgstr " リポジトリ参照と 'hg pull' のための HTTP サーバを起動します。" +msgid " Print the root directory of the current repository." +msgstr " 現リポジトリのルートディレクトリ位置を表示します。" + +msgid "start stand-alone webserver" +msgstr "独立したウェブサーバの実行開始" + +msgid "" +" Start a local HTTP repository browser and pull server. You can use\n" +" this for ad-hoc sharing and browing of repositories. It is\n" +" recommended to use a real web server to serve a repository for\n" +" longer periods of time." +msgstr "" +" リポジトリ参照と :hg:`pull` のための HTTP サーバを起動します。\n" +" この HTTP サーバを用いることで、即席でリポジトリの共有／参照を\n" +" 行うことができます。リポジトリを長期間公開する際には、通常のウェブ\n" +" サーバの使用をお勧めします。" + +msgid "" +" Please note that the server does not implement access control.\n" +" This means that, by default, anybody can read from the server and\n" +" nobody can write to it by default. Set the ``web.allow_push``\n" +" option to ``*`` to allow everybody to push to the server. You\n" +" should use a real web server if you need to authenticate users." +msgstr "" +" 本コマンドで起動されるサーバは、アクセス制御が実装されていません。\n" +" 特に設定が無い場合、誰もがリポジトリを参照可能で、且つリポジトリは\n" +" 誰にも更新できない状態にあります。``web.allow_push`` 設定を ``*``\n" +" に設定することで、誰もがリポジトリに :hg:`push` できます。\n" +" ユーザ認証が必要な場合は、通常のウェブサーバを使用してください。" msgid "" " 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" -" " +" files." msgstr "" " 特に指定が無い場合、サーバはアクセスログを標準出力に、エラーを\n" " 標準エラー出力に表示します。ログをファイルに記録する場合は、\n" -" -A/--accesslog や -E/--errorlog で指定します。\n" -" " +" -A/--accesslog や -E/--errorlog で指定します。" + +msgid "" +" 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." +msgstr "" +" サーバに空きポート番号の検出および使用をさせる場合、ポート番号には\n" +" 0 を指定します。この場合、使用するポート番号が表示されます。" #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" @@ -7933,8 +8792,7 @@ " ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = origin of the previous file listed as A (added)\n" -" " +" = origin of the previous file listed as A (added)" msgstr "" " M = 改変有り(Modified)\n" " A = 追加登録予定(Added)\n" @@ -7943,8 +8801,7 @@ " ! = 構成管理対象にも関わらず作業領域にファイルが無い(missing)\n" " ? = 構成管理対象外(unknown)\n" " I = 無視(Ignored)\n" -" = 直前に表示される新規登録予定ファイル(A)の複製元\n" -" " +" = 直前に表示される新規登録予定ファイル(A)の複製元" msgid "summarize working directory state" msgstr "作業領域状態の概要表示" @@ -7958,12 +8815,14 @@ msgid "" " With the --remote option, this will check the default paths for\n" -" incoming and outgoing changes. This can be time-consuming.\n" -" " +" incoming and outgoing changes. This can be time-consuming." msgstr "" " --remote が指定された場合、default 連携先に対する取り込み／反映に\n" -" 関する概要も表示します。この処理には時間を要する場合があります。\n" -" " +" 関する概要も表示します。この処理には時間を要する場合があります。" + +#, python-format +msgid "parent: %d:%s " +msgstr "親リビジョン : %d:%s " msgid " (empty repository)" msgstr " (空のリポジトリ)" @@ -7972,47 +8831,58 @@ msgstr " (作業領域が未更新)" #, python-format -msgid "parent: %d:%s %s\n" -msgstr "親リビジョン : %d:%s %s\n" - -#, python-format msgid "branch: %s\n" msgstr "ブランチ : %s\n" #, python-format -msgid "%d added" -msgstr "追加ファイル数 %d" - -#, python-format msgid "%d modified" -msgstr "変更ファイル数 %d" +msgstr "変更ファイル数 %d" + +#, python-format +msgid "%d added" +msgstr "追加ファイル数 %d" #, python-format msgid "%d removed" -msgstr "削除ファイル数 %d" +msgstr "削除ファイル数 %d" + +#, python-format +msgid "%d renamed" +msgstr "改名ファイル数 %d" + +#, python-format +msgid "%d copied" +msgstr "複製ファイル数 %d" #, python-format msgid "%d deleted" -msgstr "不在ファイル数 %d" +msgstr "不在ファイル数 %d" + +#, python-format +msgid "%d unknown" +msgstr "未知ファイル %d" #, python-format msgid "%d ignored" -msgstr "無視ファイル数 %d" - -#, python-format -msgid "%d unknown" -msgstr "未知ファイル %d" +msgstr "無視ファイル数 %d" #, python-format msgid "%d unresolved" msgstr "衝突未解決ファイル %d" +#, python-format +msgid "%d subrepos" +msgstr "サブリポジトリ数 %d" + msgid " (merge)" msgstr " (マージ)" msgid " (new branch)" msgstr " (新規ブランチ)" +msgid " (head closed)" +msgstr " (閉鎖済み)" + msgid " (clean)" msgstr " (改変無し)" @@ -8082,6 +8952,13 @@ " 必要であれば手動での編集も可能です。ローカルタグは '.hg/localtags' で\n" " 管理されます(リポジトリ間で共有されることはありません)" +msgid "" +" Since tag names have priority over branch names during revision\n" +" lookup, using an existing branch name as a tag name is discouraged." +msgstr "" +" リビジョン特定において、タグ名はブランチ名よりも優先度が高いので、\n" +" 既存ブランチと同名のタグの使用は止めましょう。" + msgid "tag names must be unique" msgstr "タグ名が重複しています" @@ -8109,13 +8986,11 @@ msgid "" " This lists both regular and local tags. When the -v/--verbose\n" -" switch is used, a third column \"local\" is printed for local tags.\n" -" " +" switch is used, a third column \"local\" is printed for local tags." msgstr "" " 本コマンドは、通常のタグおよびローカルタグの両方を一覧表示します。\n" -" -v/--verbose が指定された場合、ローカルタグの識別情報用に \"local\"\n" -" カラムが追加表示されます。\n" -" " +" -v/--verbose が指定された場合、ローカルタグには \"local\" 表示の\n" +" 第3のカラムが追加されます。" msgid "show the tip revision" msgstr "tip リビジョンの表示" @@ -8133,28 +9008,30 @@ " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" " that repository becomes the current tip. The \"tip\" tag is special\n" -" and cannot be renamed or assigned to a different changeset.\n" -" " +" and cannot be renamed or assigned to a different changeset." msgstr "" " コミットした直後であれば、生成されたリビジョンが tip となります。\n" " 他のリポジトリから変更履歴の取り込みをした直後であれば、連携先\n" " リポジトリでの tip が現リポジトリの tip となります。\"tip\" タグは\n" -" 特別なタグで、改名や、他のリビジョンへの付け替えはできません。\n" -" " +" 特別なタグで、改名や、他のリビジョンへの付け替えはできません。" msgid "apply one or more changegroup files" msgstr "バンドルファイルの適用" msgid "" " Apply one or more compressed changegroup files generated by the\n" -" bundle command.\n" -" " -msgstr "" -" hg bundle コマンドで生成されたバンドルファイルを適用します。\n" -" " - -msgid "update working directory" -msgstr "作業領域の更新" +" bundle command." +msgstr " :hg:`bundle` コマンドで生成されたバンドルファイルを適用します。" + +msgid "" +" Returns 0 on success, 1 if an update has unresolved files.\n" +" " +msgstr "" +" 成功時のコマンド終了値は 0、衝突未解消ファイルがある場合は 1 です。\n" +" " + +msgid "update working directory (or switch revisions)" +msgstr "作業領域の内容更新(ないしリビジョンの切り替え)" msgid "" " Update the repository's working directory to the specified\n" @@ -8207,14 +9084,16 @@ " 作業領域は指定のリビジョンで更新されます。" msgid "" -" Use null as the changeset to remove the working directory (like 'hg\n" -" clone -U')." +" Use null as the changeset to remove the working directory (like\n" +" :hg:`clone -U`)." msgstr "" " 作業領域中のファイルを削除する場合は、リビジョンに null を指定します\n" -" ('hg clone -U' と同等)。" - -msgid " If you want to update just one file to an older changeset, use 'hg revert'." -msgstr " 特定のファイルを以前の状態に戻す場合は 'hg revert' を使用します。" +" (:hg:`clone -U` と同等)。" + +msgid "" +" If you want to update just one file to an older changeset, use :hg:" +"`revert`." +msgstr " 特定のファイルを以前の状態に戻すには :hg:`revert` を使用します。" msgid "cannot specify both -c/--check and -C/--clean" msgstr "-c/--check と -C/--clean は併用できません" @@ -8232,13 +9111,12 @@ " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" -" integrity of their crosslinks and indices.\n" -" " +" integrity of their crosslinks and indices." msgstr "" " 本コマンドは、リポジトリの整合性に関する広範な検証を行います。\n" -" 変更記録・マニフェスト・各構成管理対象ファイルにおけるハッシュ値および\n" -" チェックサム、相互関連付けおよびインデックス等の整合性が検証されます。\n" -" " +" 変更記録・マニフェスト・各構成管理対象ファイルにおけるハッシュ値\n" +" およびチェックサム、相互関連付けおよびインデックス等の整合性が\n" +" 検証されます。" msgid "output version and copyright information" msgstr "バージョンおよび著作権情報の表示" @@ -8261,6 +9139,9 @@ msgid "repository root directory or name of overlay bundle file" msgstr "リポジトリのルート位置、ないしバンドルファイルのパス" +msgid "DIR" +msgstr "ディレクトリ" + msgid "change working directory" msgstr "作業領域の変更" @@ -8276,6 +9157,9 @@ msgid "set/override config option (use 'section.name=value')" msgstr "オプション設定を指定／上書き(指定形式は 'section.name=value')" +msgid "CONFIG" +msgstr "設定" + msgid "enable debugging output" msgstr "デバッグ出力を有効化" @@ -8283,10 +9167,16 @@ msgstr "デバッガを開始" msgid "set the charset encoding" -msgstr "文字エンコーディング" +msgstr "文字エンコーディングの設定" + +msgid "ENCODE" +msgstr "文字コード" + +msgid "MODE" +msgstr "モード" msgid "set the charset encoding mode" -msgstr "文字エンコーディングモード" +msgstr "文字エンコーディングのモード設定" msgid "always print a traceback on exception" msgstr "例外浮揚の際に常にトレースバックを表示" @@ -8312,16 +9202,19 @@ msgid "specify hg command to run on the remote side" msgstr "遠隔ホスト側で実行される hg コマンド" +msgid "PATTERN" +msgstr "パターン" + msgid "include names matching the given patterns" msgstr "パターンに合致したファイルを処理対象に追加" msgid "exclude names matching the given patterns" msgstr "パターンに合致したファイルを処理対象から除外" -msgid "use <text> as commit message" -msgstr "コミットメッセージ" - -msgid "read commit message from <file>" +msgid "use text as commit message" +msgstr "指定テキストをコミットメッセージとして使用" + +msgid "read commit message from file" msgstr "コミットメッセージをファイルから読み込み" msgid "record datecode as commit date" @@ -8330,6 +9223,9 @@ msgid "record the specified user as committer" msgstr "記録される作成者情報" +msgid "STYLE" +msgstr "スタイル" + msgid "display using template map file" msgstr "当該スタイルで表示をカスタマイズ" @@ -8339,6 +9235,9 @@ msgid "do not show merges" msgstr "マージ実施リビジョンの表示抑止" +msgid "output diffstat-style summary of changes" +msgstr "diffstat 形式の変更概要を生成" + msgid "treat all files as text" msgstr "全ファイルをテキストファイルと仮定" @@ -8363,8 +9262,8 @@ msgid "number of lines of context to show" msgstr "差分コンテキストの行数" -msgid "output diffstat-style summary of changes" -msgstr "diffstat 形式の変更概要を生成" +msgid "SIMILARITY" +msgstr "類似度" msgid "guess renamed files by similarity (0<=s<=100)" msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)" @@ -8405,8 +9304,11 @@ msgid "do not pass files through decoders" msgstr "デコード処理を回避" +msgid "PREFIX" +msgstr "接頭辞" + msgid "directory prefix for files in archive" -msgstr "アーカイブファイルのディレクトリ前置詞" +msgstr "アーカイブファイルのディレクトリ接頭辞" msgid "revision to distribute" msgstr "アーカイブ対象リビジョン" @@ -8534,6 +9436,21 @@ msgid "[INDEX] REV1 REV2" msgstr "[INDEX] REV1 REV2" +msgid "add single file mergeable changes" +msgstr "" + +msgid "add single file all revs append to" +msgstr "" + +msgid "add single file all revs overwrite" +msgstr "" + +msgid "add new file at each rev" +msgstr "" + +msgid "[OPTION]... TEXT" +msgstr "[OPTION]... TEXT" + msgid "[COMMAND]" msgstr "[COMMAND]" @@ -8543,6 +9460,21 @@ msgid "[-o] CMD" msgstr "[-o] CMD" +msgid "use tags as labels" +msgstr "" + +msgid "annotate with branch names" +msgstr "" + +msgid "use dots for runs" +msgstr "" + +msgid "separate elements by spaces" +msgstr "" + +msgid "[OPTION]... [FILE [REV]...]" +msgstr "[OPTION]... [FILE [REV]...]" + msgid "try extended date formats" msgstr "拡張日時形式の使用" @@ -8555,8 +9487,8 @@ msgid "[PATH]" msgstr "[PATH]" -msgid "FILE" -msgstr "FILE" +msgid "REPO NAMESPACE [KEY OLD NEW]" +msgstr "REPO NAMESPACE [KEY OLD NEW]" msgid "revision to rebuild to" msgstr "再構築対象リビジョン" @@ -8612,8 +9544,8 @@ msgid "print matching line numbers" msgstr "合致した行番号を表示" -msgid "search in given revision range" -msgstr "当該リビジョン範囲を検索" +msgid "only search files changed within revision range" +msgstr "指定リビジョン範囲のみを検索" msgid "[OPTION]... PATTERN [FILE]..." msgstr "[OPTION]... PATTERN [FILE]..." @@ -8630,8 +9562,8 @@ msgid "show normal and closed branch heads" msgstr "閉鎖したヘッドも表示" -msgid "[-ac] [-r STARTREV] [REV]..." -msgstr "[-ac] [-r STARTREV] [REV]..." +msgid "[-ac] [-r REV] [REV]..." +msgstr "[-ac] [-r REV] [REV]..." msgid "[TOPIC]" msgstr "[TOPIC]" @@ -8654,9 +9586,14 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [SOURCE]" -msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" msgstr "パス要素除去数(patch コマンドの同名オプションと同機能)" +msgid "PATH" +msgstr "パス" + msgid "base path" msgstr "基底パス" @@ -8717,8 +9654,8 @@ msgid "show copied files" msgstr "複製されたファイルを表示" -msgid "do case-insensitive search for a keyword" -msgstr "キーワードによる検索(大文字小文字は無視)" +msgid "do case-insensitive search for a given text" +msgstr "指定キーワードによる検索(大文字小文字は無視)" msgid "include revisions where files were removed" msgstr "ファイルが登録除外されたリビジョンを含める" @@ -8729,8 +9666,11 @@ msgid "revisions committed by user" msgstr "当該ユーザによってコミットされたリビジョンを表示" -msgid "show only changesets within the given named branch" -msgstr "当該名前付きブランチに属するリビジョンを表示" +msgid "show only changesets within the given named branch (DEPRECATED)" +msgstr "指定の名前付きブランチに属するリビジョンのみを表示 (非推奨)" + +msgid "show changesets within the given named branch" +msgstr "指定の名前付きブランチに属するリビジョンを表示" msgid "do not display revision or any of its ancestors" msgstr "当該リビジョンとその祖先の表示を抑止" @@ -8786,6 +9726,9 @@ msgid "force push" msgstr "反映先にヘッドが増える場合でも実施" +msgid "allow pushing a new branch" +msgstr "新規ブランチの反映を許可" + msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" @@ -8837,20 +9780,29 @@ msgid "name of error log file to write to" msgstr "エラーログの書き出し先ファイル" +msgid "PORT" +msgstr "ポート番号" + msgid "port to listen on (default: 8000)" msgstr "要求受け付けポート番号(既定値: 8000)" +msgid "ADDR" +msgstr "アドレス" + msgid "address to listen on (default: all interfaces)" msgstr "要求受け付けアドレス(既定値: 全インタフェース)" msgid "prefix path to serve from (default: server root)" -msgstr "公開パス前置詞(既定値: ルート)" +msgstr "公開パス接頭辞(既定値: ルート)" msgid "name to show in web pages (default: working directory)" msgstr "表示名(既定値: 作業領域のパス)" -msgid "name of the webdir config file (serve more than one repository)" -msgstr "webdir 設定ファイル位置(複数リポジトリの公開)" +msgid "name of the hgweb config file (serve more than one repository)" +msgstr "hgweb 設定ファイル位置(複数リポジトリの公開)" + +msgid "name of the hgweb config file (DEPRECATED)" +msgstr "hgweb 設定ファイル位置 (非推奨)" msgid "for remote clients" msgstr "(ホスト間連携での内部用途向け)" @@ -8921,6 +9873,9 @@ msgid "remove a tag" msgstr "タグの削除" +msgid "use <text> as commit message" +msgstr "コミットメッセージ" + msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." msgstr "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." @@ -8943,12 +9898,8 @@ msgstr "[-c] [-C] [-d DATE] [[-r] REV]" #, python-format -msgid "config error at %s:%d: cannot include %s (%s)" -msgstr "%s:%d:設定エラー: %s を読み込めません(%s)" - -#, python-format -msgid "config error at %s:%d: '%s'" -msgstr "%s:%d:設定エラー:%s" +msgid "cannot include %s (%s)" +msgstr "%s を読み込めません(%s)" msgid "not found in manifest" msgstr "マニフェストにありません" @@ -8956,6 +9907,50 @@ msgid "branch name not in UTF-8!" msgstr "ブランチ名が UTF-8 ではありません!" +#, python-format +msgid "%s does not exist!\n" +msgstr "%s はありません!\n" + +#, python-format +msgid "" +"%s: up to %d MB of RAM may be required to manage this file\n" +"(use 'hg revert %s' to cancel the pending addition)\n" +msgstr "" +"%s: 指定ファイルの管理には %d MBを超えるメモリが必要です\n" +"(ファイルの登録を解除するには 'hg revert %s')\n" + +#, python-format +msgid "%s not added: only files and symlinks supported currently\n" +msgstr "%s は追加登録されません: ファイルとシンボリックリンクのみ登録可能\n" + +#, python-format +msgid "%s already tracked!\n" +msgstr "%s は登録済です!\n" + +#, python-format +msgid "%s not added!\n" +msgstr "%s は追加登録されません\n" + +#, python-format +msgid "%s still exists!\n" +msgstr "%s の削除に失敗しました!\n" + +#, python-format +msgid "%s not tracked!\n" +msgstr "%s は管理されていません!\n" + +#, python-format +msgid "%s not removed!\n" +msgstr "%s は削除されませんでした!\n" + +#, python-format +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n" + +#, python-format +msgid "invalid event type in dag: %s" +msgstr "" + msgid "working directory state appears damaged!" msgstr "作業領域の状態管理に問題があります!" @@ -8972,6 +9967,10 @@ msgstr "管理情報中のファイル %r は %r によって破壊されます" #, python-format +msgid "setting %r to other parent only allowed in merges" +msgstr "%r の別親への設定はマージでのみ可能です" + +#, python-format msgid "not in dirstate: %s\n" msgstr "%s は管理情報中にありません\n" @@ -8997,13 +9996,55 @@ msgid "unsupported file type (type is %s)" msgstr "未サポートのファイル種別(%s)" +msgid "queries" +msgstr "問い合わせ" + +msgid "searching" +msgstr "検索中" + +msgid "already have changeset " +msgstr "既にチェンジセットがあります " + +msgid "warning: repository is unrelated\n" +msgstr "警告: 無関係なリポジトリです\n" + +msgid "repository is unrelated" +msgstr "無関係なリポジトリです" + +#, python-format +msgid "abort: push creates new remote heads on branch '%s'!\n" +msgstr "中断: 連携先のブランチ '%s' に新しいヘッドが作成されます!\n" + +msgid "abort: push creates new remote heads!\n" +msgstr "中断: 連携先に新しいヘッドが作成されます!\n" + +msgid "(you should pull and merge or use push -f to force)\n" +msgstr "(pull と merge を実施するか、push -f で強制実行してください)\n" + +msgid "(did you forget to merge? use push -f to force)\n" +msgstr "(マージは済んでいますか? push -f で強制実行できます)\n" + +#, python-format +msgid "abort: push creates new remote branches: %s!\n" +msgstr "中断: 連携先に新しいブランチが作成されます: %s!\n" + +msgid "(use 'hg push --new-branch' to create new remote branches)\n" +msgstr "(連携先への新規ブランチ作成は 'hg push --new-branch')\n" + +msgid "note: unsynced remote changes!\n" +msgstr "注意: 連携先での変更点が取り込まれていません!\n" + #, python-format msgid "abort: %s\n" msgstr "中止: %s\n" #, python-format -msgid "hg: %s\n" -msgstr "hg: %s\n" +msgid "hg: parse error at %s: %s\n" +msgstr "hg: %s での解析エラー: %s\n" + +#, python-format +msgid "hg: parse error: %s\n" +msgstr "hg: 解析エラー: %s\n" #, python-format msgid "" @@ -9034,6 +10075,10 @@ msgstr "hg %s: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "abort: %s!\n" msgstr "中止: %s!\n" @@ -9051,10 +10096,6 @@ msgid "hg: unknown command '%s'\n" msgstr "hg: 未知のコマンド '%s'\n" -#, python-format -msgid "abort: could not import module %s!\n" -msgstr "中断: モジュール %s の読み込みに失敗!\n" - msgid "(did you forget to compile extensions?)\n" msgstr "(エクステンションのコンパイルを忘れていませんか?)\n" @@ -9091,6 +10132,10 @@ msgstr "** ないし mercurial@selenic.com に報告してください\n" #, python-format +msgid "** Python %s\n" +msgstr "** Python %s\n" + +#, python-format msgid "** Mercurial Distributed SCM (version %s)\n" msgstr "** Mercurial - 分散構成管理(バージョン %s)\n" @@ -9124,7 +10169,9 @@ msgid "Option --cwd may not be abbreviated!" msgstr "--cwd 指定値が未解析の可能性があります!" -msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" +"repository may only be abbreviated as --repo!" msgstr "-R は独立記述(例: '-dR' は不可)、--repository の略記は --repo のみ" #, python-format @@ -9142,8 +10189,12 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "不正なプロファイル形式 '%s' を無視します\n" -msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" -msgstr "lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ からインストールしてください" +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" +"lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/" +"lsprof/ からインストールしてください" #, python-format msgid "*** failed to import extension %s from %s: %s\n" @@ -9192,6 +10243,20 @@ msgstr "%s をマージ中\n" #, python-format +msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" +msgstr "%s.premerge は無効です('%s' は真偽ないし %s のいずれでもありません)" + +#, python-format +msgid "was merge of '%s' successful (yn)?" +msgstr "'%s' のマージは成功しましたか？(y/n) " + +msgid "&No" +msgstr "&No" + +msgid "&Yes" +msgstr "&Yes" + +#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" @@ -9199,12 +10264,6 @@ " マージ結果ファイル %s は未変更に見えます\n" "マージ成功とみなしますか? (yn)" -msgid "&No" -msgstr "&No" - -msgid "&Yes" -msgstr "&Yes" - #, python-format msgid "merging %s failed!\n" msgstr "%s のマージに失敗!\n" @@ -9238,6 +10297,9 @@ msgid "Specifying Multiple Revisions" msgstr "複数リビジョンの指定" +msgid "Specifying Revision Sets" +msgstr "複数リビジョンの指定" + msgid "Diff Formats" msgstr "差分形式" @@ -9250,6 +10312,12 @@ msgid "Using additional features" msgstr "付加機能の使用" +msgid "Configuring hgweb" +msgstr "hgweb 設定ファイル" + +msgid "Glossary" +msgstr "用語集" + msgid "" "Mercurial reads configuration data from several files, if they exist.\n" "Below we list the most specific file first." @@ -9263,21 +10331,26 @@ msgid "" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%USERPROFILE%\\mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<install-dir>\\Mercurial.ini``" +"- ``%HOME%\\mercurial.ini``\n" +"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial." +"ini found)\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial." +"ini found)\n" +"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n" +"- ``<hg.exe-dir>\\mercurial.ini``" msgstr "" "- ``<リポジトリ>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%USERPROFILE%\\mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<インストール先>\\Mercurial.ini``" +"- ``%HOME%\\mercurial.ini``\n" +"- ``C:\\mercurial\\mercurial.ini`` (regkey、hgrc.d\\、mercurial.ini 不在時\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (hgrc.d\\ 、mercurial.ini 不在" +"時)\n" +"- ``<インストール先>\\hgrc.d\\*.rc`` (mercurial.ini 不在時)\n" +"- ``<インストール先>\\mercurial.ini``" msgid "On Unix, these files are read:" msgstr "Unix 環境では以下の設定ファイルが読み込まれます:" @@ -9298,6 +10371,35 @@ "- ``<インストール先>/etc/mercurial/hgrc.d/*.rc``" msgid "" +"If there is a per-repository configuration file which is not owned by\n" +"the active user, Mercurial will warn you that the file is skipped::" +msgstr "" +"実行ユーザ以外が所有となっているリポジトリ毎設定ファイルがある場合、\n" +"Mercurial は当該ファイルを読み込まない旨の警告を表示します::" + +msgid "" +" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" +msgstr " 信頼できないファイル <repo>/.hg/hgrc (所有者 USER, グループ GROUP)" + +msgid "" +"If this bothers you, the warning can be silenced (the file would still\n" +"be ignored) or trust can be established. Use one of the following\n" +"settings, the syntax is explained below:" +msgstr "" +"そのようなファイルを意図的に使用している場合、警告表示を抑止する(但し\n" +"ファイルは読み込まれません)ことも、信頼して読み込むことも可能です。\n" +"以下の文法に従い設定を行ってください:" + +msgid "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" +msgstr "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = ユーザ``\n" +"- ``trusted.groups = グループ``" + +msgid "" "The configuration files for Mercurial use a simple ini-file format. A\n" "configuration file consists of sections, led by a ``[section]`` header\n" "and followed by ``name = value`` entries::" @@ -9316,11 +10418,11 @@ " verbose = True" msgid "" -"This above entries will be referred to as ``ui.username`` and\n" +"The above entries will be referred to as ``ui.username`` and\n" "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" "description of the possible configuration values:" msgstr "" -"上記要素はそれぞれ、``ui.username`` および ``ui.verbose`` として\n" +"上記記述はそれぞれ、``ui.username`` および ``ui.verbose`` として\n" "参照されます。設定ファイルで指定可能な値の詳細に関しては、\n" "hgrc のマニュアルページを参照してください:" @@ -9441,19 +10543,19 @@ msgid "" "This means that when generating diffs from a Mercurial repository\n" -"(e.g. with \"hg export\"), you should be careful about things like file\n" +"(e.g. with :hg:`export`), you should be careful about things like file\n" "copies and renames or other things mentioned above, because when\n" "applying a standard diff to a different repository, this extra\n" "information is lost. Mercurial's internal operations (like push and\n" "pull) are not affected by this, because they use an internal binary\n" "format for communicating changes." msgstr "" -"つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n" +"つまり、Mercurial が(:hg:`export` 等で)生成した標準の差分形式は、\n" "他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n" "ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n" -"十分注意する必要があります。push や pull のように、Mercurial の\n" -"内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n" -"ことから、情報の欠落に関しては心配する必要はありません。" +"十分注意する必要があります。:hg:`push` や :hg:`pull` のような\n" +"Mercurial の内部形式で実施される操作に関しては、バイナリ形式で変更\n" +"情報の授受を行うことから、情報の欠落に関しては心配する必要はありません。" msgid "" "To make Mercurial produce the git extended diff format, use the --git\n" @@ -9710,7 +10812,7 @@ "scope, prepend its path with !::" msgstr "" "明示的にエクステンションを無効化する場合、適切な設定ファイルにおいて\n" -"パス指定の冒頭に '!' を付与します::" +"パス指定部分に '!' を記述します::" msgid "" " [extensions]\n" @@ -9726,6 +10828,588 @@ " baz = !\n" msgid "" +"Ancestor\n" +" Any changeset that can be reached by an unbroken chain of parent\n" +" changesets from a given changeset. More precisely, the ancestors\n" +" of a changeset can be defined by two properties: a parent of a\n" +" changeset is an ancestor, and a parent of an ancestor is an\n" +" ancestor. See also: 'Descendant'." +msgstr "" + +msgid "" +"Branch\n" +" (Noun) A child changeset that has been created from a parent that\n" +" is not a head. These are known as topological branches, see\n" +" 'Branch, topological'. If a topological branch is named, it becomes\n" +" a named branch. If a topological branch is not named, it becomes\n" +" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." +msgstr "" + +msgid "" +" Branches may be created when changes are pulled from or pushed to\n" +" a remote repository, since new heads may be created by these\n" +" operations. Note that the term branch can also be used informally\n" +" to describe a development process in which certain development is\n" +" done independently of other development.This is sometimes done\n" +" explicitly with a named branch, but it can also be done locally,\n" +" using bookmarks or clones and anonymous branches." +msgstr "" + +msgid " Example: \"The experimental branch\"." +msgstr "" + +msgid "" +" (Verb) The action of creating a child changeset which results in\n" +" its parent having more than one child." +msgstr "" + +msgid " Example: \"I'm going to branch at X\"." +msgstr "" + +msgid "" +"Branch, anonymous\n" +" Every time a new child changeset is created from a parent that is not\n" +" a head and the name of the branch is not changed, a new anonymous\n" +" branch is created." +msgstr "" + +msgid "" +"Branch, closed\n" +" A named branch whose branch heads have all been closed." +msgstr "" + +msgid "" +"Branch, default\n" +" The branch assigned to a changeset when no name has previously been\n" +" assigned." +msgstr "" + +msgid "" +"Branch head\n" +" See 'Head, branch'." +msgstr "" + +msgid "" +"Branch, named\n" +" A collection of changesets which have the same branch name. By\n" +" default, children of a changeset in a named branch belong to the\n" +" same named branch. A child can be explicitly assigned to a\n" +" different branch. See :hg:`help branch`, :hg:`help branches` and\n" +" :hg:`commit --close-branch` for more information on managing\n" +" branches." +msgstr "" + +msgid "" +" Named branches can be thought of as a kind of namespace, dividing\n" +" the collection of changesets that comprise the repository into a\n" +" collection of disjoint subsets. A named branch is not necessarily\n" +" a topological branch. If a new named branch is created from the\n" +" head of another named branch, or the default branch, but no\n" +" further changesets are added to that previous branch, then that\n" +" previous branch will be a branch in name only." +msgstr "" + +msgid "" +"Branch tip\n" +" See 'Tip, branch'." +msgstr "" + +msgid "" +"Branch, topological\n" +" Every time a new child changeset is created from a parent that is\n" +" not a head, a new topological branch is created. If a topological\n" +" branch is named, it becomes a named branch. If a topological\n" +" branch is not named, it becomes an anonymous branch of the\n" +" current, possibly default, branch." +msgstr "" + +msgid "" +"Changelog\n" +" A record of the changesets in the order in which they were added\n" +" to the repository. This includes details such as changeset id,\n" +" author, commit message, date, and list of changed files." +msgstr "" + +msgid "" +"Changeset\n" +" A snapshot of the state of the repository used to record a change." +msgstr "" + +msgid "" +"Changeset, child\n" +" The converse of parent changeset: if P is a parent of C, then C is\n" +" a child of P. There is no limit to the number of children that a\n" +" changeset may have." +msgstr "" + +msgid "" +"Changeset id\n" +" A SHA-1 hash that uniquely identifies a changeset. It may be\n" +" represented as either a \"long\" 40-byte hexadecimal string, or a\n" +" \"short\" 12-byte hexadecimal string." +msgstr "" + +msgid "" +"Changeset, merge\n" +" A changeset with two parents. This occurs when a merge is\n" +" committed." +msgstr "" + +msgid "" +"Changeset, parent\n" +" A revision upon which a child changeset is based. Specifically, a\n" +" parent changeset of a changeset C is a changeset whose node\n" +" immediately precedes C in the DAG. Changesets have at most two\n" +" parents." +msgstr "" + +msgid "" +"Checkout\n" +" (Noun) The working directory being updated to a specific\n" +" revision. This use should probably be avoided where possible, as\n" +" changeset is much more appropriate than checkout in this context." +msgstr "" + +msgid " Example: \"I'm using checkout X.\"" +msgstr "" + +msgid "" +" (Verb) Updating the working directory to a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"I'm going to check out changeset X.\"" +msgstr "" + +msgid "" +"Child changeset\n" +" See 'Changeset, child'." +msgstr "" + +msgid "" +"Close changeset\n" +" See 'Changeset, close'." +msgstr "" + +msgid "" +"Closed branch\n" +" See 'Branch, closed'." +msgstr "" + +msgid "" +"Clone\n" +" (Noun) An entire or partial copy of a repository. The partial\n" +" clone must be in the form of a revision and its ancestors." +msgstr "" + +msgid " Example: \"Is your clone up to date?\"." +msgstr "" + +msgid " (Verb) The process of creating a clone, using :hg:`clone`." +msgstr "" + +msgid " Example: \"I'm going to clone the repository\"." +msgstr "" + +msgid "" +"Closed branch head\n" +" See 'Head, closed branch'." +msgstr "" + +msgid "" +"Commit\n" +" (Noun) A synonym for changeset." +msgstr "" + +msgid " Example: \"Is the bug fixed in your recent commit?\"" +msgstr "" + +msgid "" +" (Verb) The act of recording changes to a repository. When files\n" +" are committed in a working directory, Mercurial finds the\n" +" differences between the committed files and their parent\n" +" changeset, creating a new changeset in the repository." +msgstr "" + +msgid " Example: \"You should commit those changes now.\"" +msgstr "" + +msgid "" +"Cset\n" +" A common abbreviation of the term changeset." +msgstr "" + +msgid "" +"DAG\n" +" The repository of changesets of a distributed version control\n" +" system (DVCS) can be described as a directed acyclic graph (DAG),\n" +" consisting of nodes and edges, where nodes correspond to\n" +" changesets and edges imply a parent -> child relation. This graph\n" +" can be visualized by graphical tools such as :hg:`glog`\n" +" (graphlog). In Mercurial, the DAG is limited by the requirement\n" +" for children to have at most two parents." +msgstr "" + +msgid "" +"Default branch\n" +" See 'Branch, default'." +msgstr "" + +msgid "" +"Descendant\n" +" Any changeset that can be reached by a chain of child changesets\n" +" from a given changeset. More precisely, the descendants of a\n" +" changeset can be defined by two properties: the child of a\n" +" changeset is a descendant, and the child of a descendant is a\n" +" descendant. See also: 'Ancestor'." +msgstr "" + +msgid "" +"Diff\n" +" (Noun) The difference between the contents and attributes of files\n" +" in two changesets or a changeset and the current working\n" +" directory. The difference is usually represented in a standard\n" +" form called a \"diff\" or \"patch\". The \"git diff\" format is used\n" +" when the changes include copies, renames, or changes to file\n" +" attributes, none of which can be represented/handled by classic\n" +" \"diff\" and \"patch\"." +msgstr "" + +msgid " Example: \"Did you see my correction in the diff?\"" +msgstr "" + +msgid "" +" (Verb) Diffing two changesets is the action of creating a diff or\n" +" patch." +msgstr "" + +msgid "" +" Example: \"If you diff with changeset X, you will see what I mean.\"" +msgstr "" + +msgid "" +"Directory, working\n" +" The working directory represents the state of the files tracked by\n" +" 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" +" to the files introduced manually or by a merge. The repository\n" +" metadata exists in the .hg directory inside the working directory." +msgstr "" + +msgid "" +"Graph\n" +" See DAG and :hg:`help graphlog`." +msgstr "" + +msgid "" +"Head\n" +" The term 'head' may be used to refer to both a branch head or a\n" +" repository head, depending on the context. See 'Head, branch' and\n" +" 'Head, repository' for specific definitions." +msgstr "" + +msgid "" +" Heads are where development generally takes place and are the\n" +" usual targets for update and merge operations." +msgstr "" + +msgid "" +"Head, branch\n" +" A changeset with no descendants on the same named branch." +msgstr "" + +msgid "" +"Head, closed branch\n" +" A changeset that marks a head as no longer interesting. The closed\n" +" head is no longer listed by :hg:`heads`. A branch is considered\n" +" closed when all its heads are closed and consequently is not\n" +" listed by :hg:`branches`." +msgstr "" + +msgid "" +"Head, repository\n" +" A topological head which has not been closed." +msgstr "" + +msgid "" +"Head, topological\n" +" A changeset with no children in the repository." +msgstr "" + +msgid "" +"History, immutable\n" +" Once committed, changesets cannot be altered. Extensions which\n" +" appear to change history actually create new changesets that\n" +" replace existing ones, and then destroy the old changesets. Doing\n" +" so in public repositories can result in old changesets being\n" +" reintroduced to the repository." +msgstr "" + +msgid "" +"History, rewriting\n" +" The changesets in a repository are immutable. However, extensions\n" +" to Mercurial can be used to alter the repository, usually in such\n" +" a way as to preserve changeset contents." +msgstr "" + +msgid "" +"Immutable history\n" +" See 'History, immutable'." +msgstr "" + +msgid "" +"Merge changeset\n" +" See 'Changeset, merge'." +msgstr "" + +msgid "" +"Manifest\n" +" Each changeset has a manifest, which is the list of files that are\n" +" tracked by the changeset." +msgstr "" + +msgid "" +"Merge\n" +" Used to bring together divergent branches of work. When you update\n" +" to a changeset and then merge another changeset, you bring the\n" +" history of the latter changeset into your working directory. Once\n" +" conflicts are resolved (and marked), this merge may be committed\n" +" as a merge changeset, bringing two branches together in the DAG." +msgstr "" + +msgid "" +"Named branch\n" +" See 'Branch, named'." +msgstr "" + +msgid "" +"Null changeset\n" +" The empty changeset. It is the parent state of newly-initialized\n" +" repositories and repositories with no checked out revision. It is\n" +" thus the parent of root changesets and the effective ancestor when\n" +" merging unrelated changesets. Can be specified by the alias 'null'\n" +" or by the changeset ID '000000000000'." +msgstr "" + +msgid "" +"Parent\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent changeset\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent, working directory\n" +" The working directory parent reflects a virtual revision which is\n" +" the child of the changeset (or two changesets with an uncommitted\n" +" merge) shown by :hg:`parents`. This is changed with\n" +" :hg:`update`. Other commands to see the working directory parent\n" +" are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." +msgstr "" + +msgid "" +"Patch\n" +" (Noun) The product of a diff operation." +msgstr "" + +msgid " Example: \"I've sent you my patch.\"" +msgstr "" + +msgid "" +" (Verb) The process of using a patch file to transform one\n" +" changeset into another." +msgstr "" + +msgid " Example: \"You will need to patch that revision.\"" +msgstr "" + +msgid "" +"Pull\n" +" An operation in which changesets in a remote repository which are\n" +" not in the local repository are brought into the local\n" +" repository. Note that this operation without special arguments\n" +" only updates the repository, it does not update the files in the\n" +" working directory. See :hg:`help pull`." +msgstr "" + +msgid "" +"Push\n" +" An operation in which changesets in a local repository which are\n" +" not in a remote repository are sent to the remote repository. Note\n" +" that this operation only adds changesets which have been committed\n" +" locally to the remote repository. Uncommitted changes are not\n" +" sent. See :hg:`help push`." +msgstr "" + +msgid "" +"Repository\n" +" The metadata describing all recorded states of a collection of\n" +" files. Each recorded state is represented by a changeset. A\n" +" repository is usually (but not always) found in the ``.hg``\n" +" subdirectory of a working directory. Any recorded state can be\n" +" recreated by \"updating\" a working directory to a specific\n" +" changeset." +msgstr "" + +msgid "" +"Repository head\n" +" See 'Head, repository'." +msgstr "" + +msgid "" +"Revision\n" +" A state of the repository at some point in time. Earlier revisions\n" +" can be updated to by using :hg:`update`. See also 'Revision\n" +" number'; See also 'Changeset'." +msgstr "" + +msgid "" +"Revision number\n" +" This integer uniquely identifies a changeset in a specific\n" +" repository. It represents the order in which changesets were added\n" +" to a repository, starting with revision number 0. Note that the\n" +" revision number may be different in each clone of a repository. To\n" +" identify changesets uniquely between different clones, see\n" +" 'Changeset id'." +msgstr "" + +msgid "" +"Revlog\n" +" History storage mechanism used by Mercurial. It is a form of delta\n" +" encoding, with occasional full revision of data followed by delta\n" +" of each successive revision. It includes data and an index\n" +" pointing to the data." +msgstr "" + +msgid "" +"Rewriting history\n" +" See 'History, rewriting'." +msgstr "" + +msgid "" +"Root\n" +" A changeset that has only the null changeset as its parent. Most\n" +" repositories have only a single root changeset." +msgstr "" + +msgid "" +"Tip\n" +" The changeset with the highest revision number. It is the changeset\n" +" most recently added in a repository." +msgstr "" + +msgid "" +"Tip, branch\n" +" The head of a given branch with the highest revision number. When\n" +" a branch name is used as a revision identifier, it refers to the\n" +" branch tip. See also 'Branch, head'. Note that because revision\n" +" numbers may be different in different repository clones, the\n" +" branch tip may be different in different cloned repositories." +msgstr "" + +msgid "" +"Update\n" +" (Noun) Another synonym of changeset." +msgstr "" + +msgid " Example: \"I've pushed an update\"." +msgstr "" + +msgid "" +" (Verb) This term is usually used to describe updating the state of\n" +" the working directory to that of a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"You should update\"." +msgstr "" + +msgid "" +"Working directory\n" +" See 'Directory, working'." +msgstr "" + +msgid "" +"Working directory parent\n" +" See 'Parent, working directory'.\n" +msgstr "" + +msgid "" +"Mercurial's internal web server, hgweb, can serve either a single\n" +"repository, or a collection of them. In the latter case, a special\n" +"configuration file can be used to specify the repository paths to use\n" +"and global web configuration options." +msgstr "" + +msgid "" +"This file uses the same syntax as hgrc configuration files, but only\n" +"the following sections are recognized:" +msgstr "" + +msgid "" +" - web\n" +" - paths\n" +" - collections" +msgstr "" + +msgid "" +"The ``web`` section can specify all the settings described in the web\n" +"section of the hgrc documentation." +msgstr "" + +msgid "" +"The ``paths`` section provides mappings of physical repository\n" +"paths to virtual ones. For instance::" +msgstr "" + +msgid "" +" [paths]\n" +" projects/a = /foo/bar\n" +" projects/b = /baz/quux\n" +" web/root = /real/root/*\n" +" / = /real/root2/*\n" +" virtual/root2 = /real/root2/**" +msgstr "" + +msgid "" +"- The first two entries make two repositories in different directories\n" +" appear under the same directory in the web interface\n" +"- The third entry maps every Mercurial repository found in '/real/root'\n" +" into 'web/root'. This format is preferred over the [collections] one,\n" +" since using absolute paths as configuration keys is not supported on " +"every\n" +" platform (especially on Windows).\n" +"- The fourth entry is a special case mapping all repositories in\n" +" '/real/root2' in the root of the virtual directory.\n" +"- The fifth entry recursively finds all repositories under the real\n" +" root, and maps their relative paths under the virtual root." +msgstr "" + +msgid "" +"The ``collections`` section provides mappings of trees of physical\n" +"repositories paths to virtual ones, though the paths syntax is generally\n" +"preferred. For instance::" +msgstr "" + +msgid "" +" [collections]\n" +" /foo = /foo" +msgstr "" +" [collections]\n" +" /foo = /foo" + +msgid "" +"Here, the left side will be stripped off all repositories found in the\n" +"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" +"``bar`` and ``quux/baz`` respectively.\n" +msgstr "" + +msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" "separated by the \":\" character." @@ -9842,8 +11526,10 @@ msgid "Regexp examples::" msgstr "正規表現指定例::" -msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -msgstr " re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n" +msgid "" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" +" re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n" msgid "Mercurial supports several ways to specify individual revisions." msgstr "Mercurial に個々のリビジョン指定する際には複数の記法が使用できます。" @@ -9908,6 +11594,268 @@ "未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n" msgid "" +"Mercurial supports a functional language for selecting a set of\n" +"revisions." +msgstr "" +"Mercurial は、複数のリビジョンを一括指定するための問い合わせ言語を提供\n" +"しています。" + +msgid "" +"The language supports a number of predicates which are joined by infix\n" +"operators. Parenthesis can be used for grouping." +msgstr "" + +msgid "" +"Identifiers such as branch names must be quoted with single or double\n" +"quotes if they contain characters outside of\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" +"predicates. Special characters can be used in quoted identifiers by\n" +"escaping them, e.g., ``\\n`` is interpreted as a newline." +msgstr "" + +msgid "There is a single prefix operator:" +msgstr "" + +msgid "" +"``not x``\n" +" Changesets not in x. Short form is ``! x``." +msgstr "" + +msgid "These are the supported infix operators:" +msgstr "" + +msgid "" +"``x::y``\n" +" 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)``." +msgstr "" + +msgid " An alternative syntax is ``x..y``." +msgstr "" + +msgid "" +"``x:y``\n" +" All changesets with revision numbers between x and y, both\n" +" inclusive. Either endpoint can be left out, they default to 0 and\n" +" tip." +msgstr "" + +msgid "" +"``x and y``\n" +" The intersection of changesets in x and y. Short form is ``x & y``." +msgstr "" + +msgid "" +"``x or y``\n" +" The union of changesets in x and y. There are two alternative short\n" +" forms: ``x | y`` and ``x + y``." +msgstr "" + +msgid "" +"``x - y``\n" +" Changesets in x but not in y." +msgstr "" + +msgid "The following predicates are supported:" +msgstr "" + +msgid "" +"``adds(pattern)``\n" +" Changesets that add a file matching pattern." +msgstr "" + +msgid "" +"``all()``\n" +" All changesets, the same as ``0:tip``." +msgstr "" + +msgid "" +"``ancestor(single, single)``\n" +" Greatest common ancestor of the two changesets." +msgstr "" + +msgid "" +"``ancestors(set)``\n" +" Changesets that are ancestors of a changeset in set." +msgstr "" + +msgid "" +"``author(string)``\n" +" Alias for ``user(string)``." +msgstr "" + +msgid "" +"``branch(set)``\n" +" The branch names are found for changesets in set, and the result is\n" +" all changesets belonging to one those branches." +msgstr "" + +msgid "" +"``children(set)``\n" +" Child changesets of changesets in set." +msgstr "" + +msgid "" +"``closed()``\n" +" Changeset is closed." +msgstr "" + +msgid "" +"``contains(pattern)``\n" +" Revision contains pattern." +msgstr "" + +msgid "" +"``date(interval)``\n" +" Changesets within the interval, see :hg:`help dates`." +msgstr "" + +msgid "" +"``descendants(set)``\n" +" Changesets which are decendants of changesets in set." +msgstr "" + +msgid "" +"``file(pattern)``\n" +" Changesets which manually affected files matching pattern." +msgstr "" + +msgid "" +"``follow()``\n" +" An alias for ``::.`` (ancestors of the working copy's first parent)." +msgstr "" + +msgid "" +"``grep(regex)``\n" +" Like ``keyword(string)`` but accepts a regex." +msgstr "" + +msgid "" +"``head()``\n" +" Changeset is a head." +msgstr "" + +msgid "" +"``heads(set)``\n" +" Members of set with no children in set." +msgstr "" + +msgid "" +"``keyword(string)``\n" +" Search commit message, user name, and names of changed files for\n" +" string." +msgstr "" + +msgid "" +"``limit(set, n)``\n" +" First n members of set." +msgstr "" + +msgid "" +"``max(set)``\n" +" Changeset with highest revision number in set." +msgstr "" + +msgid "" +"``merge()``\n" +" Changeset is a merge changeset." +msgstr "" + +msgid "" +"``modifies(pattern)``\n" +" Changesets which modify files matching pattern." +msgstr "" + +msgid "" +"``outgoing([path])``\n" +" Changesets missing in path." +msgstr "" + +msgid "" +"``p1(set)``\n" +" First parent of changesets in set." +msgstr "" + +msgid "" +"``p2(set)``\n" +" Second parent of changesets in set." +msgstr "" + +msgid "" +"``parents(set)``\n" +" The set of all parents for all changesets in set." +msgstr "" + +msgid "" +"``removes(pattern)``\n" +" Changesets which remove files matching pattern." +msgstr "" + +msgid "" +"``reverse(set)``\n" +" Reverse order of set." +msgstr "" + +msgid "" +"``roots(set)``\n" +" Changesets with no parent changeset in set." +msgstr "" + +msgid "" +"``sort(set[, [-]key...])``\n" +" Sort set by keys. The default sort order is ascending, specify a key\n" +" as ``-key`` to sort in descending order." +msgstr "" + +msgid " The keys can be:" +msgstr "" + +msgid "" +" - ``rev`` for the revision number,\n" +" - ``branch`` for the branch name,\n" +" - ``desc`` for the commit message (description),\n" +" - ``user`` for user name (``author`` can be used as an alias),\n" +" - ``date`` for the commit date" +msgstr "" + +msgid "" +"``tagged()``\n" +" Changeset is tagged." +msgstr "" + +msgid "" +"``user(string)``\n" +" User name is string." +msgstr "" + +msgid "Command line equivalents for :hg:`log`::" +msgstr "" + +msgid "" +" -f -> ::.\n" +" -d x -> date(x)\n" +" -k x -> keyword(x)\n" +" -m -> merge()\n" +" -u x -> user(x)\n" +" -b x -> branch(x)\n" +" -P x -> !::x\n" +" -l x -> limit(expr, x)" +msgstr "" + +msgid "Some sample queries::" +msgstr "" + +msgid "" +" hg log -r 'branch(default)'\n" +" hg log -r 'branch(default) and 1.5:: and not merge()'\n" +" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" +" hg log -r 'sort(date(\"May 2008\"), user)'\n" +" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgstr "" + +msgid "" "Mercurial allows you to customize output of commands through\n" "templates. You can either pass in a template from the command\n" "line, via the --template option, or select an existing\n" @@ -9925,12 +11873,14 @@ "log, outgoing, incoming, tip, parents, heads, glog" msgid "" -"Three styles are packaged with Mercurial: default (the style used\n" -"when no explicit preference is passed), compact and changelog.\n" +"Four styles are packaged with Mercurial: default (the style used\n" +"when no explicit preference is passed), compact, changelog,\n" +"and xml.\n" "Usage::" msgstr "" "Mercurial には(明示的な指定が無い場合に使用される)default、compact\n" -"および changelog の3つのスタイル設定が同梱されています。利用方法は::" +"changelog および xml の4つのスタイル設定が同梱されています。\n" +"利用方法は::" msgid " $ hg log -r1 --style changelog" msgstr " $ hg log -r1 --style changelog" @@ -10024,7 +11974,8 @@ msgid "" ":latesttag: String. Most recent global tag in the ancestors of this\n" " changeset." -msgstr ":latesttag: 文字列。当該リビジョンの先祖に対して最も最近に付与されたタグ" +msgstr "" +":latesttag: 文字列。当該リビジョンの先祖に対して最も最近に付与されたタグ" msgid ":latesttagdistance: Integer. Longest path to the latest tag." msgstr ":latesttagdistance: 整数。最新タグへの最長パス" @@ -10033,13 +11984,16 @@ "The \"date\" keyword does not produce human-readable output. If you\n" "want to use a date in your output, you can use a filter to process\n" "it. Filters are functions which return a string based on the input\n" -"variable. You can also use a chain of filters to get the desired\n" -"output::" +"variable. Be sure to use the stringify filter first when you're\n" +"applying a string-input filter to a list-like input variable.\n" +"You can also use a chain of filters to get the desired output::" msgstr "" "\"date\" キーワードの出力は可読形式ではありません。出力に日時情報を\n" -"含めたい場合、可読化するために「フィルター」を使用します。\n" -"「フィルター」とは、指定値に基づいて文字列を生成する機能です。複数の\n" -"フィルターを連ねることで、様々な出力を得ることができます::" +"含めたい場合、可読化するための「フィルター」を使用します。\n" +"「フィルター」とは、入力値に基づいて文字列を生成する機能です。\n" +"一覧系の入力に対して文字列名のフィルターを適用する場合、最初に stringify\n" +"フィルターを適用してください。複数のフィルターを連ねることで、\n" +"様々な出力を得ることができます::" msgid "" " $ hg tip --template \"{date|isodate}\\n\"\n" @@ -10220,21 +12174,21 @@ msgid "" "Paths in the local filesystem can either point to Mercurial\n" -"repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -"incoming --bundle')." +"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" +"incoming --bundle`)." msgstr "" "ローカルファイルシステム上のパスが指す先は、Mercurial のリポジトリでも、\n" -"バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n" +"バンドルファイル(:hg:`bundle` ないし :hg:`incoming --bundle` で生成)でも\n" "構いません。" msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" -"changeset to use from the remote repository. See also 'hg help\n" -"revisions'." +"changeset to use from the remote repository. See also :hg:`help\n" +"revisions`." msgstr "" "連携先リポジトリ指定において、'#' 記号に続けて識別子を指定することで、\n" "特定のブランチ、タグないしチェンジセットを指定することが出来ます。\n" -"'hg help revisions' も参照してください。" +":hg:`help revisions` も参照してください。" msgid "" "Some features, such as pushing to http:// and https:// URLs are only\n" @@ -10309,10 +12263,10 @@ msgid "" "You can then use the alias for any command that uses a URL (for\n" -"example 'hg pull alias1' will be treated as 'hg pull URL1')." +"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)." msgstr "" "URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n" -"(例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。" +"(例えば、:hg:`pull alias1` は :hg:`pull URL1` と同義です)。" msgid "" "Two path aliases are special because they are used as defaults when\n" @@ -10344,9 +12298,16 @@ " 'default' が定義されている場合でも、'default-push' が定義されていれば\n" " こちらが優先されます。\n" +msgid "remote branch lookup not supported" +msgstr "連携先リポジトリではブランチ検索機能はサポートされていません" + msgid "dirstate branch not accessible" msgstr "dirstate のブランチ情報にアクセスできません" +#, python-format +msgid "unknown branch '%s'" +msgstr "'%s' は未知のブランチです" + msgid "can only share local repositories" msgstr "共有可能なのはローカルリポジトリのみです" @@ -10368,7 +12329,9 @@ msgid "destination '%s' is not empty" msgstr "複製先 '%s' は空ではありません" -msgid "src repository does not support revision lookup and so doesn't support clone by revision" +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" msgstr "指定の複製元では、リビジョン指定付きでの複製ができません" msgid "clone from remote to remote not supported" @@ -10379,13 +12342,16 @@ msgstr "ブランチ %s へ更新中\n" #, python-format -msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgid "" +"%d files updated, %d files merged, %d files removed, %d files unresolved\n" msgstr "ファイル状態: 更新数 %d、マージ数 %d、削除数 %d、衝突未解決数 %d\n" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "'hg resolve' でマージの衝突を解消してください\n" -msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " +"abandon\n" msgstr "'hg resolve' での再度衝突解消か、'hg up -C' で変更破棄してください\n" msgid "(branch merge, don't forget to commit)\n" @@ -10552,6 +12518,10 @@ msgid "%r cannot be used in a tag name" msgstr "%r はタグ名に使用できません" +#, python-format +msgid "warning: tag %s conflicts with existing branch name\n" +msgstr "警告: タグ %s が既存のブランチ名と衝突します\n" + msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "作業領域の .hgtags が変更されています（手動でコミットしてください）" @@ -10572,8 +12542,16 @@ msgid "no interrupted transaction available\n" msgstr "中断されたトランザクションはありません\n" -msgid "rolling back last transaction\n" -msgstr "最新のトランザクションをロールバックしています\n" +#, python-format +msgid "rolling back to revision %s (undo %s: %s)\n" +msgstr "リビジョン %s へ巻き戻し中 (%s の取り消し: %s)\n" + +#, python-format +msgid "rolling back to revision %s (undo %s)\n" +msgstr "リビジョン %s へ巻き戻し中 (%s の取り消し)\n" + +msgid "rolling back unknown transaction\n" +msgstr "未知のトランザクションの巻き戻し中\n" #, python-format msgid "Named branch could not be reset, current branch still is: %s\n" @@ -10621,112 +12599,33 @@ msgid "trouble committing %s!\n" msgstr "%s のコミットに失敗しました!\n" -#, python-format -msgid "%s does not exist!\n" -msgstr "%s はありません!\n" - -#, python-format -msgid "" -"%s: files over 10MB may cause memory and performance problems\n" -"(use 'hg revert %s' to unadd the file)\n" -msgstr "" -"%s: 10MBを超えるファイルはメモリや性能の問題要因となり得ます\n" -"(ファイルの登録を解除するには 'hg revert %s')\n" - -#, python-format -msgid "%s not added: only files and symlinks supported currently\n" -msgstr "%s は追加登録されません: ファイルとシンボリックリンクのみ登録可能\n" - -#, python-format -msgid "%s already tracked!\n" -msgstr "%s は登録済です!\n" - -#, python-format -msgid "%s not added!\n" -msgstr "%s は追加登録されません\n" - -#, python-format -msgid "%s still exists!\n" -msgstr "%s の削除に失敗しました!\n" - -#, python-format -msgid "%s not tracked!\n" -msgstr "%s は管理されていません!\n" - -#, python-format -msgid "%s not removed!\n" -msgstr "%s は削除されませんでした!\n" - -#, python-format -msgid "copy failed: %s is not a file or a symbolic link\n" -msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n" - -msgid "searching for changes\n" -msgstr "変更点を探索中\n" - -msgid "queries" -msgstr "問い合わせ" - -msgid "searching" -msgstr "検索中" - -msgid "already have changeset " -msgstr "既にチェンジセットがあります " - -msgid "warning: repository is unrelated\n" -msgstr "警告: 無関係なリポジトリです\n" - -msgid "repository is unrelated" -msgstr "無関係なリポジトリです" - msgid "requesting all changes\n" msgstr "全チェンジセットを取得中\n" -msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." msgstr "連携先の changegroupsubset 機能未対応により、部分取り込みできません。" #, python-format -msgid "abort: push creates new remote heads on branch '%s'!\n" -msgstr "中断: 連携先のブランチ '%s' に新しいヘッドが作成されます!\n" - -msgid "abort: push creates new remote heads!\n" -msgstr "中断: 連携先に新しいヘッドが作成されます!\n" - -msgid "(did you forget to merge? use push -f to force)\n" -msgstr "(マージは済んでいますか? push -f で強制実行できます)\n" - -msgid "(you should pull and merge or use push -f to force)\n" -msgstr "(pull と merge を実施するか、push -f で強制実行してください)\n" - -#, python-format -msgid "abort: push creates new remote branches: %s!\n" -msgstr "中断: 連携先に新しいブランチが作成されます: %s!\n" - -msgid "(use 'hg push -f' to force)\n" -msgstr "('hg push -f' で強制実行できます)\n" - -msgid "note: unsynced remote changes!\n" -msgstr "注意: 連携先での変更点が取り込まれていません!\n" - -#, python-format msgid "%d changesets found\n" msgstr "%d 個のチェンジセット\n" -msgid "bundle changes" -msgstr "チェンジセットをバンドルに追加" +msgid "bundling changes" +msgstr "チェンジセットをバンドルに追加中" msgid "chunks" msgstr "チャンク" -msgid "bundle manifests" -msgstr "マニフェストをバンドルに追加" +msgid "bundling manifests" +msgstr "マニフェストをバンドルに追加中" #, python-format msgid "empty or missing revlog for %s" msgstr "%s に対するリビジョンログが空ないし不在です" -msgid "bundle files" -msgstr "ファイルをバンドルに追加" +msgid "bundling files" +msgstr "ファイルをバンドルに追加中" msgid "adding changesets\n" msgstr "チェンジセットを追加中\n" @@ -10749,9 +12648,6 @@ msgid "received file revlog group is empty" msgstr "ファイルのリビジョンログが空です" -msgid "files" -msgstr "ファイル" - #, python-format msgid "missing file data for %s:%s - run hg verify" msgstr "%s:%s のファイルデータが不在です - hg verify を実施してください" @@ -10836,7 +12732,9 @@ msgstr "差分コンテキストでの行数指定が不正です: %r" #, python-format -msgid "untracked file in working directory differs from file in requested revision: '%s'" +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" msgstr "未登録ファイル %s は指定リビジョンでの記録内容と異なります" #, python-format @@ -10908,8 +12806,8 @@ msgid "branch %s not found" msgstr "ブランチ %s が見つかりません" -msgid "can't merge with ancestor" -msgstr "祖先とマージできません" +msgid "merging with a working directory ancestor has no effect" +msgstr "作業領域の先祖とのマージは意味がありません" msgid "nothing to merge (use 'hg update' or check 'hg heads')" msgstr "マージは不要です('hg update' か 'hg heads' を使用してください)" @@ -10917,11 +12815,15 @@ msgid "outstanding uncommitted changes (use 'hg status' to list changes)" msgstr "未コミット変更があります('hg status' で変更一覧表示可能)" -msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)" -msgstr "ブランチ横断('hg merge' でのマージか、'hg update -C' で変更破棄してください)" +msgid "" +"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " +"changes)" +msgstr "" +"ブランチ横断('hg merge' でのマージか、'hg update -C' で変更破棄してください)" msgid "crosses branches (use 'hg merge' or use 'hg update -c')" -msgstr "ブランチ横断('hg merge' でのマージか、'hg update -c' で変更確認してください)" +msgstr "" +"ブランチ横断('hg merge' でのマージか、'hg update -c' で変更確認してください)" #, python-format msgid "cannot create %s: destination already exists" @@ -10979,8 +12881,8 @@ msgstr "バイナリパッチのサイズ不正: 実サイズ %d, 想定サイズ %d" #, python-format -msgid "unable to strip away %d dirs from %s" -msgstr "%d 個のパス要素除外に失敗:%s" +msgid "unable to strip away %d of %d dirs from %s" +msgstr "%d 個のパス要素は、%d 個のパス要素を持つ %s から除外できません" msgid "undefined source and destination files" msgstr "パッチ対象のファイル名が指定されていません" @@ -11001,6 +12903,15 @@ msgid "Unsupported line endings type: %s" msgstr "未サポートの行末種別: %s" +msgid "" +"internal patcher failed\n" +"please report details to http://mercurial.selenic.com/bts/\n" +"or mercurial@selenic.com\n" +msgstr "" +" 内部パッチツールが機能しません。\n" +"http://mercurial.selenic.com/bts ないし mercurial@selenic.com への\n" +"エラー報告にご協力ください\n" + #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "%d ファイル変更、追加 %d 行(+)、削除 %d 行(-)\n" @@ -11014,8 +12925,8 @@ msgstr "%d のシグナルで強制終了しました" #, python-format -msgid "saving bundle to %s\n" -msgstr "バンドルを %s に保存中\n" +msgid "saved backup bundle to %s\n" +msgstr "バックアップのバンドルを %s に保存\n" msgid "adding branch\n" msgstr "ブランチを追加中\n" @@ -11070,6 +12981,114 @@ msgid "consistency error adding group" msgstr "グループの追加に失敗" +msgid "unterminated string" +msgstr "文字列が終端していません" + +msgid "syntax error" +msgstr "文法エラー" + +msgid "missing argument" +msgstr "引数がありません" + +msgid "can't negate that" +msgstr "負値にできません" + +#, python-format +msgid "can't use %s here" +msgstr "ここでは %s を使用できません" + +msgid "can't use a list in this context" +msgstr "ここではリストを使用できません" + +#, python-format +msgid "not a function: %s" +msgstr "関数ではありません: %s" + +msgid "limit wants two arguments" +msgstr "limit には2つの引数が必要です" + +msgid "limit wants a number" +msgstr "limit には数値を指定してください" + +msgid "limit expects a number" +msgstr "limit には数値を指定してください" + +msgid "ancestor wants two arguments" +msgstr "ancestor には2つの引数が必要です" + +msgid "ancestor arguments must be single revisions" +msgstr "ancestor の引数はそれぞれ単一リビジョンでなければなりません" + +msgid "follow takes no arguments" +msgstr "follow には引数が指定できません" + +msgid "date wants a string" +msgstr "date の引数は文字列でなければなりません" + +msgid "keyword wants a string" +msgstr "keyword の引数は文字列でなければなりません" + +msgid "grep wants a string" +msgstr "grep の引数は文字列でなければなりません" + +msgid "author wants a string" +msgstr "author の引数は文字列でなければなりません" + +msgid "file wants a pattern" +msgstr "file の引数はパターンでなければなりません" + +msgid "contains wants a pattern" +msgstr "contains の引数はパターンでなければなりません" + +msgid "modifies wants a pattern" +msgstr "modifies の引数はパターンでなければなりません" + +msgid "adds wants a pattern" +msgstr "adds の引数はパターンでなければなりません" + +msgid "removes wants a pattern" +msgstr "removes の引数はパターンでなければなりません" + +msgid "merge takes no arguments" +msgstr "merge には引数が指定できません" + +msgid "closed takes no arguments" +msgstr "closed には引数が指定できません" + +msgid "head takes no arguments" +msgstr "head には引数が指定できません" + +msgid "sort wants one or two arguments" +msgstr "sort には1個ないし2個の引数が必要です" + +msgid "sort spec must be a string" +msgstr "sort への整列方式指定は文字列でなければなりません" + +#, python-format +msgid "unknown sort key %r" +msgstr "未知の整列方式 %r" + +msgid "all takes no arguments" +msgstr "all には引数が指定できません" + +msgid "outgoing wants a repository path" +msgstr "outgoing の引数はリポジトリパスでなければなりません" + +msgid "tagged takes no arguments" +msgstr "tagged には引数が指定できません" + +msgid "not a symbol" +msgstr "シンボル以外が指定されました" + +msgid "empty query" +msgstr "問い合わせが空です" + +msgid "searching for exact renames" +msgstr "厳密な改名を探索中" + +msgid "searching for similar files" +msgstr "類似ファイルを探索中" + #, python-format msgid "%s looks like a binary file." msgstr "%s はバイナリファイルのようです。" @@ -11154,12 +13173,12 @@ msgstr "副リポジトリの %s を登録除外中\n" #, python-format -msgid "pulling subrepo %s\n" -msgstr "副リポジトリに %s から取り込み中\n" - -#, python-format -msgid "pushing subrepo %s\n" -msgstr "副リポジトリを %s へ反映中\n" +msgid "pulling subrepo %s from %s\n" +msgstr "副リポジトリ %s に %s から取り込み中\n" + +#, python-format +msgid "pushing subrepo %s to %s\n" +msgstr "副リポジトリ %s から %s へ反映中\n" msgid "cannot commit svn externals" msgstr "svn 外部リポジトリに commit できません" @@ -11216,7 +13235,7 @@ #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" -msgstr "信頼できないファイル %s (信頼できないユーザ %s, グループ %s)\n" +msgstr "信頼できないファイル %s (所有者 %s, グループ %s)\n" #, python-format msgid "Ignored: %s\n" @@ -11430,9 +13449,6 @@ msgid "checking changesets\n" msgstr "チェンジセットの確認中\n" -msgid "changelog" -msgstr "チェンジログ" - #, python-format msgid "unpacking changeset %s" msgstr "リビジョン %s の展開中" @@ -11454,8 +13470,8 @@ msgid "crosschecking files in changesets and manifests\n" msgstr "チェンジセットとマニフェストによるファイルのクロスチェック中\n" -msgid "crosscheck" -msgstr "クロスチェック" +msgid "crosschecking" +msgstr "クロスチェック中" #, python-format msgid "changeset refers to unknown manifest %s" @@ -11474,6 +13490,9 @@ msgid "cannot decode filename '%s'" msgstr "ファイル名 '%s' のデコードに失敗" +msgid "checking" +msgstr "確認中" + #, python-format msgid "broken revlog! (%s)" msgstr "不正な revlog! (%s)"
--- a/i18n/pt_BR.po Wed Jun 30 17:23:16 2010 +0200 +++ b/i18n/pt_BR.po Fri Jul 02 11:41:43 2010 +0200 @@ -204,15 +204,16 @@ msgid "" " # Use this if you want to check access restrictions at commit time\n" -" pretxncommit.acl = python:hgext.acl.hook\n" -" \n" +" pretxncommit.acl = python:hgext.acl.hook" +msgstr "" +" # Use este gancho para verificar restrições de acesso durante um commit\n" +" pretxncommit.acl = python:hgext.acl.hook" + +msgid "" " # Use this if you want to check access restrictions for pull, push,\n" " # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" msgstr "" -" # Use este gancho para verificar restrições de acesso durante um commit\n" -" pretxncommit.acl = python:hgext.acl.hook\n" -" \n" " # Use este gancho para verificar restrições de acesso para pull, push,\n" " # bundle e serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" @@ -235,50 +236,53 @@ " # Padrão: serve\n" " sources = serve" -msgid "" -" [acl.deny.branches] \n" -" \n" -" # Everyone is denied to the frozen branch: \n" -" frozen-branch = * \n" -" \n" -" # A bad user is denied on all branches: \n" -" * = bad-user \n" -" \n" -" [acl.allow.branches] \n" -" \n" -" # A few users are allowed on branch-a: \n" -" branch-a = user-1, user-2, user-3 \n" -" \n" -" # Only one user is allowed on branch-b: \n" -" branch-b = user-1 \n" -" \n" -" # The super user is allowed on any branch: \n" -" * = super-user \n" -" \n" -" # Everyone is allowed on branch-for-tests: \n" -" branch-for-tests = * " -msgstr "" -" [acl.deny.branches] \n" -" \n" -" # Todos são recusados no ramo \"frozen\": \n" -" frozen-branch = * \n" -" \n" -" # usuário-mau é recusado em todos os ramos: \n" -" * = bad-user \n" -" \n" -" [acl.allow.branches] \n" -" \n" -" # Alguns usuários são permitidos no ramo-a: \n" -" ramo-a = usuário-1, usuário-2, usuário-3 \n" -" \n" -" # Apenas um usuário é permitido no ramo-b: \n" -" ramo-b = usuário-1 \n" -" \n" -" # super-usuário é permitido em qualquer ramo: \n" -" * = super-usuário \n" -" \n" -" # Todos são permitidos em ramo-de-testes: \n" -" ramo-de-testes = * " +msgid " [acl.deny.branches]" +msgstr " [acl.deny.branches]" + +msgid "" +" # Everyone is denied to the frozen branch:\n" +" frozen-branch = *" +msgstr "" +" # Todos são recusados no ramo \"frozen\":\n" +" frozen-branch = * " + +msgid "" +" # A bad user is denied on all branches:\n" +" * = bad-user" +msgstr "" +" # O usuário-mau é recusado em todos os ramos:\n" +" * = usuário-mau" + +msgid " [acl.allow.branches]" +msgstr " [acl.allow.branches]" + +msgid "" +" # A few users are allowed on branch-a:\n" +" branch-a = user-1, user-2, user-3" +msgstr "" +" # Alguns usuários são permitidos no ramo-a:\n" +" ramo-a = usuário-1, usuário-2, usuário-3" + +msgid "" +" # Only one user is allowed on branch-b:\n" +" branch-b = user-1" +msgstr "" +" # Apenas um usuário é permitido no ramo-b:\n" +" ramo-b = usuário-1" + +msgid "" +" # The super user is allowed on any branch:\n" +" * = super-user" +msgstr "" +" # super-usuário é permitido em qualquer ramo:\n" +" * = super-usuário" + +msgid "" +" # Everyone is allowed on branch-for-tests:\n" +" branch-for-tests = *" +msgstr "" +" # Todos são permitidos em ramo-de-testes:\n" +" ramo-de-testes = *" msgid "" " [acl.deny]\n" @@ -487,8 +491,8 @@ msgstr "marcador divergente %s não atualizado\n" #, python-format -msgid "failed to update bookmark %s!\n" -msgstr "falha ao atualizar marcador %s!\n" +msgid "updating bookmark %s failed!\n" +msgstr "a atualização do marcador %s falhou!\n" #, python-format msgid "remote bookmark %s not found!" @@ -506,9 +510,15 @@ msgid "deleting remote bookmark %s\n" msgstr "apagando marcador remoto %s\n" -#, python-format -msgid "updating bookmark %s failed!\n" -msgstr "a atualização do marcador %s falhou!\n" +msgid "searching for changes\n" +msgstr "procurando por mudanças\n" + +msgid "no changes found\n" +msgstr "nenhuma alteração encontrada\n" + +#, python-format +msgid "comparing with %s\n" +msgstr "comparando com %s\n" msgid "bookmark to import" msgstr "marcador a ser importado" @@ -516,6 +526,9 @@ msgid "bookmark to export" msgstr "marcador a ser exportado" +msgid "compare bookmark" +msgstr "compara marcador" + msgid "force" msgstr "forçar" @@ -2771,13 +2784,6 @@ " trabalho.\n" " " -#, python-format -msgid "comparing with %s\n" -msgstr "comparando com %s\n" - -msgid "no changes found\n" -msgstr "nenhuma alteração encontrada\n" - msgid "show the revision DAG" msgstr "mostra o grafo de revisões" @@ -8904,6 +8910,15 @@ " explicitamente." 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 "" +" Para desfazer uma mesclagem antes de sua consolidação, use\n" +" :hg:`update --clean .`, que obterá uma cópia limpa do primeiro pai\n" +" original, descartando todas as mudanças." + +msgid "" " Returns 0 on success, 1 if there are unresolved files.\n" " " msgstr "" @@ -9355,11 +9370,17 @@ msgstr "restaura arquivos ou diretórios para um estado anterior" msgid "" -" (Use update -r to check out earlier revisions, revert does not\n" -" change the working directory parents.)" -msgstr "" -" (Use update -r para obter revisões anteriores, revert não altera\n" -" os pais do diretório de trabalho.)" +" 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 "" +" NOTA: revert sobrescreve parcialmente o conteúdo do diretório de\n" +" trabalho sem mudar os pais do diretório de trabalho. Use\n" +" :hg:`update -r rev` para obter revisões anteriores, ou\n" +" :hg:`update --clean .` para desfazer uma mesclagem (retirando o\n" +" segundo pai adicionado por ela)." msgid "" " With no revision specified, revert the named files or directories\n" @@ -10324,7 +10345,6 @@ msgid "annotate with branch names" msgstr "comenta com nomes de ramos" -#, fuzzy msgid "use dots for runs" msgstr "usar pontos para representar sequências" @@ -10853,9 +10873,6 @@ msgid "unsupported file type (type is %s)" msgstr "tipo de arquivo não suportado (o tipo é %s)" -msgid "searching for changes\n" -msgstr "procurando por mudanças\n" - msgid "queries" msgstr "consultas" @@ -11170,7 +11187,7 @@ msgstr "Configuração do hgweb" msgid "Glossary" -msgstr "Gossário" +msgstr "Glossário" msgid "" "Mercurial reads configuration data from several files, if they exist.\n" @@ -11222,6 +11239,34 @@ "- ``<install-root>/etc/mercurial/hgrc.d/*.rc``" msgid "" +"If there is a per-repository configuration file which is not owned by\n" +"the active user, Mercurial will warn you that the file is skipped::" +msgstr "" +"Se houver um arquivo de configuração de repositório que não tenha como\n" +"dono o usuário ativo, o Mercurial avisará que o arquivo é ignorado::" + +msgid " not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" +msgstr " não confiando em arquivo <repo>/.hg/hgrc de usuário não confiável USUÁRIO, grupo GRUPO" + +msgid "" +"If this bothers you, the warning can be silenced (the file would still\n" +"be ignored) or trust can be established. Use one of the following\n" +"settings, the syntax is explained below:" +msgstr "" +"Este aviso pode ser silenciado (o arquivo ainda seria ignorado) ou\n" +"você pode especificar que confia no conteúdo desse arquivo. Use uma\n" +"das definições seguintes, a sintaxe é explicada em seguida:" + +msgid "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" +msgstr "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" + +msgid "" "The configuration files for Mercurial use a simple ini-file format. A\n" "configuration file consists of sections, led by a ``[section]`` header\n" "and followed by ``name = value`` entries::" @@ -11669,15 +11714,28 @@ " changeset is an ancestor, and a parent of an ancestor is an\n" " ancestor. See also: 'Descendant'." msgstr "" +"Ancestor\n" +" Ancestral. Qualquer revisão que possa ser alcançada por uma cadeia\n" +" contínua de revisões pais a partir de uma revisão dada. Mais\n" +" precisamente, os ancestrais de uma revisão podem ser definidos por\n" +" duas propriedades: um pai de uma revisão é um ancestral, e um pai\n" +" de um ancestral é um ancestral. Veja também: 'Descendant'." msgid "" "Branch\n" " (Noun) A child changeset that has been created from a parent that\n" " is not a head. These are known as topological branches, see\n" -" 'Branch, topological'.If a topological branch is named, it becomes\n" +" 'Branch, topological'. If a topological branch is named, it becomes\n" " a named branch. If a topological branch is not named, it becomes\n" " an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." msgstr "" +"Branch\n" +" (Nome) Ramo. Uma revisão filha que foi criada a partir de um pai que\n" +" não seja uma cabeça. Estes ão conhecidos como ramos topológicos; veja\n" +" 'Branch, topological'. Se um ramo topológico tiver um nome, ele pode\n" +" ser chamado de ramo nomeado. Se um ramo topológico não tiver um nome,\n" +" ele pode ser chamado de ramo anônimo. Veja 'Branch, anonymous' e\n" +" 'Branch, named'." msgid "" " Branches may be created when changes are pulled from or pushed to\n" @@ -11688,17 +11746,30 @@ " explicitly with a named branch, but it can also be done locally,\n" " using bookmarks or clones and anonymous branches." msgstr "" +" Ramos podem ser criados quando mudanças forem trazidas de ou enviadas\n" +" para um repositório remoto, já que novas cabeças podem ser criadas por\n" +" estas operações. Note que o termo ramo pode também ser usado\n" +" informalmente para descrever um processo de desenvolvimento no qual\n" +" parte do trabalho é feita independentemente de outras partes. Isto\n" +" pode ser feito com ramos anônimos, distinguindo-os através de\n" +" diferentes clones ou marcadores (veja :hg:`help bookmarks`), ou\n" +" explicitamente usando ramos nomeados." msgid " Example: \"The experimental branch\"." msgstr "" +" Exemplos: \"o ramo experimental\"; \"enviei a correção para o\n" +" ramo de produção\"." msgid "" " (Verb) The action of creating a child changeset which results in\n" " its parent having more than one child." msgstr "" +" (Verbo) Ramificar. A ação de criar uma revisão filha que resulta\n" +" em seu pai ter mais de uma revisão filha, muitas vezes designada\n" +" como \"criar um ramo\" ou \"fazer um ramo\"." msgid " Example: \"I'm going to branch at X\"." -msgstr "" +msgstr " Exemplos: \"vou ramificar em X\"; \"vou criar um ramo em X\"." msgid "" "Branch, anonymous\n" @@ -11706,22 +11777,35 @@ " a head and the name of the branch is not changed, a new anonymous\n" " branch is created." msgstr "" +"Branch, anonymous\n" +" Ramo anônimo. Um ramo anônimo é criado sempre que uma nova revisão\n" +" filha for criada a partir de um pai que não seja uma cabeça (veja\n" +" 'Head, branch') sem mudar o nome do ramo (veja 'Branch, named')." msgid "" "Branch, closed\n" " A named branch whose branch heads have all been closed." msgstr "" +"Branch, closed\n" +" Ramo fechado. Um ramo nomeado (veja 'Branch, named') onde todas as\n" +" cabeças de ramo (veja 'Branch, heads') tenham sido fechadas." msgid "" "Branch, default\n" " The branch assigned to a changeset when no name has previously been\n" " assigned." msgstr "" +"Branch, default\n" +" Ramo default, às vezes chamado de ramo padrão. 'default' é o nome\n" +" de ramo (veja 'Branch, named') atribuído a uma revisão se nenhum nome\n" +" for explicitamente atribuído." msgid "" "Branch head\n" " See 'Head, branch'." msgstr "" +"Branch head\n" +" Veja 'Head, branch'." msgid "" "Branch, named\n" @@ -11732,6 +11816,13 @@ " :hg:`commit --close-branch` for more information on managing\n" " branches." msgstr "" +"Branch, named\n" +" Ramo nomeado. É uma coleção de revisões que possuem o mesmo nome de\n" +" ramo. Por padrão, as revisões filhas de uma revisão em um ramo\n" +" nomeado pertencem ao mesmo ramo nomeado; uma revisão filha pode\n" +" receber um outro nome de ramo durante sua criação. Veja\n" +" :hg:`help branch`, :hg:`help branches` e :hg:`commit --close-branch`\n" +" para explicações mais detalhadas sobre gerenciamento de ramos." msgid "" " Named branches can be thought of as a kind of namespace, dividing\n" @@ -11739,14 +11830,24 @@ " collection of disjoint subsets. A named branch is not necessarily\n" " a topological branch. If a new named branch is created from the\n" " head of another named branch, or the default branch, but no\n" -" further changesets are added to that previous branch, then the new\n" -" named branch will be a branch in name only." -msgstr "" +" further changesets are added to that previous branch, then that\n" +" previous branch will be a branch in name only." +msgstr "" +" Ramos nomeados podem ser vistos como um tipo de espaço de nomes,\n" +" dividindo a coleção de revisões que compõe um repositório em\n" +" subconjuntos disjuntos. Um ramo nomeado não é necessariamente\n" +" um ramo topológico. Se um novo ramo nomeado for criado a partir\n" +" da cabeça de um outro ramo nomeado, ou do ramo default, mas nenhuma\n" +" outra revisão for adicionada no ramo de origem, tal ramo de origem\n" +" não será mais um ramo topológico, embora não deixe de ser um ramo\n" +" nomeado." msgid "" "Branch tip\n" " See 'Tip, branch'." msgstr "" +"Branch tip\n" +" Veja 'Tip, branch'." msgid "" "Branch, topological\n" @@ -11756,6 +11857,13 @@ " branch is not named, it becomes an anonymous branch of the\n" " current, possibly default, branch." msgstr "" +"Branch, topological\n" +" Ramo topológico. Cada vez que uma nova revisão filha for criada a\n" +" partir de um pai que não seja uma cabeça (veja 'Head, topological'),\n" +" um novo ramo topológico é criado. Se um ramo topológico tiver um\n" +" nome de ramo, será um ramo nomeado. Se um ramo topológico não for\n" +" nomeado, ele se torna um ramo anônimo do ramo atual (possivelmente\n" +" o ramo 'default', veja 'Branch, default')." msgid "" "Changelog\n" @@ -11763,11 +11871,19 @@ " to the repository. This includes details such as changeset id,\n" " author, commit message, date, and list of changed files." msgstr "" +"Changelog\n" +" Um registro das revisões na ordem em que elas foram adicionadas\n" +" ao repositório. Isso inclui detalhes como id de revisão, autor,\n" +" mensagem de consolidação, data e lista de arquivos modificados." msgid "" "Changeset\n" " A snapshot of the state of the repository used to record a change." msgstr "" +"Changeset\n" +" Revisão. Uma cópia do estado do repositório usado para gravar uma\n" +" mudança. Dependendo do contexto, pode se referir também à mudança\n" +" imediata que levou a esse estado." msgid "" "Changeset, child\n" @@ -11775,6 +11891,10 @@ " a child of P. There is no limit to the number of children that a\n" " changeset may have." msgstr "" +"Changeset, child\n" +" Revisão filha. O inverso de revisão pai: se P é um pai de F, então F\n" +" é uma filha de P. Não há limite no número de revisões filhas que uma\n" +" revisão possa ter." msgid "" "Changeset id\n" @@ -11782,12 +11902,21 @@ " represented as either a \"long\" 40-byte hexadecimal string, or a\n" " \"short\" 12-byte hexadecimal string." msgstr "" +"Changeset id\n" +" Id de revisão. Um hash SHA-1 que identifica unicamente uma revisão.\n" +" Pode ser representado tanto como uma cadeia \"longa\" de caracteres\n" +" hexadecimais de 40 bytes, ou uma cadeia \"curta\" de 12 caracteres\n" +" correspondente aos 12 primeiros caracteres da cadeia longa (veja\n" +" :hg:`help revisions`)." msgid "" "Changeset, merge\n" " A changeset with two parents. This occurs when a merge is\n" " committed." msgstr "" +"Changeset, merge\n" +" Revisão de mesclagem. Uma revisão com dois pais. Tais revisões são\n" +" criadas ao consolidar uma mesclagem (veja 'Merge')." msgid "" "Changeset, parent\n" @@ -11796,6 +11925,11 @@ " immediately precedes C in the DAG. Changesets have at most two\n" " parents." msgstr "" +"Changeset, parent\n" +" Revisão pai. Uma revisão na qual uma revisão filha se baseia.\n" +" Especificamente, uma revisão pai de uma revisão F é uma revisão\n" +" cujo nó imediatamente precede F no DAG (veja 'DAG'). Revisões\n" +" têm no máximo duas revisões pais." msgid "" "Checkout\n" @@ -11803,60 +11937,86 @@ " revision. This use should probably be avoided where possible, as\n" " changeset is much more appropriate than checkout in this context." msgstr "" +"Checkout\n" +" (Nome) Um diretório de trabalho atualizado para uma revisão\n" +" específica, comumente usado em outros sistemas de controle de\n" +" versão. Este uso é desencorajado, uma vez que revisão ou\n" +" 'changeset' são bem mais apropriados que 'checkout' nesse\n" +" contexto." msgid " Example: \"I'm using checkout X.\"" -msgstr "" +msgstr " Exemplo: \"Estou usando o checkout X.\"" msgid "" " (Verb) Updating the working directory to a specific changeset. See\n" " :hg:`help update`." msgstr "" +" (Verbo) Atualizar o diretório de trabalho para uma revisão específica.\n" +" É um apelido para o comando 'update'; veja :hg:`help update`." msgid " Example: \"I'm going to check out changeset X.\"" -msgstr "" +msgstr " Exemplo: \"Estou atualizando para a revisão X.\"" msgid "" "Child changeset\n" " See 'Changeset, child'." msgstr "" +"Child changeset\n" +" Veja 'Changeset, child'." msgid "" "Close changeset\n" " See 'Changeset, close'." msgstr "" +"Close changeset\n" +" Veja 'Changeset, close'." msgid "" "Closed branch\n" " See 'Branch, closed'." msgstr "" +"Closed branch\n" +" Veja 'Branch, closed'." msgid "" "Clone\n" " (Noun) An entire or partial copy of a repository. The partial\n" " clone must be in the form of a revision and its ancestors." msgstr "" +"Clone\n" +" (Nome) Uma cópia total ou parcial de um repositório." msgid " Example: \"Is your clone up to date?\"." -msgstr "" +msgstr " Exemplo: \"Seu clone está atualizado?\"." msgid " (Verb) The process of creating a clone, using :hg:`clone`." msgstr "" +" (Verbo) Clonar. O processo de criar um clone, usando o comando\n" +" de mesmo nome: :hg:`clone`." msgid " Example: \"I'm going to clone the repository\"." -msgstr "" +msgstr " Exemplo: \"Vou clonar o repositório\"." msgid "" "Closed branch head\n" " See 'Head, closed branch'." msgstr "" +"Closed branch head\n" +" Veja 'Head, closed branch'." msgid "" "Commit\n" " (Noun) A synonym for changeset." msgstr "" +"Commit\n" +" (Nome) Consolidação. Pode se referir ao ato de consolidar uma nova\n" +" revisão, o comando que faz essa consolidação (veja :hg:`help commit`)\n" +" ou simplesmente a uma revisão." msgid " Example: \"Is the bug fixed in your recent commit?\"" msgstr "" +" Exemplos: \"O bug foi corrigido por seu último commit?\";\n" +" \"A consolidação das mudanças foi finalizada com sucesso.\"" msgid "" " (Verb) The act of recording changes to a repository. When files\n" @@ -11864,14 +12024,21 @@ " differences between the committed files and their parent\n" " changeset, creating a new changeset in the repository." msgstr "" +" (Verbo) Consolidar. O ato de gravar mudanças em um repositório.\n" +" Quando arquivos são consolidados em um diretório de trabalho, o\n" +" Mercurial localiza todas as mudanças entre os arquivos consolidados\n" +" e a revisão pai (veja 'Parent, working directory'), criando uma\n" +" nova revisão no repositório." msgid " Example: \"You should commit those changes now.\"" -msgstr "" +msgstr " Exemplo: \"Você deve consolidar aquelas mudanças agora.\"" msgid "" "Cset\n" " A common abbreviation of the term changeset." msgstr "" +"Cset\n" +" Uma abreviação comum para o termo changeset (revisão)." msgid "" "DAG\n" @@ -11880,14 +12047,26 @@ " consisting of nodes and edges, where nodes correspond to\n" " changesets and edges imply a parent -> child relation. This graph\n" " can be visualized by graphical tools such as :hg:`glog`\n" -" (graphlog). In mercurial, the DAG is limited by the requirement\n" +" (graphlog). In Mercurial, the DAG is limited by the requirement\n" " for children to have at most two parents." msgstr "" +"DAG\n" +" O repositório de revisões de um sistema de controle de versão\n" +" distribuído (DVCS) pode ser descrito como um grafo acíclico\n" +" dirigido (Directed Acyclic Graph, ou DAG), consistindo de nós\n" +" correspondendo a revisões e arestas indicando relações entre\n" +" revisões pais e filhas. Esse grafo pode ser visualizado com\n" +" ferramentas como :hg:`glog` (veja :hg:`help graphlog`). No\n" +" Mercurial, o número de arestas incidentes em um nó qualquer\n" +" do DAG é limitado a dois, por ser esse o limite do número\n" +" de pais que uma revisão pode ter." msgid "" "Default branch\n" " See 'Branch, default'." msgstr "" +"Default branch\n" +" Veja 'Branch, default'." msgid "" "Descendant\n" @@ -11897,6 +12076,13 @@ " changeset is a descendant, and the child of a descendant is a\n" " descendant. See also: 'Ancestor'." msgstr "" +"Descendant\n" +" Descendente. Qualquer revisão que possa ser alcançada por uma\n" +" cadeia de revisões filhas, a partir de uma revisão dada. Mais\n" +" precisamente, os descendentes de uma revisão podem ser definidos\n" +" por duas propriedades: as revisões filhas de uma revisão são\n" +" suas descendentes, e as revisões filhas de uma descendente são\n" +" descendentes. Veja também: 'Ancestor'." msgid "" "Diff\n" @@ -11908,17 +12094,31 @@ " attributes, none of which can be represented/handled by classic\n" " \"diff\" and \"patch\"." msgstr "" +"Diff\n" +" (Nome) A diferença de conteúdos e atributos de arquivos entre\n" +" duas revisões ou entre uma revisão e o diretório de trabalho atual.\n" +" Tal diferença é tipicamente representada em um formato de texto\n" +" padronizado conhecido como \"diff\" ou \"patch\" (veja 'Patch' e\n" +" :hg:`help diff`).\n" +" O formato \"git diff\" é usado para representar cópias, renomeações\n" +" ou mudanças de atributos de arquivo, que não podem ser representadas\n" +" no formato \"diff\" clássico. Diff também é o nome de um popular\n" +" programa Unix que gera essas representações." msgid " Example: \"Did you see my correction in the diff?\"" -msgstr "" +msgstr " Exemplo: \"Você viu minha correção no diff?\"" msgid "" " (Verb) Diffing two changesets is the action of creating a diff or\n" " patch." msgstr "" +" (Verbo) A ação de criar uma representação diff a partir de duas\n" +" revisões." msgid " Example: \"If you diff with changeset X, you will see what I mean.\"" msgstr "" +" Em português, diff não aparece como verbo: costuma-se usar\n" +" \"criar um diff\" ou \"gerar um diff\" em seu lugar." msgid "" "Directory, working\n" @@ -11930,11 +12130,22 @@ " to the files introduced manually or by a merge. The repository\n" " metadata exists in the .hg directory inside the working directory." msgstr "" +"Directory, working\n" +" Diretório de trabalho. Representa o estado dos arquivos rastreados\n" +" pelo Mercurial que será gravado na próxima consolidação. O diretório\n" +" de trabalho inicialmente corresponde a uma cópia dos dados de uma\n" +" revisão existente conhecida como pai do diretório de trabalho (veja\n" +" 'Parent, working directory'). Esse estado pode ser modificado por uma\n" +" mesclagem ou por mudanças manuais nos arquivos. Os metadados do\n" +" repositório são armazenados no diretório .hg dentro do diretório de\n" +" trabalho." msgid "" "Graph\n" " See DAG and :hg:`help graphlog`." msgstr "" +"Graph\n" +" Grafo; veja 'DAG' e :hg:`help graphlog`." msgid "" "Head\n" @@ -11942,16 +12153,24 @@ " repository head, depending on the context. See 'Head, branch' and\n" " 'Head, repository' for specific definitions." msgstr "" +"Head\n" +" Cabeça. O termo pode ser usado tanto para denotar uma cabeça de\n" +" ramo como uma cabeça do repositório, dependendo do contexto. Veja\n" +" 'Head, branch' e 'Head, repository' para definições específicas." msgid "" " Heads are where development generally takes place and are the\n" " usual targets for update and merge operations." msgstr "" +" Cabeças são onde o desenvolvimento geralmente acontece e são os\n" +" alvos costumeiros para operações update e merge." msgid "" "Head, branch\n" " A changeset with no descendants on the same named branch." msgstr "" +"Head, branch\n" +" Cabeça de ramo. Uma revisão sem descendentes no mesmo ramo nomeado." msgid "" "Head, closed branch\n" @@ -11960,16 +12179,27 @@ " closed when all its heads are closed and consequently is not\n" " listed by :hg:`branches`." msgstr "" +"Head, closed branch\n" +" Cabeça de um ramo fechado. Uma revisão que marca uma linha de\n" +" desenvolvimento que não interessa mais. A cabeça fechada não\n" +" aparece mais na lista de :hg:`heads`. Um ramo é considerado\n" +" fechado quando todas as suas cabeças estiverem fechadas, e\n" +" consequentemente não será listado por :hg:`branches`." msgid "" "Head, repository\n" " A topological head which has not been closed." msgstr "" +"Head, repository\n" +" Cabeça do repositório. Uma cabeça topológica que não foi fechada." msgid "" "Head, topological\n" " A changeset with no children in the repository." msgstr "" +"Head, topological\n" +" Cabeça topológica. Uma revisão que não tem revisões filhas neste\n" +" repositório." msgid "" "History, immutable\n" @@ -11979,6 +12209,16 @@ " so in public repositories can result in old changesets being\n" " reintroduced to the repository." msgstr "" +"History, immutable\n" +" Histórico imutável. Uma vez consolidada, uma revisão não pode ser\n" +" alterada. Extensões que se propõe a alterar o histórico (veja\n" +" 'History, rewriting') na verdade criam novas revisões substituindo\n" +" as revisões existentes.\n" +" Este tipo de operação faz mais sentido em repositórios privados:\n" +" se alguém tiver copiado alguma revisão original antes da edição,\n" +" essa revisão irá reaparecer no repositório na próxima vez que\n" +" esse desenvolvedor enviar suas revisões (a remoção de revisões\n" +" não é propagada pelo Mercurial)." msgid "" "History, rewriting\n" @@ -11986,22 +12226,35 @@ " to Mercurial can be used to alter the repository, usually in such\n" " a way as to preserve changeset contents." msgstr "" +"History, rewriting\n" +" Edição, ou reescrita de histórico. As revisões de um repositório são\n" +" imutáveis; no entanto, extensões do Mercurial podem ser usadas para\n" +" alterar o repositório, através da criação de novas revisões baseadas\n" +" nas revisões existentes (preservando ou modificando conteúdos,\n" +" metadados ou posições no grafo de revisões) e remoção das revisões\n" +" originais." msgid "" "Immutable history\n" " See 'History, immutable'." msgstr "" +"Immutable history\n" +" Veja 'History, immutable'." msgid "" "Merge changeset\n" " See 'Changeset, merge'." msgstr "" +"Merge changeset\n" +" Veja 'Changeset, merge'." msgid "" "Manifest\n" " Each changeset has a manifest, which is the list of files that are\n" " tracked by the changeset." msgstr "" +"Manifest\n" +" Manifesto. É a lista de arquivos rastreados por uma determinada revisão." msgid "" "Merge\n" @@ -12011,11 +12264,21 @@ " conflicts are resolved (and marked), this merge may be committed\n" " as a merge changeset, bringing two branches together in the DAG." msgstr "" +"Merge\n" +" Mesclagem. Operação usada para conciliar ramos de trabalho divergentes.\n" +" Quando você atualiza para uma revisão e faz uma mesclagem com outra\n" +" revisão, você traz o histórico da última para seu diretório de\n" +" trabalho. Uma vez que eventuais conflitos sejam resolvidos e marcados\n" +" (como descrito em :hg:`help resolve`), esta mesclagem pode ser\n" +" consolidada como uma revisão de mesclagem. O termo também é\n" +" usado para designar tais revisões." msgid "" "Named branch\n" " See 'Branch, named'." msgstr "" +"Named branch\n" +" Veja 'Branch, named'." msgid "" "Null changeset\n" @@ -12025,16 +12288,28 @@ " merging unrelated changesets. Can be specified by the alias 'null'\n" " or by the changeset ID '000000000000'." msgstr "" +"Null changeset\n" +" Revisão nula. A revisão vazia. É o pai do diretório de trabalho em\n" +" repositórios recém-criados, ou repositórios sem uma cópia local\n" +" obtida. É portanto o pai de revisões raízes (veja 'Root') e\n" +" o ancestral efetivo ao mesclar revisões não relacionadas. Pode ser\n" +" especificado usando o nome reservado \"null\" ou pelo id de revisão\n" +" '000000000000' (note que isto .não é o mesmo que o número de revisão\n" +" 0; veja 'Revision number')." msgid "" "Parent\n" " See 'Changeset, parent'." msgstr "" +"Parent\n" +" Veja 'Changeset, parent'." msgid "" "Parent changeset\n" " See 'Changeset, parent'." msgstr "" +"Parent changeset\n" +" Veja 'Changeset, parent'." msgid "" "Parent, working directory\n" @@ -12044,22 +12319,42 @@ " :hg:`update`. Other commands to see the working directory parent\n" " are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." msgstr "" +"Parent, working directory\n" +" Pai do diretório de trabalho. É a revisão associada à cópia de trabalho\n" +" presente no momento: a próxima revisão consolidada será uma filha do\n" +" pai do diretório de trabalho (ou pais, no caso de uma mesclagem).\n" +" Podem ser exibidos com os comandos :hg:`parents`, :hg:`summary` ou\n" +" :hg:`id`, e mudados através de :hg:`update`. Pode ser especificado\n" +" usando o nome reservado \".\"." msgid "" "Patch\n" " (Noun) The product of a diff operation." msgstr "" +"Patch\n" +" (Nome) O produto de uma operação de diff (veja 'Diff').\n" +" Patch também é o nome de um programa Unix capaz de restaurar o\n" +" conteúdo de um arquivo de destino a partir do arquivo original\n" +" e da representação diff de suas diferenças com o destino.\n" +" Por serem capazes de aplicar tais diferenças mesmo em arquivos\n" +" ligeiramente diferentes dos originais, patches são muito usados\n" +" como forma legível de difundir e aplicar mudanças; veja\n" +" :hg:`help export` e :hg:`help import`." msgid " Example: \"I've sent you my patch.\"" -msgstr "" +msgstr " Exemplo: \"Eu enviei o meu patch.\"" msgid "" " (Verb) The process of using a patch file to transform one\n" " changeset into another." msgstr "" +" (Verbo) O processo de usar um arquivo de patch para transformar uma\n" +" revisão em outra." msgid " Example: \"You will need to patch that revision.\"" msgstr "" +" Em português, patch não aparece como verbo: costuma-se usar a expressão\n" +" \"aplicar um patch\" em seu lugar." msgid "" "Pull\n" @@ -12069,6 +12364,12 @@ " only updates the repository, it does not update the files in the\n" " working directory. See :hg:`help pull`." msgstr "" +"Pull\n" +" Recebimento de revisões remotas. Uma operação na qual revisões de um\n" +" repositório remoto que não estejam no repositório local são trazidas\n" +" para o repositório local. Note que esta operação tipicamente afeta\n" +" apenas o repositório, sem atualizar os arquivos da área de trabalho;\n" +" veja :hg:`help pull`." msgid "" "Push\n" @@ -12078,6 +12379,13 @@ " locally to the remote repository. Uncommitted changes are not\n" " sent. See :hg:`help push`." msgstr "" +"Push\n" +" Envio de revisões. Uma operação na qual revisões de um repositório\n" +" local que não estão em um repositório remoto são enviadas para esse\n" +" repositório remoto.\n" +" Note que essa operação apenas adiciona ao repositório remoto revisões\n" +" já consolidadas localmente; mudanças não consolidadas da cópia de\n" +" trabalho não são enviadas. Veja :hg:`help push`." msgid "" "Repository\n" @@ -12088,11 +12396,20 @@ " recreated by \"updating\" a working directory to a specific\n" " changeset." msgstr "" +"Repository\n" +" Repositório. Os metadados descrevendo todos os estados registrados\n" +" de uma coleção de arquivos. Cada estado registrado é representado por\n" +" uma revisão. Um repositório é tipicamente encontrado no subdiretório\n" +" ``.hg`` de um diretório de trabalho. Qualquer estado registrado pode\n" +" ser recriado através de uma atualização (veja 'Update') de um\n" +" diretório de trabalho para uma revisão específica." msgid "" "Repository head\n" " See 'Head, repository'." msgstr "" +"Repository head\n" +" Veja 'Head, repository'." msgid "" "Revision\n" @@ -12100,6 +12417,11 @@ " can be updated to by using :hg:`update`. See also 'Revision\n" " number'; See also 'Changeset'." msgstr "" +"Revision\n" +" Revisão. O estado de um repositório em algum ponto no tempo;\n" +" 'Changeset' é um termo alternativo praticamente equivalente.\n" +" Revisões mais antigas podem ser obtidas usando :hg:`update`.\n" +" Veja também 'Revision number'." msgid "" "Revision number\n" @@ -12110,6 +12432,13 @@ " identify changesets uniquely between different clones, see\n" " 'Changeset id'." msgstr "" +"Revision number\n" +" Número de revisão. Este inteiro identifica unicamente uma revisão\n" +" dentro de um repositório específico. Ele representa a ordem na qual as\n" +" revisões foram adicionadas a um repositório, começando pela revisão\n" +" número 0. Note que o número de revisão pode ser diferente em cada\n" +" clone de um repositório. Para identificar unicamente revisões entre\n" +" diferentes clones, veja 'Changeset id' e :hg:`help revisions`." msgid "" "Revlog\n" @@ -12118,23 +12447,36 @@ " of each successive revision. It includes data and an index\n" " pointing to the data." msgstr "" +"Revlog\n" +" O mecanismo de armazenamento de dados usado pelo Mercurial. É uma\n" +" forma de codificação por deltas, com revisões completas ocasionais\n" +" seguidas pelas diferenças com relação a cada revisão anterior. Inclui\n" +" dados e um índice referenciando esses dados." msgid "" "Rewriting history\n" -" See 'History, rewriting'." -msgstr "" +" See 'History, rewriting'." +msgstr "" +"Rewriting history\n" +" Veja 'History, rewriting'." msgid "" "Root\n" " A changeset that has only the null changeset as its parent. Most\n" " repositories have only a single root changeset." msgstr "" +"Root\n" +" Raiz. Uma revisão que possui como pai apenas a revisão nula.\n" +" A maior parte dos repositórios possui apenas uma revisão raiz." msgid "" "Tip\n" " The changeset with the highest revision number. It is the changeset\n" " most recently added in a repository." msgstr "" +"Tip\n" +" Ponta. A revisão com o maior número de revisão. É a revisão que foi\n" +" adicionada por último a um repositório." msgid "" "Tip, branch\n" @@ -12144,33 +12486,49 @@ " numbers may be different in different repository clones, the\n" " branch tip may be different in different cloned repositories." msgstr "" +"Tip, branch\n" +" A ponta de um ramo. É a cabeça de um determinado ramo com o maior\n" +" número de revisão. Quando um nome de ramo é usado como identificador\n" +" de revisão, ele se refer à ponta do ramo.\n" +" Veja também 'Branch, head'. Note que a ponta do ramo pode ser diferente\n" +" em diferentes clones de um repositório, já que os números de revisão\n" +" podem não ser os mesmos." msgid "" "Update\n" " (Noun) Another synonym of changeset." msgstr "" - -msgid " Example: \"I've pushed an update\"." -msgstr "" +"Update\n" +" (Nome) Atualização. Outro sinônimo para revisão." + +msgid " Example: \"I've pushed an update\"." +msgstr " Exemplo: \"Eu enviei uma atualização\"." msgid "" " (Verb) This term is usually used to describe updating the state of\n" " the working directory to that of a specific changeset. See\n" " :hg:`help update`." msgstr "" +" (Verb) Atualizar. Esse termo é tipicamente usado para descrever\n" +" a mudança do estado do diretório de trabalho para uma revisão\n" +" específica qualquer. Veja :hg:`help update`." msgid " Example: \"You should update\"." -msgstr "" +msgstr " Exemplo: \"Você deveria atualizar\"." msgid "" "Working directory\n" " See 'Directory, working'." msgstr "" +"Working directory\n" +" Veja 'Directory, working'." msgid "" "Working directory parent\n" -" See 'Parent, working directory'.\n" -msgstr "" +" See 'Parent, working directory'.\n" +msgstr "" +"Working directory parent\n" +" Veja 'Parent, working directory'.\n" msgid "" "Mercurial's internal web server, hgweb, can serve either a single\n" @@ -12495,17 +12853,18 @@ msgid "" "Identifiers such as branch names must be quoted with single or double\n" -"quotes if they contain characters outside of ``[a-zA-Z0-9]`` or if\n" -"they match one of the predefined predicates. Special characters can be\n" -"used in the identifiers by quoting them, e.g., ``\\n`` is interpreted\n" -"as a newline." +"quotes if they contain characters outside of\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" +"predicates. Special characters can be used in quoted identifiers by\n" +"escaping them, e.g., ``\\n`` is interpreted as a newline." msgstr "" "Identificadores (como nomes de ramo ou etiquetas) que contenham\n" -"caracteres fora de ``[a-zA-Z0-9]`` ou forem iguais a algum dos\n" -"predicados predefinidos devem ser passados entre aspas simples\n" -"ou duplas. Caracteres especiais podem ser usados em identificadores\n" -"usando escapes; por exemplo, ``\\n`` é interpretado como uma quebra\n" -"de linha." +"caracteres fora de ``[._a-zA-Z0-9\\x80-\\xff]`` ou que forem\n" +"iguais a algum dos predicados predefinidos devem ser passados\n" +"entre aspas simples ou duplas.\n" +"Dentro de identificadores protegidos por aspas, caracteres\n" +"especiais podem ser especificados usando escapes; por exemplo,\n" +"``\\n`` é interpretado como uma quebra de linha." msgid "There is a single prefix operator:" msgstr "Há um único operador prefixo:" @@ -12525,13 +12884,13 @@ " 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 "" "``x::y``\n" " Uma sequência no DAG, significando todas as revisões descendentes de x\n" " e ancestrais de y, incluindo os próprios. Se o primeiro extremo for\n" " omitido, a expressão equivale a ``ancestors(y)``, se o segundo termo\n" -" for omitido a expressão é equivalente a ``descendents(x)``." +" for omitido a expressão é equivalente a ``descendants(x)``." msgid " An alternative syntax is ``x..y``." msgstr " Uma sintaxe alternativa é ``x..y``." @@ -13599,6 +13958,9 @@ msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "não é possível consolidar parcialmente uma mesclagem (não especifique arquivos ou padrões)" +msgid "can't commit subrepos without .hgsub" +msgstr "não é possível consolidar sub-repositórios sem o arquivo .hgsub" + msgid "file not found!" msgstr "arquivo não encontrado!" @@ -13826,8 +14188,8 @@ msgid "branch %s not found" msgstr "ramo %s não encontrado" -msgid "can't merge with ancestor" -msgstr "não é possível mesclar com ancestral" +msgid "merging with a working directory ancestor has no effect" +msgstr "mesclar com um ancestral do diretório de trabalho não tem nenhum efeito" msgid "nothing to merge (use 'hg update' or check 'hg heads')" msgstr "nada para mesclar (use 'hg update' ou verifique 'hg heads')" @@ -14006,9 +14368,6 @@ msgid "missing argument" msgstr "argumento faltando" -msgid "can't negate that" -msgstr "não é possível negar essa expressão" - #, python-format msgid "can't use %s here" msgstr "não se pode usar %s aqui" @@ -14093,6 +14452,9 @@ msgid "tagged takes no arguments" msgstr "tagged não tem argumentos" +msgid "can't negate that" +msgstr "não é possível negar essa expressão" + msgid "not a symbol" msgstr "não é um símbolo"
--- a/i18n/sv.po Wed Jun 30 17:23:16 2010 +0200 +++ b/i18n/sv.po Fri Jul 02 11:41:43 2010 +0200 @@ -1,22 +1,23 @@ # Swedish translation for Mercurial # Svensk översättning för Mercurial # Copyright (C) 2009-2010 Matt Mackall and others -# +# # Translation dictionary: -# +# # changeset ändring # commit arkivera # merge sammanfoga # tag märke -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-04-19 18:58+0200\n" -"PO-Revision-Date: 2010-04-19 19:49+0200\n" +"POT-Creation-Date: 2010-06-29 09:07+0200\n" +"PO-Revision-Date: 2010-06-29 09:10+0200\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" +"Language: Swedish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -42,8 +43,9 @@ msgstr "" msgid "" -"This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets." +"This hook makes it possible to allow or deny write access to given\n" +"branches and paths of a repository when receiving incoming changesets\n" +"via pretxnchangegroup and pretxncommit." msgstr "" msgid "" @@ -54,58 +56,218 @@ msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" -"preventing authenticating users from doing anything other than\n" -"pushing or pulling. The hook is not safe to use if users have\n" -"interactive shell access, as they can then disable the hook.\n" -"Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them." -msgstr "" - -msgid "To use this hook, configure the acl extension in your hgrc like this::" -msgstr "" - -msgid "" -" [extensions]\n" -" acl =" -msgstr "" - -msgid "" -" [hooks]\n" +"preventing authenticating users from doing anything other than pushing\n" +"or pulling. The hook is not safe to use if users have interactive\n" +"shell access, as they can then disable the hook. Nor is it safe if\n" +"remote users share an account, because then there is no way to\n" +"distinguish them." +msgstr "" + +msgid "The order in which access checks are performed is:" +msgstr "" + +msgid "" +"1) Deny list for branches (section ``acl.deny.branches``)\n" +"2) Allow list for branches (section ``acl.allow.branches``)\n" +"3) Deny list for paths (section ``acl.deny``)\n" +"4) Allow list for paths (section ``acl.allow``)" +msgstr "" + +msgid "The allow and deny sections take key-value pairs." +msgstr "" + +msgid "" +"Branch-based Access Control\n" +"---------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" +"have branch-based access control. Keys in these sections can be\n" +"either:" +msgstr "" + +msgid "" +"- a branch name, or\n" +"- an asterisk, to match any branch;" +msgstr "" + +msgid "The corresponding values can be either:" +msgstr "" + +msgid "" +"- a comma-separated list containing users and groups, or\n" +"- an asterisk, to match anyone;" +msgstr "" + +msgid "" +"Path-based Access Control\n" +"-------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" +"access control. Keys in these sections accept a subtree pattern (with\n" +"a glob syntax by default). The corresponding values follow the same\n" +"syntax as the other sections above." +msgstr "" + +msgid "" +"Groups\n" +"------" +msgstr "" + +msgid "" +"Group names must be prefixed with an ``@`` symbol. Specifying a group\n" +"name has the same effect as specifying all the users in that group." +msgstr "" + +msgid "" +"You can define group members in the ``acl.groups`` section.\n" +"If a group name is not defined there, and Mercurial is running under\n" +"a Unix-like system, the list of users will be taken from the OS.\n" +"Otherwise, an exception will be raised." +msgstr "" + +msgid "" +"Example Configuration\n" +"---------------------" +msgstr "" + +msgid "::" +msgstr "::" + +msgid " [hooks]" +msgstr "" + +msgid "" +" # Use this if you want to check access restrictions at commit time\n" +" pretxncommit.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" +" # Use this if you want to check access restrictions for pull, push,\n" +" # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" msgstr "" msgid "" " [acl]\n" -" # Check whether the source of incoming changes is in this list\n" -" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" # Allow or deny access for incoming changes only if their source is\n" +" # listed here, let them pass otherwise. Source is \"serve\" for all\n" +" # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n" +" # related commands are run locally.\n" +" # Default: serve\n" " sources = serve" msgstr "" -msgid "" -"The allow and deny sections take a subtree pattern as key (with a glob\n" -"syntax by default), and a comma separated list of users as the\n" -"corresponding value. The deny list is checked before the allow list\n" -"is. ::" +msgid " [acl.deny.branches]" +msgstr "" + +msgid "" +" # Everyone is denied to the frozen branch:\n" +" frozen-branch = *" +msgstr "" + +msgid "" +" # A bad user is denied on all branches:\n" +" * = bad-user" +msgstr "" + +msgid " [acl.allow.branches]" +msgstr "" + +msgid "" +" # A few users are allowed on branch-a:\n" +" branch-a = user-1, user-2, user-3" +msgstr "" + +msgid "" +" # Only one user is allowed on branch-b:\n" +" branch-b = user-1" +msgstr "" + +msgid "" +" # The super user is allowed on any branch:\n" +" * = super-user" +msgstr "" + +msgid "" +" # Everyone is allowed on branch-for-tests:\n" +" branch-for-tests = *" +msgstr "" + +msgid "" +" [acl.deny]\n" +" # This list is checked first. If a match is found, acl.allow is not\n" +" # checked. All users are granted access if acl.deny is not present.\n" +" # Format for both lists: glob pattern = user, ..., @group, ..." +msgstr "" + +msgid "" +" # To match everyone, use an asterisk for the user:\n" +" # my/glob/pattern = *" +msgstr "" + +msgid "" +" # user6 will not have write access to any file:\n" +" ** = user6" +msgstr "" + +msgid "" +" # Group \"hg-denied\" will not have write access to any file:\n" +" ** = @hg-denied" +msgstr "" + +msgid "" +" # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n" +" # everyone being able to change all other files. See below.\n" +" src/main/resources/DONT-TOUCH-THIS.txt = *" msgstr "" msgid "" " [acl.allow]\n" -" # If acl.allow is not present, all users are allowed by default.\n" -" # An empty acl.allow section means no users allowed.\n" -" docs/** = doc_writer\n" -" .hgtags = release_engineer" -msgstr "" - -msgid "" -" [acl.deny]\n" -" # If acl.deny is not present, no users are refused by default.\n" -" # An empty acl.deny section means all users allowed.\n" -" glob pattern = user4, user5\n" -" ** = user6\n" -msgstr "" - -#, python-format -msgid "config error - hook type \"%s\" cannot stop incoming changesets" +" # if acl.allow is not present, all users are allowed by default\n" +" # empty acl.allow = no users allowed" +msgstr "" + +msgid "" +" # User \"doc_writer\" has write access to any file under the \"docs\"\n" +" # folder:\n" +" docs/** = doc_writer" +msgstr "" + +msgid "" +" # User \"jack\" and group \"designers\" have write access to any file\n" +" # under the \"images\" folder:\n" +" images/** = jack, @designers" +msgstr "" + +msgid "" +" # Everyone (except for \"user6\" - see acl.deny above) will have write\n" +" # access to any file under the \"resources\" folder (except for 1\n" +" # file. See acl.deny):\n" +" src/main/resources/** = *" +msgstr "" + +msgid " .hgtags = release_engineer" +msgstr "" + +#, python-format +msgid "group '%s' is undefined" +msgstr "" + +#, python-format +msgid "" +"config error - hook type \"%s\" cannot stop incoming changesets nor commits" +msgstr "" + +#, python-format +msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" +msgstr "" + +#, python-format +msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" msgstr "" #, python-format @@ -123,8 +285,8 @@ msgstr "" msgid "" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update)." +"It is possible to use bookmark names in every revision lookup (e.g.\n" +":hg:`merge`, :hg:`update`)." msgstr "" msgid "" @@ -148,12 +310,12 @@ msgid "" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark." -msgstr "" - -msgid "" -" You can use 'hg bookmark NAME' to set a bookmark on the working\n" +" deleted. It is possible to use bookmark names in :hg:`merge` and\n" +" :hg:`update` to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" +" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" " the bookmark is assigned to that revision.\n" @@ -181,15 +343,68 @@ msgid "no bookmarks set\n" msgstr "inga bokmärken satta\n" +#, python-format +msgid "updating bookmark %s\n" +msgstr "uppdaterar bokmärket %s\n" + +#, python-format +msgid "not updating divergent bookmark %s\n" +msgstr "" + +#, python-format +msgid "updating bookmark %s failed!\n" +msgstr "uppdatering av bokmärket %s misslyckades!\n" + +#, python-format +msgid "remote bookmark %s not found!" +msgstr "" + +#, python-format +msgid "importing bookmark %s\n" +msgstr "importerar bokmärket %s\n" + +#, python-format +msgid "exporting bookmark %s\n" +msgstr "exporterar bokmärket %s\n" + +#, python-format +msgid "deleting remote bookmark %s\n" +msgstr "raderar fjärrbokmärket %s\n" + +msgid "searching for changes\n" +msgstr "söker efter ändringar\n" + +msgid "no changes found\n" +msgstr "inga ändringar hittades\n" + +#, python-format +msgid "comparing with %s\n" +msgstr "jämför med %s\n" + +msgid "bookmark to import" +msgstr "bokmärke att importera" + +msgid "bookmark to export" +msgstr "bokmärke att exportera" + +msgid "compare bookmark" +msgstr "jämför bokmärke" + msgid "force" msgstr "tvinga" +msgid "REV" +msgstr "REV" + msgid "revision" msgstr "revision" msgid "delete a given bookmark" msgstr "" +msgid "NAME" +msgstr "NAMN" + msgid "rename a given bookmark" msgstr "" @@ -541,7 +756,7 @@ " by providing a file using the following format::" msgstr "" -msgid " <alias email> <actual email>" +msgid " <alias email> = <actual email>" msgstr "" msgid "" @@ -553,12 +768,21 @@ msgid "count rate for the specified revision or range" msgstr "" +msgid "DATE" +msgstr "DATUM" + msgid "count rate for revisions matching date spec" msgstr "" +msgid "TEMPLATE" +msgstr "MALL" + msgid "template to group changesets" msgstr "" +msgid "FORMAT" +msgstr "FORMAT" + msgid "strftime-compatible format for grouping by date" msgstr "" @@ -571,6 +795,9 @@ msgid "display added/removed lines separately" msgstr "visa tillagda/raderade rader separat" +msgid "FILE" +msgstr "FIL" + msgid "file with email aliases" msgstr "" @@ -581,7 +808,8 @@ msgstr "färglägg utmatning från vissa kommandon" msgid "" -"This extension modifies the status and resolve commands to add color to their\n" +"This extension modifies the status and resolve commands to add color to " +"their\n" "output to reflect file status, the qseries command to add color to reflect\n" "patch status (applied, unapplied, missing), and to diff-related\n" "commands to highlight additions, removals, diff headers, and trailing\n" @@ -700,6 +928,9 @@ msgid "when to colorize (always, auto, or never)" msgstr "när färgläggning ska ske (always, auto eller never)" +msgid "TYPE" +msgstr "TYP" + msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" @@ -1078,7 +1309,16 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "" -msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" +#, python-format +msgid "%s does not look like a Bazaar repository" +msgstr "%s verkar inte vara ett Bazaar-arkiv" + +msgid "Bazaar modules could not be loaded" +msgstr "Bazaar-moduler kunde inte laddas" + +msgid "" +"warning: lightweight checkouts may cause conversion failures, try with a " +"regular branch instead.\n" msgstr "" msgid "bzr source type could not be determined\n" @@ -1126,11 +1366,20 @@ #, python-format msgid "convert: %s\n" -msgstr "" +msgstr "convert: %s\n" #, python-format msgid "%s: unknown repository type" -msgstr "" +msgstr "%s: okänd arkivtyp" + +msgid "retrieving file" +msgstr "hämtar fil" + +msgid "revisions" +msgstr "revisioner" + +msgid "scanning" +msgstr "skannar" #, python-format msgid "unknown sort mode: %s" @@ -1164,17 +1413,20 @@ msgstr "" msgid "scanning source...\n" -msgstr "" +msgstr "skannar källa...\n" msgid "sorting...\n" -msgstr "" +msgstr "sorterar...\n" msgid "converting...\n" -msgstr "" +msgstr "konverterar...\n" #, python-format msgid "source: %s\n" -msgstr "" +msgstr "källa: %s\n" + +msgid "converting" +msgstr "konverterar" #, python-format msgid "assuming destination %s\n" @@ -1187,6 +1439,10 @@ msgstr "" #, python-format +msgid "%s does not look like a CVS checkout" +msgstr "%s verkar inte vara en CVS-uthämtning" + +#, python-format msgid "revision %s is not a patchset number" msgstr "" @@ -1198,7 +1454,8 @@ msgstr "" #, python-format -msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -1219,6 +1476,9 @@ msgid "collecting CVS rlog\n" msgstr "" +msgid "not a CVS sandbox" +msgstr "inte en CVS-sandlåda" + #, python-format msgid "reading cvs log cache %s\n" msgstr "" @@ -1247,6 +1507,9 @@ msgid "revision must be followed by date line" msgstr "" +msgid "log cache overlaps with new log entries, re-run without cache." +msgstr "loggcache överlappar med nya loggningar, kör igen utan cache." + #, python-format msgid "writing cvs log cache %s\n" msgstr "" @@ -1272,6 +1535,10 @@ msgstr "" #, python-format +msgid "%s does not look like a darcs repository" +msgstr "%s verkar inte vara ett darcs-arkiv" + +#, python-format msgid "darcs version 2.1 or newer needed (found %r)" msgstr "" @@ -1296,18 +1563,38 @@ msgstr "" #, python-format -msgid "%s does not look like a GNU Arch repo" -msgstr "" +msgid "%s does not look like a Git repository" +msgstr "%s verkar inte vara ett Git-arkiv" + +msgid "cannot retrieve git heads" +msgstr "kan inte hämta git-huvuden" + +#, python-format +msgid "cannot read %r object at %s" +msgstr "kan inte läsa %r-objekt som %s" + +#, python-format +msgid "cannot read changes in %s" +msgstr "kan inte läsa ändringar i %s" + +#, python-format +msgid "cannot read tags from %s" +msgstr "kan inte läsa märken från %s" + +#, python-format +msgid "%s does not look like a GNU Arch repository" +msgstr "%s verkar inte vara ett GNU Arch-arkiv" msgid "cannot find a GNU Arch tool" -msgstr "" +msgstr "kan inte hitta ett GNU Arch-verktyg" #, python-format msgid "analyzing tree version %s...\n" -msgstr "" - -#, python-format -msgid "tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "analyserar trädversion %s...\n" + +#, python-format +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "" #, python-format @@ -1315,14 +1602,18 @@ msgstr "" #, python-format -msgid "%s is not a local Mercurial repo" -msgstr "" +msgid "%s is not a local Mercurial repository" +msgstr "%s är inte ett lokalt Mercurial-arkiv" #, python-format msgid "initializing destination %s repository\n" msgstr "" #, python-format +msgid "could not create hg repository %s as sink" +msgstr "kunde inte skapa hg-arkiv %s för lagring" + +#, python-format msgid "pulling from %s into %s\n" msgstr "" @@ -1341,13 +1632,17 @@ msgstr "" #, python-format -msgid "%s does not look like a monotone repo" -msgstr "" +msgid "%s does not look like a monotone repository" +msgstr "%s verkar inte vara ett monotone-arkiv" #, python-format msgid "copying file in renamed directory from '%s' to '%s'" msgstr "" +#, python-format +msgid "%s does not look like a P4 repository" +msgstr "%s verkar inte vara ett P4-arkiv" + msgid "reading p4 views\n" msgstr "" @@ -1357,8 +1652,14 @@ msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "" -msgid "svn: cannot probe remote repository, assume it could be a subversion repository. Use --source-type if you know better.\n" -msgstr "" +msgid "" +"svn: cannot probe remote repository, assume it could be a subversion " +"repository. Use --source-type if you know better.\n" +msgstr "" + +#, python-format +msgid "%s does not look like a Subversion repository" +msgstr "%s verkar inte vara ett Subversion-arkiv" msgid "Subversion python bindings could not be loaded" msgstr "" @@ -1406,13 +1707,12 @@ msgstr "" #, python-format -msgid "no tags found at revision %d\n" -msgstr "" - -#, python-format msgid "%s not found up to revision %d" msgstr "" +msgid "scanning paths" +msgstr "skannar sökvägar" + #, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "" @@ -1426,12 +1726,12 @@ msgstr "" #, python-format -msgid "initializing svn repo %r\n" -msgstr "" - -#, python-format -msgid "initializing svn wc %r\n" -msgstr "" +msgid "initializing svn repository %r\n" +msgstr "initialiserar svn-arkivet %r\n" + +#, python-format +msgid "initializing svn working copy %r\n" +msgstr "initialiserar svn-arbetskopia %r\n" msgid "unexpected svn output:\n" msgstr "" @@ -1442,6 +1742,116 @@ msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "" +msgid "automatically manage newlines in repository files" +msgstr "" + +msgid "" +"This extension allows you to manage the type of line endings (CRLF or\n" +"LF) that are used in the repository and in the local working\n" +"directory. That way you can get CRLF line endings on Windows and LF on\n" +"Unix/Mac, thereby letting everybody use their OS native line endings." +msgstr "" + +msgid "" +"The extension reads its configuration from a versioned ``.hgeol``\n" +"configuration file every time you run an ``hg`` command. The\n" +"``.hgeol`` file use the same syntax as all other Mercurial\n" +"configuration files. It uses two sections, ``[patterns]`` and\n" +"``[repository]``." +msgstr "" + +msgid "" +"The ``[patterns]`` section specifies the line endings used in the\n" +"working directory. The format is specified by a file pattern. The\n" +"first match is used, so put more specific patterns first. The\n" +"available line endings are ``LF``, ``CRLF``, and ``BIN``." +msgstr "" + +msgid "" +"Files with the declared format of ``CRLF`` or ``LF`` are always\n" +"checked out in that format and files declared to be binary (``BIN``)\n" +"are left unchanged. Additionally, ``native`` is an alias for the\n" +"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" +"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" +"endings) is Mercurial's default behaviour; it is only needed if you\n" +"need to override a later, more general pattern." +msgstr "" + +msgid "" +"The optional ``[repository]`` section specifies the line endings to\n" +"use for files stored in the repository. It has a single setting,\n" +"``native``, which determines the storage line endings for files\n" +"declared as ``native`` in the ``[patterns]`` section. It can be set to\n" +"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n" +"that on Windows, files configured as ``native`` (``CRLF`` by default)\n" +"will be converted to ``LF`` when stored in the repository. Files\n" +"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n" +"are always stored as-is in the repository." +msgstr "" + +msgid "Example versioned ``.hgeol`` file::" +msgstr "" + +msgid "" +" [patterns]\n" +" **.py = native\n" +" **.vcproj = CRLF\n" +" **.txt = native\n" +" Makefile = LF\n" +" **.jpg = BIN" +msgstr "" + +msgid "" +" [repository]\n" +" native = LF" +msgstr "" + +msgid "" +"The extension uses an optional ``[eol]`` section in your hgrc file\n" +"(not the ``.hgeol`` file) for settings that control the overall\n" +"behavior. There are two settings:" +msgstr "" + +msgid "" +"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" +" ``CRLF`` override the default interpretation of ``native`` for\n" +" checkout. This can be used with :hg:`archive` on Unix, say, to\n" +" generate an archive where files have line endings for Windows." +msgstr "" + +msgid "" +"- ``eol.only-consistent`` (default True) can be set to False to make\n" +" the extension convert files with inconsistent EOLs. Inconsistent\n" +" means that there is both ``CRLF`` and ``LF`` present in the file.\n" +" Such files are normally not touched under the assumption that they\n" +" have mixed EOLs on purpose." +msgstr "" + +msgid "" +"See :hg:`help patterns` for more information about the glob patterns\n" +"used.\n" +msgstr "" +"Se :hg:`help patterns` för mer information om de använda glob-mönstren.\n" + +#, python-format +msgid "%s should not have CRLF line endings" +msgstr "" + +#, python-format +msgid "%s should not have LF line endings" +msgstr "" + +msgid "the eol extension is incompatible with the win32text extension" +msgstr "eol-utökningen är inkompativel med win32text-utökningen" + +#, python-format +msgid "ignoring unknown EOL style '%s' from %s\n" +msgstr "" + +#, python-format +msgid "inconsistent newline style in %s\n" +msgstr "" + msgid "command to allow external programs to compare revisions" msgstr "" @@ -1455,7 +1865,7 @@ msgid "" "The extdiff extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +"you do not need to type :hg:`extdiff -p kdiff3` always. ::" msgstr "" msgid "" @@ -1485,11 +1895,36 @@ " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" msgstr "" -msgid "" -"You can use -I/-X and list of file or directory names like normal \"hg\n" -"diff\" command. The extdiff extension makes snapshots of only needed\n" -"files, so running the external diff program will actually be pretty\n" -"fast (at least faster than having to compare the entire tree).\n" +msgid "Tool arguments can include variables that are expanded at runtime::" +msgstr "" + +msgid "" +" $parent1, $plabel1 - filename, descriptive label of first parent\n" +" $child, $clabel - filename, descriptive label of child revision\n" +" $parent2, $plabel2 - filename, descriptive label of second parent\n" +" $parent is an alias for $parent1." +msgstr "" + +msgid "" +"The extdiff extension will look in your [diff-tools] and [merge-tools]\n" +"sections for diff tool arguments, when none are specified in [extdiff]." +msgstr "" + +msgid "" +" [extdiff]\n" +" kdiff3 =" +msgstr "" + +msgid "" +" [diff-tools]\n" +" kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child" +msgstr "" + +msgid "" +"You can use -I/-X and list of file or directory names like normal\n" +":hg:`diff` command. The extdiff extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" msgstr "" #, python-format @@ -1530,9 +1965,15 @@ " to its parent." msgstr "" +msgid "CMD" +msgstr "" + msgid "comparison program to run" msgstr "" +msgid "OPT" +msgstr "" + msgid "pass option to comparison program" msgstr "" @@ -1582,11 +2023,14 @@ msgstr "" msgid "" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" " " msgstr "" - -msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" +" Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" +" " + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" msgstr "" msgid "outstanding uncommitted merge" @@ -1598,18 +2042,23 @@ msgid "working directory is missing some files" msgstr "" -msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" msgstr "" #, python-format msgid "pulling from %s\n" msgstr "drar från %s\n" -msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." -msgstr "" - -#, python-format -msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" + +#, python-format +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" msgstr "" #, python-format @@ -1689,7 +2138,9 @@ msgid "Error while signing" msgstr "" -msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" msgstr "" msgid "unknown signature version" @@ -1704,9 +2155,15 @@ msgid "do not commit the sigfile after signing" msgstr "" +msgid "ID" +msgstr "" + msgid "the key id to sign with" msgstr "" +msgid "TEXT" +msgstr "TEXT" + msgid "commit message" msgstr "" @@ -1753,16 +2210,12 @@ " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" " " -#, python-format -msgid "comparing with %s\n" -msgstr "jämför med %s\n" - -msgid "no changes found\n" -msgstr "inga ändringar hittades\n" - msgid "show the revision DAG" msgstr "visa revisionsdiagram" +msgid "NUM" +msgstr "" + msgid "limit number of changes displayed" msgstr "begränsa antalet visade ändringar" @@ -1848,7 +2301,7 @@ msgstr "" msgid "" -"The hg view command will launch the hgk Tcl script. For this command\n" +"The :hg:`view` command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" "the path to hgk in your .hgrc file::" msgstr "" @@ -2117,7 +2570,9 @@ 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" +msgid "" +"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" +"inotify.sock already exists" msgstr "" #, python-format @@ -2149,7 +2604,8 @@ msgid "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" @@ -2176,8 +2632,8 @@ msgstr "" msgid "" -"Configuration is done in the [keyword] and [keywordmaps] sections of\n" -"hgrc files." +"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" +"sections of hgrc files." msgstr "" msgid "Example::" @@ -2191,43 +2647,46 @@ msgstr "" msgid "" +" [keywordset]\n" +" # prefer svn- over cvs-like default keywordmaps\n" +" svn = True" +msgstr "" + +msgid "" "NOTE: the more specific you are in your filename patterns the less you\n" "lose speed in huge repositories." msgstr "" msgid "" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" "available templates and filters." msgstr "" -msgid "" -"An additional date template filter {date|utcdate} is provided. It\n" -"returns a date like \"2006/09/18 15:13:13\"." -msgstr "" - -msgid "" -"The default template mappings (view with \"hg kwdemo -d\") can be\n" -"replaced with customized keywords and templates. Again, run \"hg\n" -"kwdemo\" to control the results of your config changes." -msgstr "" - -msgid "" -"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +msgid "Three additional date template filters are provided::" +msgstr "" + +msgid "" +" utcdate \"2006/09/18 15:13:13\"\n" +" svnutcdate \"2006-09-18 15:13:13Z\"\n" +" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" +msgstr "" + +msgid "" +"The default template mappings (view with :hg:`kwdemo -d`) can be\n" +"replaced with customized keywords and templates. Again, run\n" +":hg:`kwdemo` to control the results of your config changes." +msgstr "" + +msgid "" +"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" "history." msgstr "" msgid "" "To force expansion after enabling it, or a configuration change, run\n" -"\"hg kwexpand\"." -msgstr "" - -msgid "" -"Also, when committing with the record extension or using mq's qrecord,\n" -"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" -"the files in question to update keyword expansions after all changes\n" -"have been checked in." +":hg:`kwexpand`." msgstr "" msgid "" @@ -2267,9 +2726,11 @@ msgstr "" msgid "" -" See \"hg help templates\" for information on templates and filters.\n" +" See :hg:`help templates` for information on templates and filters.\n" " " msgstr "" +" Se :hg:`help templates` för information om mallar och filter.\n" +" " #, python-format msgid "creating temporary repository at %s\n" @@ -2339,7 +2800,7 @@ msgstr "" msgid "" -" See \"hg help keyword\" on how to construct patterns both for\n" +" See :hg:`help keyword` on how to construct patterns both for\n" " inclusion and exclusion of files." msgstr "" @@ -2361,7 +2822,7 @@ msgid "" " Run before changing/disabling active keywords or if you experience\n" -" problems with \"hg import\" or \"hg merge\"." +" problems with :hg:`import` or :hg:`merge`." msgstr "" msgid "" @@ -2410,7 +2871,7 @@ "directory. Applied patches are both patch files and changesets." msgstr "" -msgid "Common tasks (use \"hg help command\" for more details)::" +msgid "Common tasks (use :hg:`help command` for more details)::" msgstr "" msgid "" @@ -2444,7 +2905,12 @@ "If set to 'keep', mq will obey the [diff] section configuration while\n" "preserving existing git patches upon qrefresh. If set to 'yes' or\n" "'no', mq will override the [diff] section and always generate git or\n" -"regular patches, possibly losing data in the second case.\n" +"regular patches, possibly losing data in the second case." +msgstr "" + +msgid "" +"You will by default be managing a patch queue named \"patches\". You can\n" +"create other, independent patch queues with the :hg:`qqueue` command.\n" msgstr "" #, python-format @@ -2635,6 +3101,10 @@ msgid "patch series already fully applied\n" msgstr "" +#, python-format +msgid "patch '%s' not found" +msgstr "patchen '%s' hittades inte" + msgid "cleaning up working directory..." msgstr "" @@ -2680,7 +3150,9 @@ msgid "cannot refresh a revision with children" msgstr "" -msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2778,13 +3250,14 @@ msgstr "" msgid "" -" The patches must not be applied, and at least one patch is required. With\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" " -k/--keep, the patch files are preserved in the patch directory." msgstr "" msgid "" " To stop managing a patch and move it into permanent history,\n" -" use the qfinish command." +" use the :hg:`qfinish` command." msgstr "" msgid "print the patches already applied" @@ -2852,7 +3325,7 @@ msgid "" " This command is deprecated. Without -c, it's implied by other relevant\n" -" commands. With -c, use hg init --mq instead." +" commands. With -c, use :hg:`init --mq` instead." msgstr "" msgid "clone main and patch repository at same time" @@ -2873,7 +3346,7 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by init --mq.\n" +" would be created by :hg:`init --mq`.\n" " " msgstr "" @@ -2895,8 +3368,9 @@ msgid "commit changes in the queue repository (DEPRECATED)" msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)" -msgid " This command is deprecated; use hg commit --mq instead." -msgstr " Detta är ett föråldrat kommando; använd hg commit --mq istället." +msgid " This command is deprecated; use :hg:`commit --mq` instead." +msgstr "" +" Detta är ett föråldrat kommando; använd :hg:`commit --mq` istället." msgid "print the entire series file" msgstr "" @@ -2978,9 +3452,9 @@ msgstr "" msgid "" -" Use 'hg diff' if you only want to see the changes made since the\n" -" last qrefresh, or 'hg export qtip' if you want to see changes made\n" -" by the current patch without including changes made since the\n" +" Use :hg:`diff` if you only want to see the changes made since the\n" +" last qrefresh, or :hg:`export qtip` if you want to see changes\n" +" made by the current patch without including changes made since the\n" " qrefresh.\n" " " msgstr "" @@ -3029,8 +3503,9 @@ msgid "" " Guards control whether a patch can be pushed. A patch with no\n" " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" -" pushed only if the qselect command has activated it. A patch with\n" -" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" pushed only if the :hg:`qselect` command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the :hg:`qselect` " +"command\n" " has activated it." msgstr "" @@ -3132,13 +3607,36 @@ msgid "copy %s to %s\n" msgstr "" -msgid "strip a revision and all its descendants from the repository" -msgstr "" - -msgid "" -" If one of the working directory's parent revisions is stripped, the\n" -" working directory will be updated to the parent of the stripped\n" -" revision.\n" +msgid "strip a changeset and all its descendants from the repository" +msgstr "" + +msgid "" +" The strip command removes all changesets whose local revision\n" +" number is greater than or equal to REV, and then restores any\n" +" changesets that are not descendants of REV. If the working\n" +" directory has uncommitted changes, the operation is aborted unless\n" +" the --force flag is supplied." +msgstr "" + +msgid "" +" If a parent of the working directory is stripped, then the working\n" +" directory will automatically be updated to the most recent\n" +" available ancestor of the stripped parent after the operation\n" +" completes." +msgstr "" + +msgid "" +" Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" +" bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n" +" be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n" +" where BUNDLE is the bundle file created by the strip. Note that\n" +" the local revision numbers will in general be different after the\n" +" restore." +msgstr "" + +msgid "" +" Use the --nobackup option to discard the backup bundle once the\n" +" operation completes.\n" " " msgstr "" @@ -3146,7 +3644,7 @@ msgstr "" msgid "" -" Use the qguard command to set or print guards on patch, then use\n" +" Use the :hg:`qguard` command to set or print guards on patch, then use\n" " qselect to tell mq which guards to use. A patch will be pushed if\n" " it has no guards or any positive guards match the currently\n" " selected guard, but will not be pushed if any negative guards\n" @@ -3244,6 +3742,58 @@ msgid "no revisions specified" msgstr "" +msgid "manage multiple patch queues" +msgstr "" + +msgid "" +" Supports switching between different patch queues, as well as creating\n" +" new patch queues and deleting existing ones." +msgstr "" + +msgid "" +" Omitting a queue name or specifying -l/--list will show you the " +"registered\n" +" queues - by default the \"normal\" patches queue is registered. The " +"currently\n" +" active queue will be marked with \"(active)\"." +msgstr "" + +msgid "" +" To create a new queue, use -c/--create. The queue is automatically made\n" +" active, except in the case where there are applied patches from the\n" +" currently active queue in the repository. Then the queue will only be\n" +" created and switching will fail." +msgstr "" + +msgid "" +" To delete an existing queue, use --delete. You cannot delete the " +"currently\n" +" active queue.\n" +" " +msgstr "" + +msgid "patches applied - cannot set new queue active" +msgstr "" + +msgid " (active)\n" +msgstr " (aktiv)\n" + +msgid "invalid queue name, may not contain the characters \":\\/.\"" +msgstr "" + +#, python-format +msgid "queue \"%s\" already exists" +msgstr "kön \"%s\" finns redan" + +msgid "cannot delete queue that does not exist" +msgstr "" + +msgid "cannot delete currently active queue" +msgstr "" + +msgid "use --create to create a new queue" +msgstr "" + msgid "cannot commit over an applied mq patch" msgstr "" @@ -3267,6 +3817,20 @@ msgid "There is no Mercurial repository here (.hg not found)" msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" +msgid "no queue repository" +msgstr "inget köarkiv" + +#, python-format +msgid "%d applied" +msgstr "%d applicerade" + +#, python-format +msgid "%d unapplied" +msgstr "%d oapplicerade" + +msgid "mq: (empty queue)\n" +msgstr "mq: (tom kö)\n" + msgid "operate on patch repository" msgstr "arbeta med patcharkiv" @@ -3288,6 +3852,9 @@ msgid "use uncompressed transfer (fast over LAN)" msgstr "använd okomprimerad överföring (snabbt över LAN)" +msgid "REPO" +msgstr "ARKIV" + msgid "location of source patch repository" msgstr "" @@ -3369,23 +3936,26 @@ msgid "add \"From: <current user>\" to patch" msgstr "" -msgid "add \"From: <given user>\" to patch" +msgid "USER" +msgstr "" + +msgid "add \"From: <USER>\" to patch" msgstr "" msgid "add \"Date: <current date>\" to patch" msgstr "" -msgid "add \"Date: <given date>\" to patch" -msgstr "" - -msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -msgstr "" +msgid "add \"Date: <DATE>\" to patch" +msgstr "" + +msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." +msgstr "hg qnew [-e] [-m TEXT] [-l FIL] PATCH [FIL]..." msgid "hg qnext [-s]" -msgstr "" +msgstr "hg qnext [-s]" msgid "hg qprev [-s]" -msgstr "" +msgstr "hg qprev [-s]" msgid "pop all patches" msgstr "" @@ -3414,8 +3984,11 @@ msgid "merge queue name (DEPRECATED)" msgstr "" -msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "" +msgid "reorder patch series and apply only the patch" +msgstr "omordna patchserien och applicera bara patchen" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAMN] [--move] [PATCH | INDEX]" msgid "refresh only files already in the patch and specified files" msgstr "" @@ -3483,17 +4056,25 @@ msgid "hg qseries [-ms]" msgstr "" -msgid "force removal with local changes" -msgstr "" - -msgid "bundle unrelated changesets" -msgstr "" +msgid "" +"force removal of changesets even if the working directory has uncommitted " +"changes" +msgstr "" +"tvinga borttagning av ändringar även om arbetskatalogen har oarkiverade " +"ändringar" + +msgid "" +"bundle only changesets with local revision number greater than REV which are " +"not descendants of REV (DEPRECATED)" +msgstr "" +"bunta bara ändringar med lokala revisionsnummer större än REV som inte är " +"ättling till REV (FÖRLEGAD)" msgid "no backups" msgstr "" -msgid "hg strip [-f] [-b] [-n] REV" -msgstr "" +msgid "hg strip [-f] [-n] REV" +msgstr "hg strip [-f] [-n] REV" msgid "hg qtop [-s]" msgstr "" @@ -3510,6 +4091,18 @@ msgid "hg qfinish [-a] [REV]..." msgstr "" +msgid "list all available queues" +msgstr "visa alla tillgängliga köer" + +msgid "create new queue" +msgstr "skapa ny kö" + +msgid "delete reference to queue" +msgstr "" + +msgid "[OPTION] [QUEUE]" +msgstr "[FLAGGA] [KÖ]" + msgid "hooks for sending email notifications at commit/push time" msgstr "" @@ -3561,7 +4154,8 @@ " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this list\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" " # (serve == ssh or http, push, pull, bundle)\n" " merge = False # send notification for merges (default True)\n" " [email]\n" @@ -3576,9 +4170,6 @@ "handier for you." msgstr "" -msgid "::" -msgstr "" - msgid "" " [usersubs]\n" " # key is subscriber email, value is \",\"-separated list of glob patterns\n" @@ -3678,8 +4269,8 @@ msgstr "" msgid "" -"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" -"specify them in the global .hgrc\n" +"To ignore global commands like :hg:`version` or :hg:`help`, you have\n" +"to specify them in the global .hgrc\n" msgstr "" msgid "interpret suffixes to refer to ancestor revisions" @@ -3725,7 +4316,7 @@ msgid "" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by \"hg export\"." +"- The patch itself, as generated by :hg:`export`." msgstr "" msgid "" @@ -3750,7 +4341,8 @@ " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ..." +" bcc = bcc1, bcc2, ...\n" +" reply-to = address1, address2, ..." msgstr "" msgid "" @@ -3759,13 +4351,13 @@ msgstr "" msgid "" -"Then you can use the \"hg email\" command to mail a series of changesets\n" -"as a patchbomb." +"Then you can use the :hg:`email` command to mail a series of\n" +"changesets as a patchbomb." msgstr "" msgid "" "To avoid sending patches prematurely, it is a good idea to first run\n" -"the \"email\" command with the \"-n\" option (test only). You will be\n" +"the :hg:`email` command with the \"-n\" option (test only). You will be\n" "prompted for an email recipient address, a subject and an introductory\n" "message describing the patches of your patchbomb. Then when all is\n" "done, patchbomb messages are displayed. If the PAGER environment\n" @@ -3821,9 +4413,9 @@ msgstr "" msgid "" -" By default, diffs are sent in the format generated by hg export,\n" -" one per message. The series starts with a \"[PATCH 0 of N]\"\n" -" introduction, which describes the series as a whole." +" By default, diffs are sent in the format generated by\n" +" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" +" of N]\" introduction, which describes the series as a whole." msgstr "" msgid "" @@ -3833,7 +4425,7 @@ " description. Next, (optionally) if the diffstat program is\n" " installed and -d/--diffstat is used, the result of running\n" " diffstat on the patch. Finally, the patch itself, as generated by\n" -" \"hg export\"." +" :hg:`export`." msgstr "" msgid "" @@ -3872,7 +4464,8 @@ msgid "" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" msgstr "" @@ -3945,6 +4538,9 @@ msgid "write messages to mbox file instead of sending them" msgstr "" +msgid "email addresses replies should be sent to" +msgstr "emailadresser som svar ska skickas till" + msgid "subject of first message (intro or single patch)" msgstr "" @@ -4032,7 +4628,7 @@ msgstr "" msgid "" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Unknown files: files marked with \"?\" by :hg:`status`\n" " - Empty directories: in fact Mercurial ignores directories unless\n" " they contain files under source control management" msgstr "" @@ -4043,7 +4639,7 @@ msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")" +" - New files added to the repository (with :hg:`add`)" msgstr "" msgid "" @@ -4109,11 +4705,18 @@ msgid "" " Rebase uses repeated merging to graft changesets from one part of\n" " history (the source) onto another (the destination). This can be\n" -" useful for linearizing local changes relative to a master\n" +" useful for linearizing *local* changes relative to a master\n" " development tree." msgstr "" msgid "" +" You should not rebase changesets that have already been shared\n" +" with others. Doing so will force everybody else to perform the\n" +" same rebase or they will end up with duplicated changesets after\n" +" pulling in your rebased changesets." +msgstr "" + +msgid "" " If you don't specify a destination changeset (``-d/--dest``),\n" " rebase uses the tipmost head of the current named branch as the\n" " destination. (The destination changeset is not modified by\n" @@ -4153,7 +4756,11 @@ msgid "" " If a rebase is interrupted to manually resolve a merge, it can be\n" -" continued with --continue/-c or aborted with --abort/-a.\n" +" continued with --continue/-c or aborted with --abort/-a." +msgstr "" + +msgid "" +" Returns 0 on success, 1 if nothing to rebase.\n" " " msgstr "" @@ -4214,7 +4821,7 @@ msgid "no rebase in progress" msgstr "" -msgid "warning: new changesets detected on target branch, not stripping\n" +msgid "warning: new changesets detected on target branch, can't abort\n" msgstr "" msgid "rebase aborted\n" @@ -4235,7 +4842,9 @@ msgid "rebase from the specified changeset" msgstr "" -msgid "rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)" +msgid "" +"rebase from the base of the specified changeset (up to greatest common " +"ancestor of base and dest)" msgstr "" msgid "rebase onto the specified changeset" @@ -4304,9 +4913,6 @@ msgid "&?" msgstr "" -msgid "y - record this change" -msgstr "" - msgid "user quit" msgstr "" @@ -4329,12 +4935,14 @@ msgstr "" msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be candidates for recording." msgstr "" - -msgid " See 'hg help dates' for a list of formats valid for -d/--date." -msgstr "" +" Om filer inte anges, kommer alla ändringar som :hg:`status`\n" +" rapporterar att arkiveras." + +msgid " See :hg:`help dates` for a list of formats valid for -d/--date." +msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." msgid "" " You will be prompted for whether to record changes to each\n" @@ -4362,12 +4970,18 @@ msgid " ? - display help" msgstr "" +msgid " This command is not available when committing a merge." +msgstr "" + msgid "'mq' extension not loaded" msgstr "" msgid "running non-interactively, use commit instead" msgstr "" +msgid "cannot partially commit a merge (use hg commit instead)" +msgstr "" + msgid "no changes to record\n" msgstr "" @@ -4429,6 +5043,16 @@ msgstr "" #, python-format +msgid "tip has %d files, estimated total number of files: %s\n" +msgstr "" + +msgid "collecting" +msgstr "samlar in" + +msgid "files" +msgstr "filer" + +#, python-format msgid "collected %d candidate storage files\n" msgstr "" @@ -4439,13 +5063,16 @@ msgid "not linkable: %s\n" msgstr "inte länkbar: %s\n" +msgid " files" +msgstr " filer" + +msgid "pruning" +msgstr "putsar" + #, python-format msgid "pruned down to %d probably relinkable files\n" msgstr "" -msgid " files" -msgstr "" - msgid "relinking" msgstr "länkar om" @@ -4649,7 +5276,7 @@ msgstr "" msgid "" -" hg transplant --branch REVISION --all will rebase the selected\n" +" :hg:`transplant --branch REVISION --all` will rebase the selected\n" " branch (up to the named revision) onto your current working\n" " directory." msgstr "" @@ -4662,14 +5289,14 @@ msgstr "" msgid "" -" If no merges or revisions are provided, hg transplant will start\n" -" an interactive changeset browser." +" If no merges or revisions are provided, :hg:`transplant` will\n" +" start an interactive changeset browser." msgstr "" msgid "" " If a changeset application fails, you can fix the merge by hand\n" -" and then resume where you left off by calling hg transplant\n" -" --continue/-c.\n" +" and then resume where you left off by calling :hg:`transplant\n" +" --continue/-c`.\n" " " msgstr "" @@ -4694,8 +5321,11 @@ msgid "outstanding local changes" msgstr "" -msgid "pull patches from REPOSITORY" -msgstr "" +msgid "pull patches from REPO" +msgstr "" + +msgid "BRANCH" +msgstr "GREN" msgid "pull patches from branch BRANCH" msgstr "" @@ -4715,10 +5345,10 @@ msgid "continue last transplant session after repair" msgstr "" -msgid "filter changesets through FILTER" -msgstr "" - -msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgid "filter changesets through command" +msgstr "" + +msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgstr "" msgid "allow the use of MBCS paths with problematic encodings" @@ -4781,6 +5411,18 @@ msgid "perform automatic newline conversion" msgstr "" +msgid "" +" Deprecation: The win32text extension requires each user to configure\n" +" the extension again and again for each clone since the configuration\n" +" is not copied when cloning." +msgstr "" + +msgid "" +" We have therefore made the ``eol`` as an alternative. The ``eol``\n" +" uses a version controlled file for its configuration and each clone\n" +" will therefore use the right settings from the start." +msgstr "" + msgid "To perform automatic newline conversion, use::" msgstr "" @@ -4798,7 +5440,8 @@ " # or ** = macdecode:" msgstr "" -msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" +msgid "" +"If not doing conversion, to make sure you do not commit CRLF/CR by accident::" msgstr "" msgid "" @@ -4880,7 +5523,8 @@ " $ hg serve" msgstr "" -msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" +msgid "" +"You can discover zeroconf enabled repositories by running \"hg paths\"::" msgstr "" msgid "" @@ -4958,9 +5602,6 @@ msgid "invalid format spec '%%%s' in output filename" msgstr "" -msgid "searching" -msgstr "söker" - #, python-format msgid "adding %s\n" msgstr "" @@ -4990,6 +5631,14 @@ msgstr "" #, python-format +msgid "%s: not recording move - %s does not exist\n" +msgstr "%s: sparar inte flytt - %s existerar inte\n" + +#, python-format +msgid "%s: not recording copy - %s does not exist\n" +msgstr "%s: sparar inte flytt - %s existerar inte\n" + +#, python-format msgid "%s: deleted in working copy\n" msgstr "" @@ -5154,10 +5803,10 @@ msgid "" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg forget." +" undo an add before that, see :hg:`forget`." msgstr "" " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n" -" ångra en addering innan dess, se hg forget." +" ångra en addering innan dess, se :hg:`forget`." msgid " If no names are given, add all files to the repository." msgstr " Om inga namn anges, läggs alla filer till i arkivet." @@ -5167,11 +5816,10 @@ msgid "" " An example showing how new (unknown) files are added\n" -" automatically by ``hg add``::" -msgstr "" -" An example showing how new (unknown) files are added\n" +" automatically by :hg:`add`::" +msgstr "" " Ett exempel som visar hur nya (okända) filer läggs\n" -" till automatiskt av ``hg add``::" +" till automatiskt av :hg:`add`::" msgid "" " $ ls\n" @@ -5200,7 +5848,8 @@ msgid "" " Add all new files and remove all missing files from the\n" " repository." -msgstr " Lägg till alla nya filer och radera alla saknade filer från arkivet." +msgstr "" +" Lägg till alla nya filer och radera alla saknade filer från arkivet." msgid "" " New files are ignored if they match any of the patterns in\n" @@ -5217,15 +5866,20 @@ " 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.\n" -" " +" can be expensive." 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.\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" " " msgid "similarity must be a number" @@ -5253,12 +5907,17 @@ " Without the -a/--text option, annotate will avoid processing files\n" " it detects as binary. With -a, annotate will annotate the file\n" " anyway, although the results will probably be neither useful\n" -" nor desirable.\n" -" " +" nor desirable." msgstr "" " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n" " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" -" om resultatet antagligen inte kommer att vara användbart.\n" +" om resultatet antagligen inte kommer att vara användbart." + +msgid "" +" Returns 0 on success.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades.\n" " " msgid "at least one filename or pattern is required" @@ -5269,7 +5928,7 @@ #, python-format msgid "%s: binary file\n" -msgstr "" +msgstr "%s: binär fil\n" msgid "create an unversioned archive of a repository revision" msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision" @@ -5308,22 +5967,20 @@ msgid "" " The exact name of the destination archive or directory is given\n" -" using a format string; see 'hg help export' for details." +" using a format string; see :hg:`help export` for details." msgstr "" " Det exakta namnet på destinationsarkivet eller -katalogen anges med en\n" -" formatsträng; se 'hg help export' för detaljer." +" formatsträng; se :hg:`help export` för detaljer." msgid "" " Each member added to an archive file has a directory prefix\n" " prepended. Use -p/--prefix to specify a format string for the\n" " prefix. The default is the basename of the archive, with suffixes\n" -" removed.\n" -" " +" removed." msgstr "" " Varje fil som läggs till en arkivfil har ett katalogprefix. Använd\n" " -p/--prefix för att specificera en formatsträn för prefixet. Som\n" -" standard används basnamnet för arkivet, med suffix borttagna.\n" -" " +" standard används basnamnet för arkivet, med suffix borttagna." msgid "no working directory: please specify a revision" msgstr "ingen arbetskatalog: specificera en revision" @@ -5434,15 +6091,13 @@ " Its exit status will be used to mark revisions as good or bad:\n" " status 0 means good, 125 means to skip the revision, 127\n" " (command not found) will abort the bisection, and any other\n" -" non-zero exit status means the revision is bad.\n" -" " +" non-zero exit status means the revision is bad." msgstr "" " Om du tillhandahåller ett kommando, kommer det att användas för\n" " automatisk genomsökning. Dess returkod kommer att användas för att ange\n" " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n" " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n" -" genomsökningen, och alla andra värden betyder att revisionen är dålig.\n" -" " +" genomsökningen, och alla andra värden betyder att revisionen är dålig." msgid "The first good revision is:\n" msgstr "Den första bra revisionen är:\n" @@ -5451,10 +6106,12 @@ msgstr "Den första dåliga revisionen är:\n" msgid "Due to skipped revisions, the first good revision could be any of:\n" -msgstr "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" +msgstr "" +"Tack vare skippade revisioner, är den första bra revisionen någon av:\n" msgid "Due to skipped revisions, the first bad revision could be any of:\n" -msgstr "Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" +msgstr "" +"Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" msgid "cannot bisect (no known good revisions)" msgstr "kan inte genomsöka (inga kända bra revisioner)" @@ -5517,20 +6174,20 @@ " grenbyte." msgid "" -" Use the command 'hg update' to switch to an existing branch. Use\n" -" 'hg commit --close-branch' to mark this branch as closed.\n" -" " -msgstr "" -" Använd kommandot 'hg update' för att byta till en existerande gren.\n" -" Använd 'hg commit --close-branch' för att markera grenen som stängd.\n" -" " +" Use the command :hg:`update` to switch to an existing branch. Use\n" +" :hg:`commit --close-branch` to mark this branch as closed." +msgstr "" +" Använd kommandot :hg:`update` för att byta till en existerande gren.\n" +" Använd :hg:`commit --close-branch` för att markera grenen som stängd." #, python-format msgid "reset working directory to branch %s\n" msgstr "återställ arbetskatalogen till grenen %s\n" -msgid "a branch of the same name already exists (use 'hg update' to switch to it)" -msgstr "en gren med samma namn finns redan (kör 'hg update' för att byta till den)" +msgid "" +"a branch of the same name already exists (use 'hg update' to switch to it)" +msgstr "" +"en gren med samma namn finns redan (kör 'hg update' för att byta till den)" #, python-format msgid "marked working directory as branch %s\n" @@ -5542,11 +6199,11 @@ msgid "" " List the repository's named branches, indicating which ones are\n" " inactive. If -c/--closed is specified, also list branches which have\n" -" been marked closed (see hg commit --close-branch)." +" been marked closed (see :hg:`commit --close-branch`)." msgstr "" " Visa alla namngivna grenar i arkivet, och indikera vilka som är\n" " inaktiva. Om -c/--closed anges, visas också grenar som har markerats\n" -" som stängda (se hg commit --close-branch)." +" som stängda (se :hg:`commit --close-branch`)." msgid "" " If -a/--active is specified, only show active branches. A branch\n" @@ -5555,11 +6212,15 @@ " Om -a/--acive anges, visas bara aktiva grenar. En gren anses aktiv om\n" " den innehåller arkivhuvuden." -msgid "" -" Use the command 'hg update' to switch to an existing branch.\n" +msgid " Use the command :hg:`update` to switch to an existing branch." +msgstr "" +" Använd kommandot :hg:`update` för att byta till en existerande gren." + +msgid "" +" Returns 0.\n" " " msgstr "" -" Använd kommandot 'hg update' för att byta till en existerande gren.\n" +" Returnerar 0.\n" " " msgid " (closed)" @@ -5610,11 +6271,16 @@ msgid "" " Applying bundles preserves all changeset contents including\n" -" permissions, copy/rename information, and revision history.\n" +" permissions, copy/rename information, and revision history." +msgstr "" +" Applicering av buntar bevarar allt ändringsinnehåll inklusive\n" +" tillstånd, information om kopior/namnbyte, och revisionshistorik." + +msgid "" +" Returns 0 on success, 1 if no changes found.\n" " " msgstr "" -" Applicering av buntar bevarar all ändringsinnehåll inklusive\n" -" tillstånd, information om kopior/namnbyte, och revisionshistorik.\n" +" Returnerar 0 om kommandot lyckades, 1 om inga ändringar hittades.\n" " " msgid "--base is incompatible with specifying a destination" @@ -5647,394 +6313,44 @@ msgid "" " :``%s``: basename of file being printed\n" " :``%d``: dirname of file being printed, or '.' if in repository root\n" -" :``%p``: root-relative path name of file being printed\n" -" " +" :``%p``: root-relative path name of file being printed" msgstr "" " :``%s``: basnamn på den visade filen\n" " :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n" -" :``%p``: rotrelativ sökvägsnamn för den visade filen\n" -" " - -#, fuzzy +" :``%p``: rotrelativ sökvägsnamn för den visade filen" + msgid "make a copy of an existing repository" -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +msgstr "gör en kopia av ett existerande arkiv" + msgid " Create a copy of an existing repository in a new directory." -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +msgstr " Skapa en kopia av ett existerande arkiv i en ny katalog." + msgid "" " If no destination directory name is specified, it defaults to the\n" " basename of the source." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" källan att användas." + msgid "" " The location of the source is added to the new repository's\n" " .hg/hgrc file, as the default to be used for future pulls." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy -msgid " See 'hg help urls' for valid source format details." -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" som standardplats att användas för framtida dragningar." + +msgid " See :hg:`help urls` for valid source format details." +msgstr " Se :hg:`help urls` för detaljer om giltiga källformat." + msgid "" " 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." -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" +" Please see :hg:`help urls` for important details about ``ssh://`` URLs." +msgstr "" " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" Se :hg:`help urls` för viktiga detaljer om ``ssh://``-URLer." + msgid "" " A set of changesets (tags, or branch names) to pull may be specified\n" " by listing each changeset (tag, or branch name) with -r/--rev.\n" @@ -6045,130 +6361,21 @@ " No subsequent changesets (including subsequent tags) will be present\n" " in the destination." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" att finnas i destinationen." + msgid "" " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" " local source repositories." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" --pull, även för lokala arkiv." + msgid "" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" @@ -6177,192 +6384,22 @@ " do not report errors. In these cases, use the --pull option to\n" " avoid hardlinking." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" " Av effektivitestskäl används hårda länkar när källan och destinationen\n" " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" för att undvika användning av hårda länkar." + msgid "" " In some cases, you can clone repositories and the working directory\n" " using full hardlinks with ::" msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" hårdlänkade, med ::" + msgid " $ cp -al REPO REPOCLONE" -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +msgstr " $ cp -al ARKIV ARKIVKLON" + msgid "" " This is the fastest way to clone, but it is not always safe. The\n" " operation is not atomic (making sure REPO is not modified during\n" @@ -6371,130 +6408,20 @@ " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" " Operationen är inte atomisk (att ARKIV inte modifieras under\n" " operationen är upp till dig) och du måste se till att din editor bryter\n" " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" under katalogen .hg, som mq." + msgid "" " Mercurial will update the working directory to the first applicable\n" " revision from this list:" msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" " Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " - -#, fuzzy +" revisionen från den här listan:" + msgid "" " a) null if -U or the source repository has no changesets\n" " b) if -u . and the source repository is local, the first parent of\n" @@ -6505,56 +6432,8 @@ " e) the tipmost head specified with -b\n" " f) the tipmost head specified with the url#branch source syntax\n" " g) the tipmost head of the default branch\n" -" h) tip\n" -" " -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\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\n" -" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" -" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" -" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" -" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\n" -" Av effektivitestskäl används hårda länkar när källan och destinationen\n" -" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" -" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" -" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" -" för att undvika användning av hårda länkar.\n" -"\n" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" +" h) tip" +msgstr "" " a) null med -U eller källarkivet inte har några ändringar\n" " b) med -u . och källarkivet, den första föräldern av källarkivets\n" " arbetskatalog\n" @@ -6564,8 +6443,7 @@ " e) det högsta huvudet angivet med -b\n" " f) det högsta huvudet angivent med källsyntaxen url#gren\n" " g) det högsta huvudet på default-grenen\n" -" h) tip\n" -" " +" h) tip" msgid "cannot specify both --noupdate and --updaterev" msgstr "kan inte ange både --noupdate och --updaterev" @@ -6575,18 +6453,18 @@ msgid "" " Commit changes to the given files into the repository. Unlike a\n" -" centralized RCS, this operation is a local operation. See hg push\n" -" for a way to actively distribute your changes." +" centralized RCS, this operation is a local operation. See\n" +" :hg:`push` for a way to actively distribute your changes." msgstr "" " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n" -" från ett centralicerat RCS, är detta en lokal operation. Se hg push\n" +" från ett centralicerat RCS, är detta en lokal operation. Se :hg:`push`\n" " för ett sätt att aktivt distribuera dina ändringar." msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be committed." msgstr "" -" Om filer inte anges, kommer alla ändringar som \"hg status\"\n" +" Om filer inte anges, kommer alla ändringar som :hg:`status`\n" " rapporterar att arkiveras." msgid "" @@ -6603,6 +6481,16 @@ " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" " att startas och fråga om meddelandet." +msgid "" +" Returns 0 on success, 1 if nothing changed.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om ingenting ändrades.\n" +" " + +msgid "can only close branch heads" +msgstr "kan bara stänga grenhuvuden" + msgid "nothing changed\n" msgstr "inget ändrat\n" @@ -6610,6 +6498,10 @@ msgstr "skapade ett nytt huvud\n" #, python-format +msgid "reopening closed branch head %d\n" +msgstr "återöppnar det stängda grenhuvudet %d\n" + +#, python-format msgid "committed changeset %d:%s\n" msgstr "arkiverade ändringen %d:%s\n" @@ -6636,11 +6528,16 @@ msgid "" " This command takes effect with the next commit. To undo a copy\n" -" before that, see hg revert.\n" +" before that, see :hg:`revert`." +msgstr "" +" Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" +" namnbyte innan det, se :hg:`revert`." + +msgid "" +" Returns 0 on success, 1 if errors are encountered.\n" " " msgstr "" -" Kommandot slår igenom vid nästa arkivering. För att ångra en\n" -" kopiering innan dess, se hg revert.\n" +" Returnerar 0 om kommandot lyckades, 1 om fel uppstod.\n" " " msgid "find the ancestor revision of two revisions in a given index" @@ -6649,9 +6546,73 @@ msgid "either two or three arguments required" msgstr "endera två eller tre argument krävs" +msgid "builds a repo with a given dag from scratch in the current empty repo" +msgstr "" + +msgid " Elements:" +msgstr "" + +msgid "" +" - \"+n\" is a linear run of n nodes based on the current default " +"parent\n" +" - \".\" is a single node based on the current default parent\n" +" - \"$\" resets the default parent to null (implied at the start);\n" +" otherwise the default parent is always the last node created\n" +" - \"<p\" sets the default parent to the backref p\n" +" - \"*p\" is a fork at parent p, which is a backref\n" +" - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n" +" - \"/p2\" is a merge of the preceding node and p2\n" +" - \":tag\" defines a local tag for the preceding node\n" +" - \"@branch\" sets the named branch for subsequent nodes\n" +" - \"!command\" runs the command using your shell\n" +" - \"!!my command\\n\" is like \"!\", but to the end of the line\n" +" - \"#...\\n\" is a comment up to the end of the line" +msgstr "" + +msgid " Whitespace between the above elements is ignored." +msgstr "" + +msgid " A backref is either" +msgstr "" + +msgid "" +" - a number n, which references the node curr-n, where curr is the " +"current\n" +" node, or\n" +" - the name of a local tag you placed earlier using \":tag\", or\n" +" - empty to denote the default parent." +msgstr "" + +msgid "" +" All string valued-elements are either strictly alphanumeric, or must\n" +" be enclosed in double quotes (\"...\"), with \"\" as escape character." +msgstr "" + +msgid "" +" Note that the --overwritten-file and --appended-file options imply the\n" +" use of \"HGMERGE=internal:local\" during DAG buildup.\n" +" " +msgstr "" + +msgid "need at least one of -m, -a, -o, -n" +msgstr "" + +msgid "repository is not empty" +msgstr "arkivet är inte tomt" + +#, python-format +msgid "%s command %s" +msgstr "" + +msgid "list all available commands and options" +msgstr "visa alla tillgängliga kommandon och alternativ" + msgid "returns the completion list associated with the given command" msgstr "returnerar kompletteringslistan associerad med det givna kommandot" +msgid "show information detected about current filesystem" +msgstr "visa information om det aktuella filsystemet" + msgid "rebuild the dirstate as it would look like for the given revision" msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen" @@ -6699,23 +6660,39 @@ msgid "" " With --debug, the source (filename and line number) is printed\n" -" for each config item.\n" -" " +" for each config item." msgstr "" " Med --debug, visas källan (filnamn och radnummer) för varje\n" -" alternativ.\n" -" " +" alternativ." + +#, python-format +msgid "read config from: %s\n" +msgstr "läs konfiguration från: %s\n" msgid "only one config item permitted" msgstr "bara ett konfigurationsalternativ tillåts" +msgid "access the pushkey key/value protocol" +msgstr "" + +msgid " With two args, list the keys in the given namespace." +msgstr "" + +msgid "" +" With five args, set a key to new if it currently is set to old.\n" +" Reports success or failure.\n" +" " +msgstr "" + +msgid "parse and apply a revision specification" +msgstr "" + msgid "manually set the parents of the current working directory" msgstr "" msgid "" " This is useful for writing repository conversion tools, but should\n" -" be used with care.\n" -" " +" be used with care." msgstr "" msgid "show the contents of the current dirstate" @@ -6725,6 +6702,22 @@ msgid "copy: %s -> %s\n" msgstr "" +msgid "format the changelog or an index DAG as a concise textual description" +msgstr "" + +msgid "" +" If you pass a revlog index, the revlog's DAG is emitted. If you list\n" +" revision numbers, they get labelled in the output as rN." +msgstr "" + +msgid "" +" Otherwise, the changelog DAG of the current repo is emitted.\n" +" " +msgstr "" + +msgid "need repo for changelog dag" +msgstr "" + msgid "dump the contents of a data file revision" msgstr "" @@ -6742,7 +6735,7 @@ msgstr "" msgid "test Mercurial installation" -msgstr "" +msgstr "testa Mercurial-installation" #, python-format msgid "Checking encoding (%s)...\n" @@ -6778,10 +6771,14 @@ msgid " patch test failed!\n" msgstr "" -msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" -msgstr "" - -msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -6860,12 +6857,10 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. For more information, read 'hg help diffs'.\n" -" " +" format. For more information, read :hg:`help diffs`." msgstr "" " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n" -" mer information, läs 'hg help diffs'.\n" -" " +" mer information, läs :hg:`help diffs`." msgid "dump the header and diffs for one or more changesets" msgstr "dumpa rubrik och diff för en eller fler ändringar" @@ -6928,19 +6923,17 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See 'hg help diffs' for more information." +" format. See :hg:`help diffs` for more information." msgstr "" " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n" -" Se 'hg help diffs' för mer information." +" Se :hg:`help diffs` för mer information." msgid "" " With the --switch-parent option, the diff will be against the\n" -" second parent. It can be useful to review a merge.\n" -" " +" second parent. It can be useful to review a merge." msgstr "" " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n" -" föräldern. Det kan vara användbart för att granska en sammanfogning.\n" -" " +" föräldern. Det kan vara användbart för att granska en sammanfogning." msgid "export requires at least one changeset" msgstr "" @@ -6969,12 +6962,8 @@ " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n" " projekthistoriken, och det raderar dem inte från arbetskatalogen." -msgid "" -" To undo a forget before the next commit, see hg add.\n" -" " -msgstr "" -" För att ångra en forget innan nästa arkivering, se hg add.\n" -" " +msgid " To undo a forget before the next commit, see :hg:`add`." +msgstr " För att ångra en forget innan nästa arkivering, se :hg:`add`." msgid "no files specified" msgstr "" @@ -7004,14 +6993,19 @@ " file in which it finds a match. To get it to print every revision\n" " that contains a change in match status (\"-\" for a match that\n" " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" -" use the --all flag.\n" -" " +" use the --all flag." msgstr "" " Som standard visar grep bara utmatningen från den första revisionen\n" " av en matchande fil. För att visa varje revision som innehåller en\n" " ändring i träffstatus (\"-\" för en träff som blir en icke-träff,\n" " eller \"+\" för en icke-träff som blir en träff), använd flaggan\n" -" --all.\n" +" --all." + +msgid "" +" Returns 0 if a match is found, 1 otherwise.\n" +" " +msgstr "" +" Returnerar 0 om en träff hittas, 1 annars.\n" " " #, python-format @@ -7044,10 +7038,10 @@ msgid "" " If -c/--closed is specified, also show branch heads marked closed\n" -" (see hg commit --close-branch)." +" (see :hg:`commit --close-branch`)." msgstr "" " Om -c/--closed anges, visas också grenvhuvuden som markerats som\n" -" stängda (se hg commit --close-branch)." +" stängda (se :hg:`commit --close-branch`)." msgid "" " If STARTREV is specified, only those heads that are descendants of\n" @@ -7057,12 +7051,18 @@ " anfader." msgid "" -" If -t/--topo is specified, named branch mechanics will be ignored and only\n" -" changesets without children will be shown.\n" -" " +" If -t/--topo is specified, named branch mechanics will be ignored and " +"only\n" +" changesets without children will be shown." msgstr "" " Om -t/--topo anges, ignoreras all logik för namngivna grenar och bara\n" -" ändringar utan barn kommer att visas.\n" +" ändringar utan barn kommer att visas." + +msgid "" +" Returns 0 if matching heads are found, 1 if not.\n" +" " +msgstr "" +" Returnerar 0 om matchande huvuden hittas, 1 annars.\n" " " #, python-format @@ -7076,7 +7076,8 @@ msgid "show help for a given topic or a help overview" msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt" -msgid " With no arguments, print a list of commands with short help messages." +msgid "" +" With no arguments, print a list of commands with short help messages." msgstr " Utan argument visas en kommandolista med korta hjälpmeddelanden." msgid "" @@ -7086,6 +7087,13 @@ " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n" " " +msgid "" +" Returns 0 if successful.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades.\n" +" " + msgid "global options:" msgstr "globala flaggor:" @@ -7093,7 +7101,8 @@ msgstr "använd \"hg help\" för den fulla kommandolistan" msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" +msgstr "" +"använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" #, python-format msgid "use \"hg -v help%s\" to show aliases and global options" @@ -7147,7 +7156,8 @@ msgstr "%s-utökning - %s" msgid "use \"hg help extensions\" for information on enabling extensions\n" -msgstr "använd \"hg help extensions\" för information om aktivering av utökningar\n" +msgstr "" +"använd \"hg help extensions\" för information om aktivering av utökningar\n" #, python-format msgid "'%s' is provided by the following extension:" @@ -7162,11 +7172,21 @@ msgid "enabled extensions:" msgstr "aktiverade utökningar:" +msgid "VALUE" +msgstr "VÄRDE" + msgid "DEPRECATED" msgstr "FÖRLEGAD" msgid "" "\n" +"[+] marked option can be specified multiple times" +msgstr "" +"\n" +"flaggor markerade med [+] kan anges flera gånger" + +msgid "" +"\n" "additional help topics:" msgstr "" "\n" @@ -7193,14 +7213,12 @@ " This summary identifies the repository state using one or two\n" " parent hash identifiers, followed by a \"+\" if there are\n" " uncommitted changes in the working directory, a list of tags for\n" -" this revision and a branch name for non-default branches.\n" -" " +" this revision and a branch name for non-default branches." msgstr "" " Sammanfattningen identifierar arkivstatusen med en eller två\n" " föräldrars hash-identifierare, följt av ett \"+\" om det finns\n" " oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n" -" här revisionen och ett grennamn för grenar som inte är default.\n" -" " +" här revisionen och ett grennamn för grenar som inte är default." msgid "import an ordered set of patches" msgstr "" @@ -7225,7 +7243,7 @@ msgstr "" msgid "" -" If the imported patch was generated by hg export, user and\n" +" If the imported patch was generated by :hg:`export`, user and\n" " description from patch override values from message headers and\n" " body. Values given on command line with -m/--message and -u/--user\n" " override these." @@ -7247,8 +7265,7 @@ msgid "" " To read a patch from standard input, use \"-\" as the patch name. If\n" " a URL is specified, the patch will be downloaded from it.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" See :hg:`help dates` for a list of formats valid for -d/--date." msgstr "" msgid "to working directory" @@ -7289,11 +7306,14 @@ " För fjärrarkiv, använd --bundle för att slippa ladda ner\n" " ändringarna två gånger om incoming följs av pull." -msgid "" -" See pull for valid source format details.\n" +msgid " See pull for valid source format details." +msgstr "" + +msgid "" +" Returns 0 if there are incoming changes, 1 otherwise.\n" " " msgstr "" -" Se pull för detaljer om giltiga källformat.\n" +" Returnerar 0 om det finns inkommande ändringar, 1 annars.\n" " " msgid "create a new repository in the given directory" @@ -7311,12 +7331,10 @@ msgid "" " It is possible to specify an ``ssh://`` URL as the destination.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " Det är möjligt att specificera en URL med ``ssh://`` som destination.\n" -" Se 'hg help urls' för mer information.\n" -" " +" Se :hg:`help urls` för mer informatio" msgid "locate files matching specific patterns" msgstr "hitta filer som matchar givna mönster" @@ -7348,14 +7366,12 @@ " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" -" contain whitespace as multiple filenames.\n" -" " +" contain whitespace as multiple filenames." msgstr "" " Om du vill skicka utmatningen från detta kommando till kommandot\n" -" \"xargs\", använd flaggan -O till både detta kommando och \"xargs\".\n" +" \"xargs\", använd flaggan -0 till både detta kommando och \"xargs\".\n" " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" -" innehåller blanktecken som multipla filnamn.\n" -" " +" innehåller blanktecken som multipla filnamn" msgid "show revision history of entire repository or files" msgstr "visa revisionshistorik för hela arkivet eller filer" @@ -7383,11 +7399,13 @@ msgid "" " If no revision range is specified, the default is tip:0 unless\n" " --follow is set, in which case the working directory parent is\n" -" used as the starting revision." +" used as the starting revision. You can specify a revision set for\n" +" log, see :hg:`help revsets` for more information." msgstr "" " Om ingen revisionsserie specificeras, används tip:0 som standard om\n" " inte --follow är satt, då arbetskatalogens förälder används som första\n" -" revision." +" revision. Du kan ange ett revisionsset för log, se :hg:`help revsets`\n" +" för mer information." msgid "" " By default this command prints revision number and changeset id,\n" @@ -7404,14 +7422,12 @@ " NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" -" will appear in files:.\n" -" " +" will appear in files:." msgstr "" " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" -" föräldrarna att visas i filer:.\n" -" " +" föräldrarna att visas i filer:." msgid "output the current or given revision of the project manifest" msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" @@ -7427,12 +7443,10 @@ msgid "" " With -v, print file permissions, symlink and executable bits.\n" -" With --debug, print file revision hashes.\n" -" " +" With --debug, print file revision hashes." msgstr "" " Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n" -" Med --debug visas filrevisionhashar.\n" -" " +" Med --debug visas filrevisionhashar." msgid "merge working directory with another revision" msgstr "sammanfoga arbetskatalogen med en annan revision" @@ -7459,28 +7473,35 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided.\n" -" " +" explicit revision with which to merge with must be provided." msgstr "" " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" " det andra huvudet som standard. Om inte, måste en explicit revision\n" -" anges.\n" +" anges." + +msgid "" +" Returns 0 on success, 1 if there are unresolved files.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om det finns olösta filer.\n" " " #, python-format -msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" -msgstr "avbryter: grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n" - -msgid "(run 'hg heads .' to see heads)\n" -msgstr "(kör 'hg heads .' för att se huvuden)\n" - -#, python-format -msgid "abort: branch '%s' has one head - please merge with an explicit rev\n" -msgstr "avbryter: grenen '%s' har ett huvud - sammanfoga med en specifik rev\n" - -msgid "(run 'hg heads' to see all heads)\n" -msgstr "(kör 'hg heads' för att se alla huvuden)\n" +msgid "" +"branch '%s' has %d heads - please merge with an explicit rev\n" +"(run 'hg heads .' to see heads)" +msgstr "" +"grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n" +"(kör 'hg heads .' för att se huvuden)" + +#, python-format +msgid "" +"branch '%s' has one head - please merge with an explicit rev\n" +"(run 'hg heads' to see all heads)" +msgstr "" +"grenen '%s' har ett huvud - sammanfoga med en specifik rev\n" +"(kör 'hg heads .' för att se alla huvuden)" msgid "there is nothing to merge" msgstr "det finns inget att sammanfoga" @@ -7489,8 +7510,12 @@ msgid "%s - use \"hg update\" instead" msgstr "%s - använd \"hg update\" istället" -msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" -msgstr "arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller sammanfoga med en speficik rev" +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" +msgstr "" +"arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller " +"sammanfoga med en speficik rev" msgid "show changesets not found in the destination" msgstr "visa ändringar som inte hittas i destinationen" @@ -7504,11 +7529,14 @@ " eller den vanliga push-platsen. Detta är de ändringar som skulle\n" " tryckas om push genomfördes." -msgid "" -" See pull for details of valid destination formats.\n" +msgid " See pull for details of valid destination formats." +msgstr " Se pull för information om giltiga destinationsformat." + +msgid "" +" Returns 0 if there are outgoing changes, 1 otherwise.\n" " " msgstr "" -" Se pull för information om giltiga destinationsformat.\n" +" Returnerar 0 om det finns utgående ändringar, 1 annars.\n" " " msgid "show the parents of the working directory or revision" @@ -7519,14 +7547,12 @@ " given via -r/--rev, the parent of that revision will be printed.\n" " If a file argument is given, the revision in which the file was\n" " last changed (before the working directory revision or the\n" -" argument to --rev if given) is printed.\n" -" " +" argument to --rev if given) is printed." msgstr "" " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n" " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n" " anges, kommer revisionen då den filen sist ändrades (innan\n" -" arbetskatalogens revision eller innan --rev om angiven) att visas.\n" -" " +" arbetskatalogens revision eller innan --rev om angiven) att visas." msgid "can only specify an explicit filename" msgstr "kan bara specificera ett explicit filnamn" @@ -7546,27 +7572,31 @@ " definitionen för alla tillgängliga namn." msgid "" -" 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." -msgstr "" -" 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å." - -msgid "" -" 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." -msgstr "" -" 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." - -msgid "" -" See 'hg help urls' for more information.\n" +" Path names are defined in the [paths] section of\n" +" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" +" repository, ``.hg/hgrc`` is used, too." +msgstr "" +" 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å." + +msgid "" +" The path names ``default`` and ``default-push`` have a special\n" +" meaning. When performing a push or pull operation, they are used\n" +" as fallbacks if no location is specified on the command-line.\n" +" When ``default-push`` is set, it will be used for push and\n" +" ``default`` will be used for pull; otherwise ``default`` is used\n" +" as the fallback for both. When cloning a repository, the clone\n" +" source is written as ``default`` in ``.hg/hgrc``. Note that\n" +" ``default`` and ``default-push`` apply to all inbound (e.g.\n" +" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" +" :hg:`bundle`) operations." +msgstr "" + +msgid "" +" See :hg:`help urls` for more information.\n" " " msgstr "" -" Se 'hg help urls' för mer information.\n" +" Se :hg:`help urls` för mer information.\n" " " msgid "not found!\n" @@ -7576,7 +7606,8 @@ msgstr "uppdaterar inte, eftersom nya huvuden läggs till\n" msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" -msgstr "(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n" +msgstr "" +"(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n" msgid "(run 'hg update' to get a working copy)\n" msgstr "(kör 'hg update' för att få en arbetskopia)\n" @@ -7599,64 +7630,83 @@ " arbetskatalogen." msgid "" -" Use hg incoming if you want to see what would have been added by a\n" -" pull at the time you issued this command. If you then decide to\n" -" added those changes to the repository, you should use pull -r X\n" -" where X is the last changeset listed by hg incoming." -msgstr "" -" Använd hg incoming om du vill se vad som skulle ha lagts till av en\n" +" Use :hg:`incoming` if you want to see what would have been added\n" +" by a pull at the time you issued this command. If you then decide\n" +" to add those changes to the repository, you should use :hg:`pull\n" +" -r X` where ``X`` is the last changeset listed by :hg:`incoming`." +msgstr "" +" Använd :hg:`incoming` om du vill se vad som skulle ha lagts till av en\n" " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n" -" att lägga till de ändringarna i arkivet, använd pull -r X där X -r den\n" -" sista ändringen listad av hg incoming." +" att lägga till de ändringarna i arkivet, använd :hg:`pull -r X` där\n" +" ``X`` är den sista ändringen visad av :hg:`incoming`." msgid "" " If SOURCE is omitted, the 'default' path will be used.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n" -" Se 'hg help urls' för mer information.\n" +" Se :hg:`help urls` för mer information." + +msgid "" +" Returns 0 on success, 1 if an update had unresolved files.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" +" filer.\n" " " msgid "push changes to the specified destination" msgstr "tryck ändringar till den specificerade destinationen" -msgid " Push changes from the local repository to the specified destination." -msgstr " Trycker ändringar från det lokala arkivet till angiven destination." - -msgid "" -" This is the symmetrical operation for pull. It moves changes from\n" -" the current repository to a different one. If the destination is\n" -" local this is identical to a pull in that directory from the\n" -" current one." -msgstr "" -" Detta är en symmetriska operationen för pull. Den flyttar ändringar\n" -" från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n" -" är detta identiskt med en dragning i den katalogen från den nuvarande." - -msgid "" -" By default, push will refuse to run if it detects the result would\n" -" increase the number of remote heads. This generally indicates the\n" -" user forgot to pull and merge before pushing." -msgstr "" -" Som standard vägrar push att utföra något om det upptäcks att antalet\n" -" huvuden i destinationen ökar. Det brukar generellt sett indikera att\n" -" användaren glömt att dra och sammanfoga innan tryckning." - -msgid "" -" If -r/--rev is used, the named revision and all its ancestors will\n" -" be pushed to the remote repository." +msgid "" +" Push changesets from the local repository to the specified\n" +" destination." +msgstr "" +" Trycker ändringar från det lokala arkivet till angiven destination." + +msgid "" +" This operation is symmetrical to pull: it is identical to a pull\n" +" in the destination repository from the current one." +msgstr "" + +msgid "" +" By default, push will not allow creation of new heads at the\n" +" destination, since multiple heads would make it unclear which head\n" +" to use. In this situation, it is recommended to pull and merge\n" +" before pushing." +msgstr "" + +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 "" + +msgid "" +" Use -f/--force to override the default behavior and push all\n" +" changesets on all branches." +msgstr "" + +msgid "" +" If -r/--rev is used, the specified revision and all its ancestors\n" +" will be pushed to the remote repository." msgstr "" " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" " tryckas till det andra arkivet." msgid "" -" Please see 'hg help urls' for important details about ``ssh://``\n" -" URLs. If DESTINATION is omitted, a default path will be used.\n" +" Please see :hg:`help urls` for important details about ``ssh://``\n" +" URLs. If DESTINATION is omitted, a default path will be used." +msgstr "" +" Se :hg:`help urls` för viktiga detaljer om URL:er med ``ssh://``. Om\n" +" DESTINATION inte är angivet, används standardsökvägen." + +msgid "" +" Returns 0 if push was successful, 1 if nothing to push.\n" " " msgstr "" -" Se 'hg help urls' för viktiga detaljer om URL:er med ``ssh://``. Om\n" -" DESTINATION inte är angivet, används standardsökvägen." +" Returnerar 0 om tryckning lyckates, 1 om inget fanns att trycka.\n" +" " #, python-format msgid "pushing to %s\n" @@ -7671,13 +7721,17 @@ msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" -" suggests it.\n" -" " +" suggests it." msgstr "" " Kommandot försöker att fixa arkivstatusen efter en avbruten operation.\n" " Det bör bara användas när Mercurial föreslår det.\n" " " +msgid "" +" Returns 0 if successful, 1 if nothing to recover or verify fails.\n" +" " +msgstr "" + msgid "remove the specified files on the next commit" msgstr "ta bort de specificerade filerna vid nästa arkivering" @@ -7693,21 +7747,21 @@ msgstr "" " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" " projektets historik. -A/--after kan användas för att bara ta bort filer\n" -" som redan raderats, -f/--force kan användas för att tvinga radering, och\n" -" -Af kan ta bort filer från nästa revision utan att radera dem från\n" +" som redan raderats, -f/--force kan användas för att tvinga radering,\n" +" och -Af kan ta bort filer från nästa revision utan att radera dem från\n" " arbetskopian." msgid "" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" -" reported by hg status). The actions are Warn, Remove (from branch)\n" -" and Delete (from disk)::" +" reported by :hg:`status`). The actions are Warn, Remove (from\n" +" branch) and Delete (from disk)::" msgstr "" " Följande tabell visar hur remove uppför sig för olika filstatus\n" " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" -" Modifierad [M] och Saknad [!] (som rapporteras av hg status). Aktionerna\n" -" är Varna, Radera (från gren) och Ta bort (från disk)::" +" Modifierad [M] och Saknad [!] (som rapporteras av :hg:`status`).\n" +" Aktionerna är Varna, Radera (från gren) och Ta bort (från disk)::" msgid "" " A C M !\n" @@ -7724,11 +7778,17 @@ msgid "" " This command schedules the files to be removed at the next commit.\n" -" To undo a remove before that, see hg revert.\n" -" " +" To undo a remove before that, see :hg:`revert`." msgstr "" " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n" -" att ångra en remove innan dess, se hg revert.\n" +" att ångra en remove innan dess, se :hg:`revert` .\n" +" " + +msgid "" +" Returns 0 on success, 1 if any warnings encountered.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om varningar påträffades.\n" " " #, python-format @@ -7762,11 +7822,10 @@ msgid "" " This command takes effect at the next commit. To undo a rename\n" -" before that, see hg revert.\n" -" " +" before that, see :hg:`revert`." msgstr "" " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" -" namnbyte innan det, se hg revert.\n" +" namnbyte innan det, se :hg:`revert`.\n" " " msgid "various operations to help finish a merge" @@ -7816,12 +7875,17 @@ msgid "" " Note that Mercurial will not let you commit files with unresolved merge\n" " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" -" after a conflicting merge.\n" -" " +" after a conflicting merge." msgstr "" " Notera att Mercurial inte låter dig arkivera filer med olösta\n" " konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" -" innan du kan arkivera efter en sammanfogning med konflikter.\n" +" innan du kan arkivera efter en sammanfogning med konflikter" + +msgid "" +" Returns 0 on success, 1 if any files fail a resolve attempt.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckates, 1 om någon fil inte kunde lösas.\n" " " msgid "too many options specified" @@ -7831,7 +7895,9 @@ msgstr "kan inte specificera --all och mönster" msgid "no files or directories specified; use --all to remerge all files" -msgstr "inga filer eller kataloger specificerade; använd --all för att återsammanfoga alla filer" +msgstr "" +"inga filer eller kataloger specificerade; använd --all för att " +"återsammanfoga alla filer" msgid "restore individual files or directories to an earlier state" msgstr "återställ filer eller kataloger till ett tidigare tillstånd" @@ -7860,12 +7926,12 @@ msgid "" " Using the -r/--rev option, revert the given files or directories\n" " to their contents as of a specific revision. This can be helpful\n" -" to \"roll back\" some or all of an earlier change. See 'hg help\n" -" dates' for a list of formats valid for -d/--date." +" to \"roll back\" some or all of an earlier change. See :hg:`help\n" +" dates` for a list of formats valid for -d/--date." msgstr "" " Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n" " till innehållet i den specifika revisionen. Detta kan användas för\n" -" att ångra delar av eller hela tidigare ändringar. Se 'hg help dates'\n" +" att ångra delar av eller hela tidigare ändringar. Se :hg:`help dates`\n" " för en lista med giltiga format för -d/--date." msgid "" @@ -7896,18 +7962,18 @@ msgid "" " Modified files are saved with a .orig suffix before reverting.\n" -" To disable these backups, use --no-backup.\n" -" " +" To disable these backups, use --no-backup." msgstr "" " Modifierade filer sparas med suffixet .orig innan återställning.\n" -" För att deaktivera dessa säkerhetskopior, använd --no-backup.\n" -" " +" För att deaktivera dessa säkerhetskopior, använd --no-backup." msgid "you can't specify a revision and a date" msgstr "du kan inte specificera en revision och ett datum" msgid "no files or directories specified; use --all to revert the whole repo" -msgstr "inga filer eller kataloger angivna; använd --all för att återställa hela arkivet" +msgstr "" +"inga filer eller kataloger angivna; använd --all för att återställa hela " +"arkivet" #, python-format msgid "forgetting %s\n" @@ -7979,32 +8045,54 @@ " back locally is ineffective (someone else may already have pulled\n" " the changes). Furthermore, a race is possible with readers of the\n" " repository; for example an in-progress pull from the repository\n" -" may fail if a rollback is performed.\n" -" " +" may fail if a rollback is performed." msgstr "" " Detta kommando är inte tänkt att användas i offentliga arkiv. När\n" " ändringar är tillgängliga att dras av andra användare, så är en\n" " lokal återgång ineffektivt (någon annan kan redan ha dragit\n" " ändringarna). Dessutom finns möjligheten till timingproblem; som\n" " ett exempel kan en pågående dragning misslyckas om en återgång\n" -" utförs.\n" +" utförs." + +msgid "" +" Returns 0 on success, 1 if no rollback data is available.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om ingen återgångsdata finns.\n" " " msgid "print the root (top) of the current working directory" msgstr "visa roten för den aktuella arbetskatalogen" -msgid "" -" Print the root directory of the current repository.\n" -" " -msgstr "" -" Visa rotkatalogen för det aktuella arkivet.\n" -" " +msgid " Print the root directory of the current repository." +msgstr " Visa rotkatalogen för det aktuella arkivet." msgid "start stand-alone webserver" msgstr "starta fristående webbserver" -msgid " Start a local HTTP repository browser and pull server." -msgstr " Startar en lokal HTTP-arkivbläddrare och pull-server." +msgid "" +" Start a local HTTP repository browser and pull server. You can use\n" +" this for ad-hoc sharing and browing of repositories. It is\n" +" recommended to use a real web server to serve a repository for\n" +" longer periods of time." +msgstr "" +" Starta en lokal HTTP-arkivserver för webbläsare och pull-operationer.\n" +" Du kan använda detta för improviserad delning och skummande av arkiv.\n" +" Det är rekommenderat att använda en riktig webbserver för att dela ett\n" +" arkiv under längre tidsperioder." + +msgid "" +" Please note that the server does not implement access control.\n" +" This means that, by default, anybody can read from the server and\n" +" nobody can write to it by default. Set the ``web.allow_push``\n" +" option to ``*`` to allow everybody to push to the server. You\n" +" should use a real web server if you need to authenticate users." +msgstr "" +" Notera att servern inte har någon åtkomstkontroll. Det betyder att vem\n" +" som helst kan läsa från servern och ingen kan skriva till den som\n" +" standard. Sätt flaggan ``web.allow_push`` till ``*`` för att tillåta\n" +" alla att trycka till servern. Om du behöver autenticiera användare,\n" +" borde du använda en riktig webbserver." msgid "" " By default, the server logs accesses to stdout and errors to\n" @@ -8018,12 +8106,10 @@ msgid "" " 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" -" " +" number it uses." msgstr "" " 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" -" " +" som portnummer; då visar servern det portnummer som används." #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" @@ -8086,8 +8172,7 @@ " ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = origin of the previous file listed as A (added)\n" -" " +" = origin of the previous file listed as A (added)" msgstr "" " M = modifierad\n" " A = adderad\n" @@ -8096,8 +8181,7 @@ " ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n" " ? = inte spårad\n" " I = ignorerad\n" -" = källa för den tidigare filen listad som A (adderad)\n" -" " +" = källa för den tidigare filen listad som A (adderad)" msgid "summarize working directory state" msgstr "sammanfatta arbetskatalogens tillstånd" @@ -8111,12 +8195,10 @@ msgid "" " With the --remote option, this will check the default paths for\n" -" incoming and outgoing changes. This can be time-consuming.\n" -" " +" incoming and outgoing changes. This can be time-consuming." msgstr "" " Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n" -" för att hitta inkommande och utgående ändringar. Detta kan ta lång tid.\n" -" " +" för att hitta inkommande och utgående ändringar. Detta kan ta lång tid." #, python-format msgid "parent: %d:%s " @@ -8145,6 +8227,14 @@ msgstr "%d borttagen" #, python-format +msgid "%d renamed" +msgstr "%d omdöpta" + +#, python-format +msgid "%d copied" +msgstr "%d kopierade" + +#, python-format msgid "%d deleted" msgstr "%d raderad" @@ -8160,12 +8250,19 @@ msgid "%d unresolved" msgstr "%d olöst" +#, python-format +msgid "%d subrepos" +msgstr "" + msgid " (merge)" msgstr " (sammanfogning)" msgid " (new branch)" msgstr " (ny gren)" +msgid " (head closed)" +msgstr " (huvudet stängt)" + msgid " (clean)" msgstr " (ren)" @@ -8236,6 +8333,11 @@ " samma sätt som andra projektfiler och kan ändras för hand vid behov.\n" " Filen '.hg/localtags' används för lokala märken (ej delad i arkiv)." +msgid "" +" Since tag names have priority over branch names during revision\n" +" lookup, using an existing branch name as a tag name is discouraged." +msgstr "" + msgid "tag names must be unique" msgstr "märkesnamn måste vara unika" @@ -8263,12 +8365,10 @@ msgid "" " This lists both regular and local tags. When the -v/--verbose\n" -" switch is used, a third column \"local\" is printed for local tags.\n" -" " +" switch is used, a third column \"local\" is printed for local tags." msgstr "" " Listar både vanliga och lokala märken. När flaggan -v/--verbose\n" -" används, visas en tredje kolumn med namnet \"local\" för lokala märken.\n" -" " +" används, visas en tredje kolumn med namnet \"local\" för lokala märken." msgid "show the tip revision" msgstr "visa topprevisionen" @@ -8285,25 +8385,29 @@ " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" " that repository becomes the current tip. The \"tip\" tag is special\n" -" and cannot be renamed or assigned to a different changeset.\n" -" " +" and cannot be renamed or assigned to a different changeset." msgstr "" " Om du precis har gjort en arkivering, kommer den att vara toppen. Om\n" " du har dragit ändringar från ett annat arkiv, så blir toppen för det\n" " arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n" -" döpas om eller tilldelas en annan ändring.\n" -" " +" döpas om eller tilldelas en annan ändring." msgid "apply one or more changegroup files" msgstr "applicera en eller flera filer med ändringar" msgid "" " Apply one or more compressed changegroup files generated by the\n" -" bundle command.\n" -" " +" bundle command." msgstr "" " Applicera en eller flera komprimerade filer med ändringar genererade\n" -" av bundle-kommandot.\n" +" av bundle-kommandot." + +msgid "" +" Returns 0 on success, 1 if an update has unresolved files.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" +" filer.\n" " " msgid "update working directory (or switch revisions)" @@ -8363,16 +8467,18 @@ " arbetskatalogen uppdateras till den begärda ändringen." msgid "" -" Use null as the changeset to remove the working directory (like 'hg\n" -" clone -U')." -msgstr "" -" Använd null som ändring för att radera arbetskatalogen (som 'hg clone\n" -" -U')." - -msgid " If you want to update just one file to an older changeset, use 'hg revert'." -msgstr "" -" Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n" -" revert'." +" Use null as the changeset to remove the working directory (like\n" +" :hg:`clone -U`)." +msgstr "" +" Använd null som ändring för att radera arbetskatalogen (som :hg:`clone\n" +" -U`)." + +msgid "" +" If you want to update just one file to an older changeset, use :hg:" +"`revert`." +msgstr "" +" Om du vill uppdatera bara en fil till en äldre ändring, använd :hg:" +"`revert`." msgid "cannot specify both -c/--check and -C/--clean" msgstr "" @@ -8390,13 +8496,11 @@ " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" -" integrity of their crosslinks and indices.\n" -" " +" integrity of their crosslinks and indices." msgstr "" " Detta genomför en omfattande kontroll av arkivets integritet, validerar\n" " hash- och checksummor för varje notering i ändringsloggen, manifestet,\n" -" och spårade filer, såväl som integriteten av korslänkar och indexar.\n" -" " +" och spårade filer, såväl som integriteten av korslänkar och indexar." msgid "output version and copyright information" msgstr "visa version och copyright-information" @@ -8419,6 +8523,9 @@ msgid "repository root directory or name of overlay bundle file" msgstr "arkivrotkatalog eller namn på påläggsbuntfil" +msgid "DIR" +msgstr "" + msgid "change working directory" msgstr "ändra arbetskatalog" @@ -8434,6 +8541,9 @@ msgid "set/override config option (use 'section.name=value')" msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')" +msgid "CONFIG" +msgstr "" + msgid "enable debugging output" msgstr "aktivera debugutmatning" @@ -8443,6 +8553,12 @@ msgid "set the charset encoding" msgstr "sätt teckenkodning" +msgid "ENCODE" +msgstr "" + +msgid "MODE" +msgstr "" + msgid "set the charset encoding mode" msgstr "sätt teckenkodningsläge" @@ -8450,7 +8566,7 @@ msgstr "visa alltid bakåtspårning vid undantag" msgid "time how long the command takes" -msgstr "ta tid på hud lång tid kommandot körs" +msgstr "ta tid på hur lång tid kommandot körs" msgid "print command execution profile" msgstr "visa kommandoexekveringens profil" @@ -8470,17 +8586,20 @@ msgid "specify hg command to run on the remote side" msgstr "specificera hg-kommando att köra på andra sidan" +msgid "PATTERN" +msgstr "MÖNSTER" + msgid "include names matching the given patterns" msgstr "inkludera namn som matchar de givna mönstren" msgid "exclude names matching the given patterns" msgstr "exkludera namn som matchar de givna mönstren" -msgid "use <text> as commit message" -msgstr "använd <text> som arkiveringsmeddelande" - -msgid "read commit message from <file>" -msgstr "läs arkiveringsmeddelandet från <fil>" +msgid "use text as commit message" +msgstr "använd text som arkiveringsmeddelande" + +msgid "read commit message from file" +msgstr "läs arkiveringsmeddelandet från fil" msgid "record datecode as commit date" msgstr "lagra datumkod som arkiveringsdatum" @@ -8488,6 +8607,9 @@ msgid "record the specified user as committer" msgstr "lagra den specificerade användaren som arkiverare" +msgid "STYLE" +msgstr "STIL" + msgid "display using template map file" msgstr "visa med mallfil" @@ -8497,6 +8619,9 @@ msgid "do not show merges" msgstr "visa inte sammanfogningar" +msgid "output diffstat-style summary of changes" +msgstr "visa sammanfattning av ändringar i diffstat-stil" + msgid "treat all files as text" msgstr "behandla alla filer som text" @@ -8521,8 +8646,8 @@ msgid "number of lines of context to show" msgstr "antal sammanhangsrader att visa" -msgid "output diffstat-style summary of changes" -msgstr "visa sammanfattning av ändringar i diffstat-stil" +msgid "SIMILARITY" +msgstr "" msgid "guess renamed files by similarity (0<=s<=100)" msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" @@ -8563,6 +8688,9 @@ msgid "do not pass files through decoders" msgstr "passera inte filer genom dekoders" +msgid "PREFIX" +msgstr "PREFIX" + msgid "directory prefix for files in archive" msgstr "katalogprefix för filer i arkiv" @@ -8692,6 +8820,21 @@ msgid "[INDEX] REV1 REV2" msgstr "[INDEX] REV1 REV2" +msgid "add single file mergeable changes" +msgstr "" + +msgid "add single file all revs append to" +msgstr "" + +msgid "add single file all revs overwrite" +msgstr "" + +msgid "add new file at each rev" +msgstr "" + +msgid "[OPTION]... TEXT" +msgstr "[FLAGGA]... TEXT" + msgid "[COMMAND]" msgstr "[KOMMANDO]" @@ -8701,6 +8844,21 @@ msgid "[-o] CMD" msgstr "[-o] KMD" +msgid "use tags as labels" +msgstr "" + +msgid "annotate with branch names" +msgstr "" + +msgid "use dots for runs" +msgstr "" + +msgid "separate elements by spaces" +msgstr "" + +msgid "[OPTION]... [FILE [REV]...]" +msgstr "[FLAGGA]... [FIL] [REV]...]" + msgid "try extended date formats" msgstr "pröva utökade datumformat" @@ -8713,8 +8871,8 @@ msgid "[PATH]" msgstr "[SÖKVÄG]" -msgid "FILE" -msgstr "FIL" +msgid "REPO NAMESPACE [KEY OLD NEW]" +msgstr "" msgid "revision to rebuild to" msgstr "revision att bygga om till" @@ -8759,7 +8917,8 @@ msgstr "visa alla revisioner som matchar" msgid "follow changeset history, or file history across copies and renames" -msgstr "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" +msgstr "" +"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" msgid "ignore case when matching" msgstr "ignorera versaler/gemener vid matchning" @@ -8770,8 +8929,8 @@ msgid "print matching line numbers" msgstr "visa matchande radnummer" -msgid "search in given revision range" -msgstr "sök i ett givet revisionsområde" +msgid "only search files changed within revision range" +msgstr "sök filer enbart inom ett givet revisionsområde" msgid "[OPTION]... PATTERN [FILE]..." msgstr "[FLAGGA]... MÖNSTER [FIL]..." @@ -8788,8 +8947,8 @@ msgid "show normal and closed branch heads" msgstr "visa normala och stängda grenhuvuden" -msgid "[-ac] [-r STARTREV] [REV]..." -msgstr "[-ac] [-r STARTREV] [REV]..." +msgid "[-ac] [-r REV] [REV]..." +msgstr "[-ac] [-r REV] [REV]..." msgid "[TOPIC]" msgstr "[ÄMNE]" @@ -8812,8 +8971,13 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [KÄLLA]" -msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" -msgstr "" +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" +msgstr "" + +msgid "PATH" +msgstr "SÖKVÄG" msgid "base path" msgstr "grundsökväg" @@ -8875,8 +9039,8 @@ msgid "show copied files" msgstr "visa kopierade filer" -msgid "do case-insensitive search for a keyword" -msgstr "gör versalokänslig sökning efter nyckelord" +msgid "do case-insensitive search for a given text" +msgstr "gör versalokänslig sökning efter en given text" msgid "include revisions where files were removed" msgstr "inkludera revisioner där filer togs bort" @@ -8887,8 +9051,11 @@ msgid "revisions committed by user" msgstr "revisioner arkiverade av användare" -msgid "show only changesets within the given named branch" -msgstr "visa bara ändringar i den namngivda grenen" +msgid "show only changesets within the given named branch (DEPRECATED)" +msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)" + +msgid "show changesets within the given named branch" +msgstr "visa ändringar i den namngivna grenen" msgid "do not display revision or any of its ancestors" msgstr "visa inte revision eller någon av dess föräldrar" @@ -8944,6 +9111,9 @@ msgid "force push" msgstr "tvinga tryckning" +msgid "allow pushing a new branch" +msgstr "" + msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]" @@ -8995,9 +9165,15 @@ msgid "name of error log file to write to" msgstr "namn på fellogg att skriva till" +msgid "PORT" +msgstr "PORT" + msgid "port to listen on (default: 8000)" msgstr "port att lyssna på (standard: 8000)" +msgid "ADDR" +msgstr "" + msgid "address to listen on (default: all interfaces)" msgstr "adress att lyssna på (standard alla gränssnitt)" @@ -9007,9 +9183,12 @@ msgid "name to show in web pages (default: working directory)" msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" -msgid "name of the webdir config file (serve more than one repository)" +msgid "name of the hgweb config file (serve more than one repository)" msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)" +msgid "name of the hgweb config file (DEPRECATED)" +msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)" + msgid "for remote clients" msgstr "för fjärrklienter" @@ -9079,6 +9258,9 @@ msgid "remove a tag" msgstr "ta bort ett märke" +msgid "use <text> as commit message" +msgstr "använd <text> som arkiveringsmeddelande" + msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..." @@ -9086,7 +9268,7 @@ msgstr "[-p] [-g]" msgid "update to new branch head if changesets were unbundled" -msgstr "uppdatera till nytt grenhuvud om ändringrs packades upp" +msgstr "uppdatera till nytt grenhuvud om ändringar packades upp" msgid "[-u] FILE..." msgstr "[-u] FIL..." @@ -9101,11 +9283,7 @@ msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" #, python-format -msgid "config error at %s:%d: cannot include %s (%s)" -msgstr "" - -#, python-format -msgid "config error at %s:%d: '%s'" +msgid "cannot include %s (%s)" msgstr "" msgid "not found in manifest" @@ -9114,6 +9292,50 @@ msgid "branch name not in UTF-8!" msgstr "" +#, python-format +msgid "%s does not exist!\n" +msgstr "" + +#, python-format +msgid "" +"%s: up to %d MB of RAM may be required to manage this file\n" +"(use 'hg revert %s' to cancel the pending addition)\n" +msgstr "" +"%s: upp till %d MB RAM kan behövas för att hantera denna fil\n" +"(använd 'hg revert %s' för att ångra den väntande additionen)\n" + +#, python-format +msgid "%s not added: only files and symlinks supported currently\n" +msgstr "" + +#, python-format +msgid "%s already tracked!\n" +msgstr "" + +#, python-format +msgid "%s not added!\n" +msgstr "" + +#, python-format +msgid "%s still exists!\n" +msgstr "" + +#, python-format +msgid "%s not tracked!\n" +msgstr "" + +#, python-format +msgid "%s not removed!\n" +msgstr "" + +#, python-format +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "" + +#, python-format +msgid "invalid event type in dag: %s" +msgstr "" + msgid "working directory state appears damaged!" msgstr "" @@ -9130,6 +9352,10 @@ msgstr "" #, python-format +msgid "setting %r to other parent only allowed in merges" +msgstr "" + +#, python-format msgid "not in dirstate: %s\n" msgstr "" @@ -9155,12 +9381,54 @@ msgid "unsupported file type (type is %s)" msgstr "" +msgid "queries" +msgstr "frågor" + +msgid "searching" +msgstr "" + +msgid "already have changeset " +msgstr "har redan ändringen " + +msgid "warning: repository is unrelated\n" +msgstr "varning: arkivet är obesälktat\n" + +msgid "repository is unrelated" +msgstr "arkivet är obesläktat" + +#, python-format +msgid "abort: push creates new remote heads on branch '%s'!\n" +msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" + +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" + +#, python-format +msgid "abort: push creates new remote branches: %s!\n" +msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" + +msgid "(use 'hg push --new-branch' to create new remote branches)\n" +msgstr "(använd 'hg push --new-branch' för att skapa nya fjärrgrenar)\n" + +msgid "note: unsynced remote changes!\n" +msgstr "notera: osynkade fjärrändringar!\n" + #, python-format msgid "abort: %s\n" msgstr "avbryter: %s\n" #, python-format -msgid "hg: %s\n" +msgid "hg: parse error at %s: %s\n" +msgstr "" + +#, python-format +msgid "hg: parse error: %s\n" msgstr "" #, python-format @@ -9190,6 +9458,10 @@ msgstr "" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "abort: %s!\n" msgstr "" @@ -9207,10 +9479,6 @@ msgid "hg: unknown command '%s'\n" msgstr "" -#, python-format -msgid "abort: could not import module %s!\n" -msgstr "" - msgid "(did you forget to compile extensions?)\n" msgstr "" @@ -9245,6 +9513,10 @@ msgstr "" #, python-format +msgid "** Python %s\n" +msgstr "" + +#, python-format msgid "** Mercurial Distributed SCM (version %s)\n" msgstr "" @@ -9278,7 +9550,9 @@ msgid "Option --cwd may not be abbreviated!" msgstr "" -msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" +"repository may only be abbreviated as --repo!" msgstr "" #, python-format @@ -9296,7 +9570,9 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "" -msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" msgstr "" #, python-format @@ -9344,9 +9620,11 @@ msgstr "" #, python-format -msgid "" -" output file %s appears unchanged\n" -"was merge successful (yn)?" +msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" +msgstr "" + +#, python-format +msgid "was merge of '%s' successful (yn)?" msgstr "" msgid "&No" @@ -9356,6 +9634,12 @@ msgstr "" #, python-format +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +#, python-format msgid "merging %s failed!\n" msgstr "" @@ -9388,6 +9672,9 @@ msgid "Specifying Multiple Revisions" msgstr "Ange Flera Revisioner" +msgid "Specifying Revision Sets" +msgstr "Ange Revisionsset" + msgid "Diff Formats" msgstr "Diff-format" @@ -9400,6 +9687,12 @@ msgid "Using additional features" msgstr "Använda ytterligare funktioner" +msgid "Configuring hgweb" +msgstr "Konfiguration av hgweb" + +msgid "Glossary" +msgstr "Ordlista" + msgid "" "Mercurial reads configuration data from several files, if they exist.\n" "Below we list the most specific file first." @@ -9413,21 +9706,27 @@ msgid "" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%USERPROFILE%\\mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<install-dir>\\Mercurial.ini``" +"- ``%HOME%\\mercurial.ini``\n" +"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial." +"ini found)\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial." +"ini found)\n" +"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n" +"- ``<hg.exe-dir>\\mercurial.ini``" msgstr "" "- ``<arkiv>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%USERPROFILE%\\mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<installationskatalog>\\Mercurial.ini``" +"- ``%HOME%\\mercurial.ini``\n" +"- ``C:\\mercurial\\mercurial.ini`` (om inte registernyckel eller hgrc.d\\ " +"eller mercurial.ini hittas)\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (om inte hgrc.d\\ eller " +"mercurial.ini hittas)\n" +"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (om inte mercurial.ini hittas)\n" +"- ``<hg.exe-dir>\\mercurial.ini``" msgid "On Unix, these files are read:" msgstr "Under Unix läses dessa filer:" @@ -9448,6 +9747,38 @@ "- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``" msgid "" +"If there is a per-repository configuration file which is not owned by\n" +"the active user, Mercurial will warn you that the file is skipped::" +msgstr "" +"Om det finns en arkivkonfigurationsfil som inte ägs av den aktiva\n" +"användaren, kommer Mercurial att varna dig att filen ignoreras::" + +msgid "" +" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" +msgstr "" +" Litar inte på filen <arkiv>/.hg/hgrc från opålitlig användare ANVÄNDARE,\n" +" grupp GRUPP" + +msgid "" +"If this bothers you, the warning can be silenced (the file would still\n" +"be ignored) or trust can be established. Use one of the following\n" +"settings, the syntax is explained below:" +msgstr "" +"Om det stör dig, så kan varningen tystas (filen kommer fortfarande att\n" +"ignoreras) eller du kan tala om att vederbörande är tillförlitlig. Använd\n" +"en av de följande inställningarna. Den första raden tystar varningarna, de\n" +"två andra visar att du litar på användaren:" + +msgid "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" +msgstr "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = ANVÄNDARE``\n" +"- ``trusted.groups = GRUPP``" + +msgid "" "The configuration files for Mercurial use a simple ini-file format. A\n" "configuration file consists of sections, led by a ``[section]`` header\n" "and followed by ``name = value`` entries::" @@ -9466,7 +9797,7 @@ " verbose = True" msgid "" -"This above entries will be referred to as ``ui.username`` and\n" +"The above entries will be referred to as ``ui.username`` and\n" "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" "description of the possible configuration values:" msgstr "" @@ -9581,7 +9912,7 @@ msgid "" "This means that when generating diffs from a Mercurial repository\n" -"(e.g. with \"hg export\"), you should be careful about things like file\n" +"(e.g. with :hg:`export`), you should be careful about things like file\n" "copies and renames or other things mentioned above, because when\n" "applying a standard diff to a different repository, this extra\n" "information is lost. Mercurial's internal operations (like push and\n" @@ -9604,14 +9935,22 @@ " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" " Windows) is searched." msgstr "" +"HG\n" +" Sökväg till den exekverbara filen 'hg', skickas automatiskt med när\n" +" hakar, utökningar eller externa verktyg körs. Om osatt eller tom, så är\n" +" det här hg:s körbara namn om den är frysen, eller en exekverbar fil vid\n" +" namnet 'hg' (med tillägget %PATHEXT% [COM/EXE/BAT/CMD som standard] på\n" +" Windows) sökes." msgid "" "HGEDITOR\n" " This is the name of the editor to run when committing. See EDITOR." msgstr "" +"HGEDITOR\n" +" Detta är namnet på editorn som ska köras vid arkivering. Se EDITOR." msgid " (deprecated, use .hgrc)" -msgstr "" +msgstr " (föråldrad, använd .hgrc)" msgid "" "HGENCODING\n" @@ -9719,6 +10058,10 @@ "existing commands, change the default behavior of commands, or\n" "implement hooks." msgstr "" +"Mercurial har förmågan att lägga till nya funktioner genom utökningar.\n" +"Utökningar kan lägga till nya kommandon, lägga till flaggor till\n" +"existerande kommandon, ändra hur ett kommando beter sig, eller\n" +"implementera hakar." msgid "" "Extensions are not loaded by default for a variety of reasons:\n" @@ -9729,30 +10072,44 @@ "Mercurial. It is thus up to the user to activate extensions as\n" "needed." msgstr "" +"Utökningar laddas inte som standard av ett antal orsaker: de kan göra att\n" +"Mercurial startar långsammare; de kan vara avsedda för avancerat\n" +"användning; de kan tillföra potentiellt farliga förmågor (som att låta dig\n" +"förstöra eller modifiera historik); de kanske inte är redo för fullskalig\n" +"användning än; eller de kan förändra beteendet för Mercurial. Det är därför\n" +"upp till användaren att aktiverade utökningar om de behövs." msgid "" "To enable the \"foo\" extension, either shipped with Mercurial or in\n" "the Python search path, create an entry for it in your hgrc, like\n" "this::" msgstr "" +"För att aktivera utökningen \"foo\", som endera levereras med Mercurial\n" +"eller finns i Pythons sökväg, skapa en post för den i din hgrc, så här::" msgid "" " [extensions]\n" " foo =" msgstr "" +" [extensions]\n" +" foo =" msgid "You may also specify the full path to an extension::" -msgstr "" +msgstr "Du kan också ange den fullständiga sökvägen till en utökning::" msgid "" " [extensions]\n" " myfeature = ~/.hgext/myfeature.py" msgstr "" +" [extensions]\n" +" minfunktion = ~/.hgext/minfunktion.py" msgid "" "To explicitly disable an extension enabled in an hgrc of broader\n" "scope, prepend its path with !::" msgstr "" +"För att explicit deaktivera en utökning som aktiverats i en hgrc med större\n" +"omfång, börja dess sökväg med !::" msgid "" " [extensions]\n" @@ -9761,6 +10118,631 @@ " # ditto, but no path was supplied for extension baz\n" " baz = !\n" msgstr "" +" [extensions]\n" +" # deaktiverar utökningen bar som finns i /sökväg/till/utökningen/bar.py\n" +" bar = !/sökväg/till/utökningen/bar.py\n" +" # samma sak, men ingen sökväg angavs för utökningen baz\n" +" baz = !\n" + +msgid "" +"Ancestor\n" +" Any changeset that can be reached by an unbroken chain of parent\n" +" changesets from a given changeset. More precisely, the ancestors\n" +" of a changeset can be defined by two properties: a parent of a\n" +" changeset is an ancestor, and a parent of an ancestor is an\n" +" ancestor. See also: 'Descendant'." +msgstr "" + +msgid "" +"Branch\n" +" (Noun) A child changeset that has been created from a parent that\n" +" is not a head. These are known as topological branches, see\n" +" 'Branch, topological'. If a topological branch is named, it becomes\n" +" a named branch. If a topological branch is not named, it becomes\n" +" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." +msgstr "" + +msgid "" +" Branches may be created when changes are pulled from or pushed to\n" +" a remote repository, since new heads may be created by these\n" +" operations. Note that the term branch can also be used informally\n" +" to describe a development process in which certain development is\n" +" done independently of other development.This is sometimes done\n" +" explicitly with a named branch, but it can also be done locally,\n" +" using bookmarks or clones and anonymous branches." +msgstr "" + +msgid " Example: \"The experimental branch\"." +msgstr "" + +msgid "" +" (Verb) The action of creating a child changeset which results in\n" +" its parent having more than one child." +msgstr "" + +msgid " Example: \"I'm going to branch at X\"." +msgstr "" + +msgid "" +"Branch, anonymous\n" +" Every time a new child changeset is created from a parent that is not\n" +" a head and the name of the branch is not changed, a new anonymous\n" +" branch is created." +msgstr "" + +msgid "" +"Branch, closed\n" +" A named branch whose branch heads have all been closed." +msgstr "" + +msgid "" +"Branch, default\n" +" The branch assigned to a changeset when no name has previously been\n" +" assigned." +msgstr "" + +msgid "" +"Branch head\n" +" See 'Head, branch'." +msgstr "" + +msgid "" +"Branch, named\n" +" A collection of changesets which have the same branch name. By\n" +" default, children of a changeset in a named branch belong to the\n" +" same named branch. A child can be explicitly assigned to a\n" +" different branch. See :hg:`help branch`, :hg:`help branches` and\n" +" :hg:`commit --close-branch` for more information on managing\n" +" branches." +msgstr "" + +msgid "" +" Named branches can be thought of as a kind of namespace, dividing\n" +" the collection of changesets that comprise the repository into a\n" +" collection of disjoint subsets. A named branch is not necessarily\n" +" a topological branch. If a new named branch is created from the\n" +" head of another named branch, or the default branch, but no\n" +" further changesets are added to that previous branch, then that\n" +" previous branch will be a branch in name only." +msgstr "" + +msgid "" +"Branch tip\n" +" See 'Tip, branch'." +msgstr "" + +msgid "" +"Branch, topological\n" +" Every time a new child changeset is created from a parent that is\n" +" not a head, a new topological branch is created. If a topological\n" +" branch is named, it becomes a named branch. If a topological\n" +" branch is not named, it becomes an anonymous branch of the\n" +" current, possibly default, branch." +msgstr "" + +msgid "" +"Changelog\n" +" A record of the changesets in the order in which they were added\n" +" to the repository. This includes details such as changeset id,\n" +" author, commit message, date, and list of changed files." +msgstr "" + +msgid "" +"Changeset\n" +" A snapshot of the state of the repository used to record a change." +msgstr "" + +msgid "" +"Changeset, child\n" +" The converse of parent changeset: if P is a parent of C, then C is\n" +" a child of P. There is no limit to the number of children that a\n" +" changeset may have." +msgstr "" + +msgid "" +"Changeset id\n" +" A SHA-1 hash that uniquely identifies a changeset. It may be\n" +" represented as either a \"long\" 40-byte hexadecimal string, or a\n" +" \"short\" 12-byte hexadecimal string." +msgstr "" + +msgid "" +"Changeset, merge\n" +" A changeset with two parents. This occurs when a merge is\n" +" committed." +msgstr "" + +msgid "" +"Changeset, parent\n" +" A revision upon which a child changeset is based. Specifically, a\n" +" parent changeset of a changeset C is a changeset whose node\n" +" immediately precedes C in the DAG. Changesets have at most two\n" +" parents." +msgstr "" + +msgid "" +"Checkout\n" +" (Noun) The working directory being updated to a specific\n" +" revision. This use should probably be avoided where possible, as\n" +" changeset is much more appropriate than checkout in this context." +msgstr "" + +msgid " Example: \"I'm using checkout X.\"" +msgstr "" + +msgid "" +" (Verb) Updating the working directory to a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"I'm going to check out changeset X.\"" +msgstr "" + +msgid "" +"Child changeset\n" +" See 'Changeset, child'." +msgstr "" + +msgid "" +"Close changeset\n" +" See 'Changeset, close'." +msgstr "" + +msgid "" +"Closed branch\n" +" See 'Branch, closed'." +msgstr "" + +msgid "" +"Clone\n" +" (Noun) An entire or partial copy of a repository. The partial\n" +" clone must be in the form of a revision and its ancestors." +msgstr "" + +msgid " Example: \"Is your clone up to date?\"." +msgstr "" + +msgid " (Verb) The process of creating a clone, using :hg:`clone`." +msgstr "" + +msgid " Example: \"I'm going to clone the repository\"." +msgstr "" + +msgid "" +"Closed branch head\n" +" See 'Head, closed branch'." +msgstr "" + +msgid "" +"Commit\n" +" (Noun) A synonym for changeset." +msgstr "" + +msgid " Example: \"Is the bug fixed in your recent commit?\"" +msgstr "" + +msgid "" +" (Verb) The act of recording changes to a repository. When files\n" +" are committed in a working directory, Mercurial finds the\n" +" differences between the committed files and their parent\n" +" changeset, creating a new changeset in the repository." +msgstr "" + +msgid " Example: \"You should commit those changes now.\"" +msgstr "" + +msgid "" +"Cset\n" +" A common abbreviation of the term changeset." +msgstr "" + +msgid "" +"DAG\n" +" The repository of changesets of a distributed version control\n" +" system (DVCS) can be described as a directed acyclic graph (DAG),\n" +" consisting of nodes and edges, where nodes correspond to\n" +" changesets and edges imply a parent -> child relation. This graph\n" +" can be visualized by graphical tools such as :hg:`glog`\n" +" (graphlog). In Mercurial, the DAG is limited by the requirement\n" +" for children to have at most two parents." +msgstr "" + +msgid "" +"Default branch\n" +" See 'Branch, default'." +msgstr "" + +msgid "" +"Descendant\n" +" Any changeset that can be reached by a chain of child changesets\n" +" from a given changeset. More precisely, the descendants of a\n" +" changeset can be defined by two properties: the child of a\n" +" changeset is a descendant, and the child of a descendant is a\n" +" descendant. See also: 'Ancestor'." +msgstr "" + +msgid "" +"Diff\n" +" (Noun) The difference between the contents and attributes of files\n" +" in two changesets or a changeset and the current working\n" +" directory. The difference is usually represented in a standard\n" +" form called a \"diff\" or \"patch\". The \"git diff\" format is used\n" +" when the changes include copies, renames, or changes to file\n" +" attributes, none of which can be represented/handled by classic\n" +" \"diff\" and \"patch\"." +msgstr "" + +msgid " Example: \"Did you see my correction in the diff?\"" +msgstr "" + +msgid "" +" (Verb) Diffing two changesets is the action of creating a diff or\n" +" patch." +msgstr "" + +msgid "" +" Example: \"If you diff with changeset X, you will see what I mean.\"" +msgstr "" + +msgid "" +"Directory, working\n" +" The working directory represents the state of the files tracked by\n" +" 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" +" to the files introduced manually or by a merge. The repository\n" +" metadata exists in the .hg directory inside the working directory." +msgstr "" + +msgid "" +"Graph\n" +" See DAG and :hg:`help graphlog`." +msgstr "" + +msgid "" +"Head\n" +" The term 'head' may be used to refer to both a branch head or a\n" +" repository head, depending on the context. See 'Head, branch' and\n" +" 'Head, repository' for specific definitions." +msgstr "" + +msgid "" +" Heads are where development generally takes place and are the\n" +" usual targets for update and merge operations." +msgstr "" + +msgid "" +"Head, branch\n" +" A changeset with no descendants on the same named branch." +msgstr "" + +msgid "" +"Head, closed branch\n" +" A changeset that marks a head as no longer interesting. The closed\n" +" head is no longer listed by :hg:`heads`. A branch is considered\n" +" closed when all its heads are closed and consequently is not\n" +" listed by :hg:`branches`." +msgstr "" + +msgid "" +"Head, repository\n" +" A topological head which has not been closed." +msgstr "" + +msgid "" +"Head, topological\n" +" A changeset with no children in the repository." +msgstr "" + +msgid "" +"History, immutable\n" +" Once committed, changesets cannot be altered. Extensions which\n" +" appear to change history actually create new changesets that\n" +" replace existing ones, and then destroy the old changesets. Doing\n" +" so in public repositories can result in old changesets being\n" +" reintroduced to the repository." +msgstr "" + +msgid "" +"History, rewriting\n" +" The changesets in a repository are immutable. However, extensions\n" +" to Mercurial can be used to alter the repository, usually in such\n" +" a way as to preserve changeset contents." +msgstr "" + +msgid "" +"Immutable history\n" +" See 'History, immutable'." +msgstr "" + +msgid "" +"Merge changeset\n" +" See 'Changeset, merge'." +msgstr "" + +msgid "" +"Manifest\n" +" Each changeset has a manifest, which is the list of files that are\n" +" tracked by the changeset." +msgstr "" + +msgid "" +"Merge\n" +" Used to bring together divergent branches of work. When you update\n" +" to a changeset and then merge another changeset, you bring the\n" +" history of the latter changeset into your working directory. Once\n" +" conflicts are resolved (and marked), this merge may be committed\n" +" as a merge changeset, bringing two branches together in the DAG." +msgstr "" + +msgid "" +"Named branch\n" +" See 'Branch, named'." +msgstr "" + +msgid "" +"Null changeset\n" +" The empty changeset. It is the parent state of newly-initialized\n" +" repositories and repositories with no checked out revision. It is\n" +" thus the parent of root changesets and the effective ancestor when\n" +" merging unrelated changesets. Can be specified by the alias 'null'\n" +" or by the changeset ID '000000000000'." +msgstr "" + +msgid "" +"Parent\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent changeset\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent, working directory\n" +" The working directory parent reflects a virtual revision which is\n" +" the child of the changeset (or two changesets with an uncommitted\n" +" merge) shown by :hg:`parents`. This is changed with\n" +" :hg:`update`. Other commands to see the working directory parent\n" +" are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." +msgstr "" + +msgid "" +"Patch\n" +" (Noun) The product of a diff operation." +msgstr "" + +msgid " Example: \"I've sent you my patch.\"" +msgstr "" + +msgid "" +" (Verb) The process of using a patch file to transform one\n" +" changeset into another." +msgstr "" + +msgid " Example: \"You will need to patch that revision.\"" +msgstr "" + +msgid "" +"Pull\n" +" An operation in which changesets in a remote repository which are\n" +" not in the local repository are brought into the local\n" +" repository. Note that this operation without special arguments\n" +" only updates the repository, it does not update the files in the\n" +" working directory. See :hg:`help pull`." +msgstr "" + +msgid "" +"Push\n" +" An operation in which changesets in a local repository which are\n" +" not in a remote repository are sent to the remote repository. Note\n" +" that this operation only adds changesets which have been committed\n" +" locally to the remote repository. Uncommitted changes are not\n" +" sent. See :hg:`help push`." +msgstr "" +"Push\n" +" En operation där ändringarna ett lokalt arkiv som inte är i ett annat\n" +" arkiv skickas till det andra arkivet. Notera att denna operation bara\n" +" lägger till öndringar som har arkiverats lokalt till det andra arkivet.\n" +" Oarkiverade ändringar skickas inte. Se :hg:`help push`." + +msgid "" +"Repository\n" +" The metadata describing all recorded states of a collection of\n" +" files. Each recorded state is represented by a changeset. A\n" +" repository is usually (but not always) found in the ``.hg``\n" +" subdirectory of a working directory. Any recorded state can be\n" +" recreated by \"updating\" a working directory to a specific\n" +" changeset." +msgstr "" + +msgid "" +"Repository head\n" +" See 'Head, repository'." +msgstr "" + +msgid "" +"Revision\n" +" A state of the repository at some point in time. Earlier revisions\n" +" can be updated to by using :hg:`update`. See also 'Revision\n" +" number'; See also 'Changeset'." +msgstr "" + +msgid "" +"Revision number\n" +" This integer uniquely identifies a changeset in a specific\n" +" repository. It represents the order in which changesets were added\n" +" to a repository, starting with revision number 0. Note that the\n" +" revision number may be different in each clone of a repository. To\n" +" identify changesets uniquely between different clones, see\n" +" 'Changeset id'." +msgstr "" + +msgid "" +"Revlog\n" +" History storage mechanism used by Mercurial. It is a form of delta\n" +" encoding, with occasional full revision of data followed by delta\n" +" of each successive revision. It includes data and an index\n" +" pointing to the data." +msgstr "" + +msgid "" +"Rewriting history\n" +" See 'History, rewriting'." +msgstr "" + +msgid "" +"Root\n" +" A changeset that has only the null changeset as its parent. Most\n" +" repositories have only a single root changeset." +msgstr "" + +msgid "" +"Tip\n" +" The changeset with the highest revision number. It is the changeset\n" +" most recently added in a repository." +msgstr "" + +msgid "" +"Tip, branch\n" +" The head of a given branch with the highest revision number. When\n" +" a branch name is used as a revision identifier, it refers to the\n" +" branch tip. See also 'Branch, head'. Note that because revision\n" +" numbers may be different in different repository clones, the\n" +" branch tip may be different in different cloned repositories." +msgstr "" + +msgid "" +"Update\n" +" (Noun) Another synonym of changeset." +msgstr "" + +msgid " Example: \"I've pushed an update\"." +msgstr "" + +msgid "" +" (Verb) This term is usually used to describe updating the state of\n" +" the working directory to that of a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"You should update\"." +msgstr "" + +msgid "" +"Working directory\n" +" See 'Directory, working'." +msgstr "" + +msgid "" +"Working directory parent\n" +" See 'Parent, working directory'.\n" +msgstr "" + +msgid "" +"Mercurial's internal web server, hgweb, can serve either a single\n" +"repository, or a collection of them. In the latter case, a special\n" +"configuration file can be used to specify the repository paths to use\n" +"and global web configuration options." +msgstr "" +"Mercurials interna webbserver, hgweb, kan endera dela ut ett arkiv, eller\n" +"flera stycken. I det senare fallet, så kan en speciell konfigurationsfil\n" +"användas för att ange arkivsökvägarna att använda och globala alternativ\n" +"för webbkonfiguration" + +msgid "" +"This file uses the same syntax as hgrc configuration files, but only\n" +"the following sections are recognized:" +msgstr "" +"Denna fil använder samma syntax som hgrc-konfigurationsfiler, men bara de\n" +"följande sektionerna används:" + +msgid "" +" - web\n" +" - paths\n" +" - collections" +msgstr "" +" - web\n" +" - paths\n" +" - collections" + +msgid "" +"The ``web`` section can specify all the settings described in the web\n" +"section of the hgrc documentation." +msgstr "" +"Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n" +"i hgrc-dokumentationen." + +msgid "" +"The ``paths`` section provides mappings of physical repository\n" +"paths to virtual ones. For instance::" +msgstr "" +"Sektionen ``paths`` mappar upp fysiska arkiv till virtuella. Exempelvis::" + +msgid "" +" [paths]\n" +" projects/a = /foo/bar\n" +" projects/b = /baz/quux\n" +" web/root = /real/root/*\n" +" / = /real/root2/*\n" +" virtual/root2 = /real/root2/**" +msgstr "" +" [paths]\n" +" projekt/a = /foo/bar\n" +" projekt/b = /baz/quux\n" +" web/rot = /riktig/rot/*\n" +" / = /riktig/rot2/*\n" +" virtuell/rot2 = /riktig/rot2/**" + +msgid "" +"- The first two entries make two repositories in different directories\n" +" appear under the same directory in the web interface\n" +"- The third entry maps every Mercurial repository found in '/real/root'\n" +" into 'web/root'. This format is preferred over the [collections] one,\n" +" since using absolute paths as configuration keys is not supported on " +"every\n" +" platform (especially on Windows).\n" +"- The fourth entry is a special case mapping all repositories in\n" +" '/real/root2' in the root of the virtual directory.\n" +"- The fifth entry recursively finds all repositories under the real\n" +" root, and maps their relative paths under the virtual root." +msgstr "" +"- De första två posterna gör att två arkiv i olika kataloger visas under\n" +" samma katalog i webbgränssnittet\n" +"- Den tredje posten mappar alla Mercurial-arkiv som hittas i '/riktig/rot'\n" +" i 'web/rot'. Detta format är att föredra över det i [collections],\n" +" eftersom användning av absoluta sökvägar som konfigurationsnycklar inte\n" +" stödjs på alla plattformar (särskilt Windows).\n" +"- Den fjärde posten är ett specialfall som mappar alla arkiv i\n" +" '/riktig/rot2' i roten på den virtuella katalogen.\n" +"- Den femte posten söker rekursivt efter alla arkiv under den riktiga\n" +" roten, och mappar deras relativa sökvägar under den virtuella roten." + +msgid "" +"The ``collections`` section provides mappings of trees of physical\n" +"repositories paths to virtual ones, though the paths syntax is generally\n" +"preferred. For instance::" +msgstr "" +"Sektionen ``collections`` mappar upp träd av fysiska arkiv till virtuella,\n" +"men användning av paths är generellt sett att föredra. Exempel::" + +msgid "" +" [collections]\n" +" /foo = /foo" +msgstr "" +" [collections]\n" +" /foo = /foo" + +msgid "" +"Here, the left side will be stripped off all repositories found in the\n" +"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" +"``bar`` and ``quux/baz`` respectively.\n" +msgstr "" +"Här kommer den vänstra sidan att strippas från alla arkiv som hittas i den\n" +"högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n" +"visas som ``bar``och ``quux/baz``.\n" msgid "" "When Mercurial accepts more than one revision, they may be specified\n" @@ -9866,11 +10848,13 @@ msgid "Regexp examples::" msgstr "Regexp-exempel::" -msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -msgstr " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" +msgid "" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" +" re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" msgid "Mercurial supports several ways to specify individual revisions." -msgstr "Mercurial stöder flera sött att ange individuella revisioner." +msgstr "Mercurial stöder flera sätt att ange individuella revisioner." msgid "" "A plain integer is treated as a revision number. Negative integers are\n" @@ -9935,6 +10919,266 @@ "sammanfogning pågår, så är \".\" den första förälderns revision.\n" msgid "" +"Mercurial supports a functional language for selecting a set of\n" +"revisions." +msgstr "Mercurial stöder flera sött att ange individuella revisioner." + +msgid "" +"The language supports a number of predicates which are joined by infix\n" +"operators. Parenthesis can be used for grouping." +msgstr "" + +msgid "" +"Identifiers such as branch names must be quoted with single or double\n" +"quotes if they contain characters outside of\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" +"predicates. Special characters can be used in quoted identifiers by\n" +"escaping them, e.g., ``\\n`` is interpreted as a newline." +msgstr "" + +msgid "There is a single prefix operator:" +msgstr "" + +msgid "" +"``not x``\n" +" Changesets not in x. Short form is ``! x``." +msgstr "" + +msgid "These are the supported infix operators:" +msgstr "" + +msgid "" +"``x::y``\n" +" 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)``." +msgstr "" + +msgid " An alternative syntax is ``x..y``." +msgstr "" + +msgid "" +"``x:y``\n" +" All changesets with revision numbers between x and y, both\n" +" inclusive. Either endpoint can be left out, they default to 0 and\n" +" tip." +msgstr "" + +msgid "" +"``x and y``\n" +" The intersection of changesets in x and y. Short form is ``x & y``." +msgstr "" + +msgid "" +"``x or y``\n" +" The union of changesets in x and y. There are two alternative short\n" +" forms: ``x | y`` and ``x + y``." +msgstr "" + +msgid "" +"``x - y``\n" +" Changesets in x but not in y." +msgstr "" + +msgid "The following predicates are supported:" +msgstr "" + +msgid "" +"``adds(pattern)``\n" +" Changesets that add a file matching pattern." +msgstr "" + +msgid "" +"``all()``\n" +" All changesets, the same as ``0:tip``." +msgstr "" + +msgid "" +"``ancestor(single, single)``\n" +" Greatest common ancestor of the two changesets." +msgstr "" + +msgid "" +"``ancestors(set)``\n" +" Changesets that are ancestors of a changeset in set." +msgstr "" + +msgid "" +"``author(string)``\n" +" Alias for ``user(string)``." +msgstr "" + +msgid "" +"``branch(set)``\n" +" The branch names are found for changesets in set, and the result is\n" +" all changesets belonging to one those branches." +msgstr "" + +msgid "" +"``children(set)``\n" +" Child changesets of changesets in set." +msgstr "" + +msgid "" +"``closed()``\n" +" Changeset is closed." +msgstr "" + +msgid "" +"``contains(pattern)``\n" +" Revision contains pattern." +msgstr "" + +msgid "" +"``date(interval)``\n" +" Changesets within the interval, see :hg:`help dates`." +msgstr "" + +msgid "" +"``descendants(set)``\n" +" Changesets which are decendants of changesets in set." +msgstr "" + +msgid "" +"``file(pattern)``\n" +" Changesets which manually affected files matching pattern." +msgstr "" + +msgid "" +"``follow()``\n" +" An alias for ``::.`` (ancestors of the working copy's first parent)." +msgstr "" + +msgid "" +"``grep(regex)``\n" +" Like ``keyword(string)`` but accepts a regex." +msgstr "" + +msgid "" +"``head()``\n" +" Changeset is a head." +msgstr "" + +msgid "" +"``heads(set)``\n" +" Members of set with no children in set." +msgstr "" + +msgid "" +"``keyword(string)``\n" +" Search commit message, user name, and names of changed files for\n" +" string." +msgstr "" + +msgid "" +"``limit(set, n)``\n" +" First n members of set." +msgstr "" + +msgid "" +"``max(set)``\n" +" Changeset with highest revision number in set." +msgstr "" + +msgid "" +"``merge()``\n" +" Changeset is a merge changeset." +msgstr "" + +msgid "" +"``modifies(pattern)``\n" +" Changesets which modify files matching pattern." +msgstr "" + +msgid "" +"``outgoing([path])``\n" +" Changesets missing in path." +msgstr "" + +msgid "" +"``p1(set)``\n" +" First parent of changesets in set." +msgstr "" + +msgid "" +"``p2(set)``\n" +" Second parent of changesets in set." +msgstr "" + +msgid "" +"``parents(set)``\n" +" The set of all parents for all changesets in set." +msgstr "" + +msgid "" +"``removes(pattern)``\n" +" Changesets which remove files matching pattern." +msgstr "" + +msgid "" +"``reverse(set)``\n" +" Reverse order of set." +msgstr "" + +msgid "" +"``roots(set)``\n" +" Changesets with no parent changeset in set." +msgstr "" + +msgid "" +"``sort(set[, [-]key...])``\n" +" Sort set by keys. The default sort order is ascending, specify a key\n" +" as ``-key`` to sort in descending order." +msgstr "" + +msgid " The keys can be:" +msgstr "" + +msgid "" +" - ``rev`` for the revision number,\n" +" - ``branch`` for the branch name,\n" +" - ``desc`` for the commit message (description),\n" +" - ``user`` for user name (``author`` can be used as an alias),\n" +" - ``date`` for the commit date" +msgstr "" + +msgid "" +"``tagged()``\n" +" Changeset is tagged." +msgstr "" + +msgid "" +"``user(string)``\n" +" User name is string." +msgstr "" + +msgid "Command line equivalents for :hg:`log`::" +msgstr "" + +msgid "" +" -f -> ::.\n" +" -d x -> date(x)\n" +" -k x -> keyword(x)\n" +" -m -> merge()\n" +" -u x -> user(x)\n" +" -b x -> branch(x)\n" +" -P x -> !::x\n" +" -l x -> limit(expr, x)" +msgstr "" + +msgid "Some sample queries::" +msgstr "" + +msgid "" +" hg log -r 'branch(default)'\n" +" hg log -r 'branch(default) and 1.5:: and not merge()'\n" +" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" +" hg log -r 'sort(date(\"May 2008\"), user)'\n" +" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgstr "" + +msgid "" "Mercurial allows you to customize output of commands through\n" "templates. You can either pass in a template from the command\n" "line, via the --template option, or select an existing\n" @@ -9947,8 +11191,9 @@ msgstr "" msgid "" -"Three styles are packaged with Mercurial: default (the style used\n" -"when no explicit preference is passed), compact and changelog.\n" +"Four styles are packaged with Mercurial: default (the style used\n" +"when no explicit preference is passed), compact, changelog,\n" +"and xml.\n" "Usage::" msgstr "" @@ -10183,14 +11428,14 @@ msgid "" "Paths in the local filesystem can either point to Mercurial\n" -"repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -"incoming --bundle')." +"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" +"incoming --bundle`)." msgstr "" msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" -"changeset to use from the remote repository. See also 'hg help\n" -"revisions'." +"changeset to use from the remote repository. See also :hg:`help\n" +"revisions`." msgstr "" msgid "" @@ -10243,7 +11488,7 @@ msgid "" "You can then use the alias for any command that uses a URL (for\n" -"example 'hg pull alias1' will be treated as 'hg pull URL1')." +"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)." msgstr "" msgid "" @@ -10265,9 +11510,16 @@ " prefer it over 'default' if both are defined.\n" msgstr "" +msgid "remote branch lookup not supported" +msgstr "" + msgid "dirstate branch not accessible" msgstr "dirstate-grenen inte åtkomlig" +#, python-format +msgid "unknown branch '%s'" +msgstr "okänd gren '%s'" + msgid "can only share local repositories" msgstr "kan bara dela lokala arkiv" @@ -10289,8 +11541,12 @@ msgid "destination '%s' is not empty" 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 "" +"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 "kloning från fjärr till fjärr stödjs inte" @@ -10300,13 +11556,18 @@ msgstr "uppdaterar till grenen %s\n" #, python-format -msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" -msgstr "%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer olösta\n" +msgid "" +"%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgstr "" +"%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer " +"olösta\n" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "" -msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " +"abandon\n" msgstr "" msgid "(branch merge, don't forget to commit)\n" @@ -10473,6 +11734,10 @@ msgid "%r cannot be used in a tag name" msgstr "" +#, python-format +msgid "warning: tag %s conflicts with existing branch name\n" +msgstr "" + msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "" @@ -10550,89 +11815,15 @@ msgid "trouble committing %s!\n" msgstr "" -#, python-format -msgid "%s does not exist!\n" -msgstr "" - -#, python-format -msgid "" -"%s: up to %d MB of RAM may be required to manage this file\n" -"(use 'hg revert %s' to cancel the pending addition)\n" -msgstr "" -"%s: upp till %d MB RAM kan behövas för att hantera denna fil\n" -"(använd 'hg revert %s' för att ångra den väntande additionen)\n" - -#, python-format -msgid "%s not added: only files and symlinks supported currently\n" -msgstr "" - -#, python-format -msgid "%s already tracked!\n" -msgstr "" - -#, python-format -msgid "%s not added!\n" -msgstr "" - -#, python-format -msgid "%s still exists!\n" -msgstr "" - -#, python-format -msgid "%s not tracked!\n" -msgstr "" - -#, python-format -msgid "%s not removed!\n" -msgstr "" - -#, python-format -msgid "copy failed: %s is not a file or a symbolic link\n" -msgstr "" - -msgid "searching for changes\n" -msgstr "söker efter ändringar\n" - -msgid "queries" -msgstr "frågor" - -msgid "already have changeset " -msgstr "har redan ändringen " - -msgid "warning: repository is unrelated\n" -msgstr "varning: arkivet är obesälktat\n" - -msgid "repository is unrelated" -msgstr "arkivet är obesläktat" - msgid "requesting all changes\n" msgstr "efterfrågar alla ändringar\n" -msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." -msgstr "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer changegroupsubset." - -#, python-format -msgid "abort: push creates new remote heads on branch '%s'!\n" -msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" - -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" - -#, python-format -msgid "abort: push creates new remote branches: %s!\n" -msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" - -msgid "(use 'hg push -f' to force)\n" -msgstr "använd 'hg push -f' för att tvinga)\n" - -msgid "note: unsynced remote changes!\n" -msgstr "notera: osynkade fjärrändringar!\n" +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." +msgstr "" +"Deldragningar kan inte göras eftersom det andra arkivet inte stödjer " +"changegroupsubset." #, python-format msgid "%d changesets found\n" @@ -10675,9 +11866,6 @@ msgid "received file revlog group is empty" msgstr "mottagen revlog-grupp för filer är tom" -msgid "files" -msgstr "filer" - #, python-format msgid "missing file data for %s:%s - run hg verify" msgstr "fildata för %s:%s saknas - kör hg verify" @@ -10762,7 +11950,9 @@ msgstr "" #, python-format -msgid "untracked file in working directory differs from file in requested revision: '%s'" +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" msgstr "" #, python-format @@ -10828,7 +12018,7 @@ msgid "branch %s not found" msgstr "" -msgid "can't merge with ancestor" +msgid "merging with a working directory ancestor has no effect" msgstr "" msgid "nothing to merge (use 'hg update' or check 'hg heads')" @@ -10837,7 +12027,9 @@ msgid "outstanding uncommitted changes (use 'hg status' to list changes)" msgstr "" -msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)" +msgid "" +"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " +"changes)" msgstr "" msgid "crosses branches (use 'hg merge' or use 'hg update -c')" @@ -10899,7 +12091,7 @@ msgstr "" #, python-format -msgid "unable to strip away %d dirs from %s" +msgid "unable to strip away %d of %d dirs from %s" msgstr "" msgid "undefined source and destination files" @@ -10943,7 +12135,7 @@ msgstr "" #, python-format -msgid "saving bundle to %s\n" +msgid "saved backup bundle to %s\n" msgstr "" msgid "adding branch\n" @@ -10999,6 +12191,114 @@ msgid "consistency error adding group" msgstr "" +msgid "unterminated string" +msgstr "" + +msgid "syntax error" +msgstr "" + +msgid "missing argument" +msgstr "" + +msgid "can't negate that" +msgstr "" + +#, python-format +msgid "can't use %s here" +msgstr "" + +msgid "can't use a list in this context" +msgstr "" + +#, python-format +msgid "not a function: %s" +msgstr "" + +msgid "limit wants two arguments" +msgstr "" + +msgid "limit wants a number" +msgstr "" + +msgid "limit expects a number" +msgstr "" + +msgid "ancestor wants two arguments" +msgstr "" + +msgid "ancestor arguments must be single revisions" +msgstr "" + +msgid "follow takes no arguments" +msgstr "" + +msgid "date wants a string" +msgstr "" + +msgid "keyword wants a string" +msgstr "" + +msgid "grep wants a string" +msgstr "" + +msgid "author wants a string" +msgstr "" + +msgid "file wants a pattern" +msgstr "" + +msgid "contains wants a pattern" +msgstr "" + +msgid "modifies wants a pattern" +msgstr "" + +msgid "adds wants a pattern" +msgstr "" + +msgid "removes wants a pattern" +msgstr "" + +msgid "merge takes no arguments" +msgstr "" + +msgid "closed takes no arguments" +msgstr "" + +msgid "head takes no arguments" +msgstr "" + +msgid "sort wants one or two arguments" +msgstr "" + +msgid "sort spec must be a string" +msgstr "" + +#, python-format +msgid "unknown sort key %r" +msgstr "" + +msgid "all takes no arguments" +msgstr "" + +msgid "outgoing wants a repository path" +msgstr "" + +msgid "tagged takes no arguments" +msgstr "" + +msgid "not a symbol" +msgstr "inte en symbol" + +msgid "empty query" +msgstr "" + +msgid "searching for exact renames" +msgstr "" + +msgid "searching for similar files" +msgstr "söker efter liknande filer" + #, python-format msgid "%s looks like a binary file." msgstr "" @@ -11081,8 +12381,8 @@ msgstr "drar subarkivet %s från %s\n" #, python-format -msgid "pushing subrepo %s\n" -msgstr "" +msgid "pushing subrepo %s to %s\n" +msgstr "trycker subarkivet %s från %s\n" msgid "cannot commit svn externals" msgstr "" @@ -11139,7 +12439,7 @@ #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" -msgstr "" +msgstr "Litar inte på filen %s från opålitlig användare %s, grupp %s\n" #, python-format msgid "Ignored: %s\n"
--- a/mercurial/cmdutil.py Wed Jun 30 17:23:16 2010 +0200 +++ b/mercurial/cmdutil.py Fri Jul 02 11:41:43 2010 +0200 @@ -708,15 +708,15 @@ if self.footer: self.ui.write(self.footer) - def show(self, ctx, copies=None, **props): + def show(self, ctx, copies=None, matchfn=None, **props): if self.buffered: self.ui.pushbuffer() - self._show(ctx, copies, props) + self._show(ctx, copies, matchfn, props) self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) else: - self._show(ctx, copies, props) + self._show(ctx, copies, matchfn, props) - def _show(self, ctx, copies, props): + def _show(self, ctx, copies, matchfn, props): '''show a single changeset or file revision''' changenode = ctx.node() rev = ctx.rev() @@ -796,15 +796,17 @@ label='log.summary') self.ui.write("\n") - self.showpatch(changenode) + self.showpatch(changenode, matchfn) - def showpatch(self, node): - if self.patch: + def showpatch(self, node, matchfn): + if not matchfn: + matchfn = self.patch + if matchfn: stat = self.diffopts.get('stat') diffopts = patch.diffopts(self.ui, self.diffopts) prev = self.repo.changelog.parents(node)[0] diffordiffstat(self.ui, self.repo, diffopts, prev, node, - match=self.patch, stat=stat) + match=matchfn, stat=stat) self.ui.write("\n") def _meaningful_parentrevs(self, log, rev): @@ -857,7 +859,7 @@ return [] return parents - def _show(self, ctx, copies, props): + def _show(self, ctx, copies, matchfn, props): '''show a single changeset or file revision''' showlist = templatekw.showlist @@ -912,7 +914,7 @@ # write changeset metadata, then patch if requested key = types['changeset'] self.ui.write(templater.stringify(self.t(key, **props))) - self.showpatch(ctx.node()) + self.showpatch(ctx.node(), matchfn) if types['footer']: if not self.footer: @@ -925,7 +927,7 @@ except SyntaxError, inst: raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) -def show_changeset(ui, repo, opts, buffered=False, matchfn=False): +def show_changeset(ui, repo, opts, buffered=False): """show one changeset using template or regular display. Display format will be the first non-empty hit of: @@ -939,7 +941,7 @@ # options patch = False if opts.get('patch') or opts.get('stat'): - patch = matchfn or matchall(repo) + patch = matchall(repo) tmpl = opts.get('template') style = None
--- a/mercurial/commands.py Wed Jun 30 17:23:16 2010 +0200 +++ b/mercurial/commands.py Fri Jul 02 11:41:43 2010 +0200 @@ -2484,7 +2484,7 @@ branches = opts.get('branch', []) + opts.get('only_branch', []) opts['branch'] = [repo.lookupbranch(b) for b in branches] - displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) + displayer = cmdutil.show_changeset(ui, repo, opts, True) def prep(ctx, fns): rev = ctx.rev() parents = [p for p in repo.changelog.parentrevs(rev) @@ -2517,7 +2517,11 @@ if rename: copies.append((fn, rename[0])) - displayer.show(ctx, copies=copies) + revmatchfn = None + if opts.get('patch') or opts.get('stat'): + revmatchfn = cmdutil.match(repo, fns) + + displayer.show(ctx, copies=copies, matchfn=revmatchfn) for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): if count == limit:
--- a/mercurial/localrepo.py Wed Jun 30 17:23:16 2010 +0200 +++ b/mercurial/localrepo.py Fri Jul 02 11:41:43 2010 +0200 @@ -826,8 +826,12 @@ removedsubs.discard(s) if match(s) and wctx.sub(s).dirty(): subs.append(s) - if (subs or removedsubs) and '.hgsubstate' not in changes[0]: - changes[0].insert(0, '.hgsubstate') + if (subs or removedsubs): + if (not match('.hgsub') and + '.hgsub' in (wctx.modified() + wctx.added())): + raise util.Abort(_("can't commit subrepos without .hgsub")) + if '.hgsubstate' not in changes[0]: + changes[0].insert(0, '.hgsubstate') # make sure all explicit patterns are matched if not force and match.files():
--- a/mercurial/merge.py Wed Jun 30 17:23:16 2010 +0200 +++ b/mercurial/merge.py Fri Jul 02 11:41:43 2010 +0200 @@ -167,7 +167,7 @@ m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() copied = set(copy.values()) - if not overwrite and '.hgsubstate' in m1: + if '.hgsubstate' in m1: # check whether sub state is modified for s in p1.substate: if p1.sub(s).dirty():
--- a/mercurial/subrepo.py Wed Jun 30 17:23:16 2010 +0200 +++ b/mercurial/subrepo.py Fri Jul 02 11:41:43 2010 +0200 @@ -67,11 +67,13 @@ repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) for s, l in s1.items(): + a = sa.get(s, nullstate) ld = l # local state with possible dirty flag for compares - if wctx != actx and wctx.sub(s).dirty(): + if wctx.sub(s).dirty(): ld = (l[0], l[1] + "+") + if wctx == actx: # overwrite + a = ld - a = sa.get(s, nullstate) if s in s2: r = s2[s] if ld == r or r == a: # no change or local is newer
--- a/tests/test-subrepo Wed Jun 30 17:23:16 2010 +0200 +++ b/tests/test-subrepo Fri Jul 02 11:41:43 2010 +0200 @@ -15,10 +15,20 @@ hg add .hgsub hg init s echo a > s/a + +# issue2232 - committing a subrepo without .hgsub +hg ci -mbad s + hg -R s ci -Ams0 hg sum hg ci -m1 +# issue 2022 - update -C +echo b > s/a +hg sum +hg co -C 1 +hg sum + echo % add sub sub echo ss = ss > s/.hgsub hg init s/ss
--- a/tests/test-subrepo.out Wed Jun 30 17:23:16 2010 +0200 +++ b/tests/test-subrepo.out Fri Jul 02 11:41:43 2010 +0200 @@ -1,6 +1,7 @@ % first revision, no sub adding a % add first sub +abort: can't commit subrepos without .hgsub adding a parent: 0:f7b1eb17ad24 tip 0 @@ -8,6 +9,17 @@ commit: 1 added, 1 subrepos update: (current) committing subrepository s +parent: 1:7cf8cfea66e4 tip + 1 +branch: default +commit: 1 subrepos +update: (current) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +parent: 1:7cf8cfea66e4 tip + 1 +branch: default +commit: (clean) +update: (current) % add sub sub parent: 1:7cf8cfea66e4 tip 1