# HG changeset patch # User Matt Mackall # Date 1245789789 18000 # Node ID 288ba6d6c5c76716e827a69a80938885adf8c7ba # Parent e9ef409e63992b047964619fb585731b9c48f5ad# Parent 5f6e1d5a2fbe16888740c0dc8dd309a599b118ee Merge with i18n diff -r e9ef409e6399 -r 288ba6d6c5c7 hgext/interhg.py --- a/hgext/interhg.py Fri Apr 17 16:34:43 2009 -0700 +++ b/hgext/interhg.py Tue Jun 23 15:43:09 2009 -0500 @@ -18,9 +18,9 @@ be used in your hgrc: [interhg] - issues = s!issue(\d+)!issue\1<\/a>! - bugzilla = s!((?:bug|b=|(?=#?\d{4,}))(?:\s*#?)(\d+))!\1!i - boldify = s/(^|\s)#(\d+)\b/ #\2<\/b>/ + issues = s!issue(\\d+)!issue\\1! + bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!\\1!i + boldify = s!(^|\\s)#(\\d+)\\b! #\\2! ''' import re diff -r e9ef409e6399 -r 288ba6d6c5c7 i18n/da.po --- a/i18n/da.po Fri Apr 17 16:34:43 2009 -0700 +++ b/i18n/da.po Tue Jun 23 15:43:09 2009 -0500 @@ -17,9 +17,9 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-31 19:37+0200\n" -"PO-Revision-Date: 2009-05-31 19:47+0200\n" -"Last-Translator: \n" +"POT-Creation-Date: 2009-06-21 19:16+0200\n" +"PO-Revision-Date: 2009-06-21 19:26+0200\n" +"Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,6 +48,49 @@ " aliaser %s:\n" "\n" +msgid "" +"provide simple hooks for access control\n" +"\n" +"Authorization is against local user name on system where hook is run, not\n" +"committer of original changeset (since that is easy to spoof).\n" +"\n" +"The acl hook is best to use if you use hgsh to set up restricted shells for\n" +"authenticated users to only push to / pull from. It's not safe if user has\n" +"interactive shell access, because they can disable the hook. It's also not\n" +"safe if remote users share one local account, because then there's no way " +"to\n" +"tell remote users apart.\n" +"\n" +"To use, configure the acl extension in hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.acl =\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.acl = python:hgext.acl.hook\n" +"\n" +" [acl]\n" +" sources = serve # check if source of incoming changes in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", " +"\"bundle\")\n" +"\n" +"Allow and deny lists have a subtree pattern (default syntax is glob) on the\n" +"left and user names on right. The deny list is checked before the allow " +"list.\n" +"\n" +" [acl.allow]\n" +" # if acl.allow not present, all users allowed by default\n" +" # empty acl.allow = no users allowed\n" +" docs/** = doc_writer\n" +" .hgtags = release_engineer\n" +"\n" +" [acl.deny]\n" +" # if acl.deny not present, no users denied by default\n" +" # empty acl.deny = all users allowed\n" +" glob pattern = user4, user5\n" +" ** = user6\n" +msgstr "" + #, python-format msgid "acl: %s not enabled\n" msgstr "acl: %s er ikke slået til\n" @@ -82,7 +125,7 @@ msgstr "acl: tillader ændring %s\n" msgid "" -"mercurial bookmarks\n" +"Mercurial bookmarks\n" "\n" "Mercurial bookmarks are local moveable pointers to changesets. Every\n" "bookmark points to a changeset identified by its hash. If you commit a\n" @@ -99,42 +142,42 @@ "track.current = True\n" "\n" "This will cause bookmarks to track the bookmark that you are currently\n" -"on, and just updates it. This is similar to git's approach of\n" +"on, and just updates it. This is similar to git's approach to\n" "branching.\n" msgstr "" msgid "" -"mercurial bookmarks\n" +"Mercurial bookmarks\n" "\n" " Bookmarks are pointers to certain commits that move when\n" " commiting. 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 update to a given bookmark.\n" -"\n" -" You can use 'hg bookmark NAME' to set a bookmark on the current\n" -" tip with the given name. If you specify a revision using -r REV\n" -" (where REV may be an existing bookmark), the bookmark is set to\n" -" that revision.\n" +" 'hg update' to merge and update respectively to a given bookmark.\n" +"\n" +" 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" " " msgstr "" msgid "a bookmark of this name does not exist" -msgstr "" +msgstr "et bogmærke med dette navn findes ikke" msgid "a bookmark of the same name already exists" -msgstr "" +msgstr "et bogmærke med samme navn findes allerede" msgid "new bookmark name required" -msgstr "" +msgstr "nyt bogmærkenavn påkrævet" msgid "bookmark name required" -msgstr "" +msgstr "bogmærkenavn påkrævet" msgid "bookmark name cannot contain newlines" msgstr "bogmærkenavn kan ikke indeholde linieskift" msgid "a bookmark cannot have the name of an existing branch" -msgstr "" +msgstr "et bogmærke kan ikke hedde det samme som en eksisterende gren" msgid "force" msgstr "" @@ -143,10 +186,10 @@ msgstr "" msgid "delete a given bookmark" -msgstr "" +msgstr "slet et givent bogmærke" msgid "rename a given bookmark" -msgstr "" +msgstr "omdøb et givet bogmærke" msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" msgstr "" @@ -297,7 +340,7 @@ #, python-format msgid "bugzilla notify command %s" -msgstr "" +msgstr "bugzilla notificeringskommando %s" msgid "done\n" msgstr "færdig\n" @@ -308,15 +351,15 @@ #, python-format msgid "cannot find bugzilla user id for %s" -msgstr "" +msgstr "kan ikke finde bugzilla bruger-id for %s" #, python-format msgid "cannot find bugzilla user id for %s or %s" -msgstr "" +msgstr "kan ikke finde bugzilla bruger-id for %s eller %s" #, python-format msgid "bugzilla version %s not supported" -msgstr "" +msgstr "bugzilla version %s ikke understøttet" msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" @@ -326,7 +369,7 @@ #, python-format msgid "python mysql support not available: %s" -msgstr "" +msgstr "python mysql-understøttelse ikke tilgængelig: %s" #, python-format msgid "hook type %s does not pass a changeset id" @@ -334,6 +377,9 @@ #, python-format msgid "database error: %s" +msgstr "databasefejl: %s" + +msgid "provides children command to show children changesets" msgstr "" msgid "" @@ -346,40 +392,44 @@ " argument to --rev if given) is printed.\n" " " msgstr "" -"vis børnene til arbejdskatalogets eller en given revision\n" -"\n" -" Udskriv arbejdskatalogets børnerevisioner. Hvis en revision\n" -" angivet med -r/--rev, så udskrives børnene til denne revision.\n" +"vis børnene til arbejdskataloget eller en given revision\n" +"\n" +" Udskriv arbejdskatalogets børnerevisioner. Hvis en revision er\n" +" angivet med -r/--rev, udskrives børnene til denne revision.\n" " Hvis en fil er angivet, udskrives revisionen i hvilken filen sidst\n" " blev ændret (efter arbejdskatalogets revision eller argumentet til\n" " --rev, hvis givet).\n" " " msgid "show children of the specified revision" -msgstr "" +msgstr "vis børn af den givne revision" msgid "hg children [-r REV] [FILE]" msgstr "" msgid "command to show certain statistics about revision history" -msgstr "" +msgstr "kommando til at vise statestikker om revisionshistorikken" #, python-format msgid "Revision %d is a merge, ignoring...\n" -msgstr "" +msgstr "Revision %d er en sammenføjning; ignorerer...\n" #, python-format msgid "generating stats: %d%%" msgstr "genererer statistik: %d%%" msgid "" -"graph count of revisions grouped by template\n" -"\n" -" Will graph count of changed lines or revisions grouped by template\n" -" or alternatively by date, if dateformat is used. In this case it\n" -" will override template.\n" -"\n" -" By default statistics are counted for number of changed lines.\n" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" "\n" " Examples:\n" "\n" @@ -395,22 +445,26 @@ " # display count of lines changed in every year\n" " hg churn -f '%Y' -s\n" "\n" -" The map file format used to specify aliases is fairly simple:\n" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format:\n" "\n" " \n" "\n" -" By default .hgchurn in the working directory root will be used, if\n" -" it exists. Use the --aliases option to override this.\n" +" Such a file may be specified with the --aliases option, otherwise a\n" +" .hgchurn file will be looked for in the working directory root.\n" " " msgstr "" -"plot antallet af revisioner grupperet efter et mønster\n" -"\n" -" Plotter antallet af ændrede linier eller antallet af revisioner\n" -" grupperet efter et mønster eller alternativt efter dato, hvis\n" -" dateformat bruges. I så tilfælde bruges mønstret ikke.\n" -"\n" -" Som udgangspunkt laves der statistik over antallet af ændrede\n" -" linier.\n" +"histogram over ændringer i depotet\n" +"\n" +" Denne kommando vil vise et histogram som repræsenterer antallet af\n" +" ændrede linier eller revisioner, grupperet efter en given\n" +" skabelon. Standardskabelonen vil gruppere ændringer efter\n" +" forfatter. Med --dateformat tilvalget kan resultaterne i stedet\n" +" grupperes efter dato.\n" +"\n" +" Statistikken er basseret på antallet af ændrede linier eller\n" +" alternativt på antallet af matchende revisioner, hvis --changesets\n" +" tilvalget er specificeret.\n" "\n" " Eksempler:\n" "\n" @@ -426,12 +480,13 @@ " # viser antallet af linier ændret hvert år\n" " hg churn -f '%Y' -s\n" "\n" -" Formatet for map-filen er rimelig simpelt:\n" +" Det er muligt at afbilde alternative e-mail-adresser til\n" +" hoved-adresser ved at bruge en fil med følgende format:\n" "\n" " \n" "\n" -" Som standard bruges .hgchurn i arbejdskatalogets rod, hvis denne\n" -" findes. Brug --aliases tilvalget for at ændre dette.\n" +" En sådan fil kan angivet med --aliases tilvalget. Som standard\n" +" bruges .hgchurn i arbejdskatalogets rod, hvis denne findes.\n" " " #, python-format @@ -445,7 +500,7 @@ msgstr "lav statistik for revisioner som matcher dato specifikationen" msgid "template to group changesets" -msgstr "mønster for gruppering af ændringer" +msgstr "skabelon for gruppering af ændringer" msgid "strftime-compatible format for grouping by date" msgstr "strftime-kompatibelt format til gruppering efter dato" @@ -454,7 +509,7 @@ msgstr "lav statistik efter antallet af ændringer" msgid "sort by key (default: sort by count)" -msgstr "sortér efter nøgle (standard: sortering efter antal)" +msgstr "sorter efter nøgle (standard: sorter efter antal)" msgid "file with email aliases" msgstr "fil med email-aliaser" @@ -479,11 +534,7 @@ "function (aka ANSI escape codes). This module also provides the\n" "render_text function, which can be used to add effects to any text.\n" "\n" -"To enable this extension, add this to your .hgrc file:\n" -"[extensions]\n" -"color =\n" -"\n" -"Default effects my be overridden from the .hgrc file:\n" +"Default effects may be overridden from the .hgrc file:\n" "\n" "[color]\n" "status.modified = blue bold underline red_background\n" @@ -547,6 +598,18 @@ " basename of the source with '-hg' appended. If the destination\n" " repository doesn't exist, it will be created.\n" "\n" +" By default, all sources except Mercurial will use\n" +" --branchsort. Mercurial uses --sourcesort to preserve original\n" +" revision numbers order. Sort modes have the following effects:\n" +" --branchsort: convert from parent to child revision when\n" +" possible, which means branches are usually converted one after\n" +" the other. It generates more compact repositories.\n" +" --datesort: sort revisions by date. Converted repositories have\n" +" good-looking changelogs but are often an order of magnitude\n" +" larger than the same ones generated by --branchsort.\n" +" --sourcesort: try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" +"\n" " If isn't given, it will be put in a default location\n" " (/.hg/shamap by default). The is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" @@ -739,46 +802,52 @@ msgstr "" msgid "username mapping filename" -msgstr "" +msgstr "brugernavnsafbildningsfilnavn" msgid "destination repository type" msgstr "type for destinations repository" msgid "remap file names using contents of file" -msgstr "" +msgstr "konverter filnavne ved brug af filindhold" msgid "import up to target revision REV" -msgstr "" +msgstr "importer op til revision REV" msgid "source repository type" -msgstr "" +msgstr "kildedepotstype" msgid "splice synthesized history into place" msgstr "" msgid "change branch names while converting" -msgstr "" +msgstr "omdøb grene under konverteringen" + +msgid "try to sort changesets by branches" +msgstr "forsøg at sortere ændringer efter gren" msgid "try to sort changesets by date" -msgstr "" +msgstr "forsøg at sortere ændringer efter dato" + +msgid "preserve source changesets order" +msgstr "bevar kildeændringerne ordning" msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" msgstr "" msgid "only return changes on specified branches" -msgstr "" +msgstr "returner kun ændringer på givne grene" msgid "prefix to remove from file names" -msgstr "" +msgstr "præfix der skal fjernes fra filnavne" msgid "only return changes after or between specified tags" -msgstr "" +msgstr "returner kun ændringer efter eller mellem givne mærkater" msgid "update cvs log cache" -msgstr "" +msgstr "opdater cvs log cache" msgid "create new cvs log cache" -msgstr "" +msgstr "opret ny cvs log cache" msgid "set commit time fuzz in seconds" msgstr "" @@ -787,7 +856,7 @@ msgstr "" msgid "show parent changesets" -msgstr "vis forældre-ændring" +msgstr "vis forældre-ændringer" msgid "show current changeset in ancestor branches" msgstr "" @@ -855,6 +924,10 @@ msgstr "%s: ukendt arkivtype" #, python-format +msgid "unknown sort mode: %s" +msgstr "ukendt sortering: %s" + +#, python-format msgid "cycle detected between %s and %s" msgstr "" @@ -898,6 +971,12 @@ msgid "assuming destination %s\n" msgstr "" +msgid "more than one sort mode specified" +msgstr "" + +msgid "--sourcesort is not supported by this data source" +msgstr "" + msgid "" "warning: support for external cvsps is deprecated and will be removed in " "Mercurial 1.4\n" @@ -962,10 +1041,10 @@ msgstr "" msgid "expected revision number" -msgstr "" +msgstr "forventede et revisionsnummer" msgid "revision must be followed by date line" -msgstr "" +msgstr "revision skal efterfølges af datolinje" #, python-format msgid "found synthetic revision in %s: %r\n" @@ -983,7 +1062,7 @@ msgstr "opretter ændringer\n" msgid "synthetic changeset cannot have multiple parents" -msgstr "" +msgstr "syntetisk ændring kan ikke have flere forældre" #, python-format msgid "" @@ -1003,10 +1082,10 @@ msgstr "rydder op %s\n" msgid "internal calling inconsistency" -msgstr "" +msgstr "intern kaldeinkonsistens" msgid "errors in filemap" -msgstr "" +msgstr "fejl i filafbildning" #, python-format msgid "%s:%d: %r already in %s list\n" @@ -1024,7 +1103,7 @@ msgstr "" msgid "cannot find a GNU Arch tool" -msgstr "" +msgstr "kan ikke finde GNU Arch" #, python-format msgid "analyzing tree version %s...\n" @@ -1252,6 +1331,7 @@ msgstr "" msgid "" +"allow external programs to compare revisions\n" "\n" "The `extdiff' Mercurial extension allows you to use external programs\n" "to compare revisions, or revision with working directory. The external diff\n" @@ -1259,11 +1339,6 @@ "non-option arguments: paths to directories containing snapshots of\n" "files to compare.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.extdiff =\n" -"\n" "The `extdiff' extension also allows to configure new diff commands, so\n" "you do not need to type \"hg extdiff -p kdiff3\" always.\n" "\n" @@ -1295,7 +1370,7 @@ #, python-format msgid "making snapshot of %d files from rev %s\n" -msgstr "" +msgstr "laver øjebliksbillede af %d filer fra rev %s\n" #, python-format msgid "making snapshot of %d files from working directory\n" @@ -1335,10 +1410,10 @@ msgstr "" msgid "comparison program to run" -msgstr "" +msgstr "sammenligningsprogram der skal køres" msgid "pass option to comparison program" -msgstr "" +msgstr "videregiv argument til sammenligningsprogram" msgid "change made by revision" msgstr "" @@ -1436,6 +1511,9 @@ msgid "hg fetch [SOURCE]" msgstr "" +msgid "GnuPG signing extension for Mercurial" +msgstr "" + msgid "error while verifying signature" msgstr "" @@ -1551,7 +1629,7 @@ msgstr "" msgid "limit number of changes displayed" -msgstr "" +msgstr "begræns antaln viste ændringer" msgid "show patch" msgstr "" @@ -1620,22 +1698,10 @@ "distributed with Mercurial.)\n" "\n" "hgk consists of two parts: a Tcl script that does the displaying and\n" -"querying of information, and an extension to mercurial named hgk.py,\n" +"querying of information, and an extension to Mercurial named hgk.py,\n" "which provides hooks for hgk to get information. hgk can be found in\n" -"the contrib directory, and hgk.py can be found in the hgext directory.\n" -"\n" -"To load the hgext.py extension, add it to your .hgrc file (you have to\n" -"use your global $HOME/.hgrc file, not one in a repository). You can\n" -"specify an absolute path:\n" -"\n" -" [extensions]\n" -" hgk=/usr/local/lib/hgk.py\n" -"\n" -"Mercurial can also scan the default python library path for a file\n" -"named 'hgk.py' if you set hgk empty:\n" -"\n" -" [extensions]\n" -" hgk=\n" +"the contrib directory, and the extension is shipped in the hgext\n" +"repository, and needs to be enabled.\n" "\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" @@ -1741,11 +1807,6 @@ "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" "\n" -"To enable the extension add this to hgrc:\n" -"\n" -"[extensions]\n" -"hgext.highlight =\n" -"\n" "There is a single configuration option:\n" "\n" "[web]\n" @@ -1773,16 +1834,16 @@ msgstr "" msgid "run server in background" -msgstr "" +msgstr "kører serveren i baggrunden" msgid "used internally by daemon mode" -msgstr "" +msgstr "brugt internt i daemon mode" msgid "minutes to sit idle before exiting" msgstr "" msgid "name of file to write process ID to" -msgstr "" +msgstr "navn på fil at skrive process ID til" msgid "hg inserve [OPT]..." msgstr "" @@ -1808,6 +1869,9 @@ msgid "failed to contact inotify server: %s\n" msgstr "" +msgid "received empty answer from inotify server" +msgstr "" + #, python-format msgid "(inotify: received response from incompatible server version %d)\n" msgstr "" @@ -1927,11 +1991,21 @@ msgid "finished setup\n" msgstr "" -msgid "polling: no timeout\n" -msgstr "" - -#, python-format -msgid "polling: %sms timeout\n" +msgid "" +"expand expressions into changelog and summaries\n" +"\n" +"This extension allows the use of a special syntax in summaries,\n" +"which will be automatically expanded into links or any other\n" +"arbitrary expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may\n" +"be used in your hgrc:\n" +"\n" +" [interhg]\n" +" issues = s!issue(\\d+)!issue\\1!\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!\\1!" +"i\n" +" boldify = s!(^|\\s)#(\\d+)\\b! #\\2!\n" msgstr "" #, python-format @@ -1943,7 +2017,7 @@ msgstr "" msgid "" -"keyword expansion in local repositories\n" +"keyword expansion in tracked files\n" "\n" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" "tracked text files selected by your configuration.\n" @@ -2009,7 +2083,7 @@ "print [keywordmaps] configuration and an expansion example\n" "\n" " Show current, custom, or default keyword template maps and their\n" -" expansion.\n" +" expansions.\n" "\n" " Extend current configuration by specifying maps as arguments and\n" " optionally by reading from an additional hgrc file.\n" @@ -2044,7 +2118,7 @@ msgstr "" msgid "" -"expand keywords in working directory\n" +"expand keywords in the working directory\n" "\n" " Run after (re)enabling keyword expansion.\n" "\n" @@ -2062,7 +2136,7 @@ msgstr "" msgid "" -"revert expanded keywords in working directory\n" +"revert expanded keywords in the working directory\n" "\n" " Run before changing/disabling active keywords or if you experience\n" " problems with \"hg import\" or \"hg merge\".\n" @@ -2232,8 +2306,8 @@ msgstr "anvender %s\n" #, python-format -msgid "Unable to read %s\n" -msgstr "" +msgid "unable to read %s\n" +msgstr "kan ikke læse %s\n" #, python-format msgid "imported patch %s\n" @@ -2265,6 +2339,10 @@ msgid "cannot delete revision %d above applied patches" msgstr "kan ikke slette revision %d ovenover anvendte rettelser" +#, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "" + msgid "qdelete requires at least one revision or patch name" msgstr "" @@ -2483,7 +2561,7 @@ " -r/--rev parameter. At least one patch or revision is required.\n" "\n" " With --rev, mq will stop managing the named revisions (converting\n" -" them to regular mercurial changesets). The qfinish command should\n" +" them to regular Mercurial changesets). The qfinish command should\n" " be used as an alternative for qdelete -r, as the latter option is\n" " deprecated.\n" "\n" @@ -2548,7 +2626,7 @@ " Source patch repository is looked for in /.hg/patches by\n" " default. Use -p to change.\n" "\n" -" The patch directory must be a nested mercurial repository, as\n" +" The patch directory must be a nested Mercurial repository, as\n" " would be created by qinit -c.\n" " " msgstr "" @@ -2894,7 +2972,7 @@ msgstr "" msgid "use pull protocol to copy metadata" -msgstr "" +msgstr "brug træk-protokol til at kopiere metadata" msgid "do not update the new working directories" msgstr "" @@ -2953,8 +3031,8 @@ msgid "import file in patch directory" msgstr "" -msgid "patch file name" -msgstr "patch navn" +msgid "name of patch file" +msgstr "navn på rettelsesfil" msgid "overwrite existing files" msgstr "" @@ -3294,11 +3372,6 @@ "with a diffstat summary and the changeset summary, so you can be sure\n" "you are sending the right changes.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.patchbomb =\n" -"\n" "To configure other defaults, add a section like this to your hgrc\n" "file:\n" "\n" @@ -3439,10 +3512,10 @@ msgstr "" msgid "send patches as attachments" -msgstr "" +msgstr "send lapper som vedhæftede filer" msgid "send patches as inline attachments" -msgstr "" +msgstr "send lapper som integreret tekst" msgid "email addresses of blind carbon copy recipients" msgstr "" @@ -3451,7 +3524,7 @@ msgstr "" msgid "add diffstat output to messages" -msgstr "" +msgstr "tilføj diffstat resultat til beskeder" msgid "use the given date as the sending date" msgstr "" @@ -3486,7 +3559,7 @@ msgid "send changes not in target as a binary bundle" msgstr "" -msgid "file name of the bundle attachment" +msgid "name of the bundle attachment file" msgstr "" msgid "a revision to send" @@ -3504,6 +3577,9 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "" +msgid "enable removing untracked files only" +msgstr "" + msgid "" "removes files not tracked by Mercurial\n" "\n" @@ -3551,7 +3627,7 @@ msgid "purge ignored files too" msgstr "" -msgid "print the file names instead of deleting them" +msgid "print filenames instead of deleting them" msgstr "" msgid "end filenames with NUL, for use with xargs (implies -p/--print)" @@ -3740,14 +3816,14 @@ msgstr "" msgid "this modifies a binary file (all or nothing)\n" -msgstr "" +msgstr "dette ændrer en binær fil (alt eller intet)\n" msgid "this is a binary file\n" -msgstr "" +msgstr "dette er en binær fil\n" #, python-format msgid "%d hunks, %d lines changed\n" -msgstr "" +msgstr "%d stumper, %d linjer ændret\n" msgid "[Ynsfdaq?]" msgstr "" @@ -3801,14 +3877,14 @@ msgstr "" msgid "user quit" -msgstr "" +msgstr "user quit" #, python-format msgid "examine changes to %s?" msgstr "" msgid " and " -msgstr "" +msgstr " og " #, python-format msgid "record this change to %r?" @@ -3855,17 +3931,17 @@ #, python-format msgid "backup %r as %r\n" -msgstr "" +msgstr "sikkerhedskopier %r som %r\n" msgid "applying patch\n" -msgstr "" +msgstr "tilføjer lap\n" msgid "patch failed to apply" -msgstr "" +msgstr "lap kunne ikke tilføjes" #, python-format msgid "restoring %r to %r\n" -msgstr "" +msgstr "gendanner %r som %r\n" msgid "hg record [OPTION]... [FILE]..." msgstr "" @@ -3873,6 +3949,26 @@ msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" +msgid "provides the hg share command" +msgstr "" + +msgid "" +"create a new shared repository (experimental)\n" +"\n" +" Initialize a new repository and working directory that shares its\n" +" history with another repository.\n" +"\n" +" NOTE: actions that change history such as rollback or moving the\n" +" source may confuse sharers.\n" +" " +msgstr "" + +msgid "do not create a working copy" +msgstr "opret ikke en arbejdskopi" + +msgid "[-U] SOURCE [DEST]" +msgstr "" + msgid "" "patch transplanting tool\n" "\n" @@ -4044,13 +4140,8 @@ " * You should set same encoding for the repository by locale or\n" " HGENCODING.\n" "\n" -"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" -"\n" -" [extensions]\n" -" hgext.win32mbcs =\n" -"\n" "Path encoding conversion are done between Unicode and\n" -"encoding.encoding which is decided by mercurial from current locale\n" +"encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" "\n" msgstr "" @@ -4066,6 +4157,36 @@ msgid "[win32mbcs] activated with encoding: %s\n" msgstr "" +msgid "" +"LF <-> CRLF/CR translation utilities\n" +"\n" +"To perform automatic newline conversion, use:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = cleverencode:\n" +"# or ** = macencode:\n" +"\n" +"[decode]\n" +"** = cleverdecode:\n" +"# or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident:\n" +"\n" +"[hooks]\n" +"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"To do the same check on a server to prevent CRLF/CR from being\n" +"pushed or pulled:\n" +"\n" +"[hooks]\n" +"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" +msgstr "" + #, python-format msgid "" "WARNING: %s already has %s line endings\n" @@ -4102,18 +4223,12 @@ msgstr "" msgid "" -"zeroconf support for mercurial repositories\n" +"zeroconf support for Mercurial repositories\n" "\n" "Zeroconf enabled repositories will be announced in a network without\n" "the need to configure a server or a service. They can be discovered\n" "without knowing their actual IP address.\n" "\n" -"To use the zeroconf extension add the following entry to your hgrc\n" -"file:\n" -"\n" -"[extensions]\n" -"hgext.zeroconf =\n" -"\n" "To allow other people to discover your repository using run \"hg serve\"\n" "in your repository.\n" "\n" @@ -4189,7 +4304,7 @@ msgstr "der er specificeret for mange revisioner" #, python-format -msgid "invalid format spec '%%%s' in output file name" +msgid "invalid format spec '%%%s' in output filename" msgstr "" #, python-format @@ -4341,23 +4456,7 @@ msgid "%s:%s copy source revision cannot be found!\n" msgstr "" -msgid "can only follow copies/renames for explicit file names" -msgstr "" - -#, python-format -msgid "file %s not found!" -msgstr "filen %s blev ikke fundet!" - -#, python-format -msgid "no match under directory %s!" -msgstr "" - -#, python-format -msgid "can't commit %s: unsupported file type!" -msgstr "" - -#, python-format -msgid "file %s not tracked!" +msgid "can only follow copies/renames for explicit filenames" msgstr "" msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." @@ -4445,33 +4544,35 @@ msgstr "" msgid "" -"show changeset information per file line\n" +"show changeset information by line for each file\n" "\n" " List changes in files, showing the revision id responsible for\n" " each line\n" "\n" -" This command is useful to discover who did a change or when a\n" -" change took place.\n" +" This command is useful for discovering when a change was made and\n" +" by whom.\n" "\n" " Without the -a/--text option, annotate will avoid processing files\n" -" it detects as binary. With -a, annotate will generate an\n" -" annotation anyway, probably with undesirable results.\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" " " msgstr "" -"vis information om ændringer pr linie\n" +"vis information om ændringer pr linie for hver fil\n" "\n" " Vis ændringer i filer ved at vise revisions ID'et som er\n" " ansvarligt for hver linie\n" "\n" -" Denne kommando er nyttig til at opdage hvem der lavede en ændring\n" -" og hvornår en ændring blev foretaget.\n" +" Denne kommando er nyttig til at opdage hvornår en ændring blev\n" +" foretaget og af hvem.\n" "\n" " Uden -a/--text tilvalget vil annotate undgå at behandle filer som\n" " den detekterer som binære. Med -a vil annotate generere en\n" -" annotering alligevel, sandsynligvis med et uønsket resultat.\n" +" annotering alligevel, selvom resultatet sandsynligvis vil være\n" +" hverken brugbart eller ønskværdigt.\n" " " -msgid "at least one file name or pattern required" +msgid "at least one filename or pattern is required" msgstr "" msgid "at least one of -n/-c is required for -l" @@ -4482,7 +4583,7 @@ msgstr "" msgid "" -"create unversioned archive of a repository revision\n" +"create an unversioned archive of a repository revision\n" "\n" " By default, the revision used is the parent of the working\n" " directory; use -r/--rev to specify a different revision.\n" @@ -4522,9 +4623,9 @@ " Commit the backed out changes as a new changeset. The new\n" " changeset is a child of the backed out changeset.\n" "\n" -" If you back out a changeset other than the tip, a new head is\n" +" If you backout a changeset other than the tip, a new head is\n" " created. This head will be the new tip and you should merge this\n" -" backout changeset with another head (current one by default).\n" +" backout changeset with another head.\n" "\n" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" @@ -4559,14 +4660,14 @@ msgid "please specify a revision to backout" msgstr "" -msgid "cannot back out change on a different branch" -msgstr "kan ikke bakke en ændring på en anden gren ud" - -msgid "cannot back out a change with no parents" -msgstr "kan ikke bakke en ændring ud uden forældre" - -msgid "cannot back out a merge changeset without --parent" -msgstr "" +msgid "cannot backout change on a different branch" +msgstr "kan ikke omgøre en ændring på en anden gren" + +msgid "cannot backout a change with no parents" +msgstr "kan ikke omgøre en ændring uden forældre" + +msgid "cannot backout a merge changeset without --parent" +msgstr "kan ikke omgøre en sammenføjning uden --parent" #, python-format msgid "%s is not a parent of %s" @@ -4601,18 +4702,18 @@ " bad, then mark the latest changeset which is free from the problem\n" " as good. Bisect will update your working directory to a revision\n" " for testing (unless the -U/--noupdate option is specified). Once\n" -" you have performed tests, mark the working directory as bad or\n" -" good and bisect will either update to another candidate changeset\n" +" you have performed tests, mark the working directory as good or\n" +" bad, and bisect will either update to another candidate changeset\n" " or announce that it has found the bad revision.\n" "\n" " As a shortcut, you can also use the revision argument to mark a\n" " revision as good or bad without checking it out first.\n" "\n" -" If you supply a command it will be used for automatic bisection.\n" -" Its exit status will be used as flag to mark revision as bad or\n" -" good. In case exit status is 0 the revision is marked as good, 125\n" -" - skipped, 127 (command not found) - bisection will be aborted;\n" -" any other status bigger than 0 will mark revision as bad.\n" +" If you supply a command, it will be used for automatic bisection.\n" +" 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" " " msgstr "" @@ -4641,6 +4742,10 @@ msgstr "" #, python-format +msgid "cannot find executable: %s" +msgstr "kan ikke finde program: %s" + +#, python-format msgid "failed to execute %s" msgstr "" @@ -4649,8 +4754,8 @@ msgstr "%s dræbt" #, python-format -msgid "Changeset %s: %s\n" -msgstr "Ændring: %s: %s\n" +msgid "Changeset %d:%s: %s\n" +msgstr "Ændring %d:%s: %s\n" #, python-format msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" @@ -4660,12 +4765,13 @@ "set or show the current branch name\n" "\n" " With no argument, show the current branch name. With one argument,\n" -" set the working directory branch name (the branch does not exist\n" -" in the repository until the next commit). It is recommended to use\n" -" the 'default' branch as your primary development branch.\n" +" set the working directory branch name (the branch will not exist\n" +" in the repository until the next commit). Standard practice\n" +" recommends that primary development take place on the 'default'\n" +" branch.\n" "\n" " Unless -f/--force is specified, branch will not let you set a\n" -" branch name that shadows an existing branch.\n" +" branch name that already exists, even if it's inactive.\n" "\n" " Use -C/--clean to reset the working directory branch to that of\n" " the parent of the working directory, negating a previous branch\n" @@ -4769,8 +4875,7 @@ "\n" " It is possible to specify an ssh:// URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Look at the help text for URLs for important details about ssh://\n" -" URLs.\n" +" Please see 'hg help urls' for important details about ssh:// URLs.\n" "\n" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" @@ -4817,7 +4922,7 @@ "\n" " Det er muligt at specificere en ssh:// URL som destination, men\n" " der vil ikke bliver oprettet nogen .hg/hgrc fil eller noget\n" -" arbejdskatalog på den anden side. Se hjælpeteksten for URLer for\n" +" arbejdskatalog på den anden side. Se venligst 'hg help urls' for\n" " vigtige detaljer om ssh:// URLer.\n" "\n" " Af effektivitetsgrunde bruges hårde lænker ved kloning når kilden\n" @@ -4846,13 +4951,13 @@ "\n" " 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 means to actively distribute your changes.\n" +" for a way to actively distribute your changes.\n" "\n" " If a list of files is omitted, all changes reported by \"hg status\"\n" " will be committed.\n" "\n" " If you are committing the result of a merge, do not provide any\n" -" file names or -I/-X filters.\n" +" filenames or -I/-X filters.\n" "\n" " If no commit message is specified, the configured editor is\n" " started to prompt you for a message.\n" @@ -4893,7 +4998,7 @@ " the source must be a single file.\n" "\n" " By default, this command copies the contents of files as they\n" -" stand in the working directory. If invoked with -A/--after, the\n" +" exist in the working directory. If invoked with -A/--after, the\n" " operation is recorded, but no copying is performed.\n" "\n" " This command takes effect with the next commit. To undo a copy\n" @@ -4905,7 +5010,7 @@ msgstr "" msgid "There is no Mercurial repository here (.hg not found)" -msgstr "Der er ikke noget Mercurial arkiv her (fandt ikke .hg)" +msgstr "Der er intet Mercurial depot her (.hg ikke fundet)" msgid "either two or three arguments required" msgstr "kræver enten to eller tre argumenter" @@ -4949,8 +5054,8 @@ " With multiple arguments, print names and values of all config\n" " items with matching section names.\n" "\n" -" With the --debug flag, the source (filename and line number) is\n" -" printed for each config item.\n" +" With --debug, the source (filename and line number) is printed\n" +" for each config item.\n" " " msgstr "" @@ -4985,7 +5090,7 @@ msgid "dump the contents of an index file" msgstr "" -msgid "dump an index DAG as a .dot file" +msgid "dump an index DAG as a graphviz dot file" msgstr "" msgid "test Mercurial installation" @@ -5153,7 +5258,7 @@ " diff anyway, probably with undesirable results.\n" "\n" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. Read the diffs help topic for more information.\n" +" format. See 'hg help diffs' for more information.\n" "\n" " With the --switch-parent option, the diff will be against the\n" " second parent. It can be useful to review a merge.\n" @@ -5188,7 +5293,7 @@ " annotering alligevel, sandsynligvis med et uønsket resultat.\n" "\n" " Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" -" git diff-format. For mere information, læs hg help diffs.\n" +" git diff-format. Se 'hg help diffs' for mere information.\n" "\n" " Med --switch-parent tilvalget vil ændringerne blive beregnet i\n" " forhold til den anden forælder. Dette kan være nyttigt til at\n" @@ -5231,21 +5336,30 @@ "\n" " With no arguments, show all repository head changesets.\n" "\n" -" If branch or revisions names are given this will show the heads of\n" -" the specified branches or the branches those revisions are tagged\n" -" with.\n" -"\n" " Repository \"heads\" are changesets that don't have child\n" " changesets. They are where development generally takes place and\n" " are the usual targets for update and merge operations.\n" "\n" -" Branch heads are changesets that have a given branch tag, but have\n" -" no child changesets with that tag. They are usually where\n" -" development on the given branch takes place.\n" +" If one or more REV is given, the \"branch heads\" will be shown for\n" +" the named branch associated with that revision. The name of the\n" +" branch is called the revision's branch tag.\n" +"\n" +" Branch heads are revisions on a given named branch that do not have\n" +" any children on the same branch. A branch head could be a true head\n" +" or it could be the last changeset on a branch before a new branch\n" +" was created. If none of the branch heads are true heads, the branch\n" +" is considered inactive.\n" +"\n" +" If STARTREV is specified only those heads (or branch heads) that\n" +" are descendants of STARTREV will be displayed.\n" " " msgstr "" #, python-format +msgid "no open branch heads on branch %s\n" +msgstr "ingen åbne gren-hoveder på gren %s\n" + +#, python-format msgid "no changes on branch %s containing %s are reachable from %s\n" msgstr "" @@ -5256,14 +5370,14 @@ msgid "" "show help for a given topic or a help overview\n" "\n" -" With no arguments, print a list of commands and short help.\n" +" With no arguments, print a list of commands with short help messages.\n" "\n" " Given a topic, extension, or command name, print help for that\n" " topic." msgstr "" msgid "global options:" -msgstr "" +msgstr "globale indstillinger:" msgid "use \"hg help\" for the full list of commands" msgstr "brug \"hg help\" for den fulde liste af kommandoer" @@ -5294,7 +5408,7 @@ "aliases: %s\n" msgstr "" "\n" -"aliaser %s:\n" +"aliasser: %s\n" msgid "(no help text available)" msgstr "(ingen hjælpetekst tilgængelig)" @@ -5305,25 +5419,15 @@ msgid "no commands defined\n" msgstr "ingen kommandoer defineret\n" -msgid "" -"\n" -"enabled extensions:\n" -"\n" -msgstr "" -"\n" -"aktiverede udvidelser:\n" -"\n" - -#, python-format -msgid " %s %s\n" -msgstr "" +msgid "enabled extensions:" +msgstr "aktiverede udvidelser:" msgid "no help text available" msgstr "ingen hjælpetekst tilgængelig" #, python-format msgid "%s extension - %s\n" -msgstr "" +msgstr "%s udvidelse - %s\n" msgid "Mercurial Distributed SCM\n" msgstr "Mercurial Distribueret SCM\n" @@ -5350,7 +5454,8 @@ " With no revision, print a summary of the current state of the\n" " repository.\n" "\n" -" With a path, do a lookup in another repository.\n" +" Specifying a path to a repository root or Mercurial bundle will\n" +" cause lookup to operate on that repository/bundle.\n" "\n" " This summary identifies the repository state using one or two\n" " parent hash identifiers, followed by a \"+\" if there are\n" @@ -5368,8 +5473,8 @@ " will abort unless given the -f/--force flag.\n" "\n" " You can import a patch straight from a mail message. Even patches\n" -" as attachments work (body part must be type text/plain or\n" -" text/x-patch to be used). From and Subject headers of email\n" +" as attachments work (to use the body part, it must have type\n" +" text/plain or text/x-patch). From and Subject headers of email\n" " message are used as default committer and commit message. All\n" " text/plain body parts before first diff are added to commit\n" " message.\n" @@ -5388,8 +5493,8 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use patch name \"-\". See 'hg\n" -" help dates' for a list of formats valid for -d/--date.\n" +" To read a patch from standard input, use \"-\" as the patch name.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -5407,8 +5512,8 @@ "meddelse:\n" "%s\n" -msgid "not a mercurial patch" -msgstr "" +msgid "not a Mercurial patch" +msgstr "ikke en Mercurial patch" msgid "patch is damaged or loses information" msgstr "" @@ -5417,8 +5522,8 @@ "show new changesets found in source\n" "\n" " Show new changesets found in the specified path/URL or the default\n" -" pull location. These are the changesets that would be pulled if a\n" -" pull was requested.\n" +" pull location. These are the changesets that would have been pulled\n" +" if a pull at the time you issued this command.\n" "\n" " For remote repository, using --bundle avoids downloading the\n" " changesets twice if the incoming is followed by a pull.\n" @@ -5431,7 +5536,7 @@ "create a new repository in the given directory\n" "\n" " Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it is created.\n" +" directory does not exist, it will be created.\n" "\n" " If no directory is given, the current directory is used.\n" "\n" @@ -5454,20 +5559,20 @@ msgid "" "locate files matching specific patterns\n" "\n" -" Print all files under Mercurial control whose names match the\n" -" given patterns.\n" -"\n" -" This command searches the entire repository by default. To search\n" -" just the current directory and its subdirectories, use\n" -" \"--include .\".\n" -"\n" -" If no patterns are given to match, this command prints all file\n" -" names.\n" +" Print files under Mercurial control in the working directory whose\n" +" names match the given patterns.\n" +"\n" +" By default, this command searches all directories in the working\n" +" directory. To search just the current directory and its\n" +" subdirectories, use \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints the names\n" +" of all files under Mercurial control in the working directory.\n" "\n" " 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 white space as multiple filenames.\n" +" contain whitespace as multiple filenames.\n" " " msgstr "" @@ -5478,8 +5583,8 @@ " project.\n" "\n" " File history is shown without following rename or copy history of\n" -" files. Use -f/--follow with a file name to follow history across\n" -" renames and copies. --follow without a file name will only show\n" +" files. Use -f/--follow with a filename to follow history across\n" +" renames and copies. --follow without a filename will only show\n" " ancestors or descendants of the starting revision. --follow-first\n" " only follows the first parent of merge revisions.\n" "\n" @@ -5489,16 +5594,15 @@ "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" "\n" -" By default this command outputs: changeset id and hash, tags,\n" -" non-trivial parents, user, date and time, and a summary for each\n" -" commit. When the -v/--verbose switch is used, the list of changed\n" -" files and full commit message is shown.\n" +" 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.\n" "\n" " 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, the files: list will only reflect files\n" -" that are different from BOTH parents.\n" -"\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:.\n" " " msgstr "" @@ -5507,40 +5611,39 @@ "\n" " Print a list of version controlled files for the given revision.\n" " If no revision is given, the first parent of the working directory\n" -" is used, or the null revision if none is checked out.\n" -"\n" -" With -v flag, print file permissions, symlink and executable bits.\n" -" With --debug flag, print file revision hashes.\n" +" is used, or the null revision if no revision is checked out.\n" +"\n" +" With -v, print file permissions, symlink and executable bits.\n" +" With --debug, print file revision hashes.\n" " " msgstr "" msgid "" "merge working directory with another revision\n" "\n" -" The contents of the current working directory is updated with all\n" -" changes made in the requested revision since the last common\n" -" predecessor revision.\n" +" The current working directory is updated with all changes made in\n" +" the requested revision since the last common predecessor revision.\n" "\n" " Files that changed between either parent are marked as changed for\n" " the next commit and a commit must be performed before any further\n" -" updates are allowed. The next commit has two parents.\n" +" updates to the repository are allowed. The next commit will have\n" +" two parents.\n" "\n" " 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 to merge with must be provided.\n" +" explicit revision with which to merge with must be provided.\n" " " msgstr "" "sammenføj arbejdskataloget med en anden revision\n" "\n" -" Indholdet af det nuværende arbejdskatalog opdateres med alle\n" -" ændringer lavet i den ønskede revision siden den sidste fælles\n" -" foregående revision.\n" +" Det nuværende arbejdskatalog opdateres med alle ændringer lavet i\n" +" den ønskede revision siden den sidste fælles foregående revision.\n" "\n" " Filer som ændrede sig i forhold til en af forældrene bliver\n" -" markeret som ændret med hensyn til næste arkivering, og\n" -" arkiveringen skal laves før yderligere opdateringer er tilladt.\n" -" Den næste arkiverede ændring får to forældre.\n" +" markeret som ændret med hensyn til næste arkivering, og en\n" +" arkivering skal laves før yderligere opdateringer er tilladt. Den\n" +" næste arkiverede ændring får to forældre.\n" "\n" " Hvis ingen revision angives og arbejdskatalogets forælder er en\n" " hovedrevision og den nuværende gren indeholder præcis et andet\n" @@ -5584,9 +5687,9 @@ "\n" " Print the working directory's parent revisions. If a revision is\n" " given via -r/--rev, the parent of that revision will be printed.\n" -" If a file argument is given, revision in which the file was last\n" -" changed (before the working directory revision or the argument to\n" -" --rev if given) is 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" " " msgstr "" "vis forældrene til arbejdskataloget eller en revision\n" @@ -5598,7 +5701,7 @@ " --rev, hvis givet).\n" " " -msgid "can only specify an explicit file name" +msgid "can only specify an explicit filename" msgstr "" #, python-format @@ -5609,7 +5712,7 @@ "show aliases for remote repositories\n" "\n" " Show definition of symbolic path name NAME. If no name is given,\n" -" show definition of available names.\n" +" show definition of all available names.\n" "\n" " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" @@ -5633,14 +5736,17 @@ msgid "" "pull changes from the specified source\n" "\n" -" Pull changes from a remote repository to the local one.\n" +" Pull changes from a remote repository to a local one.\n" "\n" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository. By default, this\n" -" does not update the copy of the project in the working directory.\n" -"\n" -" Use hg incoming if you want to see what will be added by the next\n" -" pull without actually adding the changes to the repository.\n" +" or URL and adds them to a local repository (the current one unless\n" +" -R is specified). By default, this does not update the copy of the\n" +" project in the working directory.\n" +"\n" +" 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.\n" "\n" " If SOURCE is omitted, the 'default' path will be used.\n" " See 'hg help urls' for more information.\n" @@ -5648,15 +5754,17 @@ msgstr "" "hent ændringer fra den angivne kilde\n" "\n" -" Hiver ændringer fra et fjert arkiv til det lokale.\n" +" Hiver ændringer fra et fjert arkiv til et lokalt.\n" "\n" " Dette finder alle ændringer fra arkivet på den specificerede sti\n" -" eller URL og tilføjer dem til det lokale arkiv. Som standard\n" -" opdateres arbejdskataloget ikke.\n" -"\n" -" Brug hg incoming hvis du vil se hvad der vil blive tilføjet til\n" -" arkivet ved næste pull, men uden rent faktisk at tilføje\n" -" ændringerne til arkivet.\n" +" eller URL og tilføjer dem til et lokalt arkiv (det nuværende arkiv\n" +" med mindre -R er angivet). Som standard opdateres arbejdskataloget\n" +" ikke.\n" +"\n" +" Brug hg incoming for at se hvad der ville være blevet tilføjet på\n" +" det tidspunkt du udførte kommandoen. Hvis du derefter beslutter at\n" +" tilføje disse ændringer til arkivet, så bør du bruge pull -r X\n" +" hvor X er den sidste ændring nævnt af hg incoming.\n" "\n" " Hvis KILDE udelades, så bruges 'default' stien.\n" " Se 'hg help urls' for mere information.\n" @@ -5674,14 +5782,13 @@ "\n" " 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" -" the client has forgotten to pull and merge before pushing.\n" +" user forgot to pull and merge before pushing.\n" "\n" " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Look at the help text for URLs for important details about ssh://\n" +" Please see 'hg help urls' for important details about ssh://\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" -" See 'hg help urls' for more information.\n" " " msgstr "" "skub ændringer til den angivne destination\n" @@ -5695,15 +5802,14 @@ "\n" " Som standard vil push nægte af køre hvis den detekterer at den vil\n" " øge antallet af hoveder i destinationen. Dette indikerer normalt\n" -" at klienten har glemt at henge og sammenføje ændringerne før\n" +" at brugeren har glemt at hente og sammenføje ændringerne før\n" " skubningen.\n" "\n" " Hvis -r/--rev bruges, så vil den navngivne revision og alle dets\n" " forfædre bliver skubbet til det andet arkiv.\n" "\n" -" Se hjælpeteksten for URL'er for vigtige detaljer om ssh:// URL'er.\n" +" Se venligst 'hg help urls' for vigtige detaljer om ssh:// URL'er.\n" " Hvis DESTINATION udelades vil en standard sti blive brugt.\n" -" Se 'hg help urls' for mere information.\n" " " #, python-format @@ -5730,13 +5836,13 @@ " entire project history. -A/--after can be used to remove only\n" " files that have already been deleted, -f/--force can be used to\n" " force deletion, and -Af can be used to remove files from the next\n" -" revision without deleting them.\n" +" revision without deleting them from the working directory.\n" "\n" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" -" states are Added, Clean, Modified and Missing (as reported by hg\n" -" status). The actions are Warn, Remove (from branch) and Delete\n" -" (from disk).\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!]\n" +" (as reported by hg status). The actions are Warn, Remove (from\n" +" branch) and Delete (from disk).\n" "\n" " A C M !\n" " none W RD W R\n" @@ -5756,13 +5862,13 @@ " projektets historie. -A/--after kan bruges til kun at fjerne filer\n" " som allerede er slettet, -f/--force kan bruges for at gennemtvinge\n" " en sletning, og -Af kan bruges til at fjerne filer fra næste\n" -" revision uden at slette dem.\n" +" revision uden at slette dem fra arbejdskataloget.\n" "\n" " Den følgende tabel viser opførslen af remove for forskellige\n" -" tilstande af filer (søjler) og kombinationer af tilvalg (rækker).\n" -" Filtilstandene er Added, Clean, Modified og Missing (som\n" -" rapporteret af hg status). Handlingerne er Warn, Remove (fra gren)\n" -" og Delete (fra disk).\n" +" filtilstande (søjler) og kombinationer af tilvalg (rækker). Mulige\n" +" filtilstande er tilføjet [A], ren [C], ændret [M] og manglende [!]\n" +" (som rapporteret af hg status). Handlingerne er Warn, Remove (fra\n" +" gren) og Delete (fra disk).\n" "\n" " A C M !\n" " none W RD W R\n" @@ -5821,9 +5927,9 @@ " will be overwritten if the merge is retried with resolve. The\n" " -m/--mark switch should be used to mark the file as resolved.\n" "\n" -" This command will also allow listing resolved files and manually\n" -" marking and unmarking files as resolved. All files must be marked\n" -" as resolved before the new commits are permitted.\n" +" This command also allows listing resolved files and manually\n" +" indicating whether or not files are resolved. All files must be\n" +" marked as resolved before a commit is permitted.\n" "\n" " The codes used to show the status of files are:\n" " U = unresolved\n" @@ -5915,7 +6021,8 @@ " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" " restore the dirstate at the time of the last transaction, losing\n" -" any dirstate changes since that time.\n" +" any dirstate changes since that time. This command does not alter\n" +" the working directory.\n" "\n" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" @@ -5972,10 +6079,10 @@ "\n" " Show status of files in the repository. If names are given, only\n" " files that match are shown. Files that are clean or ignored or\n" -" source of a copy/move operation, are not listed unless -c/--clean,\n" -" -i/--ignored, -C/--copies or -A/--all is given. Unless options\n" -" described with \"show only ...\" are given, the options -mardu are\n" -" used.\n" +" the source of a copy/move operation, are not listed unless\n" +" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" +" Unless options described with \"show only ...\" are given, the\n" +" options -mardu are used.\n" "\n" " Option -q/--quiet hides untracked (unknown and ignored) files\n" " unless explicitly requested with -u/--unknown or -i/--ignored.\n" @@ -5986,7 +6093,8 @@ " to one merge parent.\n" "\n" " If one revision is given, it is used as the base revision.\n" -" If two revisions are given, the difference between them is shown.\n" +" If two revisions are given, the differences between them are\n" +" shown.\n" "\n" " The codes used to show the status of files are:\n" " M = modified\n" @@ -5996,7 +6104,7 @@ " ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = the previous added file was copied from here\n" +" = origin of the previous file listed as A (added)\n" " " msgstr "" "vis ændrede filer i arbejdskataloget\n" @@ -6029,7 +6137,7 @@ " ! = mangler (slettet af en ikke-hg kommando, men følges stadig)\n" " ? = følges ikke\n" " I = ignoreret\n" -" = den foregående fil blev kopieret herfra\n" +" = den foregående fil markeret som A (tilføjet) stammer herfra\n" " " msgid "" @@ -6078,7 +6186,7 @@ #, python-format msgid "Removed tag %s" -msgstr "" +msgstr "Mærke %s er fjernet" #, python-format msgid "tag '%s' already exists (use -f to force)" @@ -6104,9 +6212,9 @@ msgid "" "show the tip revision\n" "\n" -" The tip revision (usually just called the tip) is the most\n" -" recently added changeset in the repository, the most recently\n" -" changed head.\n" +" The tip revision (usually just called the tip) is the changeset\n" +" most recently added to the repository (and therefore the most\n" +" recently changed head).\n" "\n" " 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" @@ -6139,7 +6247,8 @@ "\n" " When there are uncommitted changes, use option -C/--clean to\n" " discard them, forcibly replacing the state of the working\n" -" directory with the requested revision.\n" +" directory with the requested revision. Alternately, use -c/--check\n" +" to abort.\n" "\n" " When there are uncommitted changes and option -C/--clean is not\n" " used, and the parent revision and requested revision are on the\n" @@ -6168,7 +6277,8 @@ "\n" " Hvis der er uarkiverede ændringer kan -C/--clean tilvalget bruges\n" " for at kassere dem og sætte tilstanden af arbejdskataloget lig\n" -" tilstanden i den ønskede revision.\n" +" tilstanden i den ønskede revision. Alternativt, brug -c/--check\n" +" for at afbryde.\n" "\n" " Hvis der er uarkiverede ændringer, og -C/--clean tilvalget ikke\n" " bruges, og forældrerevisionen og den ønskede revision begge er på\n" @@ -6183,6 +6293,9 @@ " Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" " " +msgid "uncommitted local changes" +msgstr "" + msgid "" "verify the integrity of the repository\n" "\n" @@ -6210,7 +6323,7 @@ msgstr "" msgid "repository root directory or symbolic path name" -msgstr "" +msgstr "depotrodfolder eller symbolsk stinavn" msgid "change working directory" msgstr "skift arbejdskatalog" @@ -6222,7 +6335,7 @@ msgstr "undertryk output" msgid "enable additional output" -msgstr "" +msgstr "aktiver yderlig output" msgid "set/override config option" msgstr "" @@ -6231,7 +6344,7 @@ msgstr "" msgid "start debugger" -msgstr "" +msgstr "start debugger" msgid "set the charset encoding" msgstr "" @@ -6252,7 +6365,7 @@ msgstr "" msgid "display help and exit" -msgstr "" +msgstr "vis hjælp og exit" msgid "do not perform actions, just print output" msgstr "udfør ingen handlinger, udskriv kun outputttet" @@ -6276,7 +6389,7 @@ msgstr "læs arkiveringsbeskeden fra " msgid "record datecode as commit date" -msgstr "" +msgstr "noter dato som integrationsdato" msgid "record the specified user as committer" msgstr "" @@ -6465,10 +6578,10 @@ msgstr "[KOMMANDO]" msgid "show the command options" -msgstr "" +msgstr "vis kommando-flag" msgid "[-o] CMD" -msgstr "" +msgstr "[-o] KOMMANDO" msgid "try extended date formats" msgstr "" @@ -6506,6 +6619,9 @@ msgid "[OPTION]..." msgstr "" +msgid "revision to check" +msgstr "revision som skal undersøges" + msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." msgstr "" @@ -6545,7 +6661,10 @@ msgid "show only the active heads from open branches" msgstr "" -msgid "[-r REV] [REV]..." +msgid "show normal and closed heads" +msgstr "vis normale og lukkede hoveder" + +msgid "[-r STARTREV] [REV]..." msgstr "" msgid "[TOPIC]" @@ -6734,10 +6853,10 @@ msgstr "" msgid "name of access log file to write to" -msgstr "" +msgstr "navn på adgangslogfilen der skrives til" msgid "name of error log file to write to" -msgstr "" +msgstr "navn på fejlllog fil der skrives til" msgid "port to listen on (default: 8000)" msgstr "" @@ -6746,7 +6865,7 @@ msgstr "" msgid "prefix path to serve from (default: server root)" -msgstr "" +msgstr "prefiks sti at udstille fra (default: server-rod)" msgid "name to show in web pages (default: working directory)" msgstr "" @@ -6755,19 +6874,19 @@ msgstr "" msgid "for remote clients" -msgstr "" +msgstr "for fjernklienter" msgid "web templates to use" -msgstr "" +msgstr "web-skabelon" msgid "template style to use" -msgstr "" +msgstr "skabelon-stil" msgid "use IPv6 in addition to IPv4" -msgstr "" +msgstr "brug IPv6 og IPv4" msgid "SSL certificate file" -msgstr "" +msgstr "SSL certifikatfil" msgid "show untrusted configuration options" msgstr "" @@ -6776,67 +6895,70 @@ msgstr "" msgid "show status of all files" -msgstr "" +msgstr "vis status på alle filer" msgid "show only modified files" -msgstr "" +msgstr "vis kun ændrede filer" msgid "show only added files" -msgstr "" +msgstr "vis kun tilføjede filer" msgid "show only removed files" -msgstr "" +msgstr "vis kun fjernede filer" msgid "show only deleted (but tracked) files" -msgstr "" +msgstr "vis kun slettede (men kendte) filer" msgid "show only files without changes" -msgstr "" +msgstr "vis kun filer unden ændringer" msgid "show only unknown (not tracked) files" -msgstr "" +msgstr "vis kun ukendte filer" msgid "show only ignored files" -msgstr "" +msgstr "vis kun ignorerede filer" msgid "hide status prefix" -msgstr "" +msgstr "skjul statuspræfix" msgid "show source of copied files" -msgstr "" +msgstr "vis kilder for kopierede filer" msgid "show difference from revision" -msgstr "" +msgstr "vis forskelle fra revision" msgid "replace existing tag" -msgstr "" +msgstr "erstat eksisterende mærkat" msgid "make the tag local" -msgstr "" +msgstr "gør mærkaten lokal" msgid "revision to tag" -msgstr "" +msgstr "revision der skal mærkes" msgid "remove a tag" -msgstr "" +msgstr "fjern en mærkat" msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." msgstr "" msgid "[-p]" -msgstr "" +msgstr "[-p]" msgid "update to new tip if changesets were unbundled" -msgstr "" +msgstr "opdater til ny spids hvis ændringer blev pakket ud" msgid "[-u] FILE..." -msgstr "" +msgstr "[-u] FIL..." msgid "overwrite locally modified files (no backup)" +msgstr "overskrev lokalt modificerede filer (uden sikkerhedskopi)" + +msgid "check for uncommitted changes" msgstr "" msgid "[-C] [-d DATE] [[-r] REV]" -msgstr "" +msgstr "[-C] [-d DATO] [[-r] REV]" #, python-format msgid "config error at %s:%d: '%s'" @@ -6846,7 +6968,7 @@ msgstr "blev ikke fundet i manifest" msgid "branch name not in UTF-8!" -msgstr "" +msgstr "grennavn er ikke i UTF-8!" #, python-format msgid " searching for copies back to rev %d\n" @@ -6879,15 +7001,15 @@ msgstr "" msgid "working directory state appears damaged!" -msgstr "" +msgstr "arbejdskatalogtilstand virker beskadiget!" #, python-format msgid "'\\n' and '\\r' disallowed in filenames: %r" -msgstr "" +msgstr "'\\n' og '\\r' må ikke forekomme i filnavne: %r" #, python-format msgid "directory %r already in dirstate" -msgstr "" +msgstr "katalog %r er allerede i dirstate" #, python-format msgid "file %r in dirstate clashes with %r" @@ -6895,7 +7017,7 @@ #, python-format msgid "not in dirstate: %s\n" -msgstr "" +msgstr "ikke i dirstate: %s\n" msgid "unknown" msgstr "ukendt" @@ -6916,7 +7038,7 @@ msgstr "" #, python-format -msgid "%s: unsupported file type (type is %s)\n" +msgid "unsupported file type (type is %s)" msgstr "" #, python-format @@ -6941,7 +7063,7 @@ #, python-format msgid "lock held by %s" -msgstr "" +msgstr "lås holdt af %s" #, python-format msgid "abort: %s: %s\n" @@ -6985,10 +7107,10 @@ #, python-format msgid "abort: error: %s\n" -msgstr "" +msgstr "afbrudt: fejl: %s\n" msgid "broken pipe\n" -msgstr "" +msgstr "afbrudt pipe\n" msgid "interrupted!\n" msgstr "standset!\n" @@ -6997,6 +7119,8 @@ "\n" "broken pipe\n" msgstr "" +"\n" +"afbrudt pipe\n" msgid "abort: out of memory\n" msgstr "afbrudt: løbet tør for hukommelse\n" @@ -7016,23 +7140,23 @@ #, python-format msgid "** Extensions loaded: %s\n" -msgstr "" +msgstr "** Udvidelser indlæst: %s\n" #, python-format msgid "no definition for alias '%s'\n" -msgstr "" +msgstr "ingen definition for alias '%s'\n" #, python-format msgid "alias '%s' resolves to unknown command '%s'\n" -msgstr "" +msgstr "alias '%s' oversætter til ukendt kommando '%s'\n" #, python-format msgid "alias '%s' resolves to ambiguous command '%s'\n" -msgstr "" +msgstr "alias '%s' oversætter til tvetydig kommando '%s'\n" #, python-format msgid "alias '%s' shadows command\n" -msgstr "" +msgstr "alias '%s' skygger for en kommando\n" #, python-format msgid "malformed --config option: %s" @@ -7040,20 +7164,20 @@ #, python-format msgid "extension '%s' overrides commands: %s\n" -msgstr "" +msgstr "udvidelse '%s' overskriver kommandoer: %s\n" msgid "Option --config may not be abbreviated!" -msgstr "tilvalget --config må ikke forkortes!" +msgstr "Tilvalget --config må ikke forkortes!" msgid "Option --cwd may not be abbreviated!" -msgstr "tilvalget --cwd må ikke forkortes!" - -msgid "" -"Option -R has to be separated from other options (i.e. not -qR) and --" +msgstr "Tilvalget --cwd må ikke forkortes!" + +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" msgstr "" -"tilvalget -R skal adskilles fra andre tilvalg (i.e. ikke -qR) og --" -"repository må kun forkortes som --repo!" +"Tilvalget -R skal adskilles fra andre tilvalg (fx ikke -qR) og --repository " +"må kun forkortes som --repo!" #, python-format msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" @@ -7064,7 +7188,7 @@ msgstr "arkiv '%s' er ikke lokalt" msgid "invalid arguments" -msgstr "ugyldige argumenter" +msgstr "ugyldige parametre" #, python-format msgid "unrecognized profiling format '%s' - Ignored\n" @@ -7118,7 +7242,7 @@ msgstr "" msgid "l" -msgstr "" +msgstr "l" #, python-format msgid "merging %s and %s to %s\n" @@ -7162,6 +7286,45 @@ msgid "unknown bisect kind %s" msgstr "" +msgid "" +"\n" +" Mercurial has a mechanism for adding new features through the\n" +" use of extensions. Extensions may bring new commands, or new\n" +" hooks, or change Mercurial's behavior.\n" +"\n" +" Extensions are not loaded by default for a variety of reasons,\n" +" they may be meant for advanced users or provide potentially\n" +" dangerous commands (e.g. mq and rebase allow history to be\n" +" rewritten), they might not be ready for prime-time yet, or\n" +" they may alter Mercurial's behavior. It is thus up to the user\n" +" to activate extensions as desired.\n" +"\n" +" To enable the \"foo\" extension, either shipped with Mercurial\n" +" or in the Python search path, create an entry for it in your\n" +" hgrc, like this:\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +" You may also specify the full path to an extension:\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +" To explicitly disable an extension enabled in an hgrc of broader\n" +" scope, prepend its path with !:\n" +"\n" +" [extensions]\n" +" # disabling extension bar residing in /ext/path\n" +" hgext.bar = !/path/to/extension/bar.py\n" +" # ditto, but no path was supplied for extension baz\n" +" hgext.baz = !\n" +" " +msgstr "" + +msgid "disabled extensions:" +msgstr "deaktiverede udvidelser:" + msgid "Date Formats" msgstr "Datoformater" @@ -7645,6 +7808,18 @@ " " msgstr "" +msgid "Using additional features" +msgstr "Brug af yderligere funktioner" + +msgid "can only share local repositories" +msgstr "" + +msgid "destination already exists" +msgstr "destinationen eksisterer allerede" + +msgid "updating working directory\n" +msgstr "opdaterer arbejdskatalog\n" + #, python-format msgid "destination directory: %s\n" msgstr "" @@ -7665,9 +7840,6 @@ msgid "clone from remote to remote not supported" msgstr "" -msgid "updating working directory\n" -msgstr "opdaterer arbejdskatalog\n" - msgid "updated" msgstr "opdateret" @@ -7856,6 +8028,10 @@ msgstr "betingelse '%s' er ikke understøttet" #, python-format +msgid ".hg/sharedpath points to nonexistent directory %s" +msgstr ".hg/sharedpath peger på et ikke-eksisterende katalog %s" + +#, python-format msgid "%r cannot be used in a tag name" msgstr "%r kan ikke bruges i et mærkatnavnet" @@ -7874,10 +8050,6 @@ msgstr "" #, python-format -msgid "tag '%s' refers to unknown node" -msgstr "mærkaten '%s' henviser til en ukendt knude" - -#, python-format msgid "working directory has unknown parent '%s'!" msgstr "arbejdsbiblioteket har ukendt forældre '%s'!" @@ -7931,9 +8103,14 @@ msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" -#, python-format -msgid "%s not tracked!\n" -msgstr "%s følges ikke\n" +msgid "file not found!" +msgstr "filen blev ikke fundet!" + +msgid "no match under directory!" +msgstr "ingen træffer under kataloget!" + +msgid "file not tracked!" +msgstr "filen følges ikke!" msgid "nothing changed\n" msgstr "ingen ændringer\n" @@ -7942,6 +8119,10 @@ msgstr "" #, python-format +msgid "committing subrepository %s\n" +msgstr "arkiverer underarkiv %s\n" + +#, python-format msgid "trouble committing %s!\n" msgstr "problem ved arkivering %s!\n" @@ -7972,6 +8153,10 @@ msgstr "%s eksisterer stadig!\n" #, python-format +msgid "%s not tracked!\n" +msgstr "%s følges ikke\n" + +#, python-format msgid "%s not removed!\n" msgstr "%s ikke fjernet!\n" @@ -8187,17 +8372,6 @@ msgid "case-folding collision between %s and %s" msgstr "" -msgid "resolving manifests\n" -msgstr "" - -#, python-format -msgid " overwrite %s partial %s\n" -msgstr "" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr "" - #, python-format msgid "" " conflicting flags for %s\n" @@ -8213,6 +8387,17 @@ msgid "Sym&link" msgstr "" +msgid "resolving manifests\n" +msgstr "" + +#, python-format +msgid " overwrite %s partial %s\n" +msgstr "" + +#, python-format +msgid " ancestor %s local %s remote %s\n" +msgstr "" + #, python-format msgid "" " local changed %s which remote deleted\n" @@ -8268,16 +8453,20 @@ msgstr "intet at sammenføje (brug 'hg update' eller kontroller 'hg heads')" msgid "outstanding uncommitted changes (use 'hg status' to list changes)" -msgstr "udestående uarkiverede ændringer (brug 'hg status' for at se ændringer)" +msgstr "" +"udestående uarkiverede ændringer (brug 'hg status' for at se ændringer)" msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" -msgstr "krydser grene (brug 'hg merge' eller 'hg update -C' for at kassere ændringerne)" +msgstr "" +"krydser grene (brug 'hg merge' eller 'hg update -C' for at kassere " +"ændringerne)" msgid "crosses branches (use 'hg merge' or 'hg update -C')" msgstr "krydser grene (brug 'hg merge' eller 'hg update -C')" msgid "crosses named branches (use 'hg update -C' to discard changes)" -msgstr "krydser navngivne grene (brug 'hg update -C' for at kassere ændringerne)" +msgstr "" +"krydser navngivne grene (brug 'hg update -C' for at kassere ændringerne)" #, python-format msgid "cannot create %s: destination already exists" @@ -8361,6 +8550,10 @@ msgstr "" #, python-format +msgid "Unsupported line endings type: %s" +msgstr "Linieendelse %s understøttes ikke" + +#, python-format msgid "no valid hunks found; trying with %r instead\n" msgstr "" @@ -8484,6 +8677,43 @@ msgid "sending %s (%d bytes)\n" msgstr "" +#, python-format +msgid "" +" subrepository sources for %s differ\n" +"use (l)ocal source (%s) or (r)emote source (%s)?" +msgstr "" + +#, fuzzy +msgid "&Remote" +msgstr "fjernsystem: " + +msgid "r" +msgstr "" + +#, python-format +msgid "" +" local changed subrepository %s which remote removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +#, python-format +msgid "" +" remote changed subrepository %s which local removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +#, python-format +msgid "removing subrepo %s\n" +msgstr "fjerner underarkiv %s\n" + +#, python-format +msgid "pulling subrepo %s\n" +msgstr "hiver fra underarkiv %s\n" + +#, python-format +msgid "pushing subrepo %s\n" +msgstr "skubber til underarkiv %s\n" + msgid "unmatched quotes" msgstr "" @@ -8550,10 +8780,10 @@ msgstr "brugernavn %s indeholder et linieskift\n" msgid "unrecognized response\n" -msgstr "" +msgstr "svar ikke genkendt\n" msgid "response expected" -msgstr "" +msgstr "svar forventet" msgid "password: " msgstr "kodeord: " @@ -8569,7 +8799,7 @@ #, python-format msgid "realm: %s\n" -msgstr "" +msgstr "realm: %s\n" #, python-format msgid "user: %s\n" @@ -8666,18 +8896,18 @@ msgstr "%.0f byte" msgid "cannot verify bundle or remote repos" -msgstr "" +msgstr "kan ikke verificere bundt eller fjerndepoter" msgid "interrupted" msgstr "afbrudt" #, python-format msgid "empty or missing %s" -msgstr "tom eller mangler %s" +msgstr "tom eller manglende %s" #, python-format msgid "data length off by %d bytes" -msgstr "" +msgstr "datalænge er %d bytes forkert" #, python-format msgid "index contains %d extra bytes" @@ -8693,11 +8923,11 @@ #, python-format msgid "rev %d points to nonexistent changeset %d" -msgstr "" +msgstr "rev %d peger på ikke eksisterende ændring %d" #, python-format msgid "rev %d points to unexpected changeset %d" -msgstr "" +msgstr "rev %d peger på uventet ændring %d" #, python-format msgid " (expected %s)" @@ -8731,31 +8961,31 @@ msgstr "udpakker ændring %s" msgid "checking manifests\n" -msgstr "" +msgstr "kontrollerer manifester\n" #, python-format msgid "%s not in changesets" msgstr "%s ikke i ændringer" msgid "file without name in manifest" -msgstr "" +msgstr "fil uden navn i manifest" #, python-format msgid "reading manifest delta %s" -msgstr "" +msgstr "læser manifestforskel %s" msgid "crosschecking files in changesets and manifests\n" -msgstr "" +msgstr "krydstjekker filer i ændringer og manifester\n" #, python-format msgid "changeset refers to unknown manifest %s" -msgstr "" +msgstr "ændring refererer til et ukendt manifest %s" msgid "in changeset but not in manifest" -msgstr "" +msgstr "i ændring men ikke i manifest" msgid "in manifest but not in changeset" -msgstr "" +msgstr "i manifest men ikke i ændring" msgid "checking files\n" msgstr "kontrollerer filer\n" @@ -8766,7 +8996,7 @@ #, python-format msgid "broken revlog! (%s)" -msgstr "" +msgstr "beskadiget revlog! (%s)" msgid "missing revlog!" msgstr "manglende revlog!" @@ -8809,7 +9039,7 @@ #, python-format msgid "%d warnings encountered!\n" -msgstr "mødte %d advarsler!\n" +msgstr "fandt %d advarsler!\n" #, python-format msgid "%d integrity errors encountered!\n" diff -r e9ef409e6399 -r 288ba6d6c5c7 i18n/el.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/i18n/el.po Tue Jun 23 15:43:09 2009 -0500 @@ -0,0 +1,8779 @@ +# Greek translations for Mercurial +# Ελληνική μετάφραση των μηνυμάτων του Mercurial +# +# Copyright (C) 2009 Matt Mackall και άλλοι +# +msgid "" +msgstr "" +"Project-Id-Version: Mercurial\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-06-21 04:21+0300\n" +"PO-Revision-Date: 2009-02-13 16:27+0200\n" +"Last-Translator: \n" +"Language-Team: Greek\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#, python-format +msgid " (default: %s)" +msgstr " (προκαθορισμένο: %s)" + +msgid "OPTIONS" +msgstr "ΕΠΙΛΟΓΕΣ" + +msgid "COMMANDS" +msgstr "ΕΝΤΟΛΕΣ" + +msgid " options:\n" +msgstr " επιλογές:\n" + +#, python-format +msgid "" +" aliases: %s\n" +"\n" +msgstr "" +" ψευδώνυμα: %s\n" +"\n" + +#, python-format +msgid "acl: %s not enabled\n" +msgstr "acl: %s ανενεργό\n" + +#, python-format +msgid "acl: %s enabled, %d entries for user %s\n" +msgstr "acl: %s ενεργό, %d εγγραφές για τον χρήστη %s\n" + +#, python-format +msgid "config error - hook type \"%s\" cannot stop incoming changesets" +msgstr "" +"πρόβλημα ρυθμίσεων - το hook \"%s\" δε μπορεί να εμποδίσει εισερχόμενες " +"αλλαγές" + +#, python-format +msgid "acl: changes have source \"%s\" - skipping\n" +msgstr "acl: αλλαγές από \"%s\" - εξαίρεση αλλαγών\n" + +#, python-format +msgid "acl: user %s denied on %s\n" +msgstr "acl: ο χρήστης %s δεν επιτρέπεται να κάνει αλλαγές στο %s\n" + +#, python-format +msgid "acl: access denied for changeset %s" +msgstr "acl: η πρόσβαση για την αλλαγή %s δεν επιτρέπεται" + +#, python-format +msgid "acl: user %s not allowed on %s\n" +msgstr "acl: ο χρήστης %s δεν επιτρέπεται στο %s\n" + +#, python-format +msgid "acl: allowing changeset %s\n" +msgstr "acl: αποδοχή αλλαγής %s\n" + +msgid "" +"Mercurial bookmarks\n" +"\n" +"Mercurial bookmarks are local moveable pointers to changesets. Every\n" +"bookmark points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it, the\n" +"bookmark is forwarded to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup (e.g. hg\n" +"merge, hg update).\n" +"\n" +"The bookmark extension offers the possiblity to have a more git-like\n" +"experience by adding the following configuration option to your .hgrc:\n" +"\n" +"[bookmarks]\n" +"track.current = True\n" +"\n" +"This will cause bookmarks to track the bookmark that you are currently\n" +"on, and just updates it. This is similar to git's approach to\n" +"branching.\n" +msgstr "" + +msgid "" +"Mercurial bookmarks\n" +"\n" +" Bookmarks are pointers to certain commits that move when\n" +" commiting. 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.\n" +"\n" +" 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" +" " +msgstr "" + +msgid "a bookmark of this name does not exist" +msgstr "δεν υπάρχει σελιδοδείκτης με αυτό το όνομα" + +msgid "a bookmark of the same name already exists" +msgstr "υπάρχει ήδη σελιδοδείκτης με αυτό το όνομα" + +msgid "new bookmark name required" +msgstr "απαιτείται ένα όνομα νέου σελιδοδείκτη" + +msgid "bookmark name required" +msgstr "απαιτείται όνομα σελιδοδείκτη" + +msgid "bookmark name cannot contain newlines" +msgstr "" +"το όνομα ενός σελιδοδείκτη δεν επιτρέπεται να περιέχει χαρακτήρεςαλλαγής " +"γραμμής" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "" +"οι σελιδοδείκτες δεν επιτρέπεται να έχουν το όνομα ενός υπάρχοντος κλάδου" + +msgid "force" +msgstr "" + +msgid "revision" +msgstr "αλλαγή" + +msgid "delete a given bookmark" +msgstr "διαγραφή ενός σελιδοδείκτη" + +msgid "rename a given bookmark" +msgstr "μετονομασία ενός σελιδοδείκτη" + +#, fuzzy +msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" +msgstr "hg bookmarks [-d] [-m ΟΝΟΜΑ] [-r ΟΝΟΜΑ] [ΟΝΟΜΑ]" + +msgid "" +"Bugzilla integration\n" +"\n" +"This hook extension adds comments on bugs in Bugzilla when changesets\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change\n" +"bug status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla\n" +"installations using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification\n" +"emails. That script changes between Bugzilla versions; the\n" +"'processmail' script used prior to 2.18 is replaced in 2.18 and\n" +"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" +"be run by Mercurial as the user pushing the change; you will need to\n" +"ensure the Bugzilla install file permissions are set appropriately.\n" +"\n" +"Configuring the extension:\n" +"\n" +" [bugzilla]\n" +"\n" +" host Hostname of the MySQL server holding the Bugzilla\n" +" database.\n" +" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +" user Username to use to access MySQL server. Default 'bugs'.\n" +" password Password to use to access MySQL server.\n" +" timeout Database connection timeout (seconds). Default 5.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions\n" +" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" +" and '2.16' for versions prior to 2.18.\n" +" bzuser Fallback Bugzilla user name to record comments with, if\n" +" changeset committer cannot be found as a Bugzilla user.\n" +" bzdir Bugzilla install directory. Used by default notify.\n" +" Default '/var/www/html/bugzilla'.\n" +" notify The command to run to get Bugzilla to send bug change\n" +" notification emails. Substitutes from a map with 3\n" +" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" +" bugzilla email). Default depends on version; from 2.18\n" +" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" +" %(id)s %(user)s\".\n" +" regexp Regular expression to match bug IDs in changeset commit\n" +" message. Must contain one \"()\" group. The default\n" +" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" +" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" +" variations thereof. Matching is case insensitive.\n" +" style The style file to use when formatting comments.\n" +" template Template to use when formatting comments. Overrides\n" +" style if specified. In addition to the usual Mercurial\n" +" keywords, the extension specifies:\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial\n" +" repository.\n" +" {webroot} Stripped pathname of the Mercurial\n" +" repository.\n" +" {hgweb} Base URL for browsing Mercurial\n" +" repositories.\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +" strip The number of slashes to strip from the front of {root}\n" +" to produce {webroot}. Default 0.\n" +" usermap Path of file containing Mercurial committer ID to\n" +" Bugzilla user ID mappings. If specified, the file\n" +" should contain one mapping per line,\n" +" \"committer\"=\"Bugzilla user\". See also the [usermap]\n" +" section.\n" +"\n" +" [usermap]\n" +" Any entries in this section specify mappings of Mercurial\n" +" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" +" \"committer\"=\"Bugzilla user\"\n" +"\n" +" [web]\n" +" baseurl Base URL for browsing Mercurial repositories. Reference\n" +" from templates as {hgweb}.\n" +"\n" +"Activating the extension:\n" +"\n" +" [extensions]\n" +" hgext.bugzilla =\n" +"\n" +" [hooks]\n" +" # run bugzilla hook on every change pulled or pushed in here\n" +" incoming.bugzilla = python:hgext.bugzilla.hook\n" +"\n" +"Example configuration:\n" +"\n" +"This example configuration is for a collection of Mercurial\n" +"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" +"installation in /opt/bugzilla-3.2.\n" +"\n" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" +"rev/{node|short}\\n\\n{desc}\\n\n" +" strip=5\n" +"\n" +" [web]\n" +" baseurl=http://dev.domain.com/hg\n" +"\n" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com\n" +"\n" +"Commits add a comment to the Bugzilla bug record of the form:\n" +"\n" +" Changeset 3b16791d6642 in repository-name.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" +"\n" +" Changeset commit comment. Bug 1234.\n" +msgstr "" + +#, python-format +msgid "connecting to %s:%s as %s, password %s\n" +msgstr "σύνδεση στο %s:%s ως %s, κωδικός %s\n" + +#, python-format +msgid "query: %s %s\n" +msgstr "αίτηση: %s %s\n" + +#, python-format +msgid "failed query: %s %s\n" +msgstr "αποτυχία αίτησης: %s %s\n" + +msgid "unknown database schema" +msgstr "άγνωστο σχήμα βάσης" + +#, python-format +msgid "bug %d already knows about changeset %s\n" +msgstr "το πρόβλημα %d έχει ενημερωθεί ήδη για την αλλαγή %s\n" + +msgid "telling bugzilla to send mail:\n" +msgstr "" + +#, python-format +msgid " bug %s\n" +msgstr " πρόβλημα %s\n" + +#, python-format +msgid "running notify command %s\n" +msgstr "" + +#, python-format +msgid "bugzilla notify command %s" +msgstr "" + +msgid "done\n" +msgstr "ολοκληρώθηκε\n" + +#, python-format +msgid "looking up user %s\n" +msgstr "αναζήτηση χρήστη %s\n" + +#, python-format +msgid "cannot find bugzilla user id for %s" +msgstr "δε βρέθηκε χρήστης bugzilla με το αναγνωριστικό %s" + +#, python-format +msgid "cannot find bugzilla user id for %s or %s" +msgstr "δε βρέθηκε χρήστης bugzilla με το αναγνωριστικό %s ή %s" + +#, python-format +msgid "bugzilla version %s not supported" +msgstr "η έκδοση %s του bugzilla δεν υποστηρίζεται" + +msgid "" +"changeset {node|short} in repo {root} refers to bug {bug}.\n" +"details:\n" +"\t{desc|tabindent}" +msgstr "" + +#, python-format +msgid "python mysql support not available: %s" +msgstr "δεν έχει εγκατασταθεί η υποστήριξη mysql για την python: %s" + +#, python-format +msgid "hook type %s does not pass a changeset id" +msgstr "τα hooks τύπου %s δεν περνούν αναγνωριστικό αλλαγής" + +#, python-format +msgid "database error: %s" +msgstr "σφάλμα βάσης δεδομένων: %s" + +msgid "" +"show the children of the given or working directory revision\n" +"\n" +" Print the children of the working directory's revisions. If a\n" +" revision is given via -r/--rev, the children of that revision will\n" +" be printed. If a file argument is given, revision in which the\n" +" file was last changed (after the working directory revision or the\n" +" argument to --rev if given) is printed.\n" +" " +msgstr "" + +#, fuzzy +msgid "show children of the specified revision" +msgstr "lav statistik for de specificerede revisioner" + +msgid "hg children [-r REV] [FILE]" +msgstr "hg children [-r ΕΚΔΟΣΗ] [ΑΡΧΕΙΟ]" + +msgid "command to show certain statistics about revision history" +msgstr "" +"εντολή η οποία δείχνει κάποια στατιστικά για το ιστορικό του αποθετηρίου" + +#, python-format +msgid "Revision %d is a merge, ignoring...\n" +msgstr "" + +#, python-format +msgid "generating stats: %d%%" +msgstr "" + +#, fuzzy +msgid "" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" +"\n" +" Examples:\n" +"\n" +" # display count of changed lines for every committer\n" +" hg churn -t '{author|email}'\n" +"\n" +" # display daily activity graph\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # display activity of developers by month\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # display count of lines changed in every year\n" +" hg churn -f '%Y' -s\n" +"\n" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format:\n" +" \n" +" \n" +"\n" +" Such a file may be specified with the --aliases option, otherwise a\n" +" .hgchurn file will be looked for in the working directory root.\n" +" " +msgstr "" +"plot antallet af revisioner grupperet efter et mønster\n" +"\n" +" Plotter antallet af ændrede linier eller antallet af revisioner\n" +" grupperet efter et mønster eller alternativt efter dato, hvis\n" +" dateformat bruges. I så tilfælde bruges mønstret ikke.\n" +"\n" +" Som udgangspunkt laves der statistik over antallet af ændrede\n" +" linier.\n" +"\n" +" Eksempler:\n" +"\n" +" # viser antaller af ændrede linier for hver bruger\n" +" hg churn -t '{author|email}'\n" +"\n" +" # viser graf over daglig aktivitet\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # viser månedlig aktivitet af udviklerne\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # viser antallet af linier ændret hvert år\n" +" hg churn -f '%Y' -s\n" +"\n" +" Formatet for map-filen er rimelig simpelt:\n" +"\n" +" " + +#, python-format +msgid "assuming %i character terminal\n" +msgstr "" + +msgid "count rate for the specified revision or range" +msgstr "" + +#, fuzzy +msgid "count rate for revisions matching date spec" +msgstr "" + +msgid "template to group changesets" +msgstr "" + +msgid "strftime-compatible format for grouping by date" +msgstr "" + +msgid "count rate by number of changesets" +msgstr "" + +msgid "sort by key (default: sort by count)" +msgstr "" + +msgid "file with email aliases" +msgstr "" + +msgid "show progress" +msgstr "" + +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" +msgstr "" + +msgid "" +"add color output to status, qseries, and diff-related commands\n" +"\n" +"This extension modifies the status command to add color to its output\n" +"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" +"whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are\n" +"also available. Effects are rendered with the ECMA-48 SGR control\n" +"function (aka ANSI escape codes). This module also provides the\n" +"render_text function, which can be used to add effects to any text.\n" +"\n" +"To enable this extension, add this to your .hgrc file:\n" +"[extensions]\n" +"color =\n" +"\n" +"Default effects may be overridden from the .hgrc file:\n" +"\n" +"[color]\n" +"status.modified = blue bold underline red_background\n" +"status.added = green bold\n" +"status.removed = red bold blue_background\n" +"status.deleted = cyan bold underline\n" +"status.unknown = magenta bold underline\n" +"status.ignored = black bold\n" +"\n" +"# 'none' turns off all effects\n" +"status.clean = none\n" +"status.copied = none\n" +"\n" +"qseries.applied = blue bold underline\n" +"qseries.unapplied = black bold\n" +"qseries.missing = red bold\n" +"\n" +"diff.diffline = bold\n" +"diff.extended = cyan bold\n" +"diff.file_a = red bold\n" +"diff.file_b = green bold\n" +"diff.hunk = magenta\n" +"diff.deleted = red\n" +"diff.inserted = green\n" +"diff.changed = white\n" +"diff.trailingwhitespace = bold red_background\n" +msgstr "" + +msgid "when to colorize (always, auto, or never)" +msgstr "" + +msgid "don't colorize output" +msgstr "" + +msgid "converting foreign VCS repositories to Mercurial" +msgstr "" + +msgid "" +"convert a foreign SCM repository to a Mercurial one.\n" +"\n" +" Accepted source formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - CVS [cvs]\n" +" - Darcs [darcs]\n" +" - git [git]\n" +" - Subversion [svn]\n" +" - Monotone [mtn]\n" +" - GNU Arch [gnuarch]\n" +" - Bazaar [bzr]\n" +" - Perforce [p4]\n" +"\n" +" Accepted destination formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - Subversion [svn] (history on branches is not preserved)\n" +"\n" +" If no revision is given, all revisions will be converted.\n" +" Otherwise, convert will only import up to the named revision\n" +" (given in a format understood by the source).\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source with '-hg' appended. If the destination\n" +" repository doesn't exist, it will be created.\n" +"\n" +" By default, all sources except Mercurial will use\n" +" --branchsort. Mercurial uses --sourcesort to preserve original\n" +" revision numbers order. Sort modes have the following effects:\n" +" --branchsort: convert from parent to child revision when\n" +" possible, which means branches are usually converted one after\n" +" the other. It generates more compact repositories.\n" +" --datesort: sort revisions by date. Converted repositories have\n" +" good-looking changelogs but are often an order of magnitude\n" +" larger than the same ones generated by --branchsort.\n" +" --sourcesort: try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" +"\n" +" If isn't given, it will be put in a default location\n" +" (/.hg/shamap by default). The is a simple text file\n" +" that maps each source commit ID to the destination ID for that\n" +" revision, like so:\n" +" \n" +"\n" +" If the file doesn't exist, it's automatically created. It's\n" +" updated on each commit copied, so convert-repo can be interrupted\n" +" and can be run repeatedly to copy new commits.\n" +"\n" +" The [username mapping] file is a simple text file that maps each\n" +" source commit author to a destination commit author. It is handy\n" +" for source SCMs that use unix logins to identify authors (eg:\n" +" CVS). One line per author mapping and the line format is:\n" +" srcauthor=whatever string you want\n" +"\n" +" The filemap is a file that allows filtering and remapping of files\n" +" and directories. Comment lines start with '#'. Each line can\n" +" contain one of the following directives:\n" +"\n" +" include path/to/file\n" +"\n" +" exclude path/to/file\n" +"\n" +" rename from/file to/file\n" +"\n" +" The 'include' directive causes a file, or all files under a\n" +" directory, to be included in the destination repository, and the\n" +" exclusion of all other files and directories not explicitly included.\n" +" The 'exclude' directive causes files or directories to be omitted.\n" +" The 'rename' directive renames a file or directory. To rename from\n" +" a subdirectory into the root of the repository, use '.' as the\n" +" path to rename to.\n" +"\n" +" The splicemap is a file that allows insertion of synthetic\n" +" history, letting you specify the parents of a revision. This is\n" +" useful if you want to e.g. give a Subversion merge two parents, or\n" +" graft two disconnected series of history together. Each entry\n" +" contains a key, followed by a space, followed by one or two\n" +" comma-separated values. The key is the revision ID in the source\n" +" revision control system whose parents should be modified (same\n" +" format as a key in .hg/shamap). The values are the revision IDs\n" +" (in either the source or destination revision control system) that\n" +" should be used as the new parents for that node.\n" +"\n" +" The branchmap is a file that allows you to rename a branch when it is\n" +" being brought in from whatever external repository. When used in\n" +" conjunction with a splicemap, it allows for a powerful combination\n" +" to help fix even the most badly mismanaged repositories and turn them\n" +" into nicely structured Mercurial repositories. The branchmap contains\n" +" lines of the form \"original_branch_name new_branch_name\".\n" +" \"original_branch_name\" is the name of the branch in the source\n" +" repository, and \"new_branch_name\" is the name of the branch is the\n" +" destination repository. This can be used to (for instance) move code\n" +" in one repository from \"default\" to a named branch.\n" +"\n" +" Mercurial Source\n" +" -----------------\n" +"\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" +" ignore integrity errors when reading. Use it to fix Mercurial\n" +" repositories with missing revlogs, by converting from and to\n" +" Mercurial.\n" +" --config convert.hg.saverev=False (boolean)\n" +" store original revision ID in changeset (forces target IDs to\n" +" change)\n" +" --config convert.hg.startrev=0 (hg revision identifier)\n" +" convert start revision and its descendants\n" +"\n" +" CVS Source\n" +" ----------\n" +"\n" +" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" +" to indicate the starting point of what will be converted. Direct\n" +" access to the repository files is not needed, unless of course the\n" +" repository is :local:. The conversion uses the top level directory\n" +" in the sandbox to find the CVS repository, and then uses CVS rlog\n" +" commands to find files to convert. This means that unless a\n" +" filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganization in the CVS\n" +" sandbox is ignored.\n" +"\n" +" Because CVS does not have changesets, it is necessary to collect\n" +" individual commits to CVS and merge them into changesets. CVS\n" +" source uses its internal changeset merging code by default but can\n" +" be configured to call the external 'cvsps' program by setting:\n" +" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +" This option is deprecated and will be removed in Mercurial 1.4.\n" +"\n" +" The options shown are the defaults.\n" +"\n" +" Internal cvsps is selected by setting\n" +" --config convert.cvsps=builtin\n" +" and has a few more configurable options:\n" +" --config convert.cvsps.cache=True (boolean)\n" +" Set to False to disable remote log caching, for testing and\n" +" debugging purposes.\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed\n" +" between commits with identical user and log message in a\n" +" single changeset. When very large files were checked in as\n" +" part of a changeset then the default may not be long\n" +" enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will insert a dummy revision merging the branch on\n" +" which this log message occurs to the branch indicated in\n" +" the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will add the most recent revision on the branch\n" +" indicated in the regex as the second parent of the\n" +" changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin\n" +" changeset merging code to be run without doing a conversion. Its\n" +" parameters and output are similar to that of cvsps 2.1.\n" +"\n" +" Subversion Source\n" +" -----------------\n" +"\n" +" Subversion source detects classical trunk/branches/tags layouts.\n" +" By default, the supplied \"svn://repo/path/\" source URL is\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" +" replaces the default branch. If \"svn://repo/path/branches\" exists,\n" +" its subdirectories are listed as possible branches. If\n" +" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" +" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" +" can be overridden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable auto\n" +" detection.\n" +"\n" +" --config convert.svn.branches=branches (directory name)\n" +" specify the directory containing branches\n" +" --config convert.svn.tags=tags (directory name)\n" +" specify the directory containing tags\n" +" --config convert.svn.trunk=trunk (directory name)\n" +" specify the name of the trunk branch\n" +"\n" +" Source history can be retrieved starting at a specific revision,\n" +" instead of being integrally converted. Only single branch\n" +" conversions are supported.\n" +"\n" +" --config convert.svn.startrev=0 (svn revision number)\n" +" specify start Subversion revision.\n" +"\n" +" Perforce Source\n" +" ---------------\n" +"\n" +" The Perforce (P4) importer can be given a p4 depot path or a\n" +" client specification as source. It will convert all files in the\n" +" source to a flat Mercurial repository, ignoring labels, branches\n" +" and integrations. Note that when a depot path is given you then\n" +" usually should specify a target directory, because otherwise the\n" +" target may be named ...-hg.\n" +"\n" +" It is possible to limit the amount of source history to be\n" +" converted by specifying an initial Perforce revision.\n" +"\n" +" --config convert.p4.startrev=0 (perforce changelist number)\n" +" specify initial Perforce revision.\n" +"\n" +"\n" +" Mercurial Destination\n" +" ---------------------\n" +"\n" +" --config convert.hg.clonebranches=False (boolean)\n" +" dispatch source branches in separate clones.\n" +" --config convert.hg.tagsbranch=default (branch name)\n" +" tag revisions branch name\n" +" --config convert.hg.usebranchnames=True (boolean)\n" +" preserve branch names\n" +"\n" +" " +msgstr "" + +msgid "" +"create changeset information from CVS\n" +"\n" +" This command is intended as a debugging tool for the CVS to\n" +" Mercurial converter, and can be used as a direct replacement for\n" +" cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any\n" +" named directory) in the CVS repository, and converts the log to a\n" +" series of changesets based on matching commit log entries and\n" +" dates." +msgstr "" + +msgid "username mapping filename" +msgstr "" + +msgid "destination repository type" +msgstr "" + +msgid "remap file names using contents of file" +msgstr "" + +msgid "import up to target revision REV" +msgstr "" + +msgid "source repository type" +msgstr "" + +msgid "splice synthesized history into place" +msgstr "" + +msgid "change branch names while converting" +msgstr "" + +msgid "try to sort changesets by branches" +msgstr "" + +msgid "try to sort changesets by date" +msgstr "" + +msgid "preserve source changesets order" +msgstr "" + +msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" +msgstr "" + +msgid "only return changes on specified branches" +msgstr "" + +msgid "prefix to remove from file names" +msgstr "" + +msgid "only return changes after or between specified tags" +msgstr "" + +msgid "update cvs log cache" +msgstr "" + +msgid "create new cvs log cache" +msgstr "" + +msgid "set commit time fuzz in seconds" +msgstr "" + +msgid "specify cvsroot" +msgstr "" + +msgid "show parent changesets" +msgstr "" + +msgid "show current changeset in ancestor branches" +msgstr "" + +msgid "ignored for compatibility" +msgstr "" + +msgid "hg debugcvsps [OPTION]... [PATH]..." +msgstr "" + +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" +msgstr "" + +#, python-format +msgid "%s is not a valid revision in current branch" +msgstr "" + +#, python-format +msgid "%s is not available in %s anymore" +msgstr "" + +#, python-format +msgid "%s.%s symlink has no target" +msgstr "" + +#, python-format +msgid "cannot find required \"%s\" tool" +msgstr "" + +#, python-format +msgid "running: %s\n" +msgstr "" + +#, python-format +msgid "%s error:\n" +msgstr "" + +#, python-format +msgid "%s %s" +msgstr "" + +#, python-format +msgid "syntax error in %s(%d): key/value pair expected" +msgstr "" + +#, python-format +msgid "could not open map file %r: %s" +msgstr "" + +#, python-format +msgid "%s: missing or unsupported repository" +msgstr "" + +#, python-format +msgid "convert: %s\n" +msgstr "" + +#, python-format +msgid "%s: unknown repository type" +msgstr "" + +#, fuzzy, python-format +msgid "unknown sort mode: %s" +msgstr "" + +#, python-format +msgid "cycle detected between %s and %s" +msgstr "" + +msgid "not all revisions were sorted" +msgstr "" + +#, python-format +msgid "Writing author map file %s\n" +msgstr "" + +#, python-format +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "" + +#, python-format +msgid "mapping author %s to %s\n" +msgstr "" + +#, python-format +msgid "overriding mapping for author %s, was %s, will be %s\n" +msgstr "" + +#, python-format +msgid "spliced in %s as parents of %s\n" +msgstr "" + +msgid "scanning source...\n" +msgstr "" + +msgid "sorting...\n" +msgstr "" + +msgid "converting...\n" +msgstr "" + +#, python-format +msgid "source: %s\n" +msgstr "" + +#, python-format +msgid "assuming destination %s\n" +msgstr "" + +msgid "more than one sort mode specified" +msgstr "" + +msgid "--sourcesort is not supported by this data source" +msgstr "" + +msgid "" +"warning: support for external cvsps is deprecated and will be removed in " +"Mercurial 1.4\n" +msgstr "" + +#, python-format +msgid "revision %s is not a patchset number or date" +msgstr "" + +msgid "using builtin cvsps\n" +msgstr "" + +#, python-format +msgid "connecting to %s\n" +msgstr "" + +msgid "CVS pserver authentication failed" +msgstr "" + +msgid "server sucks" +msgstr "" + +#, python-format +msgid "%d bytes missing from remote file" +msgstr "" + +#, python-format +msgid "cvs server: %s\n" +msgstr "" + +#, python-format +msgid "unknown CVS response: %s" +msgstr "" + +msgid "collecting CVS rlog\n" +msgstr "" + +#, python-format +msgid "reading cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "cache has %d log entries\n" +msgstr "" + +#, python-format +msgid "error reading cache: %r\n" +msgstr "" + +#, python-format +msgid "running %s\n" +msgstr "εκτέλεση %s\n" + +#, python-format +msgid "prefix=%r directory=%r root=%r\n" +msgstr "πρόθεμα=%r κατάλογος=%r αρχικός-κατάλογος=%r\n" + +msgid "RCS file must be followed by working file" +msgstr "το αρχείο RCS πρέπει να ακολουθείται από ένα αρχείο εργασίας" + +msgid "must have at least some revisions" +msgstr "πρέπει να υπάρχουν κάποιες εκδόσεις αρχείων" + +msgid "expected revision number" +msgstr "αναμένεται αριθμός έκδοσης αρχείου" + +msgid "revision must be followed by date line" +msgstr "η έκδοση αρχείου πρέπει να ακολουθείται από γραμμή ημερομηνίας" + +#, fuzzy, python-format +msgid "found synthetic revision in %s: %r\n" +msgstr "" + +#, python-format +msgid "writing cvs log cache %s\n" +msgstr "αποθήκευση προσωρινού αντιγράφου cvs log %s\n" + +#, python-format +msgid "%d log entries\n" +msgstr "%d εκδόσεις αρχείων\n" + +msgid "creating changesets\n" +msgstr "δημιουργία αλλαγών\n" + +msgid "synthetic changeset cannot have multiple parents" +msgstr "" + +#, python-format +msgid "" +"warning: CVS commit message references non-existent branch %r:\n" +"%s\n" +msgstr "" + +#, python-format +msgid "%d changeset entries\n" +msgstr "%d αλλαγές\n" + +msgid "Python ElementTree module is not available" +msgstr "δεν είναι διαθέσιμο το άρθρωμα ElementTree της Python" + +#, python-format +msgid "cleaning up %s\n" +msgstr "καθαρισμός %s\n" + +msgid "internal calling inconsistency" +msgstr "εσωτερικό πρόβλημα κλήσης" + +msgid "errors in filemap" +msgstr "λάθη στο filemap" + +#, python-format +msgid "%s:%d: %r already in %s list\n" +msgstr "%s:%d: η εγγραφή %r υπάρχει ήδη στη λίστα %s\n" + +#, python-format +msgid "%s:%d: unknown directive %r\n" +msgstr "%s:%d: άγνωστη εντολή %r\n" + +msgid "source repository doesn't support --filemap" +msgstr "το αποθετήριο πηγής δεν υποστηρίζει την επιλογή --filemap" + +#, python-format +msgid "%s does not look like a GNU Arch repo" +msgstr "το %s δε φαίνεται να είναι αποθετήριο Arch" + +msgid "cannot find a GNU Arch tool" +msgstr "δεν είναι διαθέσιμο το εργαλείο GNU Arch" + +#, python-format +msgid "analyzing tree version %s...\n" +msgstr "ανάλυση καταλόγου αρχείων για την έκδοση %s...\n" + +#, python-format +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "" +"η ανάλυση καταλόγου διακόπηκε επειδή περιέχει αναφορά στην συλλογή αρχείων %" +"s, η οποία δεν υπάρχει ή δεν είναι διαθέσιμη...\n" + +#, python-format +msgid "applying revision %s...\n" +msgstr "" + +#, python-format +msgid "computing changeset between %s and %s...\n" +msgstr "" + +#, python-format +msgid "obtaining revision %s...\n" +msgstr "" + +#, fuzzy, python-format +msgid "analyzing revision %s...\n" +msgstr "ανάλυση καταλόγου αρχείων για την έκδοση %s...\n" + +#, python-format +msgid "could not parse cat-log of %s" +msgstr "" + +#, python-format +msgid "%s is not a local Mercurial repo" +msgstr "" + +#, python-format +msgid "initializing destination %s repository\n" +msgstr "" + +msgid "run hg sink pre-conversion action\n" +msgstr "" + +msgid "run hg sink post-conversion action\n" +msgstr "" + +#, python-format +msgid "pulling from %s into %s\n" +msgstr "" + +msgid "filtering out empty revision\n" +msgstr "" + +msgid "updating tags\n" +msgstr "" + +#, python-format +msgid "%s is not a valid start revision" +msgstr "" + +#, python-format +msgid "ignoring: %s\n" +msgstr "" + +msgid "run hg source pre-conversion action\n" +msgstr "" + +msgid "run hg source post-conversion action\n" +msgstr "" + +#, python-format +msgid "%s does not look like a monotone repo" +msgstr "" + +#, python-format +msgid "copying file in renamed directory from '%s' to '%s'" +msgstr "" + +#, fuzzy +msgid "reading p4 views\n" +msgstr "καθαρισμός %s\n" + +#, fuzzy +msgid "collecting p4 changelists\n" +msgstr "δημιουργία αλλαγών\n" + +msgid "Subversion python bindings could not be loaded" +msgstr "" + +#, python-format +msgid "Subversion python bindings %d.%d found, 1.4 or later required" +msgstr "" + +msgid "Subversion python bindings are too old, 1.4 or later required" +msgstr "" + +#, python-format +msgid "svn: revision %s is not an integer" +msgstr "" + +#, python-format +msgid "svn: start revision %s is not an integer" +msgstr "" + +#, python-format +msgid "no revision found in module %s" +msgstr "" + +#, python-format +msgid "expected %s to be at %r, but not found" +msgstr "" + +#, python-format +msgid "found %s at %r\n" +msgstr "" + +#, python-format +msgid "ignoring empty branch %s\n" +msgstr "" + +#, python-format +msgid "found branch %s at %d\n" +msgstr "" + +msgid "svn: start revision is not supported with more than one branch" +msgstr "" + +#, python-format +msgid "svn: no revision found after start revision %d" +msgstr "" + +#, python-format +msgid "no tags found at revision %d\n" +msgstr "" + +#, python-format +msgid "ignoring foreign branch %r\n" +msgstr "" + +#, python-format +msgid "%s not found up to revision %d" +msgstr "" + +#, python-format +msgid "branch renamed from %s to %s at %d\n" +msgstr "" + +#, python-format +msgid "reparent to %s\n" +msgstr "" + +#, python-format +msgid "copied to %s from %s@%s\n" +msgstr "" + +#, python-format +msgid "gone from %s\n" +msgstr "" + +#, python-format +msgid "found parent directory %s\n" +msgstr "" + +#, python-format +msgid "base, entry %s %s\n" +msgstr "" + +msgid "munge-o-matic\n" +msgstr "" + +#, python-format +msgid "info: %s %s %s %s\n" +msgstr "" + +#, python-format +msgid "unknown path in revision %d: %s\n" +msgstr "" + +#, python-format +msgid "mark %s came from %s:%d\n" +msgstr "" + +#, python-format +msgid "parsing revision %d (%d changes)\n" +msgstr "" + +#, python-format +msgid "found parent of branch %s at %d: %s\n" +msgstr "" + +msgid "no copyfrom path, don't know what to do.\n" +msgstr "" + +#, python-format +msgid "fetching revision log for \"%s\" from %d to %d\n" +msgstr "" + +#, python-format +msgid "skipping blacklisted revision %d\n" +msgstr "" + +#, python-format +msgid "revision %d has no entries\n" +msgstr "" + +#, python-format +msgid "svn: branch has no revision %s" +msgstr "" + +#, python-format +msgid "%r is not under %r, ignoring\n" +msgstr "" + +#, python-format +msgid "initializing svn repo %r\n" +msgstr "" + +#, python-format +msgid "initializing svn wc %r\n" +msgstr "" + +msgid "unexpected svn output:\n" +msgstr "" + +msgid "unable to cope with svn output" +msgstr "" + +msgid "XXX TAGS NOT IMPLEMENTED YET\n" +msgstr "" + +msgid "" +"\n" +"The `extdiff' Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working directory. The external diff\n" +"programs are called with a configurable set of options and two\n" +"non-option arguments: paths to directories containing snapshots of\n" +"files to compare.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.extdiff =\n" +"\n" +"The `extdiff' extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"\n" +" [extdiff]\n" +" # add new command that runs GNU diff(1) in 'context diff' mode\n" +" cdiff = gdiff -Nprc5\n" +" ## or the old way:\n" +" #cmd.cdiff = gdiff\n" +" #opts.cdiff = -Nprc5\n" +"\n" +" # add new command called vdiff, runs kdiff3\n" +" vdiff = kdiff3\n" +"\n" +" # add new command called meld, runs meld (no need to name twice)\n" +" meld =\n" +"\n" +" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" +" # (see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " +"in\n" +" # your .vimrc\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" +"\n" +"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" +msgstr "" + +#, python-format +msgid "making snapshot of %d files from rev %s\n" +msgstr "" + +#, python-format +msgid "making snapshot of %d files from working directory\n" +msgstr "" + +msgid "cannot specify --rev and --change at the same time" +msgstr "" + +#, python-format +msgid "running %r in %s\n" +msgstr "" + +#, python-format +msgid "file changed while diffing. Overwriting: %s (src: %s)\n" +msgstr "" + +msgid "cleaning up temp directory\n" +msgstr "" + +msgid "" +"use external program to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using\n" +" an external program. The default program used is diff, with\n" +" default options \"-Npru\".\n" +"\n" +" To select a different program, use the -p/--program option. The\n" +" program will be passed the names of two directories to compare. To\n" +" pass additional options to the program, use -o/--option. These\n" +" will be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent." +msgstr "" + +msgid "comparison program to run" +msgstr "" + +msgid "pass option to comparison program" +msgstr "" + +msgid "change made by revision" +msgstr "" + +msgid "hg extdiff [OPT]... [FILE]..." +msgstr "" + +#, python-format +msgid "hg %s [OPTION]... [FILE]..." +msgstr "" + +msgid "pulling, updating and merging in one command" +msgstr "" + +msgid "" +"pull changes from a remote repository, merge new changes if needed.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository.\n" +"\n" +" If the pulled changes add a new branch head, the head is\n" +" automatically merged, and the result of the merge is committed.\n" +" Otherwise, the working directory is updated to include the new\n" +" changes.\n" +"\n" +" When a merge occurs, the newly pulled changes are assumed to be\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" +" order, use --switch-parent.\n" +"\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)" +msgstr "" + +msgid "outstanding uncommitted merge" +msgstr "" + +msgid "outstanding uncommitted changes" +msgstr "υπάρχουν τοπικές αλλαγές ακόμη" + +msgid "working directory is missing some files" +msgstr "λείπουν ορισμένα αρχεία από το χώρο εργασίας" + +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" + +#, python-format +msgid "pulling from %s\n" +msgstr "" + +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 +msgid "updating to %d:%s\n" +msgstr "" + +#, python-format +msgid "merging with %d:%s\n" +msgstr "" + +#, python-format +msgid "Automated merge with %s" +msgstr "" + +#, python-format +msgid "new changeset %d:%s merges remote changes with local\n" +msgstr "" + +msgid "a specific revision you would like to pull" +msgstr "" + +msgid "edit commit message" +msgstr "" + +msgid "edit commit message (DEPRECATED)" +msgstr "" + +msgid "switch parents when merging" +msgstr "" + +msgid "hg fetch [SOURCE]" +msgstr "" + +msgid "error while verifying signature" +msgstr "" + +#, python-format +msgid "%s Bad signature from \"%s\"\n" +msgstr "" + +#, python-format +msgid "%s Note: Signature has expired (signed by: \"%s\")\n" +msgstr "" + +#, python-format +msgid "%s Note: This key has expired (signed by: \"%s\")\n" +msgstr "" + +msgid "list signed changesets" +msgstr "" + +#, python-format +msgid "%s:%d node does not exist\n" +msgstr "" + +msgid "verify all the signatures there may be for a particular revision" +msgstr "" + +#, python-format +msgid "No valid signature for %s\n" +msgstr "" + +msgid "" +"add a signature for the current or given revision\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "uncommitted merge - please provide a specific revision" +msgstr "" + +msgid "Error while signing" +msgstr "" + +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" + +#, python-format +msgid "Added signature for changeset %s" +msgstr "" + +msgid "unknown signature version" +msgstr "" + +msgid "make the signature local" +msgstr "" + +msgid "sign even if the sigfile is modified" +msgstr "" + +msgid "do not commit the sigfile after signing" +msgstr "" + +msgid "the key id to sign with" +msgstr "" + +msgid "commit message" +msgstr "" + +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "" + +msgid "hg sigcheck REVISION" +msgstr "" + +msgid "hg sigs" +msgstr "" + +msgid "" +"show revision graphs in terminal windows\n" +"\n" +"This extension adds a --graph option to the incoming, outgoing and log\n" +"commands. When this options is given, an ASCII representation of the\n" +"revision graph is also shown.\n" +msgstr "" + +#, python-format +msgid "--graph option is incompatible with --%s" +msgstr "" + +msgid "" +"show revision history alongside an ASCII revision graph\n" +"\n" +" Print a revision history alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +#, python-format +msgid "comparing with %s\n" +msgstr "σύγκριση με %s\n" + +msgid "no changes found\n" +msgstr "δεν υπάρχουν αλλαγές\n" + +msgid "show the revision DAG" +msgstr "" + +msgid "limit number of changes displayed" +msgstr "" + +msgid "show patch" +msgstr "προβολή patch" + +msgid "show the specified revision or range" +msgstr "" + +msgid "hg glog [OPTION]... [FILE]" +msgstr "" + +msgid "" +"CIA notification\n" +"\n" +"This is meant to be run as a changegroup or incoming hook.\n" +"To configure it, set the following options in your hgrc:\n" +"\n" +"[cia]\n" +"# your registered CIA user name\n" +"user = foo\n" +"# the name of the project in CIA\n" +"project = foo\n" +"# the module (subproject) (optional)\n" +"#module = foo\n" +"# Append a diffstat to the log message (optional)\n" +"#diffstat = False\n" +"# Template to use for log messages (optional)\n" +"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" +"# Style to use (optional)\n" +"#style = foo\n" +"# The URL of the CIA notification service (optional)\n" +"# You can use mailto: URLs to send by email, eg\n" +"# mailto:cia@cia.vc\n" +"# Make sure to set email.from if you do this.\n" +"#url = http://cia.vc/\n" +"# print message instead of sending it (optional)\n" +"#test = False\n" +"\n" +"[hooks]\n" +"# one of these:\n" +"changegroup.cia = python:hgcia.hook\n" +"#incoming.cia = python:hgcia.hook\n" +"\n" +"[web]\n" +"# If you want hyperlinks (optional)\n" +"baseurl = http://server/path/to/repo\n" +msgstr "" + +#, python-format +msgid "hgcia: sending update to %s\n" +msgstr "" + +msgid "email.from must be defined when sending by email" +msgstr "" + +msgid "cia: no user specified" +msgstr "" + +msgid "cia: no project specified" +msgstr "" + +msgid "" +"browsing the repository in a graphical way\n" +"\n" +"The hgk extension allows browsing the history of a repository in a\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" +"distributed with Mercurial.)\n" +"\n" +"hgk consists of two parts: a Tcl script that does the displaying and\n" +"querying of information, and an extension to Mercurial named hgk.py,\n" +"which provides hooks for hgk to get information. hgk can be found in\n" +"the contrib directory, and hgk.py can be found in the hgext directory.\n" +"\n" +"To load the hgext.py extension, add it to your .hgrc file (you have to\n" +"use your global $HOME/.hgrc file, not one in a repository). You can\n" +"specify an absolute path:\n" +"\n" +" [extensions]\n" +" hgk=/usr/local/lib/hgk.py\n" +"\n" +"Mercurial can also scan the default python library path for a file\n" +"named 'hgk.py' if you set hgk empty:\n" +"\n" +" [extensions]\n" +" hgk=\n" +"\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:\n" +"\n" +" [hgk]\n" +" path=/location/of/hgk\n" +"\n" +"hgk can make use of the extdiff extension to visualize revisions.\n" +"Assuming you had already configured extdiff vdiff command, just add:\n" +"\n" +" [hgk]\n" +" vdiff=vdiff\n" +"\n" +"Revisions context menu will now display additional entries to fire\n" +"vdiff on hovered and selected revisions." +msgstr "" + +msgid "diff trees from two commits" +msgstr "" + +msgid "output common ancestor information" +msgstr "" + +msgid "cat a specific revision" +msgstr "" + +msgid "cat-file: type or revision not supplied\n" +msgstr "" + +msgid "aborting hg cat-file only understands commits\n" +msgstr "" + +msgid "parse given revisions" +msgstr "" + +msgid "print revisions" +msgstr "" + +msgid "print extension options" +msgstr "" + +msgid "start interactive history viewer" +msgstr "" + +msgid "hg view [-l LIMIT] [REVRANGE]" +msgstr "" + +msgid "generate patch" +msgstr "" + +msgid "recursive" +msgstr "" + +msgid "pretty" +msgstr "" + +msgid "stdin" +msgstr "" + +msgid "detect copies" +msgstr "" + +msgid "search" +msgstr "" + +msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." +msgstr "" + +msgid "hg debug-cat-file [OPTION]... TYPE FILE" +msgstr "" + +msgid "hg debug-config" +msgstr "" + +msgid "hg debug-merge-base node node" +msgstr "" + +msgid "ignored" +msgstr "" + +msgid "hg debug-rev-parse REV" +msgstr "" + +msgid "header" +msgstr "" + +msgid "topo-order" +msgstr "" + +msgid "parents" +msgstr "" + +msgid "max-count" +msgstr "" + +msgid "hg debug-rev-list [options] revs" +msgstr "" + +msgid "" +"syntax highlighting in hgweb, based on Pygments\n" +"\n" +"It depends on the Pygments syntax highlighting library:\n" +"http://pygments.org/\n" +"\n" +"To enable the extension add this to hgrc:\n" +"\n" +"[extensions]\n" +"hgext.highlight =\n" +"\n" +"There is a single configuration option:\n" +"\n" +"[web]\n" +"pygments_style =