Mercurial > hg
changeset 9766:4e0d99a5a9f9
i18n-it: synchronized with e06c940d554d
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 25 Oct 2009 12:46:23 +0100 |
| parents | 70c4060bf312 |
| children | 51110ecb0476 |
| files | i18n/it.po |
| diffstat | 1 files changed, 2811 insertions(+), 3236 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/it.po Sun Oct 25 12:44:57 2009 +0100 +++ b/i18n/it.po Sun Oct 25 12:46:23 2009 +0100 @@ -4,9 +4,9 @@ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-27 18:18+0100\n" -"PO-Revision-Date: 2009-03-03 20:05+0100\n" +"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-10-25 12:45+0100\n" "Last-Translator: Stefano Tortarolo <stefano.tortarolo@gmail.com>\n" "Language-Team: Italian <Italian>\n" "MIME-Version: 1.0\n" @@ -24,7 +24,10 @@ msgid "COMMANDS" msgstr "COMANDI" -msgid " options:\n" +#, fuzzy +msgid "" +" options:\n" +"\n" msgstr " opzioni:\n" #, python-format @@ -35,16 +38,513 @@ " alias: %s\n" "\n" -msgid "return tuple of (match function, list enabled)." -msgstr "restituisce una tupla di (funzione match, elenco abilitato)." - -#, python-format -msgid "acl: %s not enabled\n" -msgstr "acl: %s non abilitato\n" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "acl: %s abilitato, %d entry per l'utente %s\n" +msgid "" +"Some commands allow the user to specify a date, e.g.:\n" +"\n" +"- 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" +" \"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" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"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" +"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" +" \"<{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" +" \"-{days}\" - within a given number of days of today\n" +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" +"While this standard format is often enough, it does not encode the\n" +"following information:\n" +"\n" +"- 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" +"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" +"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" +"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" +"importing diffs in this format or using them in the mq extension.\n" +msgstr "" + +msgid "" +"HG\n" +" Path to the 'hg' executable, automatically passed when running\n" +" 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" +"HGEDITOR\n" +" This is the name of the editor to run when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"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" +"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" +"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" +"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" +" - if it's a directory, all files ending with .rc are added\n" +" - otherwise, the file itself will be added\n" +"\n" +"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" +" - 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" +"EMAIL\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"LOGNAME\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"VISUAL\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"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" +"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" +msgstr "" + +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" +"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" +" hgext.bar = !/path/to/extension/bar.py\n" +" # ditto, but no path was supplied for extension baz\n" +" hgext.baz = !\n" +msgstr "" + +msgid "" +"When Mercurial accepts more than one revision, they may be specified\n" +"individually, or provided as a topologically continuous range,\n" +"separated by the \":\" character.\n" +"\n" +"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" +"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" +"By default, Mercurial treats filenames as shell-style extended glob\n" +"patterns.\n" +"\n" +"Alternate pattern notations must be specified explicitly.\n" +"\n" +"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" +"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" +"The supported glob syntax extensions are ``**`` to match any string\n" +"across path separators and ``{a,b}`` to mean \"a or b\".\n" +"\n" +"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" +" 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" +" 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" +"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" +"A 40-digit hexadecimal string is treated as a unique revision\n" +"identifier.\n" +"\n" +"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" +"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" +"The reserved name \"tip\" is a special tag that always identifies the\n" +"most recent revision.\n" +"\n" +"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" +"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" +"parent.\n" +msgstr "" + +msgid "" +"Mercurial allows you to customize output of commands through\n" +"templates. You can either pass in a template from the command\n" +"line, via the --template option, or select an existing\n" +"template-style (--style).\n" +"\n" +"You can customize output for any \"log-like\" command: log,\n" +"outgoing, incoming, tip, parents, heads and glog.\n" +"\n" +"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" +"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" +"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" +":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" +" default.\n" +":date: Date information. The date when the changeset was\n" +" committed.\n" +":desc: String. The text of the changeset description.\n" +":diffstat: String. Statistics of changes with the following\n" +" format: \"modified files: +added/-removed lines\"\n" +":files: List of strings. All files modified, added, or removed\n" +" by this changeset.\n" +":file_adds: List of strings. Files added by this changeset.\n" +":file_mods: List of strings. Files modified by this changeset.\n" +":file_dels: List of strings. Files removed by this changeset.\n" +":node: String. The changeset identification hash, as a\n" +" 40-character hexadecimal string.\n" +":parents: List of strings. The parents of the changeset.\n" +":rev: Integer. The repository-local changeset revision\n" +" number.\n" +":tags: List of strings. Any tags associated with the\n" +" 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" +"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" +":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" +" every line except the last.\n" +":age: Date. Returns a human-readable date/time difference\n" +" between the given date/time and the current\n" +" date/time.\n" +":basename: Any text. Treats the text as a path, and returns the\n" +" last component of the path after splitting by the\n" +" path separator (ignoring trailing separators). For\n" +" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" +" becomes \"bar\".\n" +":stripdir: Treat the text as path and strip a directory level,\n" +" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" +" \"foo\".\n" +":date: Date. Returns a date in a Unix date format, including\n" +" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" +":domain: Any text. Finds the first string that looks like an\n" +" email address, and extracts just the domain\n" +" component. Example: 'User <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\n" +" becomes 'user@example.com'.\n" +":escape: Any text. Replaces the special XML/XHTML characters\n" +" \"&\", \"<\" and \">\" with XML entities.\n" +":fill68: Any text. Wraps the text to fit in 68 columns.\n" +":fill76: Any text. Wraps the text to fit in 76 columns.\n" +":firstline: Any text. Returns the first line of text.\n" +":nonempty: Any text. Returns '(none)' if the string is empty.\n" +":hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +":isodate: Date. Returns the date in ISO 8601 format:\n" +" \"2009-08-18 13:00 +0200\".\n" +":isodatesec: Date. Returns the date in ISO 8601 format, including\n" +" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" +" rfc3339date filter.\n" +":localdate: Date. Converts a date to local date.\n" +":obfuscate: Any text. Returns the input text rendered as a\n" +" sequence of XML entities.\n" +":person: Any text. Returns the text before an email address.\n" +":rfc822date: Date. Returns a date using the same format used in\n" +" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" +":rfc3339date: Date. Returns a date using the Internet date format\n" +" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" +":short: Changeset hash. Returns the short form of a changeset\n" +" hash, i.e. a 12-byte hexadecimal string.\n" +":shortdate: Date. Returns a date like \"2006-09-18\".\n" +":strip: Any text. Strips all leading and trailing whitespace.\n" +":tabindent: Any text. Returns the text, with every line except\n" +" the first starting with a tab character.\n" +":urlescape: Any text. Escapes all \"special\" characters. For\n" +" example, \"foo bar\" becomes \"foo%20bar\".\n" +":user: Any text. Returns the user portion of an email\n" +" address.\n" +msgstr "" + +msgid "" +"Valid URLs are of the form::\n" +"\n" +" 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" +"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" +"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" +"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" +"- 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" +"- 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" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +"\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +"These URLs can all be stored in your hgrc with path aliases under the\n" +"[paths] section like so::\n" +"\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +"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" +"Two path aliases are special because they are used as defaults when\n" +"you do not provide the URL to a command:\n" +"\n" +"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" +"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" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" +"\n" +"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" +"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" +" [extensions]\n" +" hgext.acl =\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.acl = python:hgext.acl.hook\n" +"\n" +" [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" +"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" +" [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" +" [acl.deny]\n" +" # If acl.deny is not present, no users are refused by default.\n" +" # An empty acl.deny section means all users allowed.\n" +" glob pattern = user4, user5\n" +" ** = user6\n" +msgstr "" #, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" @@ -53,85 +553,32 @@ "in entrata" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "acl: le modifiche hanno sorgente \"%s\" - saltato\n" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "acl: utente %s bloccato su %s\n" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "acl: accesso negato per il changeset %s" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "acl: l'utente %s non pu avere accesso a %s\n" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "acl: consentendo il changeset %s\n" - -msgid "" -"allow user-defined command aliases\n" -"\n" -"To use, create entries in your hgrc of the form\n" -"\n" -"[alias]\n" -"mycmd = cmd --args\n" -msgstr "" -"consente alias definiti dall'utente\n" -"\n" -"Per usarlo, crea entry nel tuo hgrc della forma\n" -"\n" -"[alias]\n" -"mycmd = cmd --args\n" - -msgid "" -"defer command lookup until needed, so that extensions loaded\n" -" after alias can be aliased" -msgstr "" -"ritarda la ricerca del comando fin quando necessario, in modo che si " -"attivino gli alias\n" -" per le estensioni caricate dopo alias" - -#, python-format -msgid "*** [alias] %s: command %s is unknown" -msgstr "*** [alias] %s: il comando %s sconosciuto" - -#, python-format -msgid "*** [alias] %s: command %s is ambiguous" -msgstr "*** [alias] %s: il comando %s ambiguo" - -#, python-format -msgid "*** [alias] %s: circular dependency on %s" -msgstr "*** [alias] %s: dipendenza circolare su %s" - -#, python-format -msgid "*** [alias] %s: no definition\n" -msgstr "*** [alias] %s: nessuna definizione\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" +#, fuzzy +msgid "" +"track a line of development with movable markers\n" +"\n" +"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 is forwarded to the new changeset.\n" +"bookmark shifts 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 " -"experience\n" -"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 on, " -"and\n" -"just updates it. This is similar to git's approach of branching.\n" +"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" +" [bookmarks]\n" +" track.current = True\n" +"\n" +"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 "" "mercurial bookmarks\n" "\n" @@ -156,88 +603,17 @@ "ad aggiornarlo. Questo simile all'approccio di branching di git.\n" msgid "" -"Parse .hg/bookmarks file and return a dictionary\n" -"\n" -" Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n" -" in the .hg/bookmarks file. They are read by the parse() method and\n" -" returned as a dictionary with name => hash values.\n" -"\n" -" The parsed dictionary is cached until a write() operation is done.\n" -" " -msgstr "" -"Parsifica il file .hg/bookmarks e restituisce un dizionario\n" -"\n" -" I segnalibri sono memorizzati nel file .hg/bookmarks come \n" -" valori {HASH}\\s{NAME} (formato di localtags).\n" -" Sono letti dal metodo parse() e restituiti come dizionario con \n" -" nome => valore di hash.\n" -"\n" -" Il dizionario parsificato viene memorizzato in cache finchè\n" -" un'operazione di write() non viene eseguita.\n" -" " - -msgid "" -"Write bookmarks\n" -"\n" -" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" -" in a format equal to those of localtags.\n" -"\n" -" We also store a backup of the previous state in undo.bookmarks that\n" -" can be copied back on rollback.\n" -" " -msgstr "" -"Scrive segnalibri\n" -"\n" -" Scrive il dato dizionario segnalibro => hash nel file\n" -" .hg/bookmarks nello stesso formato di localtags.\n" -"\n" -" Viene anche effettuato un backup dello stato\n" -" precedente in undo.bookmarks che può essere\n" -" ripristinato con rollback.\n" -" " - -msgid "" -"Get the current bookmark\n" -"\n" -" If we use gittishsh branches we have a current bookmark that\n" -" we are on. This function returns the name of the bookmark. It\n" -" is stored in .hg/bookmarks.current\n" -" " -msgstr "" -"Ottiene il segnalibro corrente\n" -"\n" -" Se si usano branch in stile git si ha un segnalibro\n" -" corrente attivo. Questa funzione restituisce il\n" -" nome del segnalibro. Questi è memorizzato in\n" -" .hg/bookmarks.current\n" -" " - -msgid "" -"Set the name of the bookmark that we are currently on\n" -"\n" -" Set the name of the bookmark that we are on (hg update <bookmark>).\n" -" The name is recoreded in .hg/bookmarks.current\n" -" " -msgstr "" -"Imposta il nome del segnalibro sul quale ci si trova attualmente\n" -"\n" -" Imposta il nome del segnalibro sul quale ci si trova\n" -" (hg update <bookmark>). Il nome viene memorizzato in\n" -" .hg/bookmarks.current\n" -" " - -msgid "" -"mercurial bookmarks\n" +"track a line of development with movable markers\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 'hg\n" -" 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" +" 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" +" 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 "" @@ -259,37 +635,6 @@ msgid "a bookmark cannot have the name of an existing branch" msgstr "un segnalibro non può avere lo stesso nome di una branch esistente" -msgid "" -"Strip bookmarks if revisions are stripped using\n" -" the mercurial.strip method. This usually happens during\n" -" qpush and qpop" -msgstr "" -"Elimina i segnalibri se revisioni sono rimosse usando il metodo\n" -" mercurial.strip. Questo di norma succede durante qpush e qpop" - -msgid "" -"Add a revision to the repository and\n" -" move the bookmark" -msgstr "" -"Aggiunge una revisione al repository e\n" -" sposta il segnalibro" - -msgid "Merge bookmarks with normal tags" -msgstr "Fa il merge dei segnalibri con tag normali" - -msgid "" -"Set the current bookmark\n" -"\n" -" If the user updates to a bookmark we update the .hg/bookmarks.current\n" -" file.\n" -" " -msgstr "" -"Imposta il segnalibro corrente\n" -"\n" -" Se l'utente fa l'update ad un segnalibro viene aggiornato il file\n" -" .hg/bookmarks.current\n" -" " - msgid "force" msgstr "forza" @@ -306,89 +651,102 @@ msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]" msgid "" -"Bugzilla integration\n" +"hooks for integrating with the Bugzilla bug tracker\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 bug\n" -"status.\n" -"\n" -"The hook updates the Bugzilla database directly. Only Bugzilla " -"installations\n" -"using MySQL are supported.\n" -"\n" -"The hook relies on a Bugzilla script to send bug change notification " -"emails.\n" -"That script changes between Bugzilla versions; the 'processmail' script " -"used\n" -"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" -"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " +"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" +"The extension is configured through three different configuration\n" +"sections. These keys are recognized in the [bugzilla] section:\n" +"\n" +"host\n" +" Hostname of the MySQL server holding the Bugzilla database.\n" +"\n" +"db\n" +" Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +"\n" "user\n" -"pushing the change; you will need to ensure the Bugzilla install file\n" -"permissions are set appropriately.\n" -"\n" -"Configuring the extension:\n" -"\n" -" [bugzilla]\n" -" host Hostname of the MySQL server holding the Bugzilla 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 3.0 " -"and\n" -" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" -" 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 keys,\n" -" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla " -"email).\n" -" Default depends on version; from 2.18 it is\n" -" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" -"(user)s\".\n" -" regexp Regular expression to match bug IDs in changeset commit " -"message.\n" -" Must contain one \"()\" group. The default expression " -"matches\n" -" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" -" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " -"thereof.\n" -" 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 " -"repository.\n" -" {webroot} Stripped pathname of the Mercurial " -"repository.\n" -" {hgweb} Base URL for browsing Mercurial " -"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 Bugzilla " -"user\n" -" ID mappings. If specified, the file should contain one " -"mapping\n" -" per line, \"committer\"=\"Bugzilla user\". See also the\n" -" [usermap] section.\n" -"\n" -" [usermap]\n" -" Any entries in this section specify mappings of Mercurial committer ID\n" -" to Bugzilla user ID. See also [bugzilla].usermap.\n" -" \"committer\"=\"Bugzilla user\"\n" -"\n" -" [web]\n" -" baseurl Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}.\n" -"\n" -"Activating the extension:\n" +" Username to use to access MySQL server. Default 'bugs'.\n" +"\n" +"password\n" +" Password to use to access MySQL server.\n" +"\n" +"timeout\n" +" Database connection timeout (seconds). Default 5.\n" +"\n" +"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" +"bzuser\n" +" Fallback Bugzilla user name to record comments with, if changeset\n" +" committer cannot be found as a Bugzilla user.\n" +"\n" +"bzdir\n" +" Bugzilla install directory. Used by default notify. Default\n" +" '/var/www/html/bugzilla'.\n" +"\n" +"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" +"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" +"style\n" +" The style file to use when formatting comments.\n" +"\n" +"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" +" {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" +" 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" +"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" +"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" +"baseurl\n" +" Base URL for browsing Mercurial repositories. Reference from\n" +" templates as {hgweb}.\n" +"\n" +"Activating the extension::\n" "\n" " [extensions]\n" " hgext.bugzilla =\n" @@ -399,9 +757,9 @@ "\n" "Example configuration:\n" "\n" -"This example configuration is for a collection of Mercurial repositories\n" -"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" -"/opt/bugzilla-3.2.\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" @@ -409,8 +767,9 @@ " 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" +" template=Changeset {node|short} in {root|basename}.\n" +" {hgweb}/{webroot}/rev/{node|short}\\n\n" +" {desc}\\n\n" " strip=5\n" "\n" " [web]\n" @@ -419,7 +778,7 @@ " [usermap]\n" " user@emaildomain.com=user.name@bugzilladomain.com\n" "\n" -"Commits add a comment to the Bugzilla bug record of the form:\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" @@ -427,16 +786,10 @@ " Changeset commit comment. Bug 1234.\n" msgstr "" -msgid "support for bugzilla version 2.16." -msgstr "supporto per la versione di bugzilla 2.16." - #, python-format msgid "connecting to %s:%s as %s, password %s\n" msgstr "sto connettendomi a %s:%s come %s, password %s\n" -msgid "run a query." -msgstr "esegue una query." - #, python-format msgid "query: %s %s\n" msgstr "query: %s %s\n" @@ -445,25 +798,13 @@ msgid "failed query: %s %s\n" msgstr "query fallita: %s %s\n" -msgid "get identity of longdesc field" -msgstr "" - msgid "unknown database schema" msgstr "schema del database sconosciuto" -msgid "filter not-existing bug ids from list." -msgstr "filtra id di bug non esistenti dalla lista" - -msgid "filter bug ids from list that already refer to this changeset." -msgstr "" - #, python-format msgid "bug %d already knows about changeset %s\n" msgstr "il bug %d gi a conoscenza del changeset %s\n" -msgid "tell bugzilla to send mail." -msgstr "dice a bugzilla di inviare la mail." - msgid "telling bugzilla to send mail:\n" msgstr "sto dicendo a bugzilla di inviare la mail:\n" @@ -482,25 +823,10 @@ msgid "done\n" msgstr "fatto\n" -msgid "look up numeric bugzilla user id." -msgstr "cerca l'identificatore utente numerico di bugzilla" - #, python-format msgid "looking up user %s\n" msgstr "ricercando l'utente %s\n" -msgid "map name of committer to bugzilla user name." -msgstr "mappa il nome del committente al nome utente bugzilla" - -msgid "" -"see if committer is a registered bugzilla user. Return\n" -" bugzilla username and userid if so. If not, return default\n" -" bugzilla username and userid." -msgstr "" -"controlla se il committente è un utente registrato bugzilla. In tal\n" -" caso restituisce userid e username bugzilla. Altrimenti\n" -" restituisce userid e username bugzilla di default." - #, python-format msgid "cannot find bugzilla user id for %s" msgstr "impossibile trovare nome utente bugzilla per %s" @@ -509,41 +835,11 @@ msgid "cannot find bugzilla user id for %s or %s" msgstr "impossibile trovare nome utente bugzilla per %s o %s" -msgid "" -"add comment to bug. try adding comment as committer of\n" -" changeset, otherwise as default bugzilla user." -msgstr "" - -msgid "support for bugzilla 2.18 series." -msgstr "supporto per la serie di bugzilla 2.18." - -msgid "support for bugzilla 3.0 series." -msgstr "sopporto per la serie di bugzilla 3.0." - -msgid "" -"return object that knows how to talk to bugzilla version in\n" -" use." -msgstr "" - #, python-format msgid "bugzilla version %s not supported" msgstr "versione di bugzilla %s non supportata" msgid "" -"find valid bug ids that are referred to in changeset\n" -" comments and that do not already have references to this\n" -" changeset." -msgstr "" - -msgid "update bugzilla bug with reference to changeset." -msgstr "aggiorna il bug bugzilla con riferimento al changeset." - -msgid "" -"strip leading prefix of repo root and turn into\n" -" url-safe path." -msgstr "" - -msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" "details:\n" "\t{desc|tabindent}" @@ -552,12 +848,6 @@ "dettagli:\n" "\t{desc|tabindent}" -msgid "" -"add comment to bugzilla for each changeset that refers to a\n" -" bugzilla bug id. only add a comment once per bug, so same change\n" -" seen multiple times does not fill bug with duplicate data." -msgstr "" - #, python-format msgid "python mysql support not available: %s" msgstr "il supporto per python per mysql non è disponibile: %s" @@ -570,48 +860,64 @@ msgid "database error: %s" msgstr "errore del database: %s" -msgid "" -"show the children of the given or working dir revision\n" -"\n" -" Print the children of the working directory's revisions.\n" -" If a revision is given via --rev, the children of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (after the working directory\n" -" revision or the argument to --rev if given) is printed.\n" +#, fuzzy +msgid "command to display child changesets" +msgstr "usa il comando per controllare lo stato del changeset" + +#, fuzzy +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 "" - -msgid "show children of the specified rev" +"mostra i genitori della directory di lavoro o di una revisione\n" +"\n" +" Stampa le revisioni genitori della directory di lavoro. Se una\n" +" revisione è data tramite --rev, verrà stampato il genitore di\n" +" quella revisione. Se viene fornito un file come argomento,\n" +" verrà stampata l'ultima revisione in cui il file è stato\n" +" modificato (prima della revisione della directory di lavoro\n" +" o dell'argomento di --rev se fornito).\n" +" " + +#, fuzzy +msgid "show children of the specified revision" msgstr "mostra i figli della revisione specificata" msgid "hg children [-r REV] [FILE]" msgstr "hg·children·[-r·REV]·[FILE]" -msgid "command to show certain statistics about revision history" +#, fuzzy +msgid "command to display statistics about repository history" msgstr "comando per mostrare alcune statistiche sulla storia delle revisioni" -msgid "Calculate stats" -msgstr "Calcola statistiche" - #, python-format msgid "Revision %d is a merge, ignoring...\n" msgstr "La revisione %d è un merge, ignoro...\n" -#, python-format -msgid "\rgenerating stats: %d%%" +#, fuzzy, python-format +msgid "generating stats: %d%%" msgstr "\rsto generando le statistiche: %d%%" msgid "" -"graph count of revisions grouped by template\n" -"\n" -" Will graph count of changed lines or revisions grouped by template or\n" -" alternatively by date, if dateformat is used. In this case it will " -"override\n" -" template.\n" -"\n" -" By default statistics are counted for number of changed lines.\n" -"\n" -" Examples:\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" " # display count of changed lines for every committer\n" " hg churn -t '{author|email}'\n" @@ -625,20 +931,22 @@ " # 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" -"\n" -" <alias email> <actual email>" -msgstr "" - -#, python-format -msgid "assuming %i character terminal\n" -msgstr "assumo carattere di terminazione %i\n" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format::\n" +"\n" +" <alias email> <actual email>\n" +"\n" +" 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" +" " +msgstr "" msgid "count rate for the specified revision or range" msgstr "" -msgid "count rate for revs matching date spec" -msgstr "" +#, fuzzy +msgid "count rate for revisions matching date spec" +msgstr "mostra le revisioni che corrispondono ad una data fornita" msgid "template to group changesets" msgstr "" @@ -662,89 +970,68 @@ msgstr "hg churn [-d DATA] [-r REV] [--aliases FILE] [--progress] [FILE]" 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 to\n" -"reflect file status, the qseries command to add color to reflect patch " -"status\n" -"(applied, unapplied, missing), and to diff-related commands to highlight\n" -"additions, removals, diff headers, and trailing whitespace.\n" -"\n" -"Other effects in addition to color, like bold and underlined text, are also\n" -"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" -"ANSI escape codes). This module also provides the render_text function,\n" -"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 overriden 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 "Wrap text in commands to turn on each effect." -msgstr "" - -msgid "run the status command with colored output" -msgstr "esegue il comando status con output colorato" - -msgid "run the qseries command with colored output" -msgstr "esegue il comando qseries con output colorato" - -msgid "wrap ui.write for colored diff output" -msgstr "" - -msgid "wrap cmdutil.changeset_printer.showpatch with colored output" -msgstr "" - -msgid "run the diff command with colored output" -msgstr "esegue il comando diff con output colorato" - -msgid "Initialize the extension." -msgstr "Inizializza l'estensione." - -msgid "patch in command to command table and load effect map" +"colorize output from some 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" +"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 "quando colorare (sempre, auto o mai)" -msgid "don't colorize output" +#, fuzzy +msgid "don't colorize output (DEPRECATED)" msgstr "non colorare l'output" -msgid "converting foreign VCS repositories to Mercurial" +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "" + +#, fuzzy +msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "converte repository di altri VCS in Mercurial" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" "\n" " Accepted source formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - CVS [cvs]\n" " - Darcs [darcs]\n" @@ -756,37 +1043,54 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" -" If no revision is given, all revisions will be converted. Otherwise,\n" -" convert will only import up to the named revision (given in a format\n" -" understood by the source).\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" +" 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 --branchsort.\n" +" Mercurial uses --sourcesort to preserve original revision numbers\n" +" order. Sort modes have the following effects:\n" +"\n" +" --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" +" --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" +" --sourcesort try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" +"\n" " If <REVMAP> isn't given, it will be put in a default location\n" -" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" -" file that maps each source commit ID to the destination ID for\n" -" that revision, like so:\n" -" <source ID> <destination ID>\n" -"\n" -" If the file doesn't exist, it's automatically created. It's updated\n" -" on each commit copied, so convert-repo can be interrupted and can\n" -" be run repeatedly to copy new commits.\n" -"\n" -" The [username mapping] file is a simple text file that maps each source\n" -" commit author to a destination commit author. It is handy for source " -"SCMs\n" -" that use unix logins to identify authors (eg: CVS). One line per author\n" -" mapping and the line format is:\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" +" that maps each source commit ID to the destination ID for that\n" +" revision, like so::\n" +"\n" +" <source ID> <destination ID>\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" +" and directories. Comment lines start with '#'. Each line can\n" +" contain one of the following directives::\n" "\n" " include path/to/file\n" "\n" @@ -796,33 +1100,44 @@ "\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 dirs not explicitely included.\n" -" The 'exclude' directive causes files or directories to be omitted.\n" -" The 'rename' directive renames a file or directory. To rename from a\n" -" subdirectory into the root of the repository, use '.' as the path to\n" -" rename to.\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" " The splicemap is a file that allows insertion of synthetic\n" -" history, letting you specify the parents of a revision. This is\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" +" graft two disconnected series of history together. Each entry\n" " contains a key, followed by a space, followed by one or two\n" -" values, separated by spaces. The key is the revision ID in the\n" -" source revision control system whose parents should be modified\n" -" (same format as a key in .hg/shamap). The values are the revision\n" -" IDs (in either the source or destination revision control system)\n" -" that should be used as the new parents for that node.\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" +" ----------------\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 " -"change)\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" @@ -831,59 +1146,53 @@ "\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\n" -" the repository is :local:. The conversion uses the top level\n" -" directory in the sandbox to find the CVS repository, and then uses\n" -" CVS rlog commands to find files to convert. This means that unless\n" -" a filemap is given, all files under the starting directory will be\n" -" converted, and that any directory reorganisation in the CVS\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 is a legacy option and may be removed in future.\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.fuzz=60 (integer)\n" -" Specify the maximum time (in seconds) that is allowed between\n" -" commits with identical user and log message in a single\n" -" changeset. When very large files were checked in as part\n" -" of a changeset then the default may not be long enough.\n" -" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages are\n" -" matched. If a match occurs, then the conversion process will\n" -" insert a dummy revision merging the branch on which this log\n" -" message occurs to the branch indicated in the regex.\n" -" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" -" 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" -" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" -" merging code to be run without doing a conversion. Its parameters and\n" -" output are similar to that of cvsps 2.1.\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 between\n" +" commits with identical user and log message in a single\n" +" changeset. When very large files were checked in as part of a\n" +" changeset then the default may not be long enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" insert a dummy revision merging the branch on which this log\n" +" message occurs to the branch indicated in the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" 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" +" 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" " 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\n" -" it replaces the default branch. If \"svn://repo/path/branches\"\n" -" exists, its subdirectories are listed as possible branches. If\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 overriden with following options. Set them to paths\n" -" relative to the source URL, or leave them blank to disable\n" -" autodetection.\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" @@ -902,20 +1211,19 @@ " Perforce Source\n" " ---------------\n" "\n" -" The Perforce (P4) importer can be given a p4 depot path or a client\n" -" specification as source. It will convert all files in the source to\n" -" a flat Mercurial repository, ignoring labels, branches and " -"integrations.\n" -" Note that when a depot path is given you then usually should specify a\n" -" target directory, because otherwise the target may be named ...-hg.\n" -"\n" -" It is possible to limit the amount of source history to be converted\n" -" by specifying an initial Perforce revision.\n" -"\n" -" --config convert.p4.startrev=0 (perforce changelist number)\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" @@ -932,12 +1240,14 @@ msgid "" "create changeset information from CVS\n" "\n" -" This command is intended as a debugging tool for the CVS to Mercurial\n" -" converter, and can be used as a direct replacement for cvsps.\n" -"\n" -" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" -" directory) in the CVS repository, and converts the log to a series of\n" -" changesets based on matching commit log entries and dates." +" 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" @@ -958,9 +1268,20 @@ msgid "splice synthesized history into place" msgstr "" +msgid "change branch names while converting" +msgstr "" + +#, fuzzy +msgid "try to sort changesets by branches" +msgstr "prova ad ordinare i changeset per data" + msgid "try to sort changesets by date" msgstr "prova ad ordinare i changeset per data" +#, fuzzy +msgid "preserve source changesets order" +msgstr "prova ad ordinare i changeset per data" + msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" msgstr "hg convert [OPZIONI]... SORGENTE [DEST [REVMAP]]" @@ -997,6 +1318,14 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..." +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 "%s non è una revisione valida nella branch corrente" @@ -1006,20 +1335,20 @@ msgstr "%s non è più disponibile in %s" #, python-format +msgid "%s.%s symlink has no target" +msgstr "" + +#, python-format msgid "cannot find required \"%s\" tool" msgstr "impossibile trovare il tool \"%s\"" #, python-format -msgid "running: %s\n" -msgstr "sto eseguendo: %s\n" - -#, python-format msgid "%s error:\n" msgstr "%s errore:\n" #, python-format -msgid "%s %s" -msgstr "%s %s" +msgid "syntax error in %s(%d): key/value pair expected" +msgstr "" #, python-format msgid "could not open map file %r: %s" @@ -1037,6 +1366,10 @@ msgid "%s: unknown repository type" msgstr "%s: tipo di repository sconosciuto" +#, fuzzy, python-format +msgid "unknown sort mode: %s" +msgstr "risposta CVS sconosciuta: %s" + #, python-format msgid "cycle detected between %s and %s" msgstr "ciclo rilevato tra %s e %s" @@ -1049,16 +1382,16 @@ msgstr "Scrivo il file di associazione degli autori %s\n" #, python-format -msgid "Overriding mapping for author %s, was %s, will be %s\n" -msgstr "Rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n" +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "Ignoro riga non valida nel file di associazione degli autori %s: %s\n" #, python-format msgid "mapping author %s to %s\n" msgstr "sto associando l'autore %s a %s\n" -#, python-format -msgid "Ignoring bad line in author map file %s: %s\n" -msgstr "Ignoro riga non valida nel file di associazione degli autori %s: %s\n" +#, fuzzy, python-format +msgid "overriding mapping for author %s, was %s, will be %s\n" +msgstr "Rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n" #, python-format msgid "spliced in %s as parents of %s\n" @@ -1081,13 +1414,17 @@ msgid "assuming destination %s\n" msgstr "assumo destinazione %s\n" -#, python-format -msgid "revision %s is not a patchset number or date" +#, fuzzy +msgid "more than one sort mode specified" +msgstr "troppe opzioni specificate" + +msgid "--sourcesort is not supported by this data source" +msgstr "" + +#, fuzzy, python-format +msgid "revision %s is not a patchset number" msgstr "la revisione %s non è un numero di patchset o una data" -msgid "using builtin cvsps\n" -msgstr "sto usando cvsps integrato\n" - #, python-format msgid "connecting to %s\n" msgstr "sto connettendomi a %s\n" @@ -1095,8 +1432,10 @@ msgid "CVS pserver authentication failed" msgstr "autenticazione al pserver CVS fallita" -msgid "server sucks" -msgstr "il server fa schifo" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "" #, python-format msgid "%d bytes missing from remote file" @@ -1129,10 +1468,6 @@ msgid "running %s\n" msgstr "sto eseguendo %s\n" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "prefisso=%r directory=%r radice=%r\n" - msgid "RCS file must be followed by working file" msgstr "Il file RCS deve essere seguito da un file funzionante" @@ -1146,10 +1481,6 @@ msgstr "la revisione deve essere seguita da una riga con la data" #, python-format -msgid "found synthetic rev in %s: %r\n" -msgstr "trovata revisione sintetica in %s: %r\n" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "sto scrivendo la cache dei log cvs %s\n" @@ -1164,16 +1495,22 @@ msgstr "changeset sintetici non possono avere genitori multipli" #, 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 voci di changeset\n" +#, python-format +msgid "darcs version 2.1 or newer needed (found %r)" +msgstr "" + msgid "Python ElementTree module is not available" msgstr "il modulo Python ElementTree non è disponibile" -#, python-format -msgid "cleaning up %s\n" -msgstr "sto ripulendo %s\n" - msgid "internal calling inconsistency" msgstr "inconsistenza nella chiamata interna" @@ -1210,22 +1547,6 @@ " registrato %s...\n" #, python-format -msgid "applying revision %s...\n" -msgstr "sto applicando la revisione %s...\n" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "sto calcolando il changeset tra %s e %s...\n" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "sto ottenendo la revisione %s...\n" - -#, python-format -msgid "analysing revision %s...\n" -msgstr "sto analizzando la revisione %s...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1237,16 +1558,14 @@ msgid "initializing destination %s repository\n" msgstr "sto inizializzando il repository destinatario %s\n" -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 "sto effettuando il pull da %s a %s\n" +#, fuzzy +msgid "filtering out empty revision\n" +msgstr "stampa la data revisione" + msgid "updating tags\n" msgstr "sto aggiornando le tag\n" @@ -1258,18 +1577,12 @@ msgid "ignoring: %s\n" msgstr "sto ignorando: %s\n" -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 "%s non sembra essere un repository monotone" #, python-format -msgid "copying file in renamed dir from '%s' to '%s'" +msgid "copying file in renamed directory from '%s' to '%s'" msgstr "" msgid "reading p4 views\n" @@ -1278,6 +1591,9 @@ msgid "collecting p4 changelists\n" msgstr "sto raccogliendo le changelist p4\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "Non è stato possibile caricare i binding python per Subversion" @@ -1319,7 +1635,8 @@ msgid "found branch %s at %d\n" msgstr "trovata branch %s in %d\n" -msgid "svn: start revision is not supported with with more than one branch" +#, fuzzy +msgid "svn: start revision is not supported with more than one branch" msgstr "svn: non è supportata una revisione iniziale con più di una branch" #, python-format @@ -1331,84 +1648,22 @@ msgstr "nessuna tag trovata alla revisione %d\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "ignoro la branch straniera %r\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "%s non trovato fino alla revisione %d" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "branch rinominata da %s a %s in %d\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "riassociato il genitore come %s\n" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "copiato in %s da %s@%s\n" - -#, python-format -msgid "gone from %s\n" -msgstr "andato da %s\n" - -#, python-format -msgid "found parent directory %s\n" -msgstr "trovata directory genitore %s\n" - -#, python-format -msgid "base, entry %s %s\n" -msgstr "base, voce %s %s\n" - -msgid "munge-o-matic\n" -msgstr "munge-o-matic\n" - -#, python-format -msgid "info: %s %s %s %s\n" -msgstr "info: %s %s %s %s\n" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "percorso sconosciuto nella revisione %d: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "%s marcato come proveniente da %s:%d\n" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "sto effettuando il parsing della revisione %d (%d modifiche)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "trovato genitore della branch %s in %d: %s\n" -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 "sto saltando la revisione nella blacklist %d\n" - -#, python-format -msgid "revision %d has no entries\n" -msgstr "la revisione %d non ha voci\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: la branch non ha nessuna revisione %s" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "%r non è sotto %r, ignoro\n" - -#, python-format msgid "initializing svn repo %r\n" msgstr "inizializzo il repository svn %r\n" @@ -1426,20 +1681,16 @@ msgstr "XXX TAG NON ANCORA IMPLEMENTATE\n" msgid "" -"\n" -"The `extdiff' Mercurial extension allows you to use external programs\n" -"to compare revisions, or revision with working dir. The external diff\n" -"programs are called with a configurable set of options and two\n" +"command to 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\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" -"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" +"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" @@ -1455,56 +1706,28 @@ " 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" +" # (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" -"You can use -I/-X and list of file or directory names like normal\n" -"\"hg diff\" command. The `extdiff' extension makes snapshots of only\n" -"needed files, so running the external diff program will actually be\n" -"pretty fast (at least faster than having to compare the entire tree).\n" -msgstr "" - -msgid "snapshot files as of some revision" +"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 "" -msgid "" -"snapshot files from working directory.\n" -" if not using snapshot, -I/-X does not work and recursive diff\n" -" in tools like kdiff3 and meld displays too many files." -msgstr "" - -#, python-format -msgid "making snapshot of %d files from working dir\n" -msgstr "" - -msgid "" -"Do the actuall diff:\n" -"\n" -" - copy to a temp structure if diffing 2 internal revisions\n" -" - copy to a temp structure if diffing working revision with\n" -" another one and more than 1 file is changed\n" -" - just invoke the diff for a single file in the working dir\n" -" " +#, python-format +msgid "making snapshot of %d files from working directory\n" msgstr "" msgid "cannot specify --rev and --change at the same time" msgstr "impossibile specificare sia --rev sia --change" -#, python-format -msgid "running %r in %s\n" -msgstr "sto eseguendo %r in %s\n" - -#, python-format -msgid "file changed while diffing. Overwriting: %s (src: %s)\n" -msgstr "file modificato durante il diff. Sovrascrivo: %s (sorgente: %s)\n" - msgid "cleaning up temp directory\n" msgstr "sto ripulendo la directory temporanea\n" @@ -1512,19 +1735,19 @@ "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" +" an external program. The default program used is diff, with\n" " default options \"-Npru\".\n" "\n" -" To select a different program, use the -p option. The program\n" -" will be passed the names of two directories to compare. To pass\n" -" additional options to the program, use the -o option. These will\n" -" be passed before the names of the directories to compare.\n" -"\n" -" When two revision arguments are given, then changes are\n" -" shown between those revisions. If only one revision is\n" -" specified then that revision is compared to the working\n" -" directory, and, when no revisions are specified, the\n" -" working directory files are compared to its parent." +" 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" @@ -1539,29 +1762,44 @@ msgid "hg extdiff [OPT]... [FILE]..." msgstr "hg extdiff [OPT]... [FILE]..." -msgid "use closure to save diff command to use" +#, python-format +msgid "" +"use %(path)s to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using the\n" +" %(path)s program.\n" +"\n" +" When two revision arguments are given, then changes are shown between\n" +" those revisions. If only one revision is specified then that revision " +"is\n" +" compared to the working directory, and, when no revisions are " +"specified,\n" +" the working directory files are compared to its parent." msgstr "" #, python-format msgid "hg %s [OPTION]... [FILE]..." msgstr "hg %s [OPZIONI]... [FILE]..." -msgid "pulling, updating and merging in one command" +#, fuzzy +msgid "pull, update and merge in one command" msgstr "pull, update e merge in un comando" +#, fuzzy 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 automatically\n" -" merged, and the result of the merge is committed. Otherwise, the\n" -" working directory is updated to include the new changes.\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" +" \"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" @@ -1613,8 +1851,12 @@ msgid "pulling from %s\n" msgstr "sto facendo pull da %s\n" -msgid "fetch -r doesn't work for remote repositories yet" -msgstr "" +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" +"L'altro repository non supporta la ricerca di revisioni, quindi una " +"revisione non può essere specificata." #, python-format msgid "" @@ -1631,10 +1873,6 @@ msgstr "sto facendo il merge con %d:%s\n" #, python-format -msgid "Automated merge with %s" -msgstr "Merge automatico con %s" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "" "il nuovo changeset %d:%s fa il merge delle modifiche remote con quelle " @@ -1655,29 +1893,13 @@ msgid "hg fetch [SOURCE]" msgstr "hg fetch [SORGENTE]" -msgid " returns of the good and bad signatures" -msgstr " restituisce le firme valide e non valide" +#, fuzzy +msgid "commands to sign and verify changesets" +msgstr "elenca i changeset firmati" msgid "error while verifying signature" msgstr "errore durante la verifica della firma" -msgid "create a new gpg instance" -msgstr "crea una nuova istanza gpg" - -msgid "" -"\n" -" walk over every sigs, yields a couple\n" -" ((node, version, sig), (filename, linenumber))\n" -" " -msgstr "" -"\n" -" percorre ogni firma, restituendo una coppia\n" -" ((nodo, versione, firma), (nome del file, numero di riga))\n" -" " - -msgid "get the keys who signed a data" -msgstr "ottiene le chiavi di chi ha firmato i dati" - #, python-format msgid "%s Bad signature from \"%s\"\n" msgstr "%s Firma non valida da \"%s\"\n" @@ -1705,9 +1927,6 @@ msgid "No valid signature for %s\n" msgstr "Nessuna firma valida per %s\n" -msgid "associate a string to a key (username, comment)" -msgstr "associa una stringa ad una chiave (username, commento)" - msgid "" "add a signature for the current or given revision\n" "\n" @@ -1742,13 +1961,6 @@ "la copia di lavoro di .hgsigs è cambiata (si prega di fare il commit " "manualmente di .hgsigs o usare --force)" -#, python-format -msgid "Added signature for changeset %s" -msgstr "Aggiunta firma per il changeset %s" - -msgid "map a manifest into some text" -msgstr "associa un manifesto ad un qualche testo" - msgid "unknown signature version" msgstr "versione della firma sconosciuta" @@ -1777,60 +1989,13 @@ msgstr "hg sigs" msgid "" -"show revision graphs in terminal windows\n" +"command to view revision graphs from a shell\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" +"commands. When this options is given, an ASCII representation of the\n" "revision graph is also shown.\n" msgstr "" -msgid "" -"cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history from " -"revision\n" -" start to revision stop (which must be less than or equal to start).\n" -" " -msgstr "" - -msgid "" -"file cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history of a single\n" -" file from revision start to revision stop (which must be less than or\n" -" equal to start).\n" -" " -msgstr "" - -msgid "" -"grapher for asciigraph on a list of nodes and their parents\n" -"\n" -" nodes must generate tuples (node, parents, char, lines) where\n" -" - parents must generate the parents of node, in sorted order,\n" -" and max length 2,\n" -" - char is the char to print as the node symbol, and\n" -" - lines are the lines to display next to the node.\n" -" " -msgstr "" - -msgid "" -"prints an ASCII graph of the DAG returned by the grapher\n" -"\n" -" grapher is a generator that emits tuples with the following elements:\n" -"\n" -" - Character to use as node's symbol.\n" -" - List of lines to display as the node's text.\n" -" - Column of the current node in the set of ongoing edges.\n" -" - Edges; a list of (col, next_col) indicating the edges between\n" -" the current node and its parents.\n" -" - Number of columns (ongoing edges) in the current revision.\n" -" - The difference between the number of columns (ongoing edges)\n" -" in the next revision and the number of columns (ongoing edges)\n" -" in the current revision. That is: -1 means one column removed;\n" -" 0 means no columns added or removed; 1 means one column added.\n" -" " -msgstr "" - #, python-format msgid "--graph option is incompatible with --%s" msgstr "l'opzione --graph è incompatibile con --%s" @@ -1846,17 +2011,6 @@ " " msgstr "" -msgid "" -"show the outgoing changesets alongside an ASCII revision graph\n" -"\n" -" Print the outgoing changesets 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 "sto confrontando con %s\n" @@ -1864,20 +2018,6 @@ msgid "no changes found\n" msgstr "nessuna modifica trovata\n" -msgid "" -"show the incoming changesets alongside an ASCII revision graph\n" -"\n" -" Print the incoming changesets 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 "" - -msgid "wrap the command" -msgstr "" - msgid "show the revision DAG" msgstr "" @@ -1894,105 +2034,77 @@ msgstr "hg glog [OPZIONI]... [FILE]" 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 "" - -msgid " A CIA message " -msgstr "" - -msgid " CIA notification class " +"hooks for integrating with the CIA.vc notification service\n" +"\n" +"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" +" [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 " send CIA notification " -msgstr "invia notifica CIA" - msgid "email.from must be defined when sending by email" msgstr "email.from deve essere definito quando si mandano mail" -msgid "cia: no user specified" -msgstr "" - -msgid "cia: no project specified" -msgstr "" - -msgid "" -"browsing the repository in a graphical way\n" +msgid "" +"browse 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\n" -"not distributed with Mercurial.)\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" +"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\n" -"to use your global $HOME/.hgrc file, not one in a repository). You\n" -"can 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\n" -"specify the path to hgk in your .hgrc file:\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" +"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." +"vdiff on hovered and selected revisions.\n" msgstr "" msgid "diff trees from two commits" @@ -2052,8 +2164,9 @@ msgid "hg debug-config" msgstr "hg debug-config" -msgid "hg debug-merge-base node node" -msgstr "hg debug-merge-base nodo nodo" +#, fuzzy +msgid "hg debug-merge-base REV REV" +msgstr "hg debug-rev-parse REV" msgid "ignored" msgstr "ignorato" @@ -2073,56 +2186,39 @@ msgid "max-count" msgstr "conto massimo" -msgid "hg debug-rev-list [options] revs" -msgstr "hg debug-rev-list [opzioni] revs" - -msgid "" -"syntax highlighting in hgweb, based on Pygments\n" -"\n" -"It depends on the pygments syntax highlighting library:\n" +#, fuzzy +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..." + +msgid "" +"syntax highlighting for hgweb (requires 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 = <style>\n" +"There is a single configuration option::\n" +"\n" +" [web]\n" +" pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "inotify-based status acceleration for Linux systems\n" -msgstr "accelerazione di status per sistemi Linux basata su inotify\n" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" +msgstr "" msgid "start an inotify server for this repository" msgstr "avvia un server inotify per questo repository" -msgid "(found dead inotify server socket; removing it)\n" -msgstr "(trovato socket morto del server inotify; lo rimuovo)\n" - -msgid "(starting inotify server)\n" -msgstr "(sto avviando il server inotify)\n" - -#, python-format -msgid "could not start inotify server: %s\n" -msgstr "impossibile avviare il server inotify: %s\n" - -#, python-format -msgid "could not talk to new inotify server: %s\n" -msgstr "impossibile comunicare con il nuovo server inotify: %s\n" - -msgid "(inotify server not running)\n" -msgstr "(server inotify non in esecuzione\n" - -#, python-format -msgid "failed to contact inotify server: %s\n" -msgstr "non sono riuscito a contattare il server inotify: %s\n" +msgid "" +"debugging information for inotify extension\n" +"\n" +" Prints the list of directories being watched by the inotify server.\n" +" " +msgstr "" + +msgid "directories being watched:\n" +msgstr "" msgid "run server in background" msgstr "avvia il server in background" @@ -2136,13 +2232,37 @@ msgid "name of file to write process ID to" msgstr "nome del file in cui scrivere l'ID del processo" -msgid "hg inserve [OPT]..." +#, fuzzy +msgid "hg inserve [OPTION]..." msgstr "hg inserve [OPT]..." +msgid "(found dead inotify server socket; removing it)\n" +msgstr "(trovato socket morto del server inotify; lo rimuovo)\n" + +#, python-format +msgid "could not start inotify server: %s\n" +msgstr "impossibile avviare il server inotify: %s\n" + +#, python-format +msgid "could not talk to new inotify server: %s\n" +msgstr "impossibile comunicare con il nuovo server inotify: %s\n" + +#, python-format +msgid "failed to contact inotify server: %s\n" +msgstr "non sono riuscito a contattare il server inotify: %s\n" + +#, fuzzy +msgid "received empty answer from inotify server" +msgstr "Risposta inaspettata dal server remoto:" + #, python-format msgid "(inotify: received response from incompatible server version %d)\n" msgstr "" +#, python-format +msgid "(inotify: received '%s' response when expecting '%s')\n" +msgstr "" + msgid "this system does not seem to support inotify" msgstr "questo sistema sembra non supportare inotify" @@ -2187,10 +2307,6 @@ msgstr "sto controllando le directory sotto %r\n" #, python-format -msgid "status: %r dir(%d) -> %s\n" -msgstr "status: %r dir(%d) -> %s\n" - -#, python-format msgid "status: %r %s -> %s\n" msgstr "status: %r %s -> %s\n" @@ -2238,29 +2354,39 @@ msgstr "" #, python-format -msgid "%s processing %d deferred events as %d\n" -msgstr "" - -#, python-format msgid "could not start server: %s" msgstr "" #, python-format +msgid "answering query for %r\n" +msgstr "" + +#, python-format msgid "received query from incompatible client version %d\n" msgstr "" -#, python-format -msgid "answering query for %r\n" -msgstr "" +#, fuzzy, python-format +msgid "unrecognized query type: %s\n" +msgstr "risposta non riconosciuta\n" 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, which\n" +"will be automatically expanded into links or any other arbitrary\n" +"expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may be used\n" +"in your hgrc::\n" +"\n" +" [interhg]\n" +" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" +" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" #, python-format @@ -2272,119 +2398,63 @@ msgstr "" msgid "" -"keyword expansion in local repositories\n" -"\n" -"This extension expands RCS/CVS-like or self-customized $Keywords$\n" -"in tracked text files selected by your configuration.\n" -"\n" -"Keywords are only expanded in local repositories and not stored in\n" -"the change history. The mechanism can be regarded as a convenience\n" -"for the current user or for archive distribution.\n" -"\n" -"Configuration is done in the [keyword] and [keywordmaps] sections\n" -"of hgrc files.\n" -"\n" -"Example:\n" +"expand keywords 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" +"\n" +"Keywords are only expanded in local repositories and not stored in the\n" +"change history. The mechanism can be regarded as a convenience for the\n" +"current user or for archive distribution.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections of\n" +"hgrc files.\n" +"\n" +"Example::\n" "\n" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" " x* = ignore\n" "\n" -"Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repos.\n" +"NOTE: the more specific you are in your filename patterns the less you\n" +"lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\".\n" -"\n" -"An additional date template filter {date|utcdate} is provided.\n" -"\n" -"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" -"with customized keywords and templates.\n" -"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"available templates and filters.\n" +"\n" +"An additional date template filter {date|utcdate} is provided. It\n" +"returns a date like \"2006/09/18 15:13:13\".\n" +"\n" +"The default template mappings (view with \"hg kwdemo -d\") can be\n" +"replaced with customized keywords and templates. Again, run \"hg\n" +"kwdemo\" to control the results of your config changes.\n" "\n" "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" -"the risk of inadvertedly storing expanded keywords in the change history.\n" +"the risk of inadvertently storing expanded keywords in the change\n" +"history.\n" "\n" "To force expansion after enabling it, or a configuration change, run\n" "\"hg kwexpand\".\n" "\n" -"Also, when committing with the record extension or using mq's qrecord, be " -"aware\n" -"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" -"question to update keyword expansions after all changes have been checked " -"in.\n" +"Also, when committing with the record extension or using mq's qrecord,\n" +"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" +"the files in question to update keyword expansions after all changes\n" +"have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" -"like CVS' $Log$, are not supported. A keyword template map\n" -"\"Log = {desc}\" expands to the first line of the changeset description.\n" -msgstr "" - -msgid "Returns hgdate in cvs-like UTC format." -msgstr "" - -msgid "" -"\n" -" Sets up keyword templates, corresponding keyword regex, and\n" -" provides keyword substitution functions.\n" -" " -msgstr "" - -msgid "Replaces keywords in data with expanded template." -msgstr "" - -msgid "Returns data with keywords expanded." -msgstr "" - -msgid "" -"Returns true if path matches [keyword] pattern\n" -" and is not a symbolic link.\n" -" Caveat: localrepository._link fails on Windows." -msgstr "" - -msgid "Overwrites selected files expanding/shrinking keywords." -msgstr "" - -#, python-format -msgid "overwriting %s %s keywords\n" -msgstr "" - -msgid "Unconditionally removes all keyword substitutions from text." -msgstr "" - -msgid "Returns text with all keyword substitutions removed." -msgstr "" - -msgid "Returns lines with keyword substitutions removed." -msgstr "" - -msgid "" -"If in restricted mode returns data read from wdir with\n" -" keyword substitutions removed." -msgstr "" - -msgid "" -"\n" -" Subclass of filelog to hook into its read, add, cmp methods.\n" -" Keywords are \"stored\" unexpanded, and processed on reading.\n" -" " -msgstr "" - -msgid "Expands keywords when reading filelog." -msgstr "" - -msgid "Removes keyword substitutions when adding to filelog." -msgstr "" - -msgid "Removes keyword substitutions for comparison." -msgstr "" - -msgid "" -"Bails out if [keyword] configuration is not active.\n" -" Returns status of working directory." -msgstr "" -"Esce se la configurazione [keyword] non è attiva.\n" -" Restituisce lo stato della directory di lavoro." +"like CVS' $Log$, are not supported. A keyword template map \"Log =\n" +"{desc}\" expands to the first line of the changeset description.\n" +msgstr "" + +#, fuzzy, python-format +msgid "overwriting %s expanding keywords\n" +msgstr "sovrascrivi %s parziale %s\n" + +#, python-format +msgid "overwriting %s shrinking keywords\n" +msgstr "" msgid "[keyword] patterns cannot match" msgstr "" @@ -2392,49 +2462,66 @@ msgid "no [keyword] patterns configured" msgstr "" -msgid "Selects files and passes them to kwtemplater.overwrite." -msgstr "" - msgid "" "print [keywordmaps] configuration and an expansion example\n" "\n" -" Show current, custom, or default keyword template maps\n" -" and their expansion.\n" -"\n" -" Extend current configuration by specifying maps as arguments\n" -" and optionally by reading from an additional hgrc file.\n" -"\n" -" Override current keyword template maps with \"default\" option.\n" +" Show current, custom, or default keyword template maps and their\n" +" expansions.\n" +"\n" +" Extend the current configuration by specifying maps as arguments\n" +" and using -f/--rcfile to source an external hgrc file.\n" +"\n" +" Use -d/--default to disable current configuration.\n" +"\n" +" See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" -#, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" - -#, python-format -msgid "creating temporary repo at %s\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"%s keywords written to %s:\n" +#, fuzzy, python-format +msgid "creating temporary repository at %s\n" +msgstr "lock del repository remoto fallito" + +msgid "" +"\n" +"\tconfiguration using custom keyword template maps\n" +msgstr "" + +msgid "\textending current template maps\n" +msgstr "" + +msgid "\toverriding default template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using default keyword template maps\n" +msgstr "" + +#, fuzzy +msgid "\tdisabling current template maps\n" +msgstr "mostra usando un file mappa template" + +msgid "" +"\n" +"\tconfiguration using current keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"keywords written to %s:\n" msgstr "" msgid "unhooked all commit hooks\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repo %s\n" -msgstr "" - -msgid "" -"expand keywords in working directory\n" +msgid "" +"\n" +"\tkeywords expanded\n" +msgstr "" + +msgid "" +"expand keywords in the working directory\n" "\n" " Run after (re)enabling keyword expansion.\n" "\n" @@ -2443,54 +2530,38 @@ msgstr "" msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets for\n" -" keyword expansion.\n" -" That is, files matched by [keyword] config patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates for\n" +" expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\n" +" With -A/--all and -v/--verbose the codes used to show the status\n" +" of files are::\n" +"\n" +" K = keyword expansion candidate\n" +" k = keyword expansion candidate (not tracked)\n" +" I = ignored\n" +" i = ignored (not tracked)\n" " " msgstr "" msgid "" -"revert expanded keywords in working directory\n" -"\n" -" Run before changing/disabling active keywords\n" -" or if you experience problems with \"hg import\" or \"hg merge\".\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" "\n" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" -msgid "" -"Collects [keyword] config in kwtools.\n" -" Monkeypatches dispatch._parse if needed." -msgstr "" - -msgid "Monkeypatch dispatch._parse to obtain running hg command." -msgstr "" - -msgid "" -"Sets up repo as kwrepo for keyword substitution.\n" -" Overrides file method to return kwfilelog instead of filelog\n" -" if file matches user configuration.\n" -" Wraps commit to overwrite configured files with updated\n" -" keyword substitutions.\n" -" Monkeypatches patch and webcommands." -msgstr "" - -msgid "" -"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" -" rejects or conflicts due to expanded keywords in working dir." -msgstr "" - -msgid "" -"Monkeypatch patch.diff to avoid expansion except when\n" -" comparing against working dir." -msgstr "" - -msgid "Wraps webcommands.x turning off keyword expansion." -msgstr "" - msgid "show default keyword template maps" msgstr "" @@ -2509,7 +2580,15 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" +#, fuzzy +msgid "only show unknown (not tracked) files" +msgstr "mostra solo i file sconosciuti (non tracciati)" + +#, fuzzy +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "mostra lo stato di tutti i file" + +msgid "only show untracked files (DEPRECATED)" msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2519,41 +2598,27 @@ msgstr "hg kwshrink [OPZIONI]... [FILE]..." msgid "" -"patch management and development\n" +"manage a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" -"repository. It manages two stacks of patches - all known patches, and\n" +"repository. It manages two stacks of patches - all known patches, and\n" "applied patches (subset of known patches).\n" "\n" "Known patches are represented as patch files in the .hg/patches\n" -"directory. Applied patches are both patch files and changesets.\n" -"\n" -"Common tasks (use \"hg help command\" for more details):\n" -"\n" -"prepare repository to work with patches qinit\n" -"create new patch qnew\n" -"import existing patch qimport\n" -"\n" -"print patch series qseries\n" -"print applied patches qapplied\n" -"print name of top applied patch qtop\n" -"\n" -"add known patch to applied stack qpush\n" -"remove patch from applied stack qpop\n" -"refresh contents of top applied patch qrefresh\n" -msgstr "" - -msgid "" -"Update all references to a field in the patch header.\n" -" If none found, add it email style." -msgstr "" -"Aggiorna tutti i riferimenti ad un campo nell'intestazione della patch.\n" -" If none found, add it email style." - -msgid "" -"Remove existing message, keeping the rest of the comments fields.\n" -" If comments contains 'subject: ', message will prepend\n" -" the field and a blank line." +"directory. Applied patches are both patch files and changesets.\n" +"\n" +"Common tasks (use \"hg help command\" for more details)::\n" +"\n" +" prepare repository to work with patches qinit\n" +" create new patch qnew\n" +" import existing patch qimport\n" +"\n" +" print patch series qseries\n" +" print applied patches qapplied\n" +"\n" +" add known patch to applied stack qpush\n" +" remove patch from applied stack qpop\n" +" refresh contents of top applied patch qrefresh\n" msgstr "" #, python-format @@ -2572,10 +2637,6 @@ msgstr "carattere non valido nella guardia %r: %r" #, python-format -msgid "active guards: %s\n" -msgstr "guardie attive: %s\n" - -#, python-format msgid "guard %r too short" msgstr "la guardia %r è troppo corta" @@ -2634,11 +2695,6 @@ msgid "patch %s is not applied\n" msgstr "la patch %s non è applicata\n" -msgid "" -"Apply patchfile to the working directory.\n" -" patchfile: file name of patch" -msgstr "" - msgid "patch failed, unable to continue (try -v)\n" msgstr "patch fallita, impossibile continuare (provare con -v)\n" @@ -2646,9 +2702,9 @@ msgid "applying %s\n" msgstr "sto applicando %s\n" -#, python-format -msgid "Unable to read %s\n" -msgstr "Impossibile leggere %s\n" +#, fuzzy, python-format +msgid "unable to read %s\n" +msgstr "impossibile leggere %s" #, python-format msgid "imported patch %s\n" @@ -2680,6 +2736,10 @@ msgid "cannot delete revision %d above applied patches" msgstr "" +#, fuzzy, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "mostra solo i file senza modifiche" + msgid "qdelete requires at least one revision or patch name" msgstr "" @@ -2707,12 +2767,6 @@ msgid "\"%s\" cannot be used as the name of a patch" msgstr "" -msgid "" -"options:\n" -" msg: a string or a no-argument function returning a string\n" -" " -msgstr "" - #, python-format msgid "patch \"%s\" already exists" msgstr "la patch \"%s\" esiste gi" @@ -2721,9 +2775,6 @@ msgid "error unlinking %s\n" msgstr "" -msgid "returns (index, rev, patch)" -msgstr "" - #, python-format msgid "patch name \"%s\" is ambiguous:\n" msgstr "il nome della patch \"%s\" ambiguo:\n" @@ -2732,7 +2783,8 @@ msgid "patch %s not in series" msgstr "la patch %s non nella serie" -msgid "(working directory not at tip)\n" +#, fuzzy +msgid "(working directory not at a head)\n" msgstr "(directory di lavoro non tip)\n" msgid "no patches in series\n" @@ -2799,6 +2851,10 @@ msgid "deletions found between repo revs" msgstr "" +#, fuzzy, python-format +msgid "popping %s\n" +msgstr "sto applicando %s\n" + msgid "patch queue now empty\n" msgstr "" @@ -2853,14 +2909,6 @@ msgid "repo commit failed\n" msgstr "commit del repository fallito\n" -msgid "" -"If all_patches is False, return the index of the next pushable patch\n" -" in the series, or the series length. If all_patches is True, return " -"the\n" -" index of the first patch past the last applied one.\n" -" " -msgstr "" - #, python-format msgid "patch %s is already in the series file" msgstr "la patch %s gi nel file series" @@ -2912,54 +2960,64 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to\n" -" the --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 be\n" -" used as an alternative for qdel -r, as the latter option is deprecated.\n" -"\n" -" With --keep, the patch files are preserved in the patch directory." +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" msgid "print the patches already applied" msgstr "stampa le patch gi applicate" +msgid "only one patch applied\n" +msgstr " stata applicata solo una patch\n" + msgid "print the patches not yet applied" msgstr "stampa le patch non ancora applicate" +msgid "all patches applied\n" +msgstr "tutte le patch sono state applicate\n" + msgid "" "import a patch\n" "\n" -" The patch is inserted into the series after the last applied patch.\n" -" If no patches have been applied, qimport prepends the patch\n" +" The patch is inserted into the series after the last applied\n" +" patch. If no patches have been applied, qimport prepends the patch\n" " to the series.\n" "\n" " The patch will have the same name as its source file unless you\n" -" give it a new one with --name.\n" -"\n" -" You can register an existing patch inside the patch directory\n" -" with the --existing flag.\n" -"\n" -" With --force, an existing patch of the same name will be overwritten.\n" -"\n" -" An existing changeset may be placed under mq control with --rev\n" +" give it a new one with -n/--name.\n" +"\n" +" You can register an existing patch inside the patch directory with\n" +" the -e/--existing flag.\n" +"\n" +" With -f/--force, an existing patch of the same name will be\n" +" overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with -r/--rev\n" " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" -" With --git, patches imported with --rev will use the git diff\n" +" With -g/--git, patches imported with --rev will use the git diff\n" " format. See the diffs help topic for information on why this is\n" -" important for preserving rename/copy information and permission " -"changes.\n" +" important for preserving rename/copy information and permission\n" +" changes.\n" +"\n" +" To import a patch from standard input, pass - as the patch file.\n" +" When importing from standard input, a patch name must be specified\n" +" using the --name flag.\n" " " msgstr "" +#, fuzzy msgid "" "init a new queue repository\n" "\n" -" The queue repository is unversioned by default. If -c is\n" -" specified, qinit will create a separate nested repository\n" -" for patches (qinit -c may also be run later to convert\n" -" an unversioned patch repository into a versioned one).\n" -" You can use qcommit to commit changes to this queue repository." +" The queue repository is unversioned by default. If\n" +" -c/--create-repo is specified, qinit will create a separate nested\n" +" repository for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one). You can use\n" +" qcommit to commit changes to this queue repository." msgstr "" "inizializza un nuovo repository della coda\n" "\n" @@ -2974,16 +3032,16 @@ msgid "" "clone main and patch repository at same time\n" "\n" -" If source is local, destination will have no patches applied. If\n" +" If source is local, destination will have no patches applied. If\n" " source is remote, this command can not check if patches are\n" " applied in source, so cannot guarantee that patches are not\n" -" applied in destination. If you clone remote repository, be sure\n" +" applied in destination. If you clone remote repository, be sure\n" " before that it has no patches applied.\n" "\n" " Source patch repository is looked for in <src>/.hg/patches by\n" -" default. Use -p <url> to change.\n" -"\n" -" The patch directory must be a nested mercurial repository, as\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested Mercurial repository, as\n" " would be created by qinit -c.\n" " " msgstr "" @@ -2993,16 +3051,20 @@ "repository delle patch sotto controllo di versione non trovato (vedere qinit " "-c)" -msgid "cloning main repo\n" +#, fuzzy +msgid "cloning main repository\n" msgstr "sto clonando il repository principale\n" -msgid "cloning patch repo\n" +#, fuzzy +msgid "cloning patch repository\n" msgstr "sto clonando il repository delle patch\n" -msgid "stripping applied patches from destination repo\n" +#, fuzzy +msgid "stripping applied patches from destination repository\n" msgstr "sto rimuovendo le patch applicate dal repository di destinazione\n" -msgid "updating destination repo\n" +#, fuzzy +msgid "updating destination repository\n" msgstr "sto aggiornando il repository di destinazione\n" msgid "commit changes in the queue repository" @@ -3017,35 +3079,30 @@ msgid "print the name of the next patch" msgstr "stampa il nome della patch seguente" -msgid "all patches applied\n" -msgstr "tutte le patch sono state applicate\n" - msgid "print the name of the previous patch" msgstr "stampa il nome della patch precedente" -msgid "only one patch applied\n" -msgstr " stata applicata solo una patch\n" - +#, fuzzy msgid "" "create a new patch\n" "\n" -" qnew creates a new patch on top of the currently-applied patch (if " -"any).\n" -" It will refuse to run if there are any outstanding changes unless -f is\n" -" specified, in which case the patch will be initialized with them. You\n" -" may also use -I, -X, and/or a list of files after the patch name to add\n" -" only changes to matching files to the new patch, leaving the rest as\n" -" uncommitted modifications.\n" -"\n" -" -u and -d can be used to set the (given) user and date, respectively.\n" -" -U and -D set user to current user and date to current date.\n" -"\n" -" -e, -m or -l set the patch header as well as the commit message. If " -"none\n" -" is specified, the header is empty and the commit message is '[mq]: " -"PATCH'.\n" -"\n" -" Use the --git option to keep the patch in the git extended diff\n" +" qnew creates a new patch on top of the currently-applied patch (if\n" +" any). It will refuse to run if there are any outstanding changes\n" +" unless -f/--force is specified, in which case the patch will be\n" +" initialized with them. You may also use -I/--include,\n" +" -X/--exclude, and/or a list of files after the patch name to add\n" +" only changes to matching files to the new patch, leaving the rest\n" +" as uncommitted modifications.\n" +"\n" +" -u/--user and -d/--date can be used to set the (given) user and\n" +" date, respectively. -U/--currentuser and -D/--currentdate set user\n" +" to current user and date to current date.\n" +"\n" +" -e/--edit, -m/--message or -l/--logfile set the patch header as\n" +" well as the commit message. If none is specified, the header is\n" +" empty and the commit message is '[mq]: PATCH'.\n" +"\n" +" Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" " information.\n" @@ -3080,18 +3137,17 @@ msgid "" "update the current patch\n" "\n" -" If any file patterns are provided, the refreshed patch will contain " -"only\n" -" the modifications that match those patterns; the remaining " -"modifications\n" -" will remain in the working directory.\n" -"\n" -" If --short is specified, files currently included in the patch will\n" -" be refreshed just like matched files and remain in the patch.\n" -"\n" -" hg add/remove/copy/rename work as usual, though you might want to use\n" -" git-style patches (--git or [diff] git=1) to track copies and renames.\n" -" See the diffs help topic for more information on the git diff format.\n" +" If any file patterns are provided, the refreshed patch will\n" +" contain only the modifications that match those patterns; the\n" +" remaining modifications will remain in the working directory.\n" +"\n" +" If -s/--short is specified, files currently included in the patch\n" +" will be refreshed just like matched files and remain in the patch.\n" +"\n" +" hg add/remove/copy/rename work as usual, though you might want to\n" +" use git-style patches (-g/--git or [diff] git=1) to track copies\n" +" and renames. See the diffs help topic for more information on the\n" +" git diff format.\n" " " msgstr "" @@ -3101,14 +3157,15 @@ msgid "" "diff of the current patch and subsequent modifications\n" "\n" -" Shows a diff which includes the current patch as well as any changes " -"which\n" -" have been made in the working directory since the last refresh (thus\n" -" showing what the current patch would become after a qrefresh).\n" -"\n" -" Use 'hg diff' if you only want to see the changes made since the last\n" -" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" -" current patch without including changes made since the qrefresh.\n" +" Shows a diff which includes the current patch as well as any\n" +" changes which have been made in the working directory since the\n" +" last refresh (thus showing what the current patch would become\n" +" after a qrefresh).\n" +"\n" +" Use 'hg diff' if you only want to see the changes made since the\n" +" last qrefresh, or 'hg export qtip' if you want to see changes made\n" +" by the current patch without including changes made since the\n" +" qrefresh.\n" " " msgstr "" @@ -3118,12 +3175,12 @@ " Patches must not yet be applied. Each patch will be successively\n" " applied to the current patch in the order given. If all the\n" " patches apply successfully, the current patch will be refreshed\n" -" with the new cumulative patch, and the folded patches will\n" -" be deleted. With -k/--keep, the folded patch files will not\n" -" be removed afterwards.\n" -"\n" -" The header for each folded patch will be concatenated with\n" -" the current patch header, separated by a line of '* * *'." +" with the new cumulative patch, and the folded patches will be\n" +" deleted. With -k/--keep, the folded patch files will not be\n" +" removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with the\n" +" current patch header, separated by a line of '* * *'." msgstr "" msgid "qfold requires at least one patch name" @@ -3181,8 +3238,8 @@ msgid "" "push the next patch onto the stack\n" "\n" -" When --force is applied, all local changes in patched files will be " -"lost.\n" +" When -f/--force is applied, all local changes in patched files\n" +" will be lost.\n" " " msgstr "" @@ -3196,9 +3253,9 @@ msgid "" "pop the current patch off the stack\n" "\n" -" By default, pops off the top of the patch stack. If given a patch name,\n" -" keeps popping off patches until the named patch is at the top of the " -"stack.\n" +" By default, pops off the top of the patch stack. If given a patch\n" +" name, keeps popping off patches until the named patch is at the\n" +" top of the stack.\n" " " msgstr "" @@ -3225,7 +3282,8 @@ msgid "A patch named %s already exists in the series file" msgstr "Una patch chiamata %s esiste già nel file series" -msgid "restore the queue state saved by a rev" +#, fuzzy +msgid "restore the queue state saved by a revision" msgstr "ripristina lo stato della coda salvato da una revisione" msgid "save current queue state" @@ -3243,11 +3301,13 @@ msgid "copy %s to %s\n" msgstr "copia %s a %s\n" +#, fuzzy msgid "" "strip a revision and all its descendants from the repository\n" "\n" -" If one of the working dir's parent revisions is stripped, the working\n" -" directory will be updated to the parent of the stripped revision.\n" +" If one of the working directory's parent revisions is stripped, the\n" +" working directory will be updated to the parent of the stripped\n" +" revision.\n" " " msgstr "" "elimina una revisione e tutti i suoi discendenti dal repository\n" @@ -3261,34 +3321,34 @@ "set or print guarded patches to push\n" "\n" " Use the qguard command to set or print guards on patch, then use\n" -" qselect to tell mq which guards to use. A patch will be pushed if it\n" -" has no guards or any positive guards match the currently selected " -"guard,\n" -" but will not be pushed if any negative guards match the current guard.\n" -" For example:\n" +" qselect to tell mq which guards to use. A patch will be pushed if\n" +" it has no guards or any positive guards match the currently\n" +" selected guard, but will not be pushed if any negative guards\n" +" match the current guard. For example:\n" "\n" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" " qselect stable\n" "\n" " This activates the \"stable\" guard. mq will skip foo.patch (because\n" -" it has a negative match) but push bar.patch (because it\n" -" has a positive match).\n" +" it has a negative match) but push bar.patch (because it has a\n" +" positive match).\n" "\n" " With no arguments, prints the currently active guards.\n" " With one argument, sets the active guard.\n" "\n" " Use -n/--none to deactivate guards (no other arguments needed).\n" -" When no guards are active, patches with positive guards are skipped\n" -" and patches with negative guards are pushed.\n" +" When no guards are active, patches with positive guards are\n" +" skipped and patches with negative guards are pushed.\n" "\n" " qselect can change the guards on applied patches. It does not pop\n" -" guarded patches by default. Use --pop to pop back to the last applied\n" -" patch that is not guarded. Use --reapply (which implies --pop) to push\n" -" back to the current patch afterwards, but skip guarded patches.\n" -"\n" -" Use -s/--series to print a list of all guards in the series file (no\n" -" other arguments needed). Use -v for more information." +" guarded patches by default. Use --pop to pop back to the last\n" +" applied patch that is not guarded. Use --reapply (which implies\n" +" --pop) to push back to the current patch afterwards, but skip\n" +" guarded patches.\n" +"\n" +" Use -s/--series to print a list of all guards in the series file\n" +" (no other arguments needed). Use -v for more information." msgstr "" msgid "guards deactivated\n" @@ -3324,17 +3384,18 @@ msgid "" "move applied patches into repository history\n" "\n" -" Finishes the specified revisions (corresponding to applied patches) by\n" -" moving them out of mq control into regular repository history.\n" -"\n" -" Accepts a revision range or the --applied option. If --applied is\n" -" specified, all applied mq revisions are removed from mq control.\n" -" Otherwise, the given revisions must be at the base of the stack of\n" -" applied patches.\n" -"\n" -" This can be especially useful if your changes have been applied to an\n" -" upstream repository, or if you are about to push your changes to " -"upstream.\n" +" Finishes the specified revisions (corresponding to applied\n" +" patches) by moving them out of mq control into regular repository\n" +" history.\n" +"\n" +" Accepts a revision range or the -a/--applied option. If --applied\n" +" is specified, all applied mq revisions are removed from mq\n" +" control. Otherwise, the given revisions must be at the base of the\n" +" stack of applied patches.\n" +"\n" +" This can be especially useful if your changes have been applied to\n" +" an upstream repository, or if you are about to push your changes\n" +" to upstream.\n" " " msgstr "" @@ -3361,7 +3422,12 @@ msgid "print first line of patch header" msgstr "stampa la prima riga dell'intestazione della patch" -msgid "hg qapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the last patch" +msgstr "mostra solo i file aggiunti" + +#, fuzzy +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "hg qapplied [-s] [PATCH]" msgid "use pull protocol to copy metadata" @@ -3373,7 +3439,8 @@ msgid "use uncompressed transfer (fast over LAN)" msgstr "usa trasferimento non compresso (veloce su LAN)" -msgid "location of source patch repo" +#, fuzzy +msgid "location of source patch repository" msgstr "posizione del repository delle patch sorgente" msgid "hg qclone [OPTION]... SOURCE [DEST]" @@ -3388,7 +3455,8 @@ msgid "keep patch file" msgstr "mantieni il file della patch" -msgid "stop managing a revision" +#, fuzzy +msgid "stop managing a revision (DEPRECATED)" msgstr "smetti di gestire una revisione" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." @@ -3421,11 +3489,13 @@ msgid "hg qheader [PATCH]" msgstr "hg qheader [PATCH]" -msgid "import file in patch dir" +#, fuzzy +msgid "import file in patch directory" msgstr "importa il file nella directory delle patch" -msgid "patch file name" -msgstr "nome del file della patch" +#, fuzzy +msgid "name of patch file" +msgstr "mantieni il file della patch" msgid "overwrite existing files" msgstr "sovrascrive i file esistenti" @@ -3436,7 +3506,11 @@ msgid "use git extended diff format" msgstr "usa il formato diff git esteso" -msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." +msgid "qpush after importing" +msgstr "" + +#, fuzzy +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-r REV]... FILE..." msgid "create queue repository" @@ -3475,7 +3549,8 @@ msgid "queue name to pop" msgstr "nome della coda da disapplicare" -msgid "forget any local changes" +#, fuzzy +msgid "forget any local changes to patched files" msgstr "dimentica ogni modifica locale" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -3502,16 +3577,18 @@ msgid "refresh only files already in the patch and specified files" msgstr "aggiorna solo file già nella patch e quelli specificati" -msgid "add/update \"From: <current user>\" in patch" -msgstr "aggiunge/aggiorna \"Da: <utente corrente>\" nella patch" - -msgid "add/update \"From: <given user>\" in patch" -msgstr "aggiunge/aggiorna \"Da: <utente fornito>\" nella patch" - -msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "aggiorna \"Data: <data corrente>\" nella patch (se presente)" - -msgid "update \"Date: <given date>\" in patch (if present)" +msgid "add/update author field in patch with current user" +msgstr "" + +msgid "add/update author field in patch with given user" +msgstr "" + +#, fuzzy +msgid "add/update date field in patch with current date" +msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)" + +#, fuzzy +msgid "add/update date field in patch with given date" msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." @@ -3523,7 +3600,8 @@ msgid "delete save entry" msgstr "elimina la voce salvata" -msgid "update queue working dir" +#, fuzzy +msgid "update queue working directory" msgstr "aggiorna la directory di lavoro della coda" msgid "hg qrestore [-d] [-u] REV" @@ -3580,100 +3658,86 @@ msgid "hg qtop [-s]" msgstr "hg qtop [-s]" -msgid "hg qunapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the first patch" +msgstr "mostra solo i file aggiunti" + +#, fuzzy +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "hg qunapplied [-s] [PATCH]" msgid "finish all applied changesets" msgstr "finalizza tutti i changeset applicati" -msgid "hg qfinish [-a] [REV...]" +#, fuzzy +msgid "hg qfinish [-a] [REV]..." msgstr "hg qfinish [-a] [REV...]" msgid "" -"hook extension to email notifications on commits/pushes\n" -"\n" -"Subscriptions can be managed through hgrc. Default mode is to print\n" -"messages to stdout, for testing and configuring.\n" -"\n" -"To use, configure notify extension and enable in hgrc like this:\n" -"\n" -" [extensions]\n" -" hgext.notify =\n" -"\n" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" -" [notify]\n" -" # config items go in here\n" -"\n" -" config items:\n" -"\n" -" REQUIRED:\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -" OPTIONAL:\n" -" test = True # print messages to stdout for testing\n" -" strip = 3 # number of slashes to strip for url paths\n" -" domain = example.com # domain to use if committer missing domain\n" -" style = ... # style file to use when formatting email\n" -" template = ... # template to use when formatting email\n" -" incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" -" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" -" maxsubject = 67 # truncate subject line longer than this\n" -" diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " +"hooks for sending email notifications at commit/push time\n" +"\n" +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go here\n" +"\n" +"Required configuration items::\n" +"\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +"Optional configuration items::\n" +"\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " "list\n" -" # (serve == ssh or http, push, pull, bundle)\n" -" [email]\n" -" from = user@host.com # email address to send as if none given\n" -" [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" -" notify config file has same format as regular hgrc. it has two\n" -" sections so you can express subscriptions in whatever way is handier\n" -" for you.\n" -"\n" -" [usersubs]\n" -" # key is subscriber email, value is \",\"-separated list of glob " -"patterns\n" -" user@host = pattern\n" -"\n" -" [reposubs]\n" -" # key is glob pattern, value is \",\"-separated list of subscriber " -"emails\n" -" pattern = user@host\n" -"\n" -" glob patterns are matched against path to repo root.\n" -"\n" -" if you like, you can put notify config file in repo that users can\n" -" push changes to, they can manage their own subscriptions." -msgstr "" - -msgid "email notification class." -msgstr "classe per la notifica via email." - -msgid "strip leading slashes from local path, turn into web-safe path." -msgstr "" - -msgid "try to clean up email addresses." -msgstr "prova a pulire gli indirizzi email." - -msgid "return list of email addresses of subscribers to this repo." -msgstr "restituisce gli indirizzi email dei sottoscritti a questo repository" - -msgid "format one changeset." -msgstr "formatta un changeset." - -msgid "true if incoming changes from this source should be skipped." -msgstr "" -"vero se le modifiche in entrata da questa sorgente dovrebbero essere saltate." - -msgid "send message." -msgstr "invia messaggio." +" # (serve == ssh or http, push, pull, bundle)\n" +" merge = False # send notification for merges (default True)\n" +" [email]\n" +" from = user@host.com # email address to send as if none given\n" +" [web]\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you.\n" +"\n" +"::\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +"Glob patterns are matched against path to repository root.\n" +"\n" +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" +msgstr "" #, python-format msgid "%s: %d new changesets" @@ -3703,107 +3767,89 @@ "diff (%d linee):\n" "\n" -msgid "" -"send email notifications to interested subscribers.\n" -"\n" -" if used as changegroup hook, send one email for all changesets in\n" -" changegroup. else send one email per changeset." -msgstr "" - -#, python-format -msgid "notify: no subscribers to repo %s\n" -msgstr "" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "" - -msgid "" -"browse command output with external pager\n" -"\n" -"To set the pager that should be used, set the application variable:\n" +#, python-format +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "" + +msgid "" +"browse command output with an external pager\n" +"\n" +"To set the pager that should be used, set the application variable::\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" "\n" -"If no pager is set, the pager extensions uses the environment\n" -"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" -"is used.\n" -"\n" -"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" -"by setting:\n" +"If no pager is set, the pager extensions uses the environment variable\n" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" +"setting::\n" "\n" " [pager]\n" " quiet = True\n" "\n" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list:\n" +"pager.ignore list::\n" "\n" " [pager]\n" " ignore = version, help, update\n" "\n" -"You can also enable the pager only for certain commands using pager.attend:\n" +"You can also enable the pager only for certain commands using\n" +"pager.attend::\n" "\n" " [pager]\n" " attend = log\n" "\n" "If pager.attend is present, pager.ignore will be ignored.\n" "\n" -"To ignore global commands like \"hg version\" or \"hg help\", you have to " -"specify\n" -"them in the global .hgrc\n" -msgstr "" - -msgid "" -"use suffixes to refer to ancestor revisions\n" -"\n" -"This extension allows you to use git-style suffixes to refer to\n" -"the ancestors of a specific revision.\n" -"\n" -"For example, if you can refer to a revision as \"foo\", then:\n" -"\n" -"- foo^N = Nth parent of foo:\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" +"specify them in the global .hgrc\n" +msgstr "" + +msgid "" +"interpret suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to the\n" +"ancestors of a specific revision.\n" +"\n" +"For example, if you can refer to a revision as \"foo\", then::\n" +"\n" +" foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" " foo^ = foo^1\n" "\n" -"- foo~N = Nth first grandparent of foo\n" +" foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" -"\n" -"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" -"which describes the series as a whole.\n" -"\n" -"Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" -"the first line of the changeset description as the subject text.\n" -"The message contains two or three body parts:\n" -"\n" -" The remainder of the changeset description.\n" -"\n" -" [Optional] The result of running diffstat on the patch.\n" -"\n" -" The patch itself, as generated by \"hg export\".\n" -"\n" -"Each message refers to all of its predecessors using the In-Reply-To\n" -"and References headers, so they will show up as a sequence in\n" -"threaded mail and news readers, and in mail archives.\n" -"\n" -"For each changeset, you will be prompted with a diffstat summary and\n" -"the changeset summary, so you can be sure 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 file:\n" +"command to send changesets as (a series of) patch emails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" +"describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" +"first line of the changeset description as the subject text. The\n" +"message contains two or three body parts:\n" +"\n" +"- The changeset description.\n" +"- [Optional] The result of running diffstat on the patch.\n" +"- The patch itself, as generated by \"hg export\".\n" +"\n" +"Each message refers to the first in the series using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in threaded\n" +"mail and news readers, and in mail archives.\n" +"\n" +"With the -d/--diffstat option, you will be prompted for each changeset\n" +"with a diffstat summary and the changeset summary, so you can be sure\n" +"you are sending the right changes.\n" +"\n" +"To configure other defaults, add a section like this to your hgrc\n" +"file::\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3815,35 +3861,39 @@ "as a patchbomb.\n" "\n" "To avoid sending patches prematurely, it is a good idea to first run\n" -"the \"email\" command with the \"-n\" option (test only). You will be\n" -"prompted for an email recipient address, a subject an an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If PAGER environment variable\n" -"is set, your pager will be fired up once for each patchbomb message, so\n" -"you can verify everything is alright.\n" -"\n" -"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" -"each patchbomb message in a pager or sending the messages directly,\n" -"it will create a UNIX mailbox file with the patch emails. This\n" -"mailbox file can be previewed with any mail user agent which supports\n" -"UNIX mbox files, e.g. with mutt:\n" +"the \"email\" command with the \"-n\" option (test only). You will be\n" +"prompted for an email recipient address, a subject and an introductory\n" +"message describing the patches of your patchbomb. Then when all is\n" +"done, patchbomb messages are displayed. If the PAGER environment\n" +"variable is set, your pager will be fired up once for each patchbomb\n" +"message, so you can verify everything is alright.\n" +"\n" +"The -m/--mbox option is also very useful. Instead of previewing each\n" +"patchbomb message in a pager or sending the messages directly, it will\n" +"create a UNIX mailbox file with the patch emails. This mailbox file\n" +"can be previewed with any mail user agent which supports UNIX mbox\n" +"files, e.g. with mutt::\n" "\n" " % mutt -R -f mbox\n" "\n" -"When you are previewing the patchbomb messages, you can use `formail'\n" -"(a utility that is commonly installed as part of the procmail package),\n" -"to send each message out:\n" +"When you are previewing the patchbomb messages, you can use ``formail``\n" +"(a utility that is commonly installed as part of the procmail\n" +"package), to send each message out::\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" "That should be all. Now your patchbomb is on its way out.\n" "\n" "You can also either configure the method option in the email section\n" -"to be a sendmail compatable mailer or fill out the [smtp] section so\n" -"that the patchbomb extension can automatically send patchbombs directly\n" -"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" -"for details." -msgstr "" +"to be a sendmail compatible mailer or fill out the [smtp] section so\n" +"that the patchbomb extension can automatically send patchbombs\n" +"directly from the commandline. See the [email] and [smtp] sections in\n" +"hgrc(5) for details.\n" +msgstr "" + +#, fuzzy, python-format +msgid "%sPlease enter a valid value" +msgstr "Si prega di inserire un valore valido.\n" msgid "Please enter a valid value.\n" msgstr "Si prega di inserire un valore valido.\n" @@ -3858,50 +3908,54 @@ "send changesets by email\n" "\n" " By default, diffs are sent in the format generated by hg export,\n" -" one per message. The series starts with a \"[PATCH 0 of N]\"\n" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" " introduction, which describes the series as a whole.\n" "\n" " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" " the first line of the changeset description as the subject text.\n" -" The message contains two or three body parts. First, the rest of\n" -" the changeset description. Next, (optionally) if the diffstat\n" -" program is installed, the result of running diffstat on the patch.\n" -" Finally, the patch itself, as generated by \"hg export\".\n" -"\n" -" With --outgoing, emails will be generated for patches not\n" -" found in the destination repository (or only those which are\n" -" ancestors of the specified revisions if any are provided)\n" -"\n" -" With --bundle, changesets are selected as for --outgoing,\n" -" but a single email containing a binary Mercurial bundle as an\n" -" attachment will be sent.\n" -"\n" -" Examples:\n" -"\n" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +" The message contains two or three parts. First, the changeset\n" +" description. Next, (optionally) if the diffstat program is\n" +" installed and -d/--diffstat is used, the result of running\n" +" diffstat on the patch. Finally, the patch itself, as generated by\n" +" \"hg export\".\n" +"\n" +" By default the patch is included as text in the email body for\n" +" easy reviewing. Using the -a/--attach option will instead create\n" +" an attachment for the patch. With -i/--inline an inline attachment\n" +" will be created.\n" +"\n" +" With -o/--outgoing, emails will be generated for patches not found\n" +" in the destination repository (or only those which are ancestors\n" +" of the specified revisions if any are provided)\n" +"\n" +" With -b/--bundle, changesets are selected as for --outgoing, but a\n" +" single email containing a binary Mercurial bundle as an attachment\n" +" will be sent.\n" +"\n" +" Examples::\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " "default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" -"\n" -" Before using this command, you will need to enable email in your hgrc.\n" -" See the [email] section in hgrc(5) for details.\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" +"\n" +" Before using this command, you will need to enable email in your\n" +" hgrc. See the [email] section in hgrc(5) for details.\n" " " msgstr "" -msgid "Return the revisions present locally but not in dest" -msgstr "" - msgid "specify at least one changeset with -r or -o" msgstr "" @@ -3976,6 +4030,12 @@ msgid "subject of first message (intro or single patch)" msgstr "soggetto del primo messaggio (introduzione o patch singola)" +msgid "message identifier to reply to" +msgstr "" + +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "indirizzi mail dei destinatari" @@ -3988,16 +4048,19 @@ msgid "send changes not in target as a binary bundle" msgstr "invia le modifiche non in target come bundle binario" -msgid "file name of the bundle attachment" +#, fuzzy +msgid "name of the bundle attachment file" msgstr "nome del file dell'allegato bundle" msgid "a revision to send" msgstr "una revisione da inviare" -msgid "run even when remote repository is unrelated (with -b)" +#, fuzzy +msgid "run even when remote repository is unrelated (with -b/--bundle)" msgstr "esegui anche quando il repository remoto non è collegato (con -b)" -msgid "a base changeset to specify instead of a destination (with -b)" +#, fuzzy +msgid "a base changeset to specify instead of a destination (with -b/--bundle)" msgstr "un changeset base da specificare invece di una destinazione (con -b)" msgid "send an introduction email for a single patch" @@ -4006,27 +4069,35 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [OPZIONI]... [DEST]..." +#, fuzzy +msgid "command to delete untracked files from the working directory" +msgstr "non effettuare il commit, aggiorna solo la directory di lavoro" + msgid "" "removes files not tracked by Mercurial\n" "\n" -" Delete files not known to Mercurial. This is useful to test local and\n" -" uncommitted changes in an otherwise-clean source tree.\n" +" Delete files not known to Mercurial. This is useful to test local\n" +" and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless they\n" -" contain files under source control managment\n" +"\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" +"\n" " But it will leave untouched:\n" -" - Modified and unmodified tracked files\n" -" - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" +"\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" "\n" -" Be careful with purge, as you could irreversibly delete some files you\n" -" forgot to add to the repository. If you only want to print the list of\n" -" files that this program would delete, use the --print option.\n" +" Be careful with purge, as you could irreversibly delete some files\n" +" you forgot to add to the repository. If you only want to print the\n" +" list of files that this program would delete, use the --print\n" +" option.\n" " " msgstr "" @@ -4052,23 +4123,26 @@ msgid "purge ignored files too" msgstr "rimuove anche i file ignorati" -msgid "print the file names instead of deleting them" +#, fuzzy +msgid "print filenames instead of deleting them" msgstr "stampa i nomi dei file invece di cancellarli" -msgid "end filenames with NUL, for use with xargs (implies -p)" +#, fuzzy +msgid "end filenames with NUL, for use with xargs (implies -p/--print)" msgstr "termina il nome dei file con NUL, per usarli con xargs (implica -p)" msgid "hg purge [OPTION]... [DIR]..." msgstr "hg purge [OPZIONI]... [DIR]..." -msgid "" -"move sets of revisions to a different ancestor\n" -"\n" -"This extension lets you rebase changesets in an existing Mercurial " +#, fuzzy +msgid "" +"command to move sets of revisions to a different ancestor\n" +"\n" +"This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +"http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" "sposta insiemi di revisioni su un antenato differente\n" "\n" @@ -4078,24 +4152,16 @@ "Per maggiori informazioni:\n" "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgid "return the correct ancestor" -msgstr "restituisce l'antenato corretto" - -msgid "first revision, do not change ancestor\n" -msgstr "prima revisione, non cambia l'antenato\n" - +#, fuzzy msgid "" "move changeset (and descendants) to a different branch\n" "\n" -" Rebase uses repeated merging to graft changesets from one part of " -"history\n" -" onto another. This can be useful for linearizing local changes relative " -"to\n" -" a master development tree.\n" -"\n" -" If a rebase is interrupted to manually resolve a merge, it can be " -"continued\n" -" with --continue or aborted with --abort.\n" +" Rebase uses repeated merging to graft changesets from one part of\n" +" history onto another. This can be useful for linearizing local\n" +" changes relative to a master development tree.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be\n" +" continued with --continue/-c or aborted with --abort/-a.\n" " " msgstr "" "sposta changeset (e discendenti) su una branch differente\n" @@ -4108,9 +4174,6 @@ " può essere ripreso con --continue o abortito con --abort.\n" " " -msgid "cannot use both keepbranches and extrafn" -msgstr "non è possibile usare sia keepbranches sia extrafn" - msgid "cannot use both abort and continue" msgstr "non è possibile usare sia abort sia continue" @@ -4126,6 +4189,9 @@ msgid "nothing to rebase\n" msgstr "niente di cui effettuare il rebase\n" +msgid "cannot use both keepbranches and extrafn" +msgstr "non è possibile usare sia keepbranches sia extrafn" + msgid "rebase merging completed\n" msgstr "merge del rebase completato\n" @@ -4140,101 +4206,24 @@ msgid "%d revisions have been skipped\n" msgstr "%d revisioni sono state saltate\n" -msgid "" -"Skip commit if collapsing has been required and rev is not the last\n" -" revision, commit otherwise\n" -" " -msgstr "" -"Salta il commit se è stato richiesto di collassare e rev non è l'ultima\n" -" revisione, effettua il commit altrimenti\n" -" " - -msgid " set parents\n" -msgstr " imposta i genitori\n" - -msgid "Rebase a single revision" -msgstr "Rebase di una singola revisione" - -#, python-format -msgid "rebasing %d:%s\n" -msgstr "sto effettuando il rebase di %d:%s\n" - -#, python-format -msgid " future parents are %d and %d\n" -msgstr " i genitori futuri sono %d e %d\n" - -#, python-format -msgid " update to %d:%s\n" -msgstr " aggiorno a %d:%s\n" - -msgid " already in target\n" -msgstr " già su target\n" - -#, python-format -msgid " merge against %d:%s\n" -msgstr " merge con %d:%s\n" - msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "" "correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --" "continue" -msgid "resuming interrupted rebase\n" -msgstr "sto riprendendo un rebase interrotto\n" - #, python-format msgid "no changes, revision %d skipped\n" msgstr "nessuna modifica, revisione %d saltata\n" #, python-format -msgid "next revision set to %s\n" -msgstr "prossima revisione impostata su %s\n" - -msgid "Return the new parent relationship of the revision that will be rebased" -msgstr "" -"Restituisce la nuova relazione di parentela della revisione di cui si farà " -"il rebase" - -#, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "" "non è possibile usare la revisione %d come base, il risultato avrebbe 3 " "genitori" -msgid "Update rebased mq patches - finalize and then import them" -msgstr "" -"Aggiorna le patch mq di cui si è effettuato il rebase - le finalizza e poi " -"le importa" - -#, python-format -msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "la revisione %d è una patch mq (%s), la finalizzo.\n" - -#, python-format -msgid "import mq patch %d (%s)\n" -msgstr "import della patch mq %d (%s)\n" - -msgid "Store the current status to allow recovery" -msgstr "Salva lo status corrente per consentire il recupero" - -msgid "rebase status stored\n" -msgstr "status del rebase salvato\n" - -msgid "Remove the status files" -msgstr "Rimuove i file dello stato" - -msgid "Restore a previously stored status" -msgstr "Ripristina uno stato precedentemente salvato" - -msgid "rebase status resumed\n" -msgstr "status di rebase recuperato\n" - msgid "no rebase in progress" msgstr "nessun rebase in corso" -msgid "Restore the repository to its original state" -msgstr "Ripristina il repository al suo stato originale" - msgid "warning: new changesets detected on target branch, not stripping\n" msgstr "" "attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n" @@ -4242,49 +4231,22 @@ msgid "rebase aborted\n" msgstr "rebase abortito\n" -msgid "Define which revisions are going to be rebased and where" -msgstr "Definisce di quali revisioni si farà il rebase e dove" - msgid "cannot rebase onto an applied mq patch" msgstr "non è possibile effettuare il rebase su una patch mq applicata" -msgid "cannot rebase an ancestor" -msgstr "non è possibile effettuare il rebase di un antenato" - -msgid "cannot rebase a descendant" -msgstr "non è possibile effettuare il rebase di un discendente" - -msgid "already working on current\n" -msgstr "sto già lavorando su current\n" - -msgid "already working on the current branch\n" -msgstr "sto già lavorando sulla branch corrente\n" - -#, python-format -msgid "rebase onto %d starting from %d\n" -msgstr "rebase su %d partendo da %d\n" +#, fuzzy +msgid "source is ancestor of destination" +msgstr "nessuna sorgente o destinazione specificata" + +msgid "source is descendant of destination" +msgstr "" msgid "unable to collapse, there is more than one external parent" msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno" -msgid "Call rebase after pull if the latter has been invoked with --rebase" -msgstr "Invoca rebase dopo pull se l'ultimo è stato invocato con --rebase" - -msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "--update e --rebase non sono compatibili, ignoro il flag update\n" - -msgid "Replace pull with a decorator to provide --rebase option" -msgstr "Rimpiazza pull con un decoratore per fornire l'opzione --rebase" - msgid "rebase working directory to branch head" msgstr "effettua il rebase della directory di lavoro sulla head della branch" -msgid "keep original revisions" -msgstr "mantiene le revisioni originali" - -msgid "keep original branches" -msgstr "mantiene le branch originali" - msgid "rebase from a given revision" msgstr "rebase da una data revisione" @@ -4294,47 +4256,35 @@ msgid "rebase onto a given revision" msgstr "rebase su una data revisione" -msgid "collapse the rebased revisions" +#, fuzzy +msgid "collapse the rebased changesets" msgstr "collassa le revisioni di cui si effettua il rebase" +#, fuzzy +msgid "keep original changesets" +msgstr "mantiene le branch originali" + +#, fuzzy +msgid "keep original branch names" +msgstr "mantiene le branch originali" + msgid "continue an interrupted rebase" msgstr "continua un rebase interrotto" msgid "abort an interrupted rebase" msgstr "abortisce un rebase interrotto" -msgid "" -"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" +#, fuzzy +msgid "" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " +"| [-c] | [-a]" msgstr "" "hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" -msgid "interactive change selection during commit or qrefresh" +#, fuzzy +msgid "commands to interactively select changes for commit/qrefresh" msgstr "cambia interattivamente la selezione durante un commit o qrefresh" -msgid "" -"like patch.iterhunks, but yield different events\n" -"\n" -" - ('file', [header_lines + fromfile + tofile])\n" -" - ('context', [context_lines])\n" -" - ('hunk', [hunk_lines])\n" -" - ('range', (-start,len, +start,len, diffp))\n" -" " -msgstr "" - -msgid "scan lr while predicate holds" -msgstr "scansiona lr fino a quando il predicato vale" - -msgid "" -"patch header\n" -"\n" -" XXX shoudn't we move this to mercurial/patch.py ?\n" -" " -msgstr "" -"intestazione della patch\n" -"\n" -" XXX non dovremmo spostare questo in mercurial/patch.py ?\n" -" " - msgid "this modifies a binary file (all or nothing)\n" msgstr "questo modifica un file binario (tutto o niente)\n" @@ -4345,70 +4295,41 @@ msgid "%d hunks, %d lines changed\n" msgstr "" -msgid "hunk -> (n+,n-)" -msgstr "hunk -> (n+,n-)" - -msgid "" -"patch hunk\n" -"\n" -" XXX shouldn't we merge this with patch.hunk ?\n" -" " -msgstr "" - -msgid "patch -> [] of hunks " -msgstr "" - -msgid "patch parsing state machine" -msgstr "" - -msgid "Interactively filter patch chunks into applied-only chunks" -msgstr "" - -msgid "" -"fetch next portion from chunks until a 'header' is seen\n" -" NB: header == new-file mark\n" -" " -msgstr "" - -msgid "" -"prompt query, and process base inputs\n" -"\n" -" - y/n for the rest of file\n" -" - y/n for the rest\n" -" - ? (help)\n" -" - q (quit)\n" -"\n" -" else, input is returned to the caller.\n" -" " -msgstr "" - msgid "[Ynsfdaq?]" msgstr "[Ynsfdaq?]" -msgid "y" -msgstr "y" - -msgid "?" +#, fuzzy +msgid "&Yes, record this change" +msgstr "y - registra questa modifica" + +#, fuzzy +msgid "&No, skip this change" +msgstr "salta il changeset di test" + +msgid "&Skip remaining changes to this file" +msgstr "" + +msgid "Record remaining changes to this &file" +msgstr "" + +msgid "&Done, skip remaining changes and files" +msgstr "" + +#, fuzzy +msgid "Record &all changes to all remaining files" +msgstr "registra cancellazione per i file mancanti" + +#, fuzzy +msgid "&Quit, recording no changes" +msgstr "y - registra questa modifica" + +#, fuzzy +msgid "&?" msgstr "?" msgid "y - record this change" msgstr "y - registra questa modifica" -msgid "s" -msgstr "s" - -msgid "f" -msgstr "f" - -msgid "d" -msgstr "d" - -msgid "a" -msgstr "a" - -msgid "q" -msgstr "q" - msgid "user quit" msgstr "" @@ -4419,10 +4340,18 @@ msgid " and " msgstr " e " +msgid "y" +msgstr "y" + #, python-format msgid "record this change to %r?" msgstr "registrare questa modifica a %r?" +#, fuzzy, python-format +msgid "record change %d/%d to %r?" +msgstr "registrare questa modifica a %r?" + +#, fuzzy msgid "" "interactively select changes to commit\n" "\n" @@ -4433,20 +4362,20 @@ "\n" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" -" change to use. For each query, the following responses are\n" -" possible:\n" -"\n" -" y - record this change\n" -" n - skip this change\n" -"\n" -" s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" -" d - done, skip remaining changes and files\n" -" a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" change to use. For each query, the following responses are\n" +" possible::\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" msgstr "" "seleziona interattivamente le modifiche di cui eseguire il commit\n" "\n" @@ -4474,74 +4403,53 @@ "\n" " ? - mostra il messaggio di aiuto" -msgid "" -"interactively record a new patch\n" -"\n" -" see 'hg help qnew' & 'hg help record' for more information and usage\n" -" " -msgstr "" - msgid "'mq' extension not loaded" msgstr "estensione 'mq' non caricata" msgid "running non-interactively, use commit instead" msgstr "" -msgid "" -"This is generic record driver.\n" -"\n" -" It's job is to interactively filter local changes, and accordingly\n" -" prepare working dir into a state, where the job can be delegated to\n" -" non-interactive commit command such as 'commit' or 'qrefresh'.\n" -"\n" -" After the actual job is done by non-interactive command, working " -"dir\n" -" state is restored to original.\n" -"\n" -" In the end we'll record intresting changes, and everything else will " -"be\n" -" left in place, so the user can continue his work.\n" -" " -msgstr "" - msgid "no changes to record\n" msgstr "nessuna modifica da registrare\n" -#, python-format -msgid "backup %r as %r\n" -msgstr "backup %r come %r\n" - -msgid "applying patch\n" -msgstr "sto applicando una patch\n" - msgid "patch failed to apply" msgstr "" -#, python-format -msgid "restoring %r to %r\n" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [OPZIONI]... [FILE]..." msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "hg qrecord [OPZIONI]... PATCH [FILE]..." -msgid "" -"patch transplanting tool\n" +msgid "share a common history between several working directories" +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 "" + +#, fuzzy +msgid "do not create a working copy" +msgstr "non aggiornare le nuove directory di lavoro" + +#, fuzzy +msgid "[-U] SOURCE [DEST]" +msgstr "[OPZIONI]... SORGENTE [DEST]" + +msgid "" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" -"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" -"from a changeset hash to its hash in the source repository.\n" -msgstr "" - -msgid "" -"returns True if a node is already an ancestor of parent\n" -" or has already been transplanted" -msgstr "" - -msgid "apply the revisions in revmap one by one in revision order" +"Transplanted patches are recorded in .hg/transplant/transplants, as a\n" +"map from a changeset hash to its hash in the source repository.\n" msgstr "" #, python-format @@ -4560,9 +4468,6 @@ msgid "%s transplanted to %s\n" msgstr "" -msgid "arbitrarily rewrite changeset before applying it" -msgstr "" - #, python-format msgid "filtering %s\n" msgstr "sto filtrando %s\n" @@ -4570,9 +4475,6 @@ msgid "filter failed" msgstr "filtraggio fallito" -msgid "apply the patch in patchfile to the repository as a transplant" -msgstr "" - msgid "can only omit patchfile if merging" msgstr "" @@ -4583,16 +4485,10 @@ msgid "Fix up the merge and run hg transplant --continue" msgstr "" -msgid "recover last transaction and apply remaining changesets" -msgstr "" - #, python-format msgid "%s transplanted as %s\n" msgstr "%s trapiantato come %s\n" -msgid "commit working directory using journal metadata" -msgstr "" - msgid "transplant log file is corrupt" msgstr "" @@ -4603,15 +4499,6 @@ msgid "commit failed" msgstr "commit fallito" -msgid "journal changelog metadata for later recover" -msgstr "" - -msgid "remove changelog journal" -msgstr "" - -msgid "interactively transplant changesets" -msgstr "" - msgid "apply changeset? [ynmpcq?]:" msgstr "applicare il changeset? [ynmpcq?]:" @@ -4620,33 +4507,36 @@ "\n" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form:\n" -"\n" -" (transplanted from CHANGESETHASH)\n" +" specified, log messages will have a comment appended of the form::\n" +"\n" +" (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" -" Its argument will be invoked with the current changelog message\n" -" as $1 and the patch as $2.\n" -"\n" -" If --source is specified, selects changesets from the named\n" -" repository. If --branch is specified, selects changesets from the\n" -" branch holding the named revision, up to that revision. If --all\n" -" is specified, all changesets on the branch will be transplanted,\n" -" otherwise you will be prompted to select the changesets you want.\n" -"\n" -" hg transplant --branch REVISION --all will rebase the selected branch\n" -" (up to the named revision) onto your current working directory.\n" -"\n" -" You can optionally mark selected transplanted changesets as\n" -" merge changesets. You will not be prompted to transplant any\n" -" ancestors of a merged transplant, and you can merge descendants\n" -" of them normally instead of transplanting them.\n" +" Its argument will be invoked with the current changelog message as\n" +" $1 and the patch as $2.\n" +"\n" +" If --source/-s is specified, selects changesets from the named\n" +" repository. If --branch/-b is specified, selects changesets from\n" +" the branch holding the named revision, up to that revision. If\n" +" --all/-a is specified, all changesets on the branch will be\n" +" transplanted, otherwise you will be prompted to select the\n" +" changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected\n" +" branch (up to the named revision) onto your current working\n" +" directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as merge\n" +" changesets. You will not be prompted to transplant any ancestors\n" +" of a merged transplant, and you can merge descendants of them\n" +" normally instead of transplanting them.\n" "\n" " If no merges or revisions are provided, hg transplant will start\n" " an interactive changeset browser.\n" "\n" -" If a changeset application fails, you can fix the merge by hand and\n" -" then resume where you left off by calling hg transplant --continue.\n" +" If a changeset application fails, you can fix the merge by hand\n" +" and then resume where you left off by calling hg transplant\n" +" --continue/-c.\n" " " msgstr "" @@ -4700,48 +4590,73 @@ msgstr "" msgid "" -"allow to use MBCS path with problematic encoding.\n" -"\n" -"Some MBCS encodings are not good for some path operations\n" -"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" -"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" -"encoding\". This extension can be used to fix the issue with those\n" -"encodings by wrapping some functions to convert to unicode string\n" -"before path operation.\n" -"\n" -"This extension is usefull for:\n" -" * Japanese Windows users using shift_jis encoding.\n" -" * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings\n" -" on case-insensitive file system.\n" +"allow the use of MBCS paths with problematic encodings\n" +"\n" +"Some MBCS encodings are not good for some path operations (i.e.\n" +"splitting path, case conversion, etc.) with its encoded bytes. We call\n" +"such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" +"This extension can be used to fix the issue with those encodings by\n" +"wrapping some functions to convert to Unicode string before path\n" +"operation.\n" +"\n" +"This extension is useful for:\n" +"\n" +"- Japanese Windows users using shift_jis encoding.\n" +"- Chinese Windows users using big5 encoding.\n" +"- All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ascii chars in path.\n" -" * Any user who do not use any of problematic encodings.\n" +"\n" +"- Any user who use only ASCII chars in path.\n" +"- Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" -" * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or 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 util._encoding\n" -"which is decided by mercurial from current locale setting or HGENCODING.\n" -"\n" -msgstr "" - -#, python-format -msgid "[win32mbcs] filename conversion fail with %s encoding\n" +"\n" +"- You should use single encoding in one repository.\n" +"- You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" +"\n" +"Path encoding conversion are done between Unicode and\n" +"encoding.encoding which is decided by Mercurial from current locale\n" +"setting or HGENCODING.\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion failed with %s encoding\n" msgstr "" msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" +msgid "" +"perform automatic newline conversion\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 @@ -4780,29 +4695,22 @@ msgstr "" msgid "" -"zeroconf support for mercurial repositories\n" -"\n" -"Zeroconf enabled repositories will be announced in a network without the " -"need\n" -"to configure a server or a service. They can be discovered without knowing\n" -"their actual IP address.\n" -"\n" -"To use the zeroconf extension add the following entry to your hgrc file:\n" -"\n" -"[extensions]\n" -"hgext.zeroconf =\n" -"\n" -"To allow other people to discover your repository using run \"hg serve\" in " -"your\n" -"repository.\n" -"\n" -" $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\".\n" -"\n" -" $ hg paths\n" -" zc-test = http://example.com:8000/test\n" +"discover and advertise repositories on the local network\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 allow other people to discover your repository using run \"hg serve\"\n" +"in your repository::\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgstr "" msgid "archive prefix contains illegal components" @@ -4844,6 +4752,10 @@ msgid "premature EOF reading chunk (got %d bytes, expected %d)" msgstr "" +#, fuzzy +msgid "empty username" +msgstr "stringa vuota\n" + #, python-format msgid "username %s contains a newline" msgstr "" @@ -4865,7 +4777,7 @@ msgstr "" #, python-format -msgid "invalid format spec '%%%s' in output file name" +msgid "invalid format spec '%%%s' in output filename" msgstr "" #, python-format @@ -5015,32 +4927,57 @@ 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 "file %s non trovato!" - -#, python-format -msgid "no match under directory %s!" -msgstr "nessuna corrispondenza sotto la directory %s!" - -#, python-format -msgid "can't commit %s: unsupported file type!" -msgstr "impossibile fare il commit di %s: tipo di file non supportato!" - -#, python-format -msgid "file %s not tracked!" -msgstr "il file %s non è tracciato!" +msgid "can only follow copies/renames for explicit filenames" +msgstr "" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "" + +msgid "HG: Leave message empty to abort commit." +msgstr "" + +#, fuzzy, python-format +msgid "HG: user: %s" +msgstr "utente: %s\n" + +msgid "HG: branch merge" +msgstr "" + +#, python-format +msgid "HG: branch '%s'" +msgstr "" + +#, python-format +msgid "HG: subrepo %s" +msgstr "" + +#, python-format +msgid "HG: added %s" +msgstr "" + +#, fuzzy, python-format +msgid "HG: changed %s" +msgstr "aggiungo changeset %s\n" + +#, fuzzy, python-format +msgid "HG: removed %s" +msgstr "rimossi" + +#, fuzzy +msgid "HG: no files changed" +msgstr "sto aggiungendo le modifiche ai file\n" + +msgid "empty commit message" +msgstr "messaggio di commit vuoto" msgid "" "add the specified files on the next commit\n" "\n" -" Schedule files to be version controlled and added to the repository.\n" +" Schedule files to be version controlled and added to the\n" +" repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " @@ -5049,17 +4986,19 @@ msgid "" "add all new files, delete all missing files\n" "\n" -" Add all new files and remove all missing files from the repository.\n" -"\n" -" New files are ignored if they match any of the patterns in .hgignore. " -"As\n" -" with add, these changes take effect at the next commit.\n" -"\n" -" Use the -s option to detect renamed files. With a parameter > 0,\n" -" this compares every removed file with every added file and records\n" -" those similar enough as renames. This option takes a percentage\n" -" between 0 (disabled) and 100 (files must be identical) as its\n" -" parameter. Detecting renamed files this way can be expensive.\n" +" Add all new files and remove all missing files from the\n" +" repository.\n" +"\n" +" New files are ignored if they match any of the patterns in\n" +" .hgignore. As with add, these changes take effect at the next\n" +" commit.\n" +"\n" +" Use the -s/--similarity option to detect renamed files. With a\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" +" option takes a percentage between 0 (disabled) and 100 (files must\n" +" be identical) as its parameter. Detecting renamed files this way\n" +" can be expensive.\n" " " msgstr "" @@ -5070,22 +5009,22 @@ msgstr "" msgid "" -"show changeset information per file line\n" -"\n" -" List changes in files, showing the revision id responsible for each " -"line\n" -"\n" -" This command is useful to discover who did a change or when a change " -"took\n" -" place.\n" -"\n" -" Without the -a option, annotate will avoid processing files it\n" -" detects as binary. With -a, annotate will generate an annotation\n" -" anyway, probably with undesirable results.\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 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 annotate the file\n" +" anyway, although the results will probably be neither useful\n" +" nor desirable.\n" " " msgstr "" -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" @@ -5096,27 +5035,28 @@ 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\" to specify a different revision.\n" -"\n" -" To specify the type of archive to create, use \"-t\". Valid\n" -" types are:\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" directory; use -r/--rev to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use -t/--type. Valid\n" +" types are::\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" -" using a format string; see \"hg help export\" for details.\n" +" using a format string; see 'hg help export' for details.\n" "\n" " Each member added to an archive file has a directory prefix\n" -" prepended. Use \"-p\" to specify a format string for the prefix.\n" -" The default is the basename of the archive, with suffixes removed.\n" +" prepended. Use -p/--prefix to specify a format string for the\n" +" prefix. The default is the basename of the archive, with suffixes\n" +" removed.\n" " " msgstr "" @@ -5129,21 +5069,21 @@ msgid "cannot archive plain files to stdout" msgstr "" +#, fuzzy msgid "" "reverse effect of earlier changeset\n" "\n" " 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" -" changeset afterwards. This saves you from doing the merge by\n" -" hand. The result of this merge is not committed, as with a normal\n" -" merge.\n" +" changeset afterwards. This saves you from doing the merge by hand.\n" +" The result of this merge is not committed, as with a normal merge.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -5174,13 +5114,13 @@ msgid "please specify a revision to backout" msgstr "" -msgid "cannot back out change on a different branch" -msgstr "" - -msgid "cannot back out a change with no parents" -msgstr "" - -msgid "cannot back out a merge changeset without --parent" +msgid "cannot backout change on a different branch" +msgstr "" + +msgid "cannot backout a change with no parents" +msgstr "" + +msgid "cannot backout a merge changeset without --parent" msgstr "" #, python-format @@ -5191,10 +5131,6 @@ msgstr "" #, python-format -msgid "Backed out changeset %s" -msgstr "" - -#, python-format msgid "changeset %s backs out changeset %s\n" msgstr "" @@ -5211,35 +5147,38 @@ msgid "" "subdivision search of changesets\n" "\n" -" This command helps to find changesets which introduce problems.\n" -" To use, mark the earliest changeset you know exhibits the problem\n" -" as bad, then mark the latest changeset which is free from the\n" -" problem as good. Bisect will update your working directory to a\n" -" revision for testing (unless the --noupdate option is specified).\n" -" Once you have performed tests, mark the working directory as bad\n" -" or good and bisect will either update to another candidate changeset\n" +" This command helps to find changesets which introduce problems. To\n" +" use, mark the earliest changeset you know exhibits the problem as\n" +" 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 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. Its " -"exit\n" -" status will be used as flag to mark revision as bad or good. In case " -"exit\n" -" status is 0 the revision is marked as good, 125 - skipped, 127 (command " -"not\n" -" found) - bisection will be aborted; any other status bigger than 0 will\n" -" 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 "" -#, python-format -msgid "The first %s revision is:\n" +#, fuzzy +msgid "The first good revision is:\n" msgstr "La prima revisione %s è:\n" -#, python-format -msgid "Due to skipped revisions, the first %s revision could be any of:\n" +#, fuzzy +msgid "The first bad revision is:\n" +msgstr "La prima revisione %s è:\n" + +msgid "Due to skipped revisions, the first good revision could be any of:\n" +msgstr "" + +msgid "Due to skipped revisions, the first bad revision could be any of:\n" msgstr "" msgid "cannot bisect (no known good revisions)" @@ -5262,28 +5201,32 @@ msgid "%s killed" msgstr "%s ucciso" -#, python-format -msgid "Changeset %s: %s\n" +#, fuzzy, python-format +msgid "Changeset %d:%s: %s\n" msgstr "Changeset %s: %s\n" #, python-format -msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "" msgid "" "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 in\n" -" the repository until the next commit).\n" -"\n" -" Unless --force is specified, branch will not let you set a\n" -" branch name that shadows an existing branch.\n" -"\n" -" Use --clean to reset the working directory branch to that of the\n" -" parent of the working directory, negating a previous branch change.\n" -"\n" -" Use the command 'hg update' to switch to an existing 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 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" +" change.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" @@ -5303,9 +5246,11 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -5320,21 +5265,25 @@ " If no destination repository is specified the destination is\n" " assumed to have all the nodes specified by one or more --base\n" " parameters. To create a bundle containing all changesets, use\n" -" --all (or --base null). To change the compression method applied,\n" -" use the -t option (by default, bundles are compressed using bz2).\n" -"\n" -" The bundle file can then be transferred using conventional means and\n" -" applied to another repository with the unbundle or pull command.\n" -" This is useful when direct push and pull are not available or when\n" -" exporting an entire repository is undesirable.\n" +" -a/--all (or --base null).\n" +"\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\n" +"\n" +" The bundle file can then be transferred using conventional means\n" +" and applied to another repository with the unbundle or pull\n" +" command. This is useful when direct push and pull are not\n" +" available or when exporting an entire repository is undesirable.\n" "\n" " Applying bundles preserves all changeset contents including\n" " permissions, copy/rename information, and revision history.\n" " " msgstr "" -msgid "--base is incompatible with specifiying a destination" -msgstr "" +#, fuzzy +msgid "--base is incompatible with specifying a destination" +msgstr "un changeset base da specificare invece di una destinazione" msgid "unknown bundle type specified with --type" msgstr "" @@ -5342,17 +5291,17 @@ msgid "" "output the current or given revision of files\n" "\n" -" Print the specified files as they were at the given revision.\n" -" If no revision is given, the parent of the working directory is used,\n" +" Print the specified files as they were at the given revision. If\n" +" no revision is given, the parent of the working directory is used,\n" " or tip if no revision is checked out.\n" "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repo root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions::\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repository root\n" +" %p root-relative path name of file being printed\n" " " msgstr "" @@ -5367,6 +5316,22 @@ " The location of the source is added to the new repository's\n" " .hg/hgrc file, as the default to be used for future pulls.\n" "\n" +" If you use the -r/--rev option to clone up to a specific revision,\n" +" no subsequent revisions (including subsequent tags) will be\n" +" present in the cloned repository. This option implies --pull, even\n" +" on local repositories.\n" +"\n" +" By default, clone will check out the head of the 'default' branch.\n" +" If the -U/--noupdate option is used, the new clone will contain\n" +" only a repository (.hg) and no working copy (the working copy\n" +" parent is the null revision).\n" +"\n" +" See 'hg help urls' for valid source format details.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination, but no\n" +" .hg/hgrc and working directory will be created on the remote side.\n" +" Please see 'hg help urls' for important details about ssh:// URLs.\n" +"\n" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" " to the repository data, not to the checked out files). Some\n" @@ -5375,96 +5340,35 @@ " avoid hardlinking.\n" "\n" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with\n" +" using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" -" This is the fastest way to clone, but it is not always safe. The\n" +" This is the fastest way to clone, but it is not always safe. The\n" " operation is not atomic (making sure REPO is not modified during\n" " the operation is up to you) and you have to make sure your editor\n" -" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" +" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" -"\n" -" If you use the -r option to clone up to a specific revision, no\n" -" subsequent revisions will be present in the cloned repository.\n" -" This option implies --pull, even on local repositories.\n" -"\n" -" If the -U option is used, the new clone will contain only a repository\n" -" (.hg) and no working copy (the working copy parent is the null " -"revision).\n" -"\n" -" See 'hg help urls' for valid source format details.\n" -"\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" -" .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:// URLs.\n" " " msgstr "" -"crea una copia di un repository esistente\n" -"\n" -" Crea una copia di un repository esistente in una nuova directory.\n" -"\n" -" Se non viene specificato nessun nome di directory\n" -" destinazione, di default viene usata la directory base\n" -" della sorgente.\n" -"\n" -" La posizione della sorgente viene aggiunta al file .hg/hgrc\n" -" del nuovo repository, come default da usare per pull futuri.\n" -"\n" -" Per efficienza, si usano hardlink per clonare ogni volta che\n" -" la sorgente e la destinazione sono sullo stesso filesystem\n" -" (notare che questo vale per i dati del repository, non per\n" -" per i file di cui si è fatto il check out). Alcuni\n" -" filesystem, tipo AFS, non implementano correttamente gli\n" -" hardlink, ma non riportano errori. In questi casi, usare\n" -" l'opzione --pull per evitare gli hardlink.\n" -"\n" -" In alcuni casi, è possibile clonare i repository e i file di\n" -" cui si è fatto il check out usando hardlink completi con\n" -"\n" -" $ cp -al REPO REPOCLONE\n" -"\n" -" Questo è il modo più veloce per clonare, ma non è sempre\n" -" sicuro. L'operazione non è atomica (spetta all'utente\n" -" assicurarsi che REPO non venga modificato durante la\n" -" operazione) e bisogna assicurarsi che l'editor usato spezzi\n" -" gli hardlink (Emacs e i principali tool del Kernel Linux lo\n" -" fanno). Inoltre, questo non è compatibile con alcune\n" -" estensioni che mettono i loro metadati sotto la directory\n" -" .hg, tipo mq.\n" -"\n" -" Se viene usata l'opzione -r per clonare fino ad una\n" -" revisione specifica, nessuna revisione seguente sarà presente\n" -" nel repository clonato. Questa opzione implica --pull, anche\n" -" per repository locali.\n" -"\n" -" Se viene usata l'opzione -U, il nuovo clone conterrà solo un\n" -" repository (.hg) e nessuna copia di lavoro (il genitore\n" -" della copia di lavoro è la revisione nulla).\n" -"\n" -" Vedere 'hg help urls' per dettagli sui formati di sorgenti\n" -" validi.\n" -"\n" -" E' possibile specificare un URL ssh:// come destinazione, ma\n" -" nessun .hg/hgrc e directory di lavoro verranno creati sul\n" -" lato remoto. Riferirsi al testo di aiuto per gli url per\n" -" dettagli importanti riguardo gli URL ssh://.\n" -" " - + +#, fuzzy msgid "" "commit the specified files or all outstanding changes\n" "\n" -" Commit changes to the given files into the repository.\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 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" -"\n" -" If no commit message is specified, the configured editor is started to\n" -" prompt you for a message.\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" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -5486,6 +5390,9 @@ " -d/--date.\n" " " +msgid "nothing changed\n" +msgstr "nulla è cambiato\n" + msgid "created new head\n" msgstr "creata una nuova head\n" @@ -5501,7 +5408,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 --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" @@ -5549,13 +5456,17 @@ msgid "" "show combined config settings from all hgrc files\n" "\n" -" With no args, print names and values of all config items.\n" -"\n" -" With one arg of the form section.name, print just the value of\n" -" that config item.\n" -"\n" -" With multiple args, print names and values of all config items\n" -" with matching section names." +" With no arguments, print names and values of all config items.\n" +"\n" +" With one argument of the form section.name, print just the value\n" +" of that config item.\n" +"\n" +" With multiple arguments, print names and values of all config\n" +" items with matching section names.\n" +"\n" +" With --debug, the source (filename and line number) is printed\n" +" for each config item.\n" +" " msgstr "" msgid "only one config item permitted" @@ -5589,7 +5500,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" @@ -5635,8 +5546,8 @@ msgstr "" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5696,12 +5607,12 @@ " revisions are specified, the working directory files are compared\n" " to its parent.\n" "\n" -" Without the -a option, diff will avoid generating diffs of files\n" -" it detects as binary. With -a, diff will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. For more information, read hg help diffs.\n" +" Without the -a/--text option, diff will avoid generating diffs of\n" +" files it detects as binary. With -a, diff will generate a diff\n" +" anyway, probably with undesirable results.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. For more information, read 'hg help diffs'.\n" " " msgstr "" @@ -5713,30 +5624,31 @@ " The information shown in the changeset header is: author,\n" " changeset hash, parent(s) and commit comment.\n" "\n" -" NOTE: export may generate unexpected diff output for merge changesets,\n" -" as it will compare the merge changeset against its first parent only.\n" +" NOTE: export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows:\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\n" -" %N number of patches being generated\n" -" %R changeset revision number\n" -" %b basename of the exporting repository\n" -" %h short-form changeset hash (12 bytes of hexadecimal)\n" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" -"\n" -" Without the -a option, export will avoid generating diffs of files\n" -" it detects as binary. With -a, export will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. Read the diffs help topic for more information.\n" -"\n" -" With the --switch-parent option, the diff will be against the second\n" -" parent. It can be useful to review a merge.\n" +" given using a format string. The formatting rules are as follows::\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" +"\n" +" Without the -a/--text option, export will avoid generating diffs\n" +" of files it detects as binary. With -a, export will generate a\n" +" diff anyway, probably with undesirable results.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\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" " " msgstr "" @@ -5750,14 +5662,35 @@ msgstr "" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "nessun file specificato" + +#, fuzzy, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" "\n" " This command behaves differently than Unix grep. It only accepts\n" " Python/Perl regexps. It searches repository history, not the\n" -" working directory. It always prints the revision number in which\n" -" a match appears.\n" +" working directory. It always prints the revision number in which a\n" +" match appears.\n" "\n" " By default, grep only prints output for the first revision of a\n" " file in which it finds a match. To get it to print every revision\n" @@ -5776,20 +5709,35 @@ "\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" +" Repository \"heads\" are changesets with no child changesets. They are\n" +" where development generally takes place and are the usual targets\n" +" for update and merge operations.\n" +"\n" +" If one or more REV is given, the \"branch heads\" will be shown for\n" +" the named branch associated with the specified changeset(s).\n" +"\n" +" Branch heads are changesets on a named branch with no descendants on\n" +" the same branch. A branch head could be a \"true\" (repository) head,\n" +" or it could be the last changeset on that branch before it was\n" +" merged into another branch, or it could be the last changeset on the\n" +" branch before a new branch was created. If none of the branch heads\n" +" are true heads, the branch is considered inactive.\n" +"\n" +" If -c/--closed is specified, also show branch heads marked closed\n" +" (see hg commit --close-branch).\n" +"\n" +" If STARTREV is specified, only those heads that are descendants of\n" +" STARTREV will be displayed.\n" " " msgstr "" +msgid "you must specify a branch to use --closed" +msgstr "" + +#, fuzzy, python-format +msgid "no open branch heads on branch %s\n" +msgstr "svn: la branch non ha nessuna revisione %s" + #, python-format msgid "no changes on branch %s containing %s are reachable from %s\n" msgstr "" @@ -5798,12 +5746,14 @@ msgid "no changes on branch %s are reachable from %s\n" msgstr "" +#, fuzzy 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" -"\n" -" Given a topic, extension, or command name, print help for that topic." +" 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 "" "mostra l'aiuto per un dato argomento o una panoramica d'aiuto\n" "\n" @@ -5855,24 +5805,20 @@ msgid "no commands defined\n" msgstr "nessun comando definito\n" -msgid "" -"\n" -"enabled extensions:\n" -"\n" +#, fuzzy +msgid "enabled extensions:" msgstr "" "\n" "estensioni abilitate:\n" "\n" -#, python-format -msgid " %s %s\n" -msgstr " %s %s\n" - msgid "no help text available" msgstr "nessun testo di aiuto disponibile" -#, python-format -msgid "%s extension - %s\n" +#, fuzzy, python-format +msgid "" +"%s extension - %s\n" +"\n" msgstr "estensione %s - %s\n" msgid "Mercurial Distributed SCM\n" @@ -5894,17 +5840,20 @@ "argomenti di aiuto aggiuntivi:\n" "\n" +#, fuzzy msgid "" "identify the working copy or specified revision\n" "\n" -" With no revision, print a summary of the current state of the repo.\n" -"\n" -" With a path, do a lookup in another repository.\n" -"\n" -" This summary identifies the repository state using one or two parent\n" -" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" -" in the working directory, a list of tags for this revision and a branch\n" -" name for non-default branches.\n" +" With no revision, print a summary of the current state of the\n" +" repository.\n" +"\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" +" uncommitted changes in the working directory, a list of tags for\n" +" this revision and a branch name for non-default branches.\n" " " msgstr "" "identifica la copia di lavoro o una revisione specifica\n" @@ -5921,35 +5870,38 @@ " non-default.\n" " " +#, fuzzy msgid "" "import an ordered set of patches\n" "\n" " Import a list of patches and commit them individually.\n" "\n" " If there are outstanding changes in the working directory, import\n" -" will abort unless given the -f flag.\n" +" 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" "\n" -" If the imported patch was generated by hg export, user and description\n" -" from patch override values from message headers and body. Values\n" -" given on command line with -m and -u override these.\n" -"\n" -" If --exact is specified, import will set the working directory\n" -" to the parent of each patch before applying it, and will abort\n" -" if the resulting changeset has a different ID than the one\n" -" recorded in the patch. This may happen due to character set\n" -" problems or other deficiencies in the text patch format.\n" -"\n" -" With --similarity, hg will attempt to discover renames and copies\n" -" in the patch in the same way as 'addremove'.\n" -"\n" -" To read a patch from standard input, use patch name \"-\".\n" +" If the imported patch was generated by hg export, user and\n" +" description from patch override values from message headers and\n" +" body. Values given on command line with -m/--message and -u/--user\n" +" override these.\n" +"\n" +" If --exact is specified, import will set the working directory to\n" +" the parent of each patch before applying it, and will abort if the\n" +" resulting changeset has a different ID than the one recorded in\n" +" the patch. This may happen due to character set problems or other\n" +" deficiencies in the text patch format.\n" +"\n" +" 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 \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -5995,29 +5947,23 @@ msgid "no diffs found" msgstr "nessun diff trovato" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"messaggio:\n" -"%s\n" - -msgid "not a mercurial patch" +#, fuzzy +msgid "not a Mercurial patch" msgstr "non è una patch di mercurial" msgid "patch is damaged or loses information" msgstr "la patch è danneggiata o perde informazioni" +#, fuzzy msgid "" "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 pull\n" -" was requested.\n" -"\n" -" For remote repository, using --bundle avoids downloading the changesets\n" -" twice if the incoming is followed by a pull.\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" "\n" " See pull for valid source format details.\n" " " @@ -6034,11 +5980,12 @@ " Vedere pull per dettagli sui formati di sorgenti validi.\n" " " +#, fuzzy msgid "" "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" @@ -6057,23 +6004,24 @@ " Vedere 'hg help urls' per maggiorni informazioni.\n" " " +#, fuzzy 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\".\n" -" This will avoid the problem of \"xargs\" treating single filenames\n" -" that contain white space as multiple filenames.\n" +" command, use the -0 option to both this command and \"xargs\". This\n" +" will avoid the problem of \"xargs\" treating single filenames that\n" +" contain whitespace as multiple filenames.\n" " " msgstr "" "trova file corrispondenti a pattern specificati\n" @@ -6103,8 +6051,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" @@ -6114,16 +6062,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" -"\n" -" NOTE: log -p may generate unexpected diff output for merge\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 "" "show revision history of entire repository or files\n" @@ -6156,45 +6103,32 @@ " " msgid "" -"looks up all renames for a file (up to endrev) the first\n" -" time the file is given. It indexes on the changerev and only\n" -" parses the manifest if linkrev != changerev.\n" -" Returns rename info for fn at changerev rev." -msgstr "" -"cerca tutte le rinomine di un file (fino a endrev) la prima volta che\n" -" il file viene fornito. Indicizza su changerev e parsifica solo\n" -" il manifesto se linkrev != changerev.\n" -" Restituisce le informazioni sulle rinomine per fn alla\n" -" revisione changerev." - -msgid "" "output the current or given revision of the project manifest\n" "\n" " Print a list of version controlled files for the given revision.\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" -" The manifest is the list of files being version controlled. If no " -"revision\n" -" is given then the first parent of the working directory is used.\n" -"\n" -" With -v flag, print file permissions, symlink and executable bits. With\n" -" --debug flag, print file revision hashes.\n" +" If no revision is given, the first parent of the working directory\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" -" Merge the contents of the current working directory and the\n" -" requested revision. Files that changed between either parent are\n" -" marked as changed for the next commit and a commit must be\n" -" performed before any further updates are allowed.\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 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 head,\n" -" the other head is merged with by default. Otherwise, an explicit\n" -" revision to merge with must be provided.\n" +" head revision, and the current branch contains exactly one other\n" +" head, the other head is merged with by default. Otherwise, an\n" +" explicit revision with which to merge with must be provided.\n" " " msgstr "" @@ -6220,13 +6154,13 @@ "la directory di lavoro non è una revisione head - usare \"hg update\"\n" "o fare il merge con una revisione esplicita" +#, fuzzy msgid "" "show changesets not found in destination\n" "\n" -" Show changesets not found in the specified destination repository or\n" -" the default push location. These are the changesets that would be " -"pushed\n" -" if a push was requested.\n" +" Show changesets not found in the specified destination repository\n" +" or the default push location. These are the changesets that would\n" +" be pushed if a push was requested.\n" "\n" " See pull for valid destination format details.\n" " " @@ -6241,14 +6175,15 @@ " Vedere pull per dettagli sui formati validi di destinazioni.\n" " " -msgid "" -"show the parents of the working dir or revision\n" -"\n" -" Print the working directory's parent revisions. If a\n" -" revision is given via --rev, the parent of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (before the working directory\n" -" revision or the argument to --rev if given) is printed.\n" +#, fuzzy +msgid "" +"show the parents of the working directory or revision\n" +"\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, 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 "" "mostra i genitori della directory di lavoro o di una revisione\n" @@ -6261,8 +6196,9 @@ " o dell'argomento di --rev se fornito).\n" " " -msgid "can only specify an explicit file name" -msgstr "" +#, fuzzy +msgid "can only specify an explicit filename" +msgstr "possibile specificare solo due etichette." #, python-format msgid "'%s' not found in manifest!" @@ -6271,8 +6207,8 @@ msgid "" "show aliases for remote repositories\n" "\n" -" Show definition of symbolic path name NAME. If no name is given, show\n" -" definition of available names.\n" +" Show definition of symbolic path name NAME. If no name is given,\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" @@ -6293,14 +6229,21 @@ msgid "(run 'hg update' to get a working copy)\n" msgstr "(esegui 'hg update' per ottenere una copia funzionante)\n" +#, fuzzy msgid "" "pull changes from the specified source\n" "\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" +" 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" @@ -6320,33 +6263,26 @@ " Vedere 'hg help urls' per maggiori informazioni.\n" " " -msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " -"specified." -msgstr "" -"L'altro repository non supporta la ricerca di revisioni, quindi una " -"revisione non può essere specificata." - +#, fuzzy msgid "" "push changes to the specified destination\n" "\n" " Push changes from the local repository to the given destination.\n" "\n" -" This is the symmetrical operation for pull. It helps to move\n" -" changes from the current repository to a different one. If the\n" -" destination is local this is identical to a pull in that directory\n" -" from the current one.\n" +" This is the symmetrical operation for pull. It moves changes from\n" +" the current repository to a different one. If the destination is\n" +" local this is identical to a pull in that directory from the\n" +" current one.\n" "\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" -"\n" -" If -r is used, the named changeset and all its ancestors will be pushed\n" -" to the remote repository.\n" -"\n" -" Look at the help text for urls for important details about ssh:// URLs.\n" -" If DESTINATION is omitted, a default path will be used.\n" -" See 'hg help urls' for more information.\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" +" Please see 'hg help urls' for important details about ssh://\n" +" URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" "effettua il push di modifiche verso la destinazione specificata\n" @@ -6376,30 +6312,15 @@ msgid "pushing to %s\n" msgstr "sto effettuando il push verso %s\n" -msgid "" -"raw commit interface (DEPRECATED)\n" -"\n" -" (DEPRECATED)\n" -" Lowlevel commit, for use in helper scripts.\n" -"\n" -" This command is not intended to be used by normal users, as it is\n" -" primarily useful for importing from other SCMs.\n" -"\n" -" This command is now deprecated and will be removed in a future\n" -" release, please use debugsetparents and commit instead.\n" -" " -msgstr "" - -msgid "(the rawcommit command is deprecated)\n" -msgstr "(il comando rawcommit è deprecato)\n" - +#, fuzzy msgid "" "roll back an interrupted transaction\n" "\n" " Recover from an interrupted commit or pull.\n" "\n" -" This command tries to fix the repository status after an interrupted\n" -" operation. It should only be necessary when Mercurial suggests it.\n" +" This command tries to fix the repository status after an\n" +" interrupted operation. It should only be necessary when Mercurial\n" +" suggests it.\n" " " msgstr "" "effettua il rollback di una transazione interrotta\n" @@ -6416,29 +6337,32 @@ "\n" " Schedule the indicated files for removal from the repository.\n" "\n" -" This only removes files from the current branch, not from the entire\n" -" project history. -A can be used to remove only files that have already\n" -" been deleted, -f can be used to force deletion, and -Af can be used\n" -" to remove files from the next revision without deleting them.\n" -"\n" -" The following table details the behavior of remove for different file\n" -" states (columns) and option combinations (rows). The file states are\n" -" Added, Clean, Modified and Missing (as reported by hg status). The\n" -" actions are Warn, Remove (from branch) and Delete (from disk).\n" -"\n" -" A C M !\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" +" This only removes files from the current branch, not from the\n" +" 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 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 [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by hg status). The actions are Warn, Remove (from branch)\n" +" and Delete (from disk)::\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" "\n" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" " " msgstr "" -msgid "no files specified" -msgstr "nessun file specificato" +#, fuzzy, python-format +msgid "not removing %s: file is untracked\n" +msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n" #, python-format msgid "not removing %s: file %s (use -f to force removal)\n" @@ -6456,12 +6380,12 @@ msgid "" "rename files; equivalent of copy + remove\n" "\n" -" Mark dest as copies of sources; mark sources for deletion. If\n" -" dest is a directory, copies are put in that directory. If dest is\n" -" a file, there can only be one source.\n" +" Mark dest as copies of sources; mark sources for deletion. If dest\n" +" is a directory, copies are put in that directory. If dest is a\n" +" file, there can only be one source.\n" "\n" " By default, this command copies the contents of files as they\n" -" exist in the working directory. If invoked with --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 at the next commit. To undo a rename\n" @@ -6474,14 +6398,20 @@ "\n" " This command will cleanly retry unresolved file merges using file\n" " revisions preserved from the last update or merge. To attempt to\n" -" resolve all unresolved files, use the -a switch.\n" -"\n" -" This command will also allow listing resolved files and manually\n" -" marking and unmarking files as resolved.\n" -"\n" -" The codes used to show the status of files are:\n" -" U = unresolved\n" -" R = resolved\n" +" resolve all unresolved files, use the -a/--all switch.\n" +"\n" +" If a conflict is resolved manually, please note that the changes\n" +" 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 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" +"\n" +" U = unresolved\n" +" R = resolved\n" " " msgstr "" @@ -6496,11 +6426,12 @@ "nessun file o directory specificata; usare --all per rieffettuare il merge " "di tutti i file" -msgid "" -"restore individual files or dirs to an earlier state\n" -"\n" -" (use update -r to check out earlier revisions, revert does not\n" -" change the working dir parents)\n" +#, fuzzy +msgid "" +"restore individual files or directories to an earlier state\n" +"\n" +" (Use update -r to check out earlier revisions, revert does not\n" +" change the working directory parents.)\n" "\n" " With no revision specified, revert the named files or directories\n" " to the contents they had in the parent of the working directory.\n" @@ -6509,10 +6440,10 @@ " working directory has two parents, you must explicitly specify the\n" " revision to revert to.\n" "\n" -" Using the -r option, revert the given files or directories to their\n" -" contents as of a specific revision. This can be helpful to \"roll\n" -" back\" some or all of an earlier change.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" Using the -r/--rev option, revert the given files or directories\n" +" to their contents as of a specific revision. This can be helpful\n" +" to \"roll back\" some or all of an earlier change. See 'hg help\n" +" dates' for a list of formats valid for -d/--date.\n" "\n" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" @@ -6520,8 +6451,8 @@ " directory, the reverted files will thus appear modified\n" " afterwards.\n" "\n" -" If a file has been deleted, it is restored. If the executable\n" -" mode of a file was changed, it is reset.\n" +" If a file has been deleted, it is restored. If the executable mode\n" +" of a file was changed, it is reset.\n" "\n" " If names are given, all files matching the names are reverted.\n" " If no arguments are given, no files are reverted.\n" @@ -6600,18 +6531,20 @@ msgid "no changes needed to %s\n" msgstr "nessuna modifica richiesta per %s\n" +#, fuzzy msgid "" "roll back the last transaction\n" "\n" " 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" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back:\n" +" and their effects can be rolled back::\n" "\n" " commit\n" " import\n" @@ -6655,8 +6588,9 @@ " repository potrebbe fallire se viene effettuato un rollback.\n" " " -msgid "" -"print the root (top) of the current working dir\n" +#, fuzzy +msgid "" +"print the root (top) of the current working directory\n" "\n" " Print the root directory of the current repository.\n" " " @@ -6666,13 +6600,15 @@ " Stampa la directory radice del repository corrente.\n" " " +#, fuzzy msgid "" "export the repository via HTTP\n" "\n" " Start a local HTTP repository browser and pull server.\n" "\n" " By default, the server logs accesses to stdout and errors to\n" -" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" +" files.\n" " " msgstr "" "esporta il repository via HTTP\n" @@ -6693,12 +6629,13 @@ "\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 is given. Unless options described\n" -" with \"show only ...\" are given, the options -mardu are 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" +" unless explicitly requested with -u/--unknown or -i/--ignored.\n" "\n" " NOTE: status may appear to disagree with diff if permissions have\n" " changed or a merge has occurred. The standard diff format does not\n" @@ -6706,20 +6643,122 @@ " 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" -"\n" -" The codes used to show the status of files are:\n" -" M = modified\n" -" A = added\n" -" R = removed\n" -" C = clean\n" -" ! = deleted, but still tracked\n" -" ? = not tracked\n" -" I = ignored\n" -" = the previous added file was copied from here\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" +"\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" +" ? = not tracked\n" +" I = ignored\n" +" = origin of the previous file listed as A (added)\n" +" " +msgstr "" + +msgid "" +"summarize working directory state\n" +"\n" +" This generates a brief summary of the working directory state,\n" +" including parents, branch, commit status, and available updates.\n" +"\n" +" With the --remote option, this will check the default paths for\n" +" incoming and outgoing changes. This can be time-consuming.\n" " " msgstr "" +#, fuzzy +msgid " (empty repository)" +msgstr "repository·%s" + +#, fuzzy +msgid " (no revision checked out)" +msgstr "nessuna revisione specificata" + +#, fuzzy, python-format +msgid "parent: %d:%s %s\n" +msgstr "genitore: %d:%s\n" + +#, fuzzy, python-format +msgid "branch: %s\n" +msgstr "branch: %s\n" + +#, fuzzy, python-format +msgid "%d added" +msgstr "%s non aggiunto!\n" + +#, fuzzy, python-format +msgid "%d modified" +msgstr "è modificato" + +#, fuzzy, python-format +msgid "%d removed" +msgstr "rimossi" + +#, python-format +msgid "%d deleted" +msgstr "" + +#, fuzzy, python-format +msgid "%d ignored" +msgstr "ignorato" + +#, fuzzy, python-format +msgid "%d unknown" +msgstr "base sconosciuta" + +#, fuzzy, python-format +msgid "%d unresolved" +msgstr "non risolti" + +#, fuzzy +msgid " (merge)" +msgstr "merge" + +#, fuzzy +msgid " (new branch)" +msgstr "mostra le branch" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, fuzzy, python-format +msgid "commit: %s\n" +msgstr "convert: %s\n" + +msgid "update: (current)\n" +msgstr "" + +#, fuzzy, python-format +msgid "update: %d new changesets (update)\n" +msgstr "%s: %d nuovi changeset" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, fuzzy, python-format +msgid "remote: %s\n" +msgstr "remoto: " + +#, fuzzy +msgid "remote: (synced)\n" +msgstr "remoto: " + +#, fuzzy msgid "" "add one or more tags for the current or given revision\n" "\n" @@ -6729,8 +6768,8 @@ " very useful to compare different revisions, to go back to significant\n" " earlier versions or to mark branch points as releases, etc.\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" +" If no revision is given, the parent of the working directory is\n" +" used, or tip if no revision is checked out.\n" "\n" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" @@ -6778,27 +6817,24 @@ msgid "tag '%s' does not exist" msgstr "la tag '%s' non esiste" -#, python-format -msgid "tag '%s' is not a %s tag" +#, fuzzy, python-format +msgid "tag '%s' is not a global tag" msgstr "la tag '%s' non è una tag %s" -#, python-format -msgid "Removed tag %s" -msgstr "Rimossa tag %s" +#, fuzzy, python-format +msgid "tag '%s' is not a local tag" +msgstr "la tag '%s' non è una tag %s" #, python-format msgid "tag '%s' already exists (use -f to force)" msgstr "la tag '%s' esiste già (usare -f per forzare)" -#, python-format -msgid "Added tag %s for changeset %s" -msgstr "Aggiunta tag %s per il changeset %s" - +#, fuzzy msgid "" "list repository tags\n" "\n" -" This lists both regular and local tags. When the -v/--verbose switch\n" -" is used, a third column \"local\" is printed for local tags.\n" +" This lists both regular and local tags. When the -v/--verbose\n" +" switch is used, a third column \"local\" is printed for local tags.\n" " " msgstr "" "elenca le tag del repository\n" @@ -6808,12 +6844,13 @@ " una terza colonna \"local\" viene stampata per le tag locali.\n" " " +#, fuzzy 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" @@ -6847,32 +6884,37 @@ " comando bundle.\n" " " +#, fuzzy msgid "" "update working directory\n" "\n" -" Update the repository's working directory to the specified revision,\n" -" or the tip of the current branch if none is specified. Use null as\n" -" the revision to remove the working copy (like 'hg clone -U').\n" -"\n" -" When the working dir contains no uncommitted changes, it will be\n" -" replaced by the state of the requested revision from the repo. When\n" -" the requested revision is on a different branch, the working dir\n" -" will additionally be switched to that branch.\n" -"\n" -" When there are uncommitted changes, use option -C to discard them,\n" -" forcibly replacing the state of the working dir with the requested\n" -" revision.\n" -"\n" -" When there are uncommitted changes and option -C is not used, and\n" -" the parent revision and requested revision are on the same branch,\n" -" and one of them is an ancestor of the other, then the new working\n" -" directory will contain the requested revision merged with the\n" -" uncommitted changes. Otherwise, the update will fail with a\n" -" suggestion to use 'merge' or 'update -C' instead.\n" -"\n" -" If you want to update just one file to an older revision, use revert.\n" -"\n" -" See 'hg help dates' for a list of formats valid for --date.\n" +" Update the repository's working directory to the specified\n" +" revision, or the tip of the current branch if none is specified.\n" +" Use null as the revision to remove the working copy (like 'hg\n" +" clone -U').\n" +"\n" +" When the working directory contains no uncommitted changes, it\n" +" will be replaced by the state of the requested revision from the\n" +" repository. When the requested revision is on a different branch,\n" +" the working directory will additionally be switched to that\n" +" branch.\n" +"\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. 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" +" same branch, and one of them is an ancestor of the other, then the\n" +" new working directory will contain the requested revision merged\n" +" with the uncommitted changes. Otherwise, the update will fail with\n" +" a suggestion to use 'merge' or 'update -C' instead.\n" +"\n" +" If you want to update just one file to an older revision, use\n" +" revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" "aggiorna la directory di lavoro\n" @@ -6906,6 +6948,14 @@ " Vedere 'hg help dates' per un elenco di formati validi per --date.\n" " " +#, fuzzy +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "non è possibile specificare sia una revisione sia una base" + +#, fuzzy +msgid "uncommitted local changes" +msgstr "sovrascrivi ogni modifica locale" + msgid "" "verify the integrity of the repository\n" "\n" @@ -6946,7 +6996,8 @@ "Non c'è alcuna garanzia; neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO\n" "SCOPO PARTICOLARE.\n" -msgid "repository root directory or symbolic path name" +#, fuzzy +msgid "repository root directory or name of overlay bundle file" msgstr "directory radice del repository o nome del percorso simbolico" msgid "change working directory" @@ -6976,9 +7027,6 @@ msgid "set the charset encoding mode" msgstr "imposta la modalità di codifica dei caratteri" -msgid "print improved command execution profile" -msgstr "stampa il profilo di esecuzione dei comandi migliorato" - msgid "print traceback on exception" msgstr "stampa un traceback in seguito ad eccezioni" @@ -7018,7 +7066,8 @@ msgid "record datecode as commit date" msgstr "registra il datecode come data del commit" -msgid "record user as committer" +#, fuzzy +msgid "record the specified user as committer" msgstr "registra l'utente come committente" msgid "display using template map file" @@ -7142,6 +7191,9 @@ msgstr "" "mostra solo le branch che hanno head di cui non si è effettuato il merge" +msgid "show normal and closed branches" +msgstr "" + msgid "[-a]" msgstr "[-a]" @@ -7227,12 +7279,6 @@ msgid "FILE" msgstr "FILE" -msgid "parent" -msgstr "genitore" - -msgid "file list" -msgstr "elenco dei file" - msgid "revision to rebuild to" msgstr "revisione alla quale ricostruire" @@ -7254,6 +7300,10 @@ msgid "[OPTION]..." msgstr "[OPZIONI]..." +#, fuzzy +msgid "revision to check" +msgstr "revisione di cui effettuare il backout" + msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." msgstr "[OPZIONI]... [-r REV1 [-r REV2]] [FILE]..." @@ -7277,7 +7327,8 @@ msgid "ignore case when matching" msgstr "ignora il case quando si cercano corrispondenze" -msgid "print only filenames and revs that match" +#, fuzzy +msgid "print only filenames and revisions that match" msgstr "stampa solo i nomi dei file e le revisioni che corrispondono" msgid "print matching line numbers" @@ -7289,19 +7340,26 @@ msgid "[OPTION]... PATTERN [FILE]..." msgstr "[OPZIONI]... PATTERN [FILE]..." -msgid "show only heads which are descendants of rev" +#, fuzzy +msgid "show only heads which are descendants of REV" msgstr "mostra solo le head che sono discendenti della revisione" -msgid "show only the active heads from open branches" +#, fuzzy +msgid "show only the active branch heads from open branches" msgstr "mostra solo le head attive dalle branch aperte" -msgid "[-r REV] [REV]..." +msgid "show normal and closed branch heads" +msgstr "" + +#, fuzzy +msgid "[-r STARTREV] [REV]..." msgstr "[-r REV] [REV]..." msgid "[TOPIC]" msgstr "[ARGOMENTO]" -msgid "identify the specified rev" +#, fuzzy +msgid "identify the specified revision" msgstr "identifica la revisione specificata" msgid "show local revision number" @@ -7319,9 +7377,10 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [SORGENTE]" -msgid "" -"directory strip option for patch. This has the same\n" -"meaning as the corresponding patch option" +#, fuzzy +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" msgstr "" "opzione di rimozione della directory per patch. Questa ha lo stesso\n" "significato dell'opzione corrispondente di patch" @@ -7339,7 +7398,8 @@ msgid "apply patch to the nodes from which it was generated" msgstr "applica la patch al nodo da cui è stata generata" -msgid "Use any branch information in patch (implied by --exact)" +#, fuzzy +msgid "use any branch information in patch (implied by --exact)" msgstr "" "Usa qualunque informazione sulla branch nella patch (implicato da --exact)" @@ -7361,7 +7421,8 @@ msgid "[-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-e CMD] [--remotecmd CMD] [DEST]" -msgid "search the repository as it stood at rev" +#, fuzzy +msgid "search the repository as it stood at REV" msgstr "cerca nel repository per come era alla revisione rev" msgid "end filenames with NUL, for use with xargs" @@ -7376,7 +7437,8 @@ msgid "only follow the first parent of merge changesets" msgstr "segui solo il primo genitore di un changeset di merge" -msgid "show revs matching date spec" +#, fuzzy +msgid "show revisions matching date spec" msgstr "mostra le revisioni che corrispondono ad una data fornita" msgid "show copied files" @@ -7385,13 +7447,15 @@ msgid "do case-insensitive search for a keyword" msgstr "effettua una ricerca case-insensitive di una parola chiave" -msgid "include revs where files were removed" +#, fuzzy +msgid "include revisions where files were removed" msgstr "include le revisioni in cui sono stati rimossi dei file" msgid "show only merges" msgstr "mostra solo i merge" -msgid "revs committed by user" +#, fuzzy +msgid "revisions committed by user" msgstr "commit delle revisioni effettuato dall'utente" msgid "show only changesets within the given named branch" @@ -7415,6 +7479,9 @@ msgid "revision to merge" msgstr "revisione di cui fare il merge" +msgid "review revisions to merge (no merge is performed)" +msgstr "" + msgid "[-f] [[-r] REV]" msgstr "[-f] [[-r] REV]" @@ -7424,11 +7491,13 @@ msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" -msgid "show parents from the specified rev" +#, fuzzy +msgid "show parents from the specified revision" msgstr "mostra i genitori della revisione specificata" -msgid "hg parents [-r REV] [FILE]" -msgstr "hg parents [-r REV] [FILE]" +#, fuzzy +msgid "[-r REV] [FILE]" +msgstr "[-r REV] FILE" msgid "[NAME]" msgstr "[NOME]" @@ -7499,10 +7568,12 @@ msgid "prefix path to serve from (default: server root)" msgstr "prefisso del percorso da cui servire (default: radice del server)" -msgid "name to show in web pages (default: working dir)" +#, fuzzy +msgid "name to show in web pages (default: working directory)" msgstr "nome da mostrare nelle pagine web (default: la directory di lavoro)" -msgid "name of the webdir config file (serve more than one repo)" +#, fuzzy +msgid "name of the webdir config file (serve more than one repository)" msgstr "nome del file di configurazione webdir (serve più di un repository)" msgid "for remote clients" @@ -7526,6 +7597,9 @@ msgid "[-u] [NAME]..." msgstr "[-u] [NOME]..." +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "mostra lo stato di tutti i file" @@ -7586,52 +7660,27 @@ msgid "overwrite locally modified files (no backup)" msgstr "sovrascrivi file modificati localmente (nessun backup)" +#, fuzzy +msgid "check for uncommitted changes" +msgstr "" +"salta il controllo di modifiche pendenti di cui non si è effettuato il commit" + msgid "[-C] [-d DATE] [[-r] REV]" msgstr "[-C] [-d DATA] [[-r] REV]" +#, fuzzy, python-format +msgid "config error at %s:%d: '%s'" +msgstr "impossibile avviare il server a '%s:%d': %s" + msgid "not found in manifest" msgstr "non trovato nel manifesto" msgid "branch name not in UTF-8!" msgstr "il nome della branch non è in UTF-8!" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr " sto cercando copie fino alla revisione %d\n" - -#, python-format -msgid "" -" unmatched files in local:\n" -" %s\n" -msgstr "" -" file non corrispondenti in locale:\n" -" %s\n" - -#, python-format -msgid "" -" unmatched files in other:\n" -" %s\n" -msgstr "" -" file non corrispondenti in altro:\n" -" %s\n" - -msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr " trovate tutte le copie (* = per merge, ! = divergenti):\n" - -#, python-format -msgid " %s -> %s %s\n" -msgstr " %s -> %s %s\n" - -msgid " checking for directory renames\n" -msgstr " sto controllando directory rinominate\n" - -#, python-format -msgid " dir %s -> %s\n" -msgstr " dir %s -> %s\n" - -#, python-format -msgid " file %s -> %s\n" -msgstr " file %s -> %s\n" +#, fuzzy +msgid "working directory state appears damaged!" +msgstr "(directory di lavoro non tip)\n" #, python-format msgid "'\\n' and '\\r' disallowed in filenames: %r" @@ -7649,6 +7698,10 @@ msgid "not in dirstate: %s\n" msgstr "non nel dirstate: %s\n" +#, fuzzy +msgid "unknown" +msgstr "base sconosciuta" + msgid "character device" msgstr "device a caratteri" @@ -7664,8 +7717,8 @@ msgid "directory" msgstr "directory" -#, python-format -msgid "%s: unsupported file type (type is %s)\n" +#, fuzzy, python-format +msgid "unsupported file type (type is %s)" msgstr "%s: tipo di file non supportato (il tipo è %s)\n" #, python-format @@ -7673,6 +7726,10 @@ msgstr "abortito: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -7701,10 +7758,6 @@ msgstr "hg %s: %s\n" #, python-format -msgid "hg: %s\n" -msgstr "hg: %s\n" - -#, python-format msgid "abort: %s!\n" msgstr "abortito: %s!\n" @@ -7755,7 +7808,8 @@ msgid "** unknown exception encountered, details follow\n" msgstr "** incontrata eccezione sconosciuta, seguono dettagli\n" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +#, fuzzy +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" msgstr "** riportare dettagli del bug a http://www.selenic.com/mercurial/bts\n" msgid "** or mercurial@selenic.com\n" @@ -7770,6 +7824,18 @@ msgstr "** Estensioni caricate: %s\n" #, python-format +msgid "no definition for alias '%s'\n" +msgstr "" + +#, fuzzy, python-format +msgid "alias '%s' resolves to unknown command '%s'\n" +msgstr "la tag '%s' si riferisce ad un nodo sconosciuto" + +#, python-format +msgid "alias '%s' resolves to ambiguous command '%s'\n" +msgstr "" + +#, python-format msgid "malformed --config option: %s" msgstr "opzione --config malformata: %s" @@ -7784,7 +7850,7 @@ msgstr "Non si può abbreviare l'opzione --cwd!" msgid "" -"Option -R has to be separated from other options (i.e. not -qR) and --" +"Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" msgstr "" @@ -7799,8 +7865,9 @@ msgid "invalid arguments" msgstr "argomenti non validi" -msgid "exception raised - generating profile anyway\n" -msgstr "eccezione sollevata - genero comunque il profilo\n" +#, python-format +msgid "unrecognized profiling format '%s' - Ignored\n" +msgstr "" msgid "" "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" @@ -7832,20 +7899,16 @@ msgstr "il tool %s richiede una GUI\n" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" msgstr "" -msgid "[lo]" -msgstr "[lo]" - -msgid "l" -msgstr "l" +msgid "&Local" +msgstr "" + +msgid "&Other" +msgstr "" #, python-format msgid "merging %s and %s to %s\n" @@ -7856,23 +7919,16 @@ msgstr "sto effettuando il merge di %s\n" #, python-format -msgid "my %s other %s ancestor %s\n" -msgstr "mio %s altro %s antenato %s\n" - -msgid " premerge successful\n" -msgstr " premerge eseguito con successo\n" - -#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" msgstr "" -msgid "[yn]" -msgstr "[yn]" - -msgid "n" -msgstr "n" +msgid "&No" +msgstr "" + +msgid "&Yes" +msgstr "" #, python-format msgid "merging %s failed!\n" @@ -7886,443 +7942,51 @@ msgid "unknown bisect kind %s" msgstr "" +#, fuzzy +msgid "disabled extensions:" +msgstr "" +"\n" +"estensioni abilitate:\n" +"\n" + msgid "Date Formats" msgstr "Formati della data" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\n" -" * 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" -" \"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" -" \"Dec 6\" (midnight)\n" -" \"13:18\" (today assumed)\n" -" \"3:39\" (3:39AM assumed)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"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" -" This is the internal representation format for dates. unixtime is\n" -" the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n" -" is the offset of the local timezone, in seconds west of UTC (negative\n" -" if the timezone is east of UTC).\n" -"\n" -" The log command also accepts date ranges:\n" -"\n" -" \"<{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" -" \"-{days}\" - within a given number of days of today\n" -" " -msgstr "" - msgid "File Name Patterns" msgstr "Pattern dei Nomi dei File" -msgid "" -"\n" -" Mercurial accepts several notations for identifying one or more\n" -" files at a time.\n" -"\n" -" By default, Mercurial treats filenames as shell-style extended\n" -" glob patterns.\n" -"\n" -" Alternate pattern notations must be specified explicitly.\n" -"\n" -" To use a plain path name without any pattern matching, start it\n" -" with \"path:\". These path names must completely match starting at\n" -" the current repository root.\n" -"\n" -" To use an extended glob, start a name with \"glob:\". Globs are\n" -" rooted at the current directory; a glob such as \"*.c\" will only\n" -" match files in the current directory ending with \".c\".\n" -"\n" -" The supported glob syntax extensions are \"**\" to match any string\n" -" across path separators and \"{a,b}\" to mean \"a or b\".\n" -"\n" -" 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" -" path:foo/bar a name bar in a directory named foo in the root of\n" -" the repository\n" -" path:path:name a file or directory named \"path:name\"\n" -"\n" -" Glob examples:\n" -"\n" -" 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" -"\n" -" " -msgstr "" - msgid "Environment Variables" msgstr "Variabili d'ambiente" -msgid "" -"\n" -"HG::\n" -" Path to the 'hg' executable, automatically passed when running hooks,\n" -" extensions or external tools. If unset or empty, this is the hg\n" -" executable's name if it's frozen, or an executable named 'hg'\n" -" (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" -" Windows) is searched.\n" -"\n" -"HGEDITOR::\n" -" This is the name of the editor to run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"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" -"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" -"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" -"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" -" * if it's a directory, all directories ending with .rc are added\n" -" * otherwise, the directory itself will be added\n" -"\n" -"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" -" * 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" -"EMAIL::\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" -"LOGNAME::\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" -"VISUAL::\n" -" This is the name of the editor to use when committing. See EDITOR.\n" -"\n" -"EDITOR::\n" -" Sometimes Mercurial needs to open a text file in an editor\n" -" for a user to modify, for example when writing commit messages.\n" -" The 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" -"PYTHONPATH::\n" -" This is used by Python to find imported modules and may need to be set\n" -" appropriately if this Mercurial is not installed system-wide.\n" -" " -msgstr "" - msgid "Specifying Single Revisions" msgstr "" -msgid "" -"\n" -" Mercurial supports several ways to specify individual\n" -" revisions.\n" -"\n" -" A plain integer is treated as a revision number. Negative\n" -" integers are treated as topological offsets from the tip, with\n" -" -1 denoting the tip. As such, negative numbers are only useful\n" -" if you've memorized your local tree numbers and want to save\n" -" typing a single digit. This editor suggests copy and paste.\n" -"\n" -" A 40-digit hexadecimal string is treated as a unique revision\n" -" identifier.\n" -"\n" -" A hexadecimal string less than 40 characters long is treated as a\n" -" unique revision identifier, and referred to as a short-form\n" -" identifier. A short-form identifier is only valid if it is the\n" -" prefix of exactly one full-length identifier.\n" -"\n" -" Any other string is treated as a tag name, which is a symbolic\n" -" name associated with a revision identifier. Tag names may not\n" -" contain the \":\" character.\n" -"\n" -" The reserved name \"tip\" is a special tag that always identifies\n" -" the most recent revision.\n" -"\n" -" 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" -" The reserved name \".\" indicates the working directory parent. If\n" -" no working directory is checked out, it is equivalent to null.\n" -" If an uncommitted merge is in progress, \".\" is the revision of\n" -" the first parent.\n" -" " -msgstr "" - msgid "Specifying Multiple Revisions" msgstr "Specificare Revisioni Multiple" -msgid "" -"\n" -" When Mercurial accepts more than one revision, they may be\n" -" specified individually, or provided as a topologically continuous\n" -" range, separated by the \":\" character.\n" -"\n" -" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" -" are revision identifiers. Both BEGIN and END are optional. If\n" -" BEGIN is not specified, it defaults to revision number 0. If END\n" -" is not specified, it defaults to the tip. The range \":\" thus\n" -" means \"all revisions\".\n" -"\n" -" If BEGIN is greater than END, revisions are treated in reverse\n" -" order.\n" -"\n" -" 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 "Diff Formats" msgstr "Formati di diff" -msgid "" -"\n" -" Mercurial's default format for showing changes between two versions\n" -" of a file is compatible with the unified format of GNU diff, which\n" -" can be used by GNU patch and many other standard tools.\n" -"\n" -" While this standard format is often enough, it does not encode the\n" -" following information:\n" -"\n" -" - 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" -" Mercurial also supports the extended diff format from the git VCS\n" -" which addresses these limitations. The git diff format is not\n" -" produced by default because a few widespread tools still do not\n" -" understand this format.\n" -"\n" -" This means that when generating diffs from a Mercurial repository\n" -" (e.g. with \"hg export\"), you should be careful about things like\n" -" file copies and renames or other things mentioned above, because\n" -" when 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" -" To make Mercurial produce the git extended diff format, use the\n" -" --git option available for many commands, or set 'git = True' in the\n" -" [diff] section of your hgrc. You do not need to set this option when\n" -" importing diffs in this format or using them in the mq extension.\n" -" " -msgstr "" - msgid "Template Usage" msgstr "" -msgid "" -"\n" -" Mercurial allows you to customize output of commands through\n" -" templates. You can either pass in a template from the command line,\n" -" via the --template option, or select an existing template-style (--" -"style).\n" -"\n" -" You can customize output for any \"log-like\" command: log, outgoing,\n" -" incoming, tip, parents, heads and glog.\n" -"\n" -" Three styles are packaged with Mercurial: default (the style used\n" -" when no explicit preference is passed), compact and changelog. Usage:\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" A template is a piece of text, with markup to invoke variable " -"expansion:\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" Strings in curly braces are called keywords. The availability of\n" -" keywords depends on the exact context of the templater. These keywords\n" -" are usually available for templating a log-like command:\n" -"\n" -" - 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 default.\n" -" - date: Date information. The date when the changeset was committed.\n" -" - desc: String. The text of the changeset description.\n" -" - diffstat: String. Statistics of changes with the following format:\n" -" \"modified files: +added/-removed lines\"\n" -" - files: List of strings. All files modified, added, or removed by\n" -" this changeset.\n" -" - file_adds: List of strings. Files added by this changeset.\n" -" - file_mods: List of strings. Files modified by this changeset.\n" -" - file_dels: List of strings. Files removed by this changeset.\n" -" - node: String. The changeset identification hash, as a 40-character\n" -" hexadecimal string.\n" -" - parents: List of strings. The parents of the changeset.\n" -" - rev: Integer. The repository-local changeset revision number.\n" -" - tags: List of strings. Any tags associated with the changeset.\n" -"\n" -" 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 it.\n" -" Filters are functions which return a string based on the input " -"variable.\n" -" You can also use a chain of filters to get the desired output:\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" List of filters:\n" -"\n" -" - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" -" every line except the last.\n" -" - age: Date. Returns a human-readable date/time difference between\n" -" the given date/time and the current date/time.\n" -" - basename: Any text. Treats the text as a path, and returns the\n" -" last component of the path after splitting by the path\n" -" separator (ignoring trailing seprators). For example,\n" -" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" -"\".\n" -" - date: Date. Returns a date in a Unix date format, including\n" -" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" -" - domain: Any text. Finds the first string that looks like an email\n" -" address, and extracts just the domain component.\n" -" Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an email\n" -" address. Example: 'User <user@example.com>' becomes\n" -" 'user@example.com'.\n" -" - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" -" \"<\" and \">\" with XML entities.\n" -" - fill68: Any text. Wraps the text to fit in 68 columns.\n" -" - fill76: Any text. Wraps the text to fit in 76 columns.\n" -" - firstline: Any text. Returns the first line of text.\n" -" - hgdate: Date. Returns the date as a pair of numbers:\n" -" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" -" - isodate: Date. Returns the date in ISO 8601 format.\n" -" - obfuscate: Any text. Returns the input text rendered as a sequence\n" -" of XML entities.\n" -" - person: Any text. Returns the text before an email address.\n" -" - rfc822date: Date. Returns a date using the same format used\n" -" in email headers.\n" -" - short: Changeset hash. Returns the short form of a changeset hash,\n" -" i.e. a 12-byte hexadecimal string.\n" -" - shortdate: Date. Returns a date like \"2006-09-18\".\n" -" - strip: Any text. Strips all leading and trailing whitespace.\n" -" - tabindent: Any text. Returns the text, with every line except the\n" -" first starting with a tab character.\n" -" - urlescape: Any text. Escapes all \"special\" characters. For example,\n" -" \"foo bar\" becomes \"foo%20bar\".\n" -" - user: Any text. Returns the user portion of an email address.\n" -" " -msgstr "" - -msgid "Url Paths" +#, fuzzy +msgid "URL Paths" msgstr "Percorsi url" -msgid "" -"\n" -" Valid URLs are of the form:\n" -"\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" Paths in the local filesystem can either point to Mercurial\n" -" repositories or to bundle files (as created by 'hg bundle' or\n" -" 'hg incoming --bundle').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\n" -"\n" -" Some features, such as pushing to http:// and https:// URLs are\n" -" only possible if the feature is explicitly enabled on the\n" -" remote Mercurial server.\n" -"\n" -" Some notes about using SSH with Mercurial:\n" -" - 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.\n" -" Use an extra slash at the start of a path to specify an absolute " -"path:\n" -" ssh://example.com//tmp/repository\n" -" - 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" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option.\n" -"\n" -" These urls can all be stored in your hgrc with path aliases under the\n" -" [paths] section like so:\n" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" You can then use the alias for any command that uses a url (for example\n" -" 'hg pull alias1' would pull from the 'alias1' path).\n" -"\n" -" Two path aliases are special because they are used as defaults\n" -" when you do not provide the url to a command:\n" -"\n" -" 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-\n" -" and pull-like commands (including in and out).\n" -"\n" -" 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 "" +#, fuzzy +msgid "Using additional features" +msgstr "abilita output aggiuntivo" + +msgid "can only share local repositories" +msgstr "" + +#, fuzzy +msgid "destination already exists" +msgstr "la destinazione '%s' esiste già" + +msgid "updating working directory\n" +msgstr "sto aggiornando la directory di lavoro\n" #, python-format msgid "destination directory: %s\n" @@ -8332,6 +7996,10 @@ msgid "destination '%s' already exists" msgstr "la destinazione '%s' esiste già" +#, fuzzy, python-format +msgid "destination '%s' is not empty" +msgstr "la destinazione %s non è una directory" + msgid "" "src repository does not support revision lookup and so doesn't support clone " "by revision" @@ -8340,30 +8008,21 @@ msgid "clone from remote to remote not supported" msgstr "clone da remoto a remoto non supportato" -msgid "updating working directory\n" -msgstr "sto aggiornando la directory di lavoro\n" - -msgid "updated" -msgstr "aggiornati" - -msgid "merged" -msgstr "merge" - -msgid "removed" -msgstr "rimossi" - -msgid "unresolved" -msgstr "non risolti" - -#, python-format -msgid "%d files %s" -msgstr "%d file %s" +#, fuzzy, python-format +msgid "updating to branch %s\n" +msgstr "sto aggiornando la cache delle branch\n" + +#, python-format +msgid "" +"%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgstr "" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "usa 'hg resolve' per riprovare i merge sui file non risolti\n" -msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " +#, fuzzy +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " "abandon\n" msgstr "" "usa 'hg resolve' per riprovare i merge sui file non risolti o\n" @@ -8379,7 +8038,8 @@ msgid "SSL support is unavailable" msgstr "Supporto SSL non disponibile" -msgid "IPv6 not available on this system" +#, fuzzy +msgid "IPv6 is not available on this system" msgstr "IPv6 non disponibile su questo sistema" #, python-format @@ -8441,32 +8101,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "componente URL non supportato: \"%s\"" -#, python-format -msgid "using %s\n" -msgstr "sto usando %s\n" - -#, python-format -msgid "capabilities: %s\n" -msgstr "funzionalità: %s\n" - msgid "operation not supported over http" msgstr "operazione non supportata su http" -#, python-format -msgid "sending %s command\n" -msgstr "sto inviando il comando %s\n" - -#, python-format -msgid "sending %s bytes\n" -msgstr "sto inviando %s byte\n" - msgid "authorization failed" msgstr "autorizzazione fallita" -#, python-format -msgid "http error while sending %s command\n" -msgstr "errore http durante l'invio del comando %s\n" - msgid "http error, possibly caused by proxy setting" msgstr "errore http, probabilmente causato dalle impostazioni del proxy" @@ -8475,10 +8115,6 @@ msgstr "il vero URL è %s\n" #, python-format -msgid "Requested URL: '%s'\n" -msgstr "URL richiesto: '%s'\n" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' non sembra essere un repository hg" @@ -8513,7 +8149,7 @@ msgstr "impossibile creare un nuovo repository http" #, python-format -msgid "%s: ignoring invalid syntax '%s'\n" +msgid "ignoring invalid syntax '%s'" msgstr "" #, python-format @@ -8533,6 +8169,10 @@ msgstr "requisito '%s' non supportato" #, python-format +msgid ".hg/sharedpath points to nonexistent directory %s" +msgstr "" + +#, python-format msgid "%r cannot be used in a tag name" msgstr "" @@ -8541,29 +8181,14 @@ "la copia di lavoro di .hgtags è cambiata (si prega di effettuare il commit " "manuale di .hgtags)" -#, python-format -msgid "%s, line %s: %s\n" -msgstr "%s, linea %s: %s\n" - -msgid "cannot parse entry" -msgstr "impossibile parsificare la entry" - -#, python-format -msgid "node '%s' is not well formed" -msgstr "il nodo '%s' non è ben formato" - -#, python-format -msgid "tag '%s' refers to unknown node" -msgstr "la tag '%s' si riferisce ad un nodo sconosciuto" +#, fuzzy, python-format +msgid "working directory has unknown parent '%s'!" +msgstr "directory di lavoro di %s" #, python-format msgid "unknown revision '%s'" msgstr "revisione sconosciuta '%s'" -#, python-format -msgid "filtering %s through %s\n" -msgstr "sto filtrando %s attraverso %s\n" - msgid "journal already exists - run hg recover" msgstr "il journal esiste già - eseguire hg recover" @@ -8595,37 +8220,32 @@ msgid "working directory of %s" msgstr "directory di lavoro di %s" -#, python-format -msgid " %s: searching for copy revision for %s\n" -msgstr "" - -#, python-format -msgid " %s: copy %s:%s\n" -msgstr "" - msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" -#, python-format -msgid "%s not tracked!\n" -msgstr "%s non è tracciato!\n" +#, fuzzy +msgid "file not found!" +msgstr "file %s non trovato!" + +#, fuzzy +msgid "no match under directory!" +msgstr "nessuna corrispondenza sotto la directory %s!" + +#, fuzzy +msgid "file not tracked!" +msgstr "il file %s non è tracciato!" msgid "unresolved merge conflicts (see hg resolve)" msgstr "" -msgid "nothing changed\n" -msgstr "nulla è cambiato\n" +#, fuzzy, python-format +msgid "committing subrepository %s\n" +msgstr "repository·%s" #, python-format msgid "trouble committing %s!\n" msgstr "" -msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." -msgstr "" - -msgid "empty commit message" -msgstr "messaggio di commit vuoto" - #, python-format msgid "%s does not exist!\n" msgstr "%s non esiste!\n" @@ -8657,6 +8277,10 @@ msgstr "" #, python-format +msgid "%s not tracked!\n" +msgstr "%s non è tracciato!\n" + +#, python-format msgid "%s not removed!\n" msgstr "" @@ -8667,41 +8291,6 @@ msgid "searching for changes\n" msgstr "sto cercando modifiche\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "" - -msgid "branch already found\n" -msgstr "branch già trovata\n" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "trovata branch incompleta %s:%s\n" - -#, python-format -msgid "found new changeset %s\n" -msgstr "trovato nuovo changeset %s\n" - -#, python-format -msgid "request %d: %s\n" -msgstr "" - -#, python-format -msgid "received %s:%s\n" -msgstr "" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "" - msgid "already have changeset " msgstr "" @@ -8711,16 +8300,6 @@ msgid "repository is unrelated" msgstr "il repository non è imparentato" -msgid "found new changesets starting at " -msgstr "trovati nuovi changeset a partire da " - -#, python-format -msgid "%d total queries\n" -msgstr "%d query totali\n" - -msgid "common changesets up to " -msgstr "changeset comuni fino a " - msgid "requesting all changes\n" msgstr "sto richiedendo tutte le modifiche\n" @@ -8729,6 +8308,10 @@ "changegroupsubset." msgstr "" +#, fuzzy, python-format +msgid "abort: push creates new remote branch '%s'!\n" +msgstr "abortito: push crea nuove head remote!\n" + msgid "abort: push creates new remote heads!\n" msgstr "abortito: push crea nuove head remote!\n" @@ -8743,17 +8326,10 @@ msgid "%d changesets found\n" msgstr "%d changeset trovati\n" -msgid "list of changesets:\n" -msgstr "elenco dei changeset:\n" - #, python-format msgid "empty or missing revlog for %s" msgstr "revlog vuoto o mancante per %s" -#, python-format -msgid "add changeset %s\n" -msgstr "aggiungo changeset %s\n" - msgid "adding changesets\n" msgstr "sto aggiungendo i changeset\n" @@ -8766,10 +8342,6 @@ msgid "adding file changes\n" msgstr "sto aggiungendo le modifiche ai file\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "sto aggiungendo %s revisioni\n" - msgid "received file revlog group is empty" msgstr "il gruppo di file revlog ricevuto è vuoto" @@ -8781,9 +8353,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "aggiunti %d changeset con %d modifiche a %d file%s\n" -msgid "updating the branch cache\n" -msgstr "sto aggiornando la cache delle branch\n" - msgid "Unexpected response from remote server:" msgstr "Risposta inaspettata dal server remoto:" @@ -8804,10 +8373,6 @@ msgstr "%d file da trasferire, %s di dati\n" #, python-format -msgid "adding %s (%s)\n" -msgstr "sto aggiungendo %s (%s)\n" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "trasferiti %s in %.1f secondi (%s/sec)\n" @@ -8851,9 +8416,6 @@ msgid "invalid local address: %s" msgstr "" -msgid "'\\n' and '\\r' disallowed in filenames" -msgstr "" - #, python-format msgid "failed to remove %s from manifest" msgstr "" @@ -8872,33 +8434,35 @@ msgid "case-folding collision between %s and %s" msgstr "" -msgid "resolving manifests\n" -msgstr "sto risolvendo i manifesti\n" - -#, python-format -msgid " overwrite %s partial %s\n" -msgstr "sovrascrivi %s parziale %s\n" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr "antenato %s locale %s remoto %s\n" - #, python-format msgid "" " conflicting flags for %s\n" "(n)one, e(x)ec or sym(l)ink?" msgstr "" +#, fuzzy +msgid "&None" +msgstr "fatto\n" + +msgid "E&xec" +msgstr "" + +msgid "Sym&link" +msgstr "" + +msgid "resolving manifests\n" +msgstr "sto risolvendo i manifesti\n" + #, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" msgstr "" -msgid "[cd]" -msgstr "" - -msgid "c" +msgid "&Changed" +msgstr "" + +msgid "&Delete" msgstr "" #, python-format @@ -8907,8 +8471,7 @@ "use (c)hanged version or leave (d)eleted?" msgstr "" -#, python-format -msgid "preserving %s for resolve of %s\n" +msgid "&Deleted" msgstr "" #, python-format @@ -8938,6 +8501,10 @@ msgstr "" "niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')" +#, fuzzy +msgid "outstanding uncommitted changes (use 'hg status' to list changes)" +msgstr "ci sono modifiche in sospeso di cui non si è effettuato il commit" + msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" msgstr "" @@ -8956,13 +8523,6 @@ msgstr "impossibile creare %s: impossibile creare la directory di destinazione" #, python-format -msgid "found patch at byte %d\n" -msgstr "" - -msgid "patch generated by hg export\n" -msgstr "patch generata da hg export\n" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "" @@ -8983,7 +8543,11 @@ msgstr "" #, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" +msgid "Hunk #%d succeeded at %d %s(offset %d line).\n" +msgstr "" + +#, python-format +msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n" msgstr "" #, python-format @@ -9024,9 +8588,13 @@ msgid "patch command failed: %s" msgstr "comando patch fallito: %s" -#, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "" +#, fuzzy, python-format +msgid "Unsupported line endings type: %s" +msgstr "%s: tipo di file non supportato (il tipo è %s)\n" + +#, fuzzy, python-format +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" +msgstr "%d file, %d changeset, %d revisioni totali\n" #, python-format msgid "exited with status %d" @@ -9037,13 +8605,6 @@ msgstr "ucciso dal segnale %d" #, python-format -msgid "stopped by signal %d" -msgstr "terminato dal segnale %d" - -msgid "invalid exit code" -msgstr "codice d'uscita non valido" - -#, python-format msgid "saving bundle to %s\n" msgstr "sto salvando il bundle in %s\n" @@ -9070,6 +8631,10 @@ msgid "index %s unknown format %d" msgstr "" +#, fuzzy, python-format +msgid "index %s is corrupted" +msgstr "interrotto" + msgid "no node" msgstr "nessun nodo" @@ -9110,12 +8675,12 @@ msgid "could not create remote repo" msgstr "non è stato possibile creare il repository remoto" +msgid "no suitable response from remote hg" +msgstr "nessuna risposta accettabile dall'hg remoto" + msgid "remote: " msgstr "remoto: " -msgid "no suitable response from remote hg" -msgstr "nessuna risposta accettabile dall'hg remoto" - #, python-format msgid "push refused: %s" msgstr "push rifiutato: %s" @@ -9133,93 +8698,102 @@ msgid "invalid entry in fncache, line %s" msgstr "voce non valida in fncache, linea %s" -msgid "scanning\n" -msgstr "sto effettuando la scansione\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "sto inviando %s (%d byte)\n" +#, python-format +msgid "" +" subrepository sources for %s differ\n" +"use (l)ocal source (%s) or (r)emote source (%s)?" +msgstr "" + +#, fuzzy +msgid "&Remote" +msgstr "remoto: " + +#, 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 "" + +#, fuzzy, python-format +msgid "removing subrepo %s\n" +msgstr "sto rimuovendo %s\n" + +#, fuzzy, python-format +msgid "pulling subrepo %s\n" +msgstr "sto facendo pull da %s\n" + +#, fuzzy, python-format +msgid "pushing subrepo %s\n" +msgstr "sto effettuando il push verso %s\n" + +#, python-format +msgid "%s, line %s: %s\n" +msgstr "%s, linea %s: %s\n" + +msgid "cannot parse entry" +msgstr "impossibile parsificare la entry" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "il nodo '%s' non è ben formato" msgid "unmatched quotes" msgstr "" +#, fuzzy, python-format +msgid "error expanding '%s%%%s'" +msgstr "errore di lettura di %s/.hg/hgrc: %s\n" + +#, fuzzy, python-format +msgid "unknown filter '%s'" +msgstr "revisione sconosciuta '%s'" + #, python-format msgid "style not found: %s" msgstr "stile non trovato: %s" #, python-format -msgid "%s:%s: parse error" -msgstr "" - -#, python-format msgid "template file %s: %s" msgstr "" -#, python-format -msgid "Error expanding '%s%%%s'" +msgid "cannot use transaction when it is already committed/aborted" +msgstr "" + +#, python-format +msgid "failed to truncate %s\n" msgstr "" msgid "transaction abort!\n" msgstr "transazione abortita!\n" -#, python-format -msgid "failed to truncate %s\n" -msgstr "" - msgid "rollback completed\n" msgstr "rollback completato\n" +#, fuzzy +msgid "rollback failed - please run hg recover\n" +msgstr "il journal esiste già - eseguire hg recover" + #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" msgstr "" #, python-format -msgid "" -"Failed to parse %s\n" -"%s" -msgstr "" -"Fallita la parsificazione di %s\n" -"%s" - -#, python-format msgid "Ignored: %s\n" msgstr "Ignorato: %s\n" -#, python-format -msgid "unable to open %s: %s" -msgstr "impossibile aprire %s: %s" - -#, python-format -msgid "" -"failed to parse %s\n" -"%s" -msgstr "" -"fallita la parsificazione di %s\n" -"%s" - -#, python-format -msgid "" -"Error in configuration section [%s] parameter '%s':\n" -"%s" -msgstr "" -"Errore nella sezione di configurazione [%s] parametro '%s':\n" -"%s" - -#, python-format -msgid "Ignoring untrusted configuration option %s.%s = %s\n" +#, fuzzy, python-format +msgid "ignoring untrusted configuration option %s.%s = %s\n" msgstr "Ignoro l'opzione di configurazione non affidabile %s.%s = %s\n" #, python-format -msgid "" -"Error in configuration section [%s]:\n" -"%s" -msgstr "" -"Errore nella sezione di configurazione [%s]:\n" -"%s" +msgid "%s.%s not a boolean ('%s')" +msgstr "" msgid "enter a commit username:" msgstr "inserire uno username per il commit:" @@ -9235,12 +8809,12 @@ msgid "username %s contains a newline\n" msgstr "lo username %s contiene un carattere di fine riga\n" +msgid "response expected" +msgstr "risposta attesa" + msgid "unrecognized response\n" msgstr "risposta non riconosciuta\n" -msgid "response expected" -msgstr "risposta attesa" - msgid "password: " msgstr "password: " @@ -9265,18 +8839,10 @@ msgstr "utente:" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "usando proxy attraverso http://%s:%s\n" - -#, python-format msgid "http auth: user %s, password %s\n" msgstr "autenticazione http: utente %s, password %s\n" #, python-format -msgid "%s, please check your locale settings" -msgstr "%s, si prega di controllare le impostazioni di localizzazione" - -#, python-format msgid "command '%s' failed: %s" msgstr "comando '%s' fallito: %s" @@ -9381,8 +8947,12 @@ msgid "warning: `%s' uses revlog format 0" msgstr "attenzione: `%s' usa il formato di revlog 0" -#, python-format -msgid "rev %d point to %s changeset %d" +#, fuzzy, python-format +msgid "rev %d points to nonexistent changeset %d" +msgstr "rev %d punta a %s changeset %d" + +#, fuzzy, python-format +msgid "rev %d points to unexpected changeset %d" msgstr "rev %d punta a %s changeset %d" #, python-format @@ -9419,6 +8989,10 @@ msgid "checking manifests\n" msgstr "sto controllando i manifesti\n" +#, fuzzy, python-format +msgid "%s not in changesets" +msgstr "%s non è nei manifesti" + msgid "file without name in manifest" msgstr "file senza nome nel manifesto" @@ -9467,11 +9041,15 @@ msgstr "sto spacchettando %s" #, python-format +msgid "warning: copy source of '%s' not in parents of %s" +msgstr "" + +#, python-format msgid "empty or missing copy source revlog %s:%s" msgstr "" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" #, python-format @@ -9505,6 +9083,3 @@ msgid "user name not available - set USERNAME environment variable" msgstr "" "nome utente non disponibile - impostare la variabile d'ambiente USERNAME" - -#~ msgid "%s %s to %s\n" -#~ msgstr "%s %s in %s\n"