##// END OF EJS Templates
i18n-it: updates after msgmerge on stable branch, 2nd part
Paolo Giarrusso -
r12218:0bd15f88 stable
parent child Browse files
Show More
@@ -1711,7 +1711,6 b' msgstr "svn: nessuna revisione trovata d'
1711 1711 msgid "%s not found up to revision %d"
1712 1712 msgstr "%s non trovato fino alla revisione %d"
1713 1713
1714 #, fuzzy
1715 1714 msgid "scanning paths"
1716 1715 msgstr "scansione percorsi"
1717 1716
@@ -1988,56 +1987,28 b' msgstr "hg extdiff [OPZIONE]... [FILE]..'
1988 1987 #, python-format
1989 1988 msgid "use %(path)s to diff repository (or selected files)"
1990 1989 msgstr ""
1991
1992 #, fuzzy, python-format
1990 "usa %(path)s per creare una diff tra repository (o tra i file selezionati)"
1991
1992 #, python-format
1993 1993 msgid ""
1994 1994 " Show differences between revisions for the specified files, using\n"
1995 1995 " the %(path)s program."
1996 1996 msgstr ""
1997 "show revision history of entire repository or files\n"
1998 "\n"
1999 " Print the revision history of the specified files or the entire\n"
2000 " project.\n"
2001 "\n"
2002 " File history is shown without following rename or copy history of\n"
2003 " files. Use -f/--follow with a file name to follow history across\n"
2004 " renames and copies. --follow without a file name will only show\n"
2005 " ancestors or descendants of the starting revision. --follow-first\n"
2006 " only follows the first parent of merge revisions.\n"
2007 "\n"
2008 " If no revision range is specified, the default is tip:0 unless\n"
2009 " --follow is set, in which case the working directory parent is\n"
2010 " used as the starting revision.\n"
2011 "\n"
2012 " Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
2013 "\n"
2014 " By default this command outputs: changeset id and hash, tags,\n"
2015 " non-trivial parents, user, date and time, and a summary for each\n"
2016 " commit. When the -v/--verbose switch is used, the list of changed\n"
2017 " files and full commit message is shown.\n"
2018 "\n"
2019 " NOTE: log -p may generate unexpected diff output for merge\n"
2020 " changesets, as it will compare the merge changeset against its\n"
2021 " first parent only. Also, the files: list will only reflect files\n"
2022 " that are different from BOTH parents.\n"
2023 "\n"
2024 " "
1997 " Mostra differenze tra revisioni per i file specificati, usando\n"
1998 " il programma %(path)s."
2025 1999
2026 2000 #, python-format
2027 2001 msgid "hg %s [OPTION]... [FILE]..."
2028 2002 msgstr "hg %s [OPZIONE]... [FILE]..."
2029 2003
2030 #, fuzzy
2031 2004 msgid "pull, update and merge in one command"
2032 2005 msgstr "pull, update e merge in un comando"
2033 2006
2034 #, fuzzy
2035 2007 msgid "pull changes from a remote repository, merge new changes if needed."
2036 2008 msgstr ""
2037 2009 "effettua il pull delle modifiche da un repository remoto, effettua il merge "
2038 2010 "delle nuove modifiche se necessario."
2039 2011
2040 #, fuzzy
2041 2012 msgid ""
2042 2013 " This finds all changes from the repository at the specified path\n"
2043 2014 " or URL and adds them to the local repository."
@@ -2046,19 +2017,17 b' msgstr ""'
2046 2017 "specificato\n"
2047 2018 " e le aggiunge al repository locale."
2048 2019
2049 #, fuzzy
2050 2020 msgid ""
2051 2021 " If the pulled changes add a new branch head, the head is\n"
2052 2022 " automatically merged, and the result of the merge is committed.\n"
2053 2023 " Otherwise, the working directory is updated to include the new\n"
2054 2024 " changes."
2055 2025 msgstr ""
2056 " Se le modifiche ottenute aggiungono una nuova head, il merge di questa "
2057 "viene effettuato\n"
2026 " Se le modifiche ottenute aggiungono una nuova head di branch, il merge "
2027 "di questa viene effettuato\n"
2058 2028 " automaticamente e si effettua il commit del merge. Altrimenti, la\n"
2059 2029 " directory di lavoro viene aggiornata per includere le nuove modifiche."
2060 2030
2061 #, fuzzy
2062 2031 msgid ""
2063 2032 " When a merge occurs, the newly pulled changes are assumed to be\n"
2064 2033 " \"authoritative\". The head of the new changes is used as the first\n"
@@ -2071,12 +2040,11 b' msgstr ""'
2071 2040 " genitore, con le modifiche locali come secondo. Per invertire l'ordine\n"
2072 2041 " di merge, usare --switch-parent."
2073 2042
2074 #, fuzzy
2075 2043 msgid ""
2076 2044 " See :hg:`help dates` for a list of formats valid for -d/--date.\n"
2077 2045 " "
2078 2046 msgstr ""
2079 " Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
2047 " Vedere :hg:`help dates` per un elenco dei formati validi per -d/--date.\n"
2080 2048 " "
2081 2049
2082 2050 msgid ""
@@ -2146,9 +2114,8 b' msgstr "inverte i genitori durante il me'
2146 2114 msgid "hg fetch [SOURCE]"
2147 2115 msgstr "hg fetch [SORGENTE]"
2148 2116
2149 #, fuzzy
2150 2117 msgid "commands to sign and verify changesets"
2151 msgstr "elenca i changeset firmati"
2118 msgstr "comandi per firmare e verificare changeset"
2152 2119
2153 2120 msgid "error while verifying signature"
2154 2121 msgstr "errore durante la verifica della firma"
@@ -2443,9 +2410,8 b' msgstr "hg debug-cat-file [OPZIONE]... T'
2443 2410 msgid "hg debug-config"
2444 2411 msgstr "hg debug-config"
2445 2412
2446 #, fuzzy
2447 2413 msgid "hg debug-merge-base REV REV"
2448 msgstr "hg debug-rev-parse REV"
2414 msgstr ""
2449 2415
2450 2416 msgid "ignored"
2451 2417 msgstr "ignorato"
General Comments 0
You need to be logged in to leave comments. Login now