Mercurial > hg
changeset 15430:54c0517c0fe8 stable
merge with main
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Fri, 04 Nov 2011 10:31:38 +0100 |
parents | e48f0913f018 (diff) db8b0ee74025 (current diff) |
children | 2ddae301d0a2 6ba2fc0a87ab d8238600265d |
files | |
diffstat | 4 files changed, 24 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/de.po Thu Nov 03 10:59:32 2011 -0400 +++ b/i18n/de.po Fri Nov 04 10:31:38 2011 +0100 @@ -6436,12 +6436,15 @@ msgid "&No, skip this change" msgstr "&No, überspringt diese Änderung" +#, fuzzy msgid "&Skip remaining changes to this file" msgstr "&Überspringe die restlichen Änderungen an dieser Datei" +#, fuzzy msgid "Record remaining changes to this &file" msgstr "Zeichne die restlichen Änderungen an dieser &Datei auf" +#, fuzzy msgid "&Done, skip remaining changes and files" msgstr "&Fertig, überspringe die restlichen Änderungen und Dateien"
--- a/i18n/it.po Thu Nov 03 10:59:32 2011 -0400 +++ b/i18n/it.po Fri Nov 04 10:31:38 2011 +0100 @@ -5291,12 +5291,15 @@ msgid "Record remaining changes to this &file" msgstr "Registra le modifiche rimanenti a questo &file" +#, fuzzy msgid "&Done, skip remaining changes and files" msgstr "&Fatto, salta le modifiche e i file rimanenti" +#, fuzzy msgid "Record &all changes to all remaining files" msgstr "Registra &tutte le modifiche a tutti i file rimanenti" +#, fuzzy msgid "&Quit, recording no changes" msgstr "&Esce, non registrando alcuna modifica"
--- a/i18n/ro.po Thu Nov 03 10:59:32 2011 -0400 +++ b/i18n/ro.po Fri Nov 04 10:31:38 2011 +0100 @@ -5420,12 +5420,14 @@ msgid "&No, skip this change" msgstr "&Nu, omite această modificare" +#, fuzzy msgid "&Skip remaining changes to this file" msgstr "&Omite restul modificărilor pentru acest fișier" msgid "Record remaining changes to this &file" msgstr "" +#, fuzzy msgid "&Done, skip remaining changes and files" msgstr "În&cheiat, omite restul modificărilor și fișierelor"
--- a/mercurial/help/subrepos.txt Thu Nov 03 10:59:32 2011 -0400 +++ b/mercurial/help/subrepos.txt Fri Nov 04 10:31:38 2011 +0100 @@ -73,32 +73,33 @@ ----------------------------------- :add: add does not recurse in subrepos unless -S/--subrepos is - specified. Subversion subrepositories are currently silently - ignored. + specified. Git and Subversion subrepositories are currently + silently ignored. :archive: archive does not recurse in subrepositories unless -S/--subrepos is specified. :commit: commit creates a consistent snapshot of the state of the - entire project and its subrepositories. It does this by first - attempting to commit all modified subrepositories, then recording - their state and finally committing it in the parent - repository. Mercurial can be made to abort if any subrepository - content is modified by setting "ui.commitsubrepos=no" in a - configuration file (see :hg:`help config`). + entire project and its subrepositories. If any subrepositories + have been modified, Mercurial will abort. Mercurial can be made + to instead commit all modified subrepositories by specifying + -S/--subrepos, or setting "ui.commitsubrepos=True" in a + configuration file (see :hg:`help config`). After there are no + longer any modified subrepositories, it records their state and + finally commits it in the parent repository. :diff: diff does not recurse in subrepos unless -S/--subrepos is specified. Changes are displayed as usual, on the subrepositories - elements. Subversion subrepositories are currently silently - ignored. + elements. Git and Subversion subrepositories are currently + silently ignored. :incoming: incoming does not recurse in subrepos unless -S/--subrepos - is specified. Subversion subrepositories are currently silently - ignored. + is specified. Git and Subversion subrepositories are currently + silently ignored. :outgoing: outgoing does not recurse in subrepos unless -S/--subrepos - is specified. Subversion subrepositories are currently silently - ignored. + is specified. Git and Subversion subrepositories are currently + silently ignored. :pull: pull is not recursive since it is not clear what to pull prior to running :hg:`update`. Listing and retrieving all @@ -109,7 +110,7 @@ :push: Mercurial will automatically push all subrepositories first when the parent repository is being pushed. This ensures new subrepository changes are available when referenced by top-level - repositories. + repositories. Push is a no-op for Subversion subrepositories. :status: status does not recurse into subrepositories unless -S/--subrepos is specified. Subrepository changes are displayed as