The following commit has been merged in the master branch: commit e0ce9b4ac351a921de12bf0302cfa97f1c7251e2 Author: Raphaël Hertzog <hert...@debian.org> Date: Thu Jul 7 16:09:33 2011 +0200
dpkg-source(1): fix a small typo Replace ", under as" with "under". Add missing dot at the end of the sentence. Reported-by: "Barak A. Pearlmutter" <b...@debian.org> diff --git a/debian/changelog b/debian/changelog index 41607a6..1d25bb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ dpkg (1.16.1) UNRELEASED; urgency=low * update-alternatives: do not allow to reuse a slave link in another slave alternative. Closes: #631547 * Improve dpkg-source's logic to identify ignored files. Closes: #632168 + * Fix a small typo in dpkg-source(1). Closes: #632937 [ Guillem Jover ] * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520 diff --git a/man/dpkg-source.1 b/man/dpkg-source.1 index bb01523..c9b1b22 100644 --- a/man/dpkg-source.1 +++ b/man/dpkg-source.1 @@ -563,8 +563,8 @@ the cloned git repository. .PP Note that by default the new repository will have the same branch checked out that was checked out in the original source. (Typically "master", but -it could be anything.) Any other branches will be available, under as -`remotes/origin/` +it could be anything.) Any other branches will be available under +`remotes/origin/`. .PP .B Building .PP diff --git a/man/po/de.po b/man/po/de.po index 220a8d1..23c8301 100644 --- a/man/po/de.po +++ b/man/po/de.po @@ -14243,8 +14243,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" "Beachten Sie, dass standardmäßig im neuen Depot der gleiche Zweig " "ausgecheckt ist, der auch in der ursprünglichen Quelle ausgecheckt war " diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot index 65f4730..93a1a17 100644 --- a/man/po/dpkg-man.pot +++ b/man/po/dpkg-man.pot @@ -10998,8 +10998,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" #. type: Plain text diff --git a/man/po/es.po b/man/po/es.po index 502cce9..cc15344 100644 --- a/man/po/es.po +++ b/man/po/es.po @@ -14069,8 +14069,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" "Tenga en cuenta que, por omisión, el nuevo repositorio tendrá un «checkout» " "de la misma rama de la que se realizó el «checkout» de la fuente original. " diff --git a/man/po/fr.po b/man/po/fr.po index 4e73bb9..6ec4f94 100644 --- a/man/po/fr.po +++ b/man/po/fr.po @@ -14088,8 +14088,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" "Veuillez noter que, par défaut, le nouveau dépôt aura la même branche " "récupérée que celle qui était récupérée dans les sources d'origine (souvent " diff --git a/man/po/hu.po b/man/po/hu.po index 16eb0ad..1bbac79 100644 --- a/man/po/hu.po +++ b/man/po/hu.po @@ -11458,8 +11458,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" #. type: Plain text diff --git a/man/po/ja.po b/man/po/ja.po index ca940cd..9764eaf 100644 --- a/man/po/ja.po +++ b/man/po/ja.po @@ -12193,8 +12193,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" #. type: Plain text diff --git a/man/po/pl.po b/man/po/pl.po index 87406f8..dbb1e29 100644 --- a/man/po/pl.po +++ b/man/po/pl.po @@ -13822,8 +13822,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" #. type: Plain text diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po index bc4d70c..c602d78 100644 --- a/man/po/pt_BR.po +++ b/man/po/pt_BR.po @@ -11544,8 +11544,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" #. type: Plain text diff --git a/man/po/ru.po b/man/po/ru.po index ececd82..dec0ea1 100644 --- a/man/po/ru.po +++ b/man/po/ru.po @@ -11769,8 +11769,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" #. type: Plain text diff --git a/man/po/sv.po b/man/po/sv.po index da43c28..8a344a0 100644 --- a/man/po/sv.po +++ b/man/po/sv.po @@ -13720,8 +13720,8 @@ msgstr "" msgid "" "Note that by default the new repository will have the same branch checked " "out that was checked out in the original source. (Typically \"master\", but " -"it could be anything.) Any other branches will be available, under as " -"`remotes/origin/`" +"it could be anything.) Any other branches will be available under " +"`remotes/origin/`." msgstr "" "Observera att det nya arkivet som standard kommer att ha samma gren " "utcheckad som den som var utcheckad i det ursprungliga källkodsträdet. " -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org