diff --git a/i18n/fr.po b/i18n/fr.po --- a/i18n/fr.po +++ b/i18n/fr.po @@ -106,25 +106,25 @@ msgid "COMMANDS" msgstr "COMMANDES" #, fuzzy -msgid "" -" options:\n" -"\n" +msgid " options:" msgstr "options :\n" #, python-format -msgid "" -" aliases: %s\n" -"\n" -msgstr "" - -msgid "" -"Some commands allow the user to specify a date, e.g.:\n" -"\n" +msgid " aliases: %s" +msgstr "" + +msgid "Some commands allow the user to specify a date, e.g.:" +msgstr "" + +msgid "" "- backout, commit, import, tag: Specify the commit date.\n" -"- log, revert, update: Select revision(s) by date.\n" -"\n" -"Many date formats are valid. Here are some examples::\n" -"\n" +"- log, revert, update: Select revision(s) by date." +msgstr "" + +msgid "Many date formats are valid. Here are some examples::" +msgstr "" + +msgid "" " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" @@ -137,19 +137,26 @@ msgid "" " \"2006-12-6\"\n" " \"12-6\"\n" " \"12/6\"\n" -" \"12/6/6\" (Dec 6 2006)\n" -"\n" -"Lastly, there is Mercurial's internal format::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" +" \"12/6/6\" (Dec 6 2006)" +msgstr "" + +msgid "Lastly, there is Mercurial's internal format::" +msgstr "" + +msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)" +msgstr "" + +msgid "" "This is the internal representation format for dates. unixtime is the\n" "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" "the offset of the local timezone, in seconds west of UTC (negative if\n" -"the timezone is east of UTC).\n" -"\n" -"The log command also accepts date ranges::\n" -"\n" +"the timezone is east of UTC)." +msgstr "" + +msgid "The log command also accepts date ranges::" +msgstr "" + +msgid "" " \"<{datetime}\" - at or before a given date/time\n" " \">{datetime}\" - on or after a given date/time\n" " \"{datetime} to {datetime}\" - a date range, inclusive\n" @@ -159,29 +166,39 @@ msgstr "" msgid "" "Mercurial's default format for showing changes between two versions of\n" "a file is compatible with the unified format of GNU diff, which can be\n" -"used by GNU patch and many other standard tools.\n" -"\n" +"used by GNU patch and many other standard tools." +msgstr "" + +msgid "" "While this standard format is often enough, it does not encode the\n" -"following information:\n" -"\n" +"following information:" +msgstr "" + +msgid "" "- executable status and other permission bits\n" "- copy or rename information\n" "- changes in binary files\n" -"- creation or deletion of empty files\n" -"\n" +"- creation or deletion of empty files" +msgstr "" + +msgid "" "Mercurial also supports the extended diff format from the git VCS\n" "which addresses these limitations. The git diff format is not produced\n" "by default because a few widespread tools still do not understand this\n" -"format.\n" -"\n" +"format." +msgstr "" + +msgid "" "This means that when generating diffs from a Mercurial repository\n" "(e.g. with \"hg export\"), you should be careful about things like file\n" "copies and renames or other things mentioned above, because when\n" "applying a standard diff to a different repository, this extra\n" "information is lost. Mercurial's internal operations (like push and\n" "pull) are not affected by this, because they use an internal binary\n" -"format for communicating changes.\n" -"\n" +"format for communicating changes." +msgstr "" + +msgid "" "To make Mercurial produce the git extended diff format, use the --git\n" "option available for many commands, or set 'git = True' in the [diff]\n" "section of your hgrc. You do not need to set this option when\n" @@ -194,74 +211,98 @@ msgid "" " hooks, extensions or external tools. If unset or empty, this is\n" " the hg executable's name if it's frozen, or an executable named\n" " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" -" Windows) is searched.\n" -"\n" +" Windows) is searched." +msgstr "" + +msgid "" "HGEDITOR\n" -" This is the name of the editor to run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" This is the name of the editor to run when committing. See EDITOR." +msgstr "" + +msgid " (deprecated, use .hgrc)" +msgstr "" + +msgid "" "HGENCODING\n" " This overrides the default locale setting detected by Mercurial.\n" " This setting is used to convert data including usernames,\n" " changeset descriptions, tag names, and branches. This setting can\n" -" be overridden with the --encoding command-line option.\n" -"\n" +" be overridden with the --encoding command-line option." +msgstr "" + +msgid "" "HGENCODINGMODE\n" " This sets Mercurial's behavior for handling unknown characters\n" " while transcoding user input. The default is \"strict\", which\n" " causes Mercurial to abort if it can't map a character. Other\n" " settings include \"replace\", which replaces unknown characters, and\n" " \"ignore\", which drops them. This setting can be overridden with\n" -" the --encodingmode command-line option.\n" -"\n" +" the --encodingmode command-line option." +msgstr "" + +msgid "" "HGMERGE\n" " An executable to use for resolving merge conflicts. The program\n" " will be executed with three arguments: local file, remote file,\n" -" ancestor file.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" ancestor file." +msgstr "" + +msgid "" "HGRCPATH\n" " A list of files or directories to search for hgrc files. Item\n" " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" " platform default search path is used. If empty, only the .hg/hgrc\n" -" from the current repository is read.\n" -"\n" -" For each element in HGRCPATH:\n" -"\n" +" from the current repository is read." +msgstr "" + +msgid " For each element in HGRCPATH:" +msgstr "" + +msgid "" " - if it's a directory, all files ending with .rc are added\n" -" - otherwise, the file itself will be added\n" -"\n" +" - otherwise, the file itself will be added" +msgstr "" + +msgid "" "HGUSER\n" " This is the string used as the author of a commit. If not set,\n" -" available values will be considered in this order:\n" -"\n" +" available values will be considered in this order:" +msgstr "" + +msgid "" " - HGUSER (deprecated)\n" " - hgrc files from the HGRCPATH\n" " - EMAIL\n" " - interactive prompt\n" -" - LOGNAME (with '@hostname' appended)\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" - LOGNAME (with '@hostname' appended)" +msgstr "" + +msgid "" "EMAIL\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "LOGNAME\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "VISUAL\n" -" This is the name of the editor to use when committing. See EDITOR.\n" -"\n" +" This is the name of the editor to use when committing. See EDITOR." +msgstr "" + +msgid "" "EDITOR\n" " Sometimes Mercurial needs to open a text file in an editor for a\n" " user to modify, for example when writing commit messages. The\n" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'.\n" -"\n" +" defaults to 'vi'." +msgstr "" + +msgid "" "PYTHONPATH\n" " This is used by Python to find imported modules and may need to be\n" " set appropriately if this Mercurial is not installed system-wide.\n" @@ -272,44 +313,25 @@ msgid "" "Mercurial has the ability to add new features through the use of\n" "extensions. Extensions may add new commands, add options to\n" "existing commands, change the default behavior of commands, or\n" -"implement hooks.\n" -"\n" +"implement hooks." +msgstr "" +"\n" +" Mercurial a la capacité de s'enrichir de nouvelles\n" +" fonctionnalités par le biais d'extensions. Les extensions\n" +" permettent d'ajouter des nouvelles commandes, de changer le\n" +" comportement de commandes existantes ou leur ajouter des\n" +" options, ou encore d'implémenter de nouveaux \"hooks\"." + +#, fuzzy +msgid "" "Extensions are not loaded by default for a variety of reasons:\n" "they can increase startup overhead; they may be meant for advanced\n" "usage only; they may provide potentially dangerous abilities (such\n" "as letting you destroy or modify history); they might not be ready\n" "for prime time; or they may alter some usual behaviors of stock\n" "Mercurial. It is thus up to the user to activate extensions as\n" -"needed.\n" -"\n" -"To enable the \"foo\" extension, either shipped with Mercurial or in\n" -"the Python search path, create an entry for it in your hgrc, like\n" -"this::\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 /path/to/extension/bar.py\n" -" bar = !/path/to/extension/bar.py\n" -" # ditto, but no path was supplied for extension baz\n" -" baz = !\n" -msgstr "" -"\n" -" Mercurial a la capacité de s'enrichir de nouvelles\n" -" fonctionnalités par le biais d'extensions. Les extensions\n" -" permettent d'ajouter des nouvelles commandes, de changer le\n" -" comportement de commandes existantes ou leur ajouter des\n" -" options, ou encore d'implémenter de nouveaux \"hooks\".\n" -"\n" +"needed." +msgstr "" " Les extensions ne sont pas chargées automatiquement par défaut\n" " pour diverses raisons : elles peuvent accroître la latence\n" " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n" @@ -320,23 +342,54 @@ msgstr "" " grand nombre ; ou encore elles peuvent modifier certains des\n" " comportements habituels de Mercurial.\n" " Il appartient donc à l'utilisateur de les activer en fonction\n" -" de ses besoins.\n" -"\n" +" de ses besoins." + +#, fuzzy +msgid "" +"To enable the \"foo\" extension, either shipped with Mercurial or in\n" +"the Python search path, create an entry for it in your hgrc, like\n" +"this::" +msgstr "" " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n" " présente dans le chemin de recherche de Python, déclarez-la\n" -" dans votre fichier de configuration hgrc comme suit :\n" -"\n" +" dans votre fichier de configuration hgrc comme suit :" + +#, fuzzy +msgid "" +" [extensions]\n" +" foo =" +msgstr "" " [extensions]\n" -" truc =\n" -"\n" -" Vous pouvez aussi indiquer l'endroit où elle se trouve :\n" -"\n" +" truc =" + +#, fuzzy +msgid "You may also specify the full path to an extension::" +msgstr " Vous pouvez aussi indiquer l'endroit où elle se trouve :" + +#, fuzzy +msgid "" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py" +msgstr "" " [extensions]\n" -" monbidule = ~/.hgext/monbidule.py\n" -"\n" +" monbidule = ~/.hgext/monbidule.py" + +#, fuzzy +msgid "" +"To explicitly disable an extension enabled in an hgrc of broader\n" +"scope, prepend its path with !::" +msgstr "" " Pour forcer la désactivation d'une extension activée par un\n" -" autre hgrc, précédez son chemin d'un point d'exclamation :\n" -"\n" +" autre hgrc, précédez son chemin d'un point d'exclamation :" + +#, fuzzy +msgid "" +" [extensions]\n" +" # disabling extension bar residing in /path/to/extension/bar.py\n" +" bar = !/path/to/extension/bar.py\n" +" # ditto, but no path was supplied for extension baz\n" +" baz = !\n" +msgstr "" " [extensions]\n" " # désactivation de machin qui se trouve dans /vers/machin.py\n" " bar = !/vers/machin.py\n" @@ -347,89 +400,126 @@ msgstr "" msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" -"separated by the \":\" character.\n" -"\n" +"separated by the \":\" character." +msgstr "" + +msgid "" "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" "specified, it defaults to revision number 0. If END is not specified,\n" -"it defaults to the tip. The range \":\" thus means \"all revisions\".\n" -"\n" -"If BEGIN is greater than END, revisions are treated in reverse order.\n" -"\n" +"it defaults to the tip. The range \":\" thus means \"all revisions\"." +msgstr "" + +msgid "If BEGIN is greater than END, revisions are treated in reverse order." +msgstr "" + +msgid "" "A range acts as a closed interval. This means that a range of 3:5\n" "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" msgstr "" msgid "" "Mercurial accepts several notations for identifying one or more files\n" -"at a time.\n" -"\n" +"at a time." +msgstr "" + +msgid "" "By default, Mercurial treats filenames as shell-style extended glob\n" -"patterns.\n" -"\n" -"Alternate pattern notations must be specified explicitly.\n" -"\n" +"patterns." +msgstr "" + +msgid "Alternate pattern notations must be specified explicitly." +msgstr "" + +msgid "" "To use a plain path name without any pattern matching, start it with\n" "``path:``. These path names must completely match starting at the\n" -"current repository root.\n" -"\n" +"current repository root." +msgstr "" + +msgid "" "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" "at the current directory; a glob such as ``*.c`` will only match files\n" -"in the current directory ending with ``.c``.\n" -"\n" +"in the current directory ending with ``.c``." +msgstr "" + +msgid "" "The supported glob syntax extensions are ``**`` to match any string\n" -"across path separators and ``{a,b}`` to mean \"a or b\".\n" -"\n" +"across path separators and ``{a,b}`` to mean \"a or b\"." +msgstr "" + +msgid "" "To use a Perl/Python regular expression, start a name with ``re:``.\n" -"Regexp pattern matching is anchored at the root of the repository.\n" -"\n" -"Plain examples::\n" -"\n" +"Regexp pattern matching is anchored at the root of the repository." +msgstr "" + +msgid "Plain examples::" +msgstr "" + +msgid "" " path:foo/bar a name bar in a directory named foo in the root\n" " of the repository\n" -" path:path:name a file or directory named \"path:name\"\n" -"\n" -"Glob examples::\n" -"\n" +" path:path:name a file or directory named \"path:name\"" +msgstr "" + +msgid "Glob examples::" +msgstr "" + +msgid "" " glob:*.c any name ending in \".c\" in the current directory\n" " *.c any name ending in \".c\" in the current directory\n" " **.c any name ending in \".c\" in any subdirectory of the\n" " current directory including itself.\n" " foo/*.c any name ending in \".c\" in the directory foo\n" " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" -" including itself.\n" -"\n" -"Regexp examples::\n" -"\n" -" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -msgstr "" - -msgid "" -"Mercurial supports several ways to specify individual revisions.\n" -"\n" +" including itself." +msgstr "" + +msgid "Regexp examples::" +msgstr "" + +msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" + +msgid "Mercurial supports several ways to specify individual revisions." +msgstr "" + +msgid "" "A plain integer is treated as a revision number. Negative integers are\n" "treated as sequential offsets from the tip, with -1 denoting the tip,\n" -"-2 denoting the revision prior to the tip, and so forth.\n" -"\n" +"-2 denoting the revision prior to the tip, and so forth." +msgstr "" + +msgid "" "A 40-digit hexadecimal string is treated as a unique revision\n" -"identifier.\n" -"\n" +"identifier." +msgstr "" + +msgid "" "A hexadecimal string less than 40 characters long is treated as a\n" "unique revision identifier and is referred to as a short-form\n" "identifier. A short-form identifier is only valid if it is the prefix\n" -"of exactly one full-length identifier.\n" -"\n" +"of exactly one full-length identifier." +msgstr "" + +msgid "" "Any other string is treated as a tag or branch name. A tag name is a\n" "symbolic name associated with a revision identifier. A branch name\n" "denotes the tipmost revision of that branch. Tag and branch names must\n" -"not contain the \":\" character.\n" -"\n" +"not contain the \":\" character." +msgstr "" + +msgid "" "The reserved name \"tip\" is a special tag that always identifies the\n" -"most recent revision.\n" -"\n" +"most recent revision." +msgstr "" + +msgid "" "The reserved name \"null\" indicates the null revision. This is the\n" -"revision of an empty repository, and the parent of revision 0.\n" -"\n" +"revision of an empty repository, and the parent of revision 0." +msgstr "" + +msgid "" "The reserved name \".\" indicates the working directory parent. If no\n" "working directory is checked out, it is equivalent to null. If an\n" "uncommitted merge is in progress, \".\" is the revision of the first\n" @@ -440,26 +530,38 @@ msgid "" "Mercurial allows you to customize output of commands through\n" "templates. You can either pass in a template from the command\n" "line, via the --template option, or select an existing\n" -"template-style (--style).\n" -"\n" +"template-style (--style)." +msgstr "" + +msgid "" "You can customize output for any \"log-like\" command: log,\n" -"outgoing, incoming, tip, parents, heads and glog.\n" -"\n" +"outgoing, incoming, tip, parents, heads and glog." +msgstr "" + +msgid "" "Three styles are packaged with Mercurial: default (the style used\n" "when no explicit preference is passed), compact and changelog.\n" -"Usage::\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" +"Usage::" +msgstr "" + +msgid " $ hg log -r1 --style changelog" +msgstr "" + +msgid "" "A template is a piece of text, with markup to invoke variable\n" -"expansion::\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\\n b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" +"expansion::" +msgstr "" + +msgid " $ hg log -r1 --template \"{node}\\n\"\\n b56ce7b07c52de7d5fd79fb89701ea538af65746" +msgstr "" + +msgid "" "Strings in curly braces are called keywords. The availability of\n" "keywords depends on the exact context of the templater. These\n" -"keywords are usually available for templating a log-like command:\n" -"\n" +"keywords are usually available for templating a log-like command:" +msgstr "" + +msgid "" ":author: String. The unmodified author of the changeset.\n" ":branches: String. The name of the branch on which the changeset\n" " was committed. Will be empty if the branch name was\n" @@ -483,18 +585,24 @@ msgid "" " changeset.\n" ":latesttag: String. Most recent global tag in the ancestors of this\n" " changeset.\n" -":latesttagdistance: Integer. Longest path to the latest tag.\n" -"\n" +":latesttagdistance: Integer. Longest path to the latest tag." +msgstr "" + +msgid "" "The \"date\" keyword does not produce human-readable output. If you\n" "want to use a date in your output, you can use a filter to process\n" "it. Filters are functions which return a string based on the input\n" "variable. You can also use a chain of filters to get the desired\n" -"output::\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\\n 2008-08-21 18:22 +0000\n" -"\n" -"List of filters:\n" -"\n" +"output::" +msgstr "" + +msgid " $ hg tip --template \"{date|isodate}\\n\"\\n 2008-08-21 18:22 +0000" +msgstr "" + +msgid "List of filters:" +msgstr "" + +msgid "" ":addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n" " every line except the last.\n" ":age: Date. Returns a human-readable date/time difference\n" @@ -550,113 +658,160 @@ msgid "" " address.\n" msgstr "" -msgid "" -"Valid URLs are of the form::\n" -"\n" +msgid "Valid URLs are of the form::" +msgstr "" + +msgid "" " local/filesystem/path[#revision]\n" " file://local/filesystem/path[#revision]\n" " http://[user[:pass]@]host[:port]/[path][#revision]\n" " https://[user[:pass]@]host[:port]/[path][#revision]\n" -" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" -"\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]" +msgstr "" + +msgid "" "Paths in the local filesystem can either point to Mercurial\n" "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -"incoming --bundle').\n" -"\n" +"incoming --bundle')." +msgstr "" + +msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" "changeset to use from the remote repository. See also 'hg help\n" -"revisions'.\n" -"\n" +"revisions'." +msgstr "" + +msgid "" "Some features, such as pushing to http:// and https:// URLs are only\n" "possible if the feature is explicitly enabled on the remote Mercurial\n" -"server.\n" -"\n" -"Some notes about using SSH with Mercurial:\n" -"\n" +"server." +msgstr "" + +msgid "Some notes about using SSH with Mercurial:" +msgstr "" + +msgid "" "- SSH requires an accessible shell account on the destination machine\n" " and a copy of hg in the remote path or specified with as remotecmd.\n" "- path is relative to the remote user's home directory by default. Use\n" -" an extra slash at the start of a path to specify an absolute path::\n" -"\n" -" ssh://example.com//tmp/repository\n" -"\n" +" an extra slash at the start of a path to specify an absolute path::" +msgstr "" + +msgid " ssh://example.com//tmp/repository" +msgstr "" + +msgid "" "- Mercurial doesn't use its own compression via SSH; the right thing\n" -" to do is to configure it in your ~/.ssh/config, e.g.::\n" -"\n" +" to do is to configure it in your ~/.ssh/config, e.g.::" +msgstr "" + +msgid "" " Host *.mylocalnetwork.example.com\n" " Compression no\n" " Host *\n" -" Compression yes\n" -"\n" +" Compression yes" +msgstr "" + +msgid "" " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option.\n" -"\n" +" with the --ssh command line option." +msgstr "" + +msgid "" "These URLs can all be stored in your hgrc with path aliases under the\n" -"[paths] section like so::\n" -"\n" +"[paths] section like so::" +msgstr "" + +msgid "" " [paths]\n" " alias1 = URL1\n" " alias2 = URL2\n" -" ...\n" -"\n" +" ..." +msgstr "" + +msgid "" "You can then use the alias for any command that uses a URL (for\n" -"example 'hg pull alias1' would pull from the 'alias1' path).\n" -"\n" +"example 'hg pull alias1' would pull from the 'alias1' path)." +msgstr "" + +msgid "" "Two path aliases are special because they are used as defaults when\n" -"you do not provide the URL to a command:\n" -"\n" +"you do not provide the URL to a command:" +msgstr "" + +msgid "" "default:\n" " When you create a repository with hg clone, the clone command saves\n" " the location of the source repository as the new repository's\n" " 'default' path. This is then used when you omit path from push- and\n" -" pull-like commands (including incoming and outgoing).\n" -"\n" +" pull-like commands (including incoming and outgoing)." +msgstr "" + +msgid "" "default-push:\n" " The push command will look for a path named 'default-push', and\n" " prefer it over 'default' if both are defined.\n" msgstr "" -msgid "" -"hooks for controlling repository access\n" -"\n" +msgid "hooks for controlling repository access" +msgstr "" + +msgid "" "This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets.\n" -"\n" +"of a repository when receiving incoming changesets." +msgstr "" + +msgid "" "The authorization is matched based on the local user name on the\n" "system where the hook runs, and not the committer of the original\n" -"changeset (since the latter is merely informative).\n" -"\n" +"changeset (since the latter is merely informative)." +msgstr "" + +msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" "preventing authenticating users from doing anything other than\n" "pushing or pulling. The hook is not safe to use if users have\n" "interactive shell access, as they can then disable the hook.\n" "Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them.\n" -"\n" -"To use this hook, configure the acl extension in your hgrc like this::\n" -"\n" +"is no way to distinguish them." +msgstr "" + +msgid "To use this hook, configure the acl extension in your hgrc like this::" +msgstr "" + +msgid "" " [extensions]\n" -" acl =\n" -"\n" +" acl =" +msgstr "" + +msgid "" " [hooks]\n" -" pretxnchangegroup.acl = python:hgext.acl.hook\n" -"\n" +" pretxnchangegroup.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" " [acl]\n" " # Check whether the source of incoming changes is in this list\n" " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" -" sources = serve\n" -"\n" +" sources = serve" +msgstr "" + +msgid "" "The allow and deny sections take a subtree pattern as key (with a glob\n" "syntax by default), and a comma separated list of users as the\n" "corresponding value. The deny list is checked before the allow list\n" -"is. ::\n" -"\n" +"is. ::" +msgstr "" + +msgid "" " [acl.allow]\n" " # If acl.allow is not present, all users are allowed by default.\n" " # An empty acl.allow section means no users allowed.\n" " docs/** = doc_writer\n" -" .hgtags = release_engineer\n" -"\n" +" .hgtags = release_engineer" +msgstr "" + +msgid "" " [acl.deny]\n" " # If acl.deny is not present, no users are refused by default.\n" " # An empty acl.deny section means all users allowed.\n" @@ -672,38 +827,47 @@ msgstr "" msgid "acl: access denied for changeset %s" msgstr "" -msgid "" -"track a line of development with movable markers\n" -"\n" +msgid "track a line of development with movable markers" +msgstr "" + +msgid "" "Bookmarks are local movable markers to changesets. Every bookmark\n" "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 shifts to the new changeset.\n" -"\n" +"bookmark shifts to the new changeset." +msgstr "" + +msgid "" "It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" +"merge, hg update)." +msgstr "" + +msgid "" "By default, when several bookmarks point to the same changeset, they\n" "will all move forward together. It is possible to obtain a more\n" "git-like experience by adding the following configuration option to\n" -"your .hgrc::\n" -"\n" +"your .hgrc::" +msgstr "" + +msgid "" " [bookmarks]\n" -" track.current = True\n" -"\n" +" track.current = True" +msgstr "" + +msgid "" "This will cause Mercurial to track the bookmark that you are currently\n" "using, and only update it. This is similar to git's approach to\n" "branching.\n" msgstr "" msgid "" -"track a line of development with movable markers\n" -"\n" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" " deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark.\n" -"\n" +" 'hg update' to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" " You can use 'hg bookmark NAME' to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" @@ -745,116 +909,168 @@ msgstr "Renommer un signet donné" msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" msgstr "" -msgid "" -"hooks for integrating with the Bugzilla bug tracker\n" -"\n" +msgid "hooks for integrating with the Bugzilla bug tracker" +msgstr "" + +msgid "" "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" +"bug status." +msgstr "" + +msgid "" "The hook updates the Bugzilla database directly. Only Bugzilla\n" -"installations using MySQL are supported.\n" -"\n" +"installations using MySQL are supported." +msgstr "" + +msgid "" "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" +"ensure the Bugzilla install file permissions are set appropriately." +msgstr "" + +msgid "" "The extension is configured through three different configuration\n" -"sections. These keys are recognized in the [bugzilla] section:\n" -"\n" +"sections. These keys are recognized in the [bugzilla] section:" +msgstr "" + +msgid "" "host\n" -" Hostname of the MySQL server holding the Bugzilla database.\n" -"\n" +" Hostname of the MySQL server holding the Bugzilla database." +msgstr "" + +msgid "" "db\n" -" Name of the Bugzilla database in MySQL. Default 'bugs'.\n" -"\n" +" Name of the Bugzilla database in MySQL. Default 'bugs'." +msgstr "" + +msgid "" "user\n" -" Username to use to access MySQL server. Default 'bugs'.\n" -"\n" +" Username to use to access MySQL server. Default 'bugs'." +msgstr "" + +msgid "" "password\n" -" Password to use to access MySQL server.\n" -"\n" +" Password to use to access MySQL server." +msgstr "" + +msgid "" "timeout\n" -" Database connection timeout (seconds). Default 5.\n" -"\n" +" Database connection timeout (seconds). Default 5." +msgstr "" + +msgid "" "version\n" " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n" " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n" -" to 2.18.\n" -"\n" +" to 2.18." +msgstr "" + +msgid "" "bzuser\n" " Fallback Bugzilla user name to record comments with, if changeset\n" -" committer cannot be found as a Bugzilla user.\n" -"\n" +" committer cannot be found as a Bugzilla user." +msgstr "" + +msgid "" "bzdir\n" " Bugzilla install directory. Used by default notify. Default\n" -" '/var/www/html/bugzilla'.\n" -"\n" +" '/var/www/html/bugzilla'." +msgstr "" + +msgid "" "notify\n" " The command to run to get Bugzilla to send bug change notification\n" " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n" " and 'user' (committer bugzilla email). Default depends on version;\n" " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" -" %(id)s %(user)s\".\n" -"\n" +" %(id)s %(user)s\"." +msgstr "" + +msgid "" "regexp\n" " Regular expression to match bug IDs in changeset commit message.\n" " Must contain one \"()\" group. The default expression matches 'Bug\n" " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n" -" 1234 and 5678' and variations thereof. Matching is case insensitive.\n" -"\n" +" 1234 and 5678' and variations thereof. Matching is case insensitive." +msgstr "" + +msgid "" "style\n" -" The style file to use when formatting comments.\n" -"\n" +" The style file to use when formatting comments." +msgstr "" + +msgid "" "template\n" " Template to use when formatting comments. Overrides style if\n" " specified. In addition to the usual Mercurial keywords, the\n" -" extension specifies::\n" -"\n" +" extension specifies::" +msgstr "" + +msgid "" " {bug} The Bugzilla bug ID.\n" " {root} The full pathname of the Mercurial repository.\n" " {webroot} Stripped pathname of the Mercurial repository.\n" -" {hgweb} Base URL for browsing Mercurial repositories.\n" -"\n" +" {hgweb} Base URL for browsing Mercurial repositories." +msgstr "" + +msgid "" " Default 'changeset {node|short} in repo {root} refers '\n" " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\\n\n" "strip\n" " The number of slashes to strip from the front of {root} to produce\n" -" {webroot}. Default 0.\n" -"\n" +" {webroot}. Default 0." +msgstr "" + +msgid "" "usermap\n" " Path of file containing Mercurial committer ID to Bugzilla user ID\n" " mappings. If specified, the file should contain one mapping per\n" -" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n" -"\n" +" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section." +msgstr "" + +msgid "" "The [usermap] section is used to specify mappings of Mercurial\n" "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" -"\"committer\"=\"Bugzilla user\"\n" -"\n" -"Finally, the [web] section supports one entry:\n" -"\n" +"\"committer\"=\"Bugzilla user\"" +msgstr "" + +msgid "Finally, the [web] section supports one entry:" +msgstr "" + +msgid "" "baseurl\n" " Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}.\n" -"\n" -"Activating the extension::\n" -"\n" +" templates as {hgweb}." +msgstr "" + +msgid "Activating the extension::" +msgstr "" + +msgid "" " [extensions]\n" -" bugzilla =\n" -"\n" +" bugzilla =" +msgstr "" + +msgid "" " [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" +" incoming.bugzilla = python:hgext.bugzilla.hook" +msgstr "" + +msgid "Example configuration:" +msgstr "" + +msgid "" "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" +"installation in /opt/bugzilla-3.2. ::" +msgstr "" + +msgid "" " [bugzilla]\n" " host=localhost\n" " password=XYZZY\n" @@ -862,20 +1078,28 @@ msgid "" " 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" +" {hgweb}/{webroot}/rev/{node|short}\\n\\n {desc}\\n\\n strip=5" +msgstr "" + +msgid "" " [web]\n" -" baseurl=http://dev.domain.com/hg\n" -"\n" +" baseurl=http://dev.domain.com/hg" +msgstr "" + +msgid "" " [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" +" user@emaildomain.com=user.name@bugzilladomain.com" +msgstr "" + +msgid "Commits add a comment to the Bugzilla bug record of the form::" +msgstr "" + +msgid "" " Changeset 3b16791d6642 in repository-name.\n" -" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" -"\n" -" Changeset commit comment. Bug 1234.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642" +msgstr "" + +msgid " Changeset commit comment. Bug 1234.\n" msgstr "" #, python-format @@ -952,9 +1176,10 @@ msgstr "" msgid "command to display child changesets" msgstr "" -msgid "" -"show the children of the given or working directory revision\n" -"\n" +msgid "show the children of the given or working directory revision" +msgstr "" + +msgid "" " 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" @@ -981,38 +1206,55 @@ msgstr "" msgid "generating stats: %d%%" msgstr "" -msgid "" -"histogram of changes to the repository\n" -"\n" +msgid "histogram of changes to the repository" +msgstr "" + +msgid "" " 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" +" date instead." +msgstr "" + +msgid "" " 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" +" --changesets option is specified." +msgstr "" + +msgid " Examples::" +msgstr "" + +msgid "" " # display count of changed lines for every committer\n" -" hg churn -t '{author|email}'\n" -"\n" +" hg churn -t '{author|email}'" +msgstr "" + +msgid "" " # display daily activity graph\n" -" hg churn -f '%H' -s -c\n" -"\n" +" hg churn -f '%H' -s -c" +msgstr "" + +msgid "" " # display activity of developers by month\n" -" hg churn -f '%Y-%m' -s -c\n" -"\n" +" hg churn -f '%Y-%m' -s -c" +msgstr "" + +msgid "" " # display count of lines changed in every year\n" -" hg churn -f '%Y' -s\n" -"\n" +" hg churn -f '%Y' -s" +msgstr "" + +msgid "" " 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 providing a file using the following format::" +msgstr "" + +msgid " " +msgstr "" + +msgid "" " Such a file may be specified with the --aliases option, otherwise\n" " a .hgchurn file will be looked for in the working directory root.\n" " " @@ -1045,38 +1287,50 @@ msgstr "" msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" msgstr "" -msgid "" -"colorize output from some commands\n" -"\n" +msgid "colorize output from some commands" +msgstr "" + +msgid "" "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" +"whitespace." +msgstr "" + +msgid "" "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" -"Default effects may be overridden from the .hgrc file::\n" -"\n" +"render_text function, which can be used to add effects to any text." +msgstr "" + +msgid "Default effects may be overridden from the .hgrc file::" +msgstr "" + +msgid "" " [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" +" status.ignored = black bold" +msgstr "" + +msgid "" " # 'none' turns off all effects\n" " status.clean = none\n" -" status.copied = none\n" -"\n" +" status.copied = none" +msgstr "" + +msgid "" " qseries.applied = blue bold underline\n" " qseries.unapplied = black bold\n" -" qseries.missing = red bold\n" -"\n" +" qseries.missing = red bold" +msgstr "" + +msgid "" " diff.diffline = bold\n" " diff.extended = cyan bold\n" " diff.file_a = red bold\n" @@ -1101,11 +1355,13 @@ msgstr "" msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" -msgid "" -"convert a foreign SCM repository to a Mercurial one.\n" -"\n" -" Accepted source formats [identifiers]:\n" -"\n" +msgid "convert a foreign SCM repository to a Mercurial one." +msgstr "" + +msgid " Accepted source formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" " - CVS [cvs]\n" " - Darcs [darcs]\n" @@ -1114,72 +1370,103 @@ msgid "" " - Monotone [mtn]\n" " - GNU Arch [gnuarch]\n" " - Bazaar [bzr]\n" -" - Perforce [p4]\n" -"\n" -" Accepted destination formats [identifiers]:\n" -"\n" +" - Perforce [p4]" +msgstr "" + +msgid " Accepted destination formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" -" - Subversion [svn] (history on branches is not preserved)\n" -"\n" +" - Subversion [svn] (history on branches is not preserved)" +msgstr "" + +msgid "" " 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" +" (given in a format understood by the source)." +msgstr "" + +msgid "" " 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" +" repository doesn't exist, it will be created." +msgstr "" + +msgid "" " By default, all sources except Mercurial will use --branchsort.\n" " Mercurial uses --sourcesort to preserve original revision numbers\n" -" order. Sort modes have the following effects:\n" -"\n" +" order. Sort modes have the following effects:" +msgstr "" + +msgid "" " --branchsort convert from parent to child revision when possible,\n" " which means branches are usually converted one after\n" -" the other. It generates more compact repositories.\n" -"\n" +" the other. It generates more compact repositories." +msgstr "" + +msgid "" " --datesort sort revisions by date. Converted repositories have\n" " good-looking changelogs but are often an order of\n" " magnitude larger than the same ones generated by\n" -" --branchsort.\n" -"\n" +" --branchsort." +msgstr "" + +msgid "" " --sourcesort try to preserve source revisions order, only\n" -" supported by Mercurial sources.\n" -"\n" +" supported by Mercurial sources." +msgstr "" + +msgid "" " 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" -"\n" +" revision, like so::" +msgstr "" + +msgid " " +msgstr "" + +msgid "" " 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" +" and can be run repeatedly to copy new commits." +msgstr "" + +msgid "" " 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" +" srcauthor=whatever string you want" +msgstr "" + +msgid "" " The filemap is a file that allows filtering and remapping of files\n" " and directories. Comment lines start with '#'. Each line can\n" -" contain one of the following directives::\n" -"\n" -" include path/to/file\n" -"\n" -" exclude path/to/file\n" -"\n" -" rename from/file to/file\n" -"\n" +" contain one of the following directives::" +msgstr "" + +msgid " include path/to/file" +msgstr "" + +msgid " exclude path/to/file" +msgstr "" + +msgid " rename from/file to/file" +msgstr "" + +msgid "" " 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\n" " included. The 'exclude' directive causes files or directories to\n" " be omitted. The 'rename' directive renames a file or directory. To\n" " rename from a subdirectory into the root of the repository, use\n" -" '.' as the path to rename to.\n" -"\n" +" '.' as the path to rename to." +msgstr "" + +msgid "" " 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" @@ -1189,8 +1476,10 @@ msgid "" " 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" +" should be used as the new parents for that node." +msgstr "" + +msgid "" " 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" @@ -1200,11 +1489,15 @@ msgid "" " \"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" +" in one repository from \"default\" to a named branch." +msgstr "" + +msgid "" " Mercurial Source\n" -" ----------------\n" -"\n" +" ----------------" +msgstr "" + +msgid "" " --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" @@ -1213,11 +1506,15 @@ msgid "" " 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" +" convert start revision and its descendants" +msgstr "" + +msgid "" " CVS Source\n" -" ----------\n" -"\n" +" ----------" +msgstr "" + +msgid "" " 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" @@ -1226,10 +1523,13 @@ msgid "" " 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" -" The options shown are the defaults.\n" -"\n" +" sandbox is ignored." +msgstr "" + +msgid " The options shown are the defaults." +msgstr "" + +msgid "" " --config convert.cvsps.cache=True (boolean)\n" " Set to False to disable remote log caching, for testing and\n" " debugging purposes.\n" @@ -1247,16 +1547,22 @@ msgid "" " Specify a regular expression to which commit log messages are\n" " matched. If a match occurs, then the conversion process will\n" " add the most recent revision on the branch indicated in the\n" -" regex as the second parent of the changeset.\n" -"\n" +" regex as the second parent of the changeset." +msgstr "" + +msgid "" " An additional \"debugcvsps\" Mercurial command 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. Please see\n" -" the command help for more details.\n" -"\n" +" the command help for more details." +msgstr "" + +msgid "" " Subversion Source\n" -" -----------------\n" -"\n" +" -----------------" +msgstr "" + +msgid "" " 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" @@ -1266,58 +1572,80 @@ msgid "" " 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" +" detection." +msgstr "" + +msgid "" " --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" +" specify the name of the trunk branch" +msgstr "" + +msgid "" " 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" +" conversions are supported." +msgstr "" + +msgid "" " --config convert.svn.startrev=0 (svn revision number)\n" -" specify start Subversion revision.\n" -"\n" +" specify start Subversion revision." +msgstr "" + +msgid "" " Perforce Source\n" -" ---------------\n" -"\n" +" ---------------" +msgstr "" + +msgid "" " 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" +" target may be named ...-hg." +msgstr "" + +msgid "" " It is possible to limit the amount of source history to be\n" -" converted by specifying an initial Perforce revision.\n" -"\n" +" converted by specifying an initial Perforce revision." +msgstr "" + +msgid "" " --config convert.p4.startrev=0 (perforce changelist number)\n" -" specify initial Perforce revision.\n" -"\n" +" specify initial Perforce revision." +msgstr "" + +msgid "" " Mercurial Destination\n" -" ---------------------\n" -"\n" +" ---------------------" +msgstr "" + +msgid "" " --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" +" preserve branch names" +msgstr "" + +msgid " " +msgstr "" + +msgid "create changeset information from CVS" +msgstr "" + +msgid "" " 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" +" cvsps." +msgstr "" + +msgid "" " 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" @@ -1745,37 +2073,50 @@ msgstr "" msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "XXX TAGS PAS ENCORE IMPLÉMENTÉ\n" -msgid "" -"command to allow external programs to compare revisions\n" -"\n" +msgid "command to allow external programs to compare revisions" +msgstr "" + +msgid "" "The extdiff Mercurial extension allows you to use external programs\n" "to compare revisions, or revision with working directory. The external\n" "diff 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" +"files to compare." +msgstr "" + +msgid "" "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" +"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +msgstr "" + +msgid "" " [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" +" #opts.cdiff = -Nprc5" +msgstr "" + +msgid "" " # add new command called vdiff, runs kdiff3\n" -" vdiff = kdiff3\n" -"\n" +" vdiff = kdiff3" +msgstr "" + +msgid "" " # add new command called meld, runs meld (no need to name twice)\n" -" meld =\n" -"\n" +" meld =" +msgstr "" + +msgid "" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" " # 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" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" +msgstr "" + +msgid "" "You can use -I/-X and list of file or directory names like normal \"hg\n" "diff\" command. The extdiff extension makes snapshots of only needed\n" "files, so running the external diff program will actually be pretty\n" @@ -1796,18 +2137,23 @@ msgstr "" msgid "cleaning up temp directory\n" msgstr "nettoyage du dossier temporaire\n" -msgid "" -"use external program to diff repository (or selected files)\n" -"\n" +msgid "use external program to diff repository (or selected files)" +msgstr "" + +msgid "" " 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" +" default options \"-Npru\"." +msgstr "" + +msgid "" " 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" +" will be passed before the names of the directories to compare." +msgstr "" + +msgid "" " 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" @@ -1828,12 +2174,17 @@ msgid "hg extdiff [OPT]... [FILE]..." msgstr "" #, python-format -msgid "" -"use %(path)s to diff repository (or selected files)\n" -"\n" +msgid "use %(path)s to diff repository (or selected files)" +msgstr "" + +#, python-format +msgid "" " Show differences between revisions for the specified files, using the\n" -" %(path)s program.\n" -"\n" +" %(path)s program." +msgstr "" + +#, python-format +msgid "" " When two revision arguments are given, then changes are shown between\n" " those revisions. If only one revision is specified then that revision is\n" " compared to the working directory, and, when no revisions are specified,\n" @@ -1847,22 +2198,29 @@ msgstr "" msgid "pull, update and merge in one command" msgstr "" -msgid "" -"pull changes from a remote repository, merge new changes if needed.\n" -"\n" +msgid "pull changes from a remote repository, merge new changes if needed." +msgstr "" + +msgid "" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository.\n" -"\n" +" or URL and adds them to the local repository." +msgstr "" + +msgid "" " 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" +" changes." +msgstr "" + +msgid "" " 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" +" order, use --switch-parent." +msgstr "" + +msgid "" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -1952,14 +2310,12 @@ msgstr "" msgid "No valid signature for %s\n" msgstr "Signature invalide pour %s\n" -msgid "" -"add a signature for the current or given revision\n" -"\n" +msgid "add a signature for the current or given revision" +msgstr "" + +msgid "" " 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" -" " +" or tip if no revision is checked out." msgstr "" msgid "uncommitted merge - please provide a specific revision" @@ -1998,9 +2354,10 @@ msgstr "" msgid "hg sigs" msgstr "" -msgid "" -"command to view revision graphs from a shell\n" -"\n" +msgid "command to view revision graphs from a shell" +msgstr "" + +msgid "" "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" @@ -2010,12 +2367,15 @@ msgstr "" msgid "--graph option is incompatible with --%s" msgstr "" -msgid "" -"show revision history alongside an ASCII revision graph\n" -"\n" +msgid "show revision history alongside an ASCII revision graph" +msgstr "" + +msgid "" " Print a revision history alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" +" ASCII characters." +msgstr "" + +msgid "" " Nodes printed as an @ character are parents of the working\n" " directory.\n" " " @@ -2043,12 +2403,15 @@ msgstr "" msgid "hg glog [OPTION]... [FILE]" msgstr "" -msgid "" -"hooks for integrating with the CIA.vc notification service\n" -"\n" +msgid "hooks for integrating with the CIA.vc notification service" +msgstr "" + +msgid "" "This is meant to be run as a changegroup or incoming hook. To\n" -"configure it, set the following options in your hgrc::\n" -"\n" +"configure it, set the following options in your hgrc::" +msgstr "" + +msgid "" " [cia]\n" " # your registered CIA user name\n" " user = foo\n" @@ -2067,13 +2430,17 @@ msgid "" " # 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" +" #test = False" +msgstr "" + +msgid "" " [hooks]\n" " # one of these:\n" " changegroup.cia = python:hgcia.hook\n" -" #incoming.cia = python:hgcia.hook\n" -"\n" +" #incoming.cia = python:hgcia.hook" +msgstr "" + +msgid "" " [web]\n" " # If you want hyperlinks (optional)\n" " baseurl = http://server/path/to/repo\n" @@ -2086,32 +2453,45 @@ msgstr "" msgid "email.from must be defined when sending by email" msgstr "" -msgid "" -"browse the repository in a graphical way\n" -"\n" +msgid "browse the repository in a graphical way" +msgstr "" + +msgid "" "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" +"distributed with Mercurial.)" +msgstr "" + +msgid "" "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 the extension is shipped in the hgext\n" -"repository, and needs to be enabled.\n" -"\n" +"repository, and needs to be enabled." +msgstr "" + +msgid "" "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" +"the path to hgk in your .hgrc file::" +msgstr "" + +msgid "" " [hgk]\n" -" path=/location/of/hgk\n" -"\n" +" path=/location/of/hgk" +msgstr "" + +msgid "" "hgk can make use of the extdiff extension to visualize revisions.\n" -"Assuming you had already configured extdiff vdiff command, just add::\n" -"\n" +"Assuming you had already configured extdiff vdiff command, just add::" +msgstr "" + +msgid "" " [hgk]\n" -" vdiff=vdiff\n" -"\n" +" vdiff=vdiff" +msgstr "" + +msgid "" "Revisions context menu will now display additional entries to fire\n" "vdiff on hovered and selected revisions.\n" msgstr "" @@ -2197,18 +2577,23 @@ msgstr "" msgid "hg debug-rev-list [OPTION]... REV..." msgstr "hg debug-rev-list [OPTION]... REV..." -msgid "" -"syntax highlighting for hgweb (requires Pygments)\n" -"\n" +msgid "syntax highlighting for hgweb (requires Pygments)" +msgstr "" + +msgid "" "It depends on the Pygments syntax highlighting library:\n" -"http://pygments.org/\n" -"\n" -"There is a single configuration option::\n" -"\n" +"http://pygments.org/" +msgstr "" + +msgid "There is a single configuration option::" +msgstr "" + +msgid "" " [web]\n" -" pygments_style =