diff --git a/i18n/de.po b/i18n/de.po --- a/i18n/de.po +++ b/i18n/de.po @@ -6436,12 +6436,15 @@ msgstr "&Yes - übernimmt diese Änderung" 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" diff --git a/i18n/it.po b/i18n/it.po --- a/i18n/it.po +++ b/i18n/it.po @@ -5291,12 +5291,15 @@ msgstr "&Salta le modifiche rimanenti a 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" diff --git a/i18n/ro.po b/i18n/ro.po --- a/i18n/ro.po +++ b/i18n/ro.po @@ -5420,12 +5420,14 @@ msgstr "" 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" diff --git a/mercurial/help/subrepos.txt b/mercurial/help/subrepos.txt --- a/mercurial/help/subrepos.txt +++ b/mercurial/help/subrepos.txt @@ -75,32 +75,33 @@ Interaction with Mercurial Commands :add: add does not recurse in subrepos unless -S/--subrepos is specified. However, if you specify the full path of a file in a subrepo, it will be added even without -S/--subrepos specified. - Subversion subrepositories are currently silently + 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 @@ -111,7 +112,7 @@ Interaction with Mercurial Commands :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