The branch, master has been updated
via f006a48bcc7a19fb4726d95bf2b400a3e902c878 (commit)
via 0ca6ad38d93107ed9f72213f93b77708b66b593c (commit)
from 22ddeee0236bdff13745c1c4c4f81c1f30951138 (commit)
- Shortlog ------------------------------------------------------------
f006a48 Fix typos in translations to avoid fuzzy strings.
0ca6ad3 Fix some typos in various manpages.
Summary of changes:
debian/changelog | 1 +
man/ChangeLog | 10 ++++++++++
man/deb-symbols.5 | 4 ++--
man/dpkg-gensymbols.1 | 4 ++--
man/dpkg-shlibdeps.1 | 6 +++---
man/dpkg-source.1 | 2 +-
man/po/de.po | 4 ++--
man/po/dpkg-man.pot | 4 ++--
man/po/es.po | 4 ++--
man/po/fr.po | 4 ++--
man/po/hu.po | 4 ++--
man/po/ja.po | 4 ++--
man/po/pl.po | 4 ++--
man/po/pt_BR.po | 4 ++--
man/po/ru.po | 4 ++--
man/po/sv.po | 4 ++--
16 files changed, 39 insertions(+), 28 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit f006a48bcc7a19fb4726d95bf2b400a3e902c878
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Sun Dec 30 11:03:35 2007 +0100
Fix typos in translations to avoid fuzzy strings.
diff --git a/debian/changelog b/debian/changelog
index b9d227e..fd55f19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ dpkg (1.14.15) UNRELEASED; urgency=low
Closes: #452730
* Blacklist armel-specific symbols in dpkg-gensymbols. Reported by Riku
Voipio. Closes: #457964
+ * Fix typos in various manpages. Patch from A. Costa. Closes: #458276
[ Guillem Jover ]
* Move compression related variables to a new Dpkg::Compression module.
diff --git a/man/ChangeLog b/man/ChangeLog
index fb531ef..18f1102 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-30 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * po/*.po: Fix typos in translations as well to avoid fuzzy
+ strings.
+
2007-12-30 A. Costa <[EMAIL PROTECTED]>
* dpkg-gensymbols.1, dpkg-shlibdeps.1, dpkg-source.1, deb-symbols.5:
diff --git a/man/po/de.po b/man/po/de.po
index 8b2f65f..3e69d4c 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -7509,7 +7509,7 @@ msgstr "I<adminverz>/info/I<Paket>.symbols"
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
"Vom Paket bereitgestellte Abhängigkeitsinformationen für "
@@ -8282,7 +8282,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
"Dies ist sehr hilfreich, um irrelevante Dateien, die im Diff aufgenommen "
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index 7610054..36ad7e9 100644
--- a/man/po/dpkg-man.pot
+++ b/man/po/dpkg-man.pot
@@ -5942,7 +5942,7 @@ msgstr ""
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
@@ -6529,7 +6529,7 @@ msgid ""
".cvsignore, .svn/). The default regexp is already very exhaustive, but if "
"you need to replace it, please note that by default it can match any part of "
"a path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/es.po b/man/po/es.po
index 66a97c7..2c97597 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -7468,7 +7468,7 @@ msgstr ""
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
#, fuzzy
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
"Información acerca de redefinición de dependencias de bibliotecas "
@@ -8140,7 +8140,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/fr.po b/man/po/fr.po
index 3f25f3f..af5882b 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -7448,7 +7448,7 @@ msgstr ""
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
#, fuzzy
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
"Fichier particulier à un paquet remplaçant les informations qui concernent "
@@ -8119,7 +8119,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/hu.po b/man/po/hu.po
index f1a87d5..4084680 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -6354,7 +6354,7 @@ msgstr ""
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
@@ -6940,7 +6940,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/ja.po b/man/po/ja.po
index 1f6e1f2..029c243 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -6983,7 +6983,7 @@ msgstr ""
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
@@ -7567,7 +7567,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/pl.po b/man/po/pl.po
index 4d9271a..5e05031 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -7519,7 +7519,7 @@ msgstr "I<katalog_admin>/info/I<pakiet>.symbols"
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
@@ -8138,7 +8138,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 6c8e8a0..51d79ad 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -6510,7 +6510,7 @@ msgstr ""
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
@@ -7093,7 +7093,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/ru.po b/man/po/ru.po
index c91ff26..ec31906 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -6640,7 +6640,7 @@ msgstr ""
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
@@ -7222,7 +7222,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
diff --git a/man/po/sv.po b/man/po/sv.po
index 6e4aef0..9b8db57 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -7333,7 +7333,7 @@ msgstr "I<adminkat>/info/I<paket>.symbols"
# type: Plain text
#: ../../man/dpkg-shlibdeps.1:64 ../../man/dpkg-shlibdeps.1:95
msgid ""
-"Package-provided shared library dependency information. Unless overriden, "
+"Package-provided shared library dependency information. Unless overridden, "
"I<admindir> is /var/lib/dpkg."
msgstr ""
"Paketlokal överstyrande beroendeinformation för delade bibliotek. Normalt är "
@@ -8078,7 +8078,7 @@ msgid ""
"cvsignore, .svn/). The default regexp is already very exhaustive, but if you "
"need to replace it, please note that by default it can match any part of a "
"path, so if you want to match the begin of a filename or only full "
-"filenames, you will need to provide the neccessary anchors (e.g. '(^|/)', "
+"filenames, you will need to provide the necessary anchors (e.g. '(^|/)', "
"'($|/)') yourself."
msgstr ""
"Flaggan är mycket användbar för att utesluta extrafiler som kommer med i "
commit 0ca6ad38d93107ed9f72213f93b77708b66b593c
Author: A. Costa <[EMAIL PROTECTED]>
Date: Sun Dec 30 10:54:55 2007 +0100
Fix some typos in various manpages.
diff --git a/man/ChangeLog b/man/ChangeLog
index 6870a65..fb531ef 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-30 A. Costa <[EMAIL PROTECTED]>
+
+ * dpkg-gensymbols.1, dpkg-shlibdeps.1, dpkg-source.1, deb-symbols.5:
+ Fix some typos.
+
2007-12-29 Guillem Jover <[EMAIL PROTECTED]>
* po/sv.po: Merged with dpkg-man.pot.
diff --git a/man/deb-symbols.5 b/man/deb-symbols.5
index 98a3c55..285f542 100644
--- a/man/deb-symbols.5
+++ b/man/deb-symbols.5
@@ -19,13 +19,13 @@ in these files is:
[ * <field-name>: <field value> ]
.br
[ ... ]
- <symbol> <mininal version>[ <id of dependency template> ]
+ <symbol> <minimal version>[ <id of dependency template> ]
.P
The \fIlibrary soname\fR is exactly the value of the SONAME field
as exported by \fBobjdump\fR(1). A \fIdependency template\fR is a
dependency where \fI#MINVER#\fR is dynamically replaced either by
a version check like "(>= \fIminimal version\fR)" or by nothing (if
-an unversionned dependency is deemed sufficient).
+an unversioned dependency is deemed sufficient).
.P
Each exported \fIsymbol\fR (listed as [EMAIL PROTECTED], with
\fIversion\fR being "Base" if the library is not versioned) is associated
diff --git a/man/dpkg-gensymbols.1 b/man/dpkg-gensymbols.1
index 81fd7d9..b9ebb00 100644
--- a/man/dpkg-gensymbols.1
+++ b/man/dpkg-gensymbols.1
@@ -108,7 +108,7 @@ Define the package version. Defaults to the version
extracted from
debian/changelog. Required if called outside of a source package tree.
.TP
.BI \-e library-file
-Only analyze libraries explicitely listed instead of finding all public
+Only analyze libraries explicitly listed instead of finding all public
libraries. You can use a regular expression in \fIlibrary-file\fR to match
multiple libraries with a single argument (otherwise you need multiple
\fB\-e\fR).
@@ -136,7 +136,7 @@ disappeared. Level 2 fails if some new symbols have been
introduced.
Level 3 fails if some libraries have disappeared. Level 4 fails if some
libraries have been introduced.
-This value can be overriden by the environment variable
+This value can be overridden by the environment variable
DPKG_GENSYMBOLS_CHECK_LEVEL.
.TP
.BI \-d
diff --git a/man/dpkg-shlibdeps.1 b/man/dpkg-shlibdeps.1
index d7ea373..a54b3cd 100644
--- a/man/dpkg-shlibdeps.1
+++ b/man/dpkg-shlibdeps.1
@@ -60,7 +60,7 @@ Per-system overriding shared library dependency information.
.BR "dpkg-architecture -qDEB_HOST_ARCH" ).
.IP \fIadmindir\fR/info/\fIpackage\fR.symbols
Package-provided shared library dependency information.
-Unless overriden, \fIadmindir\fR is /var/lib/dpkg.
+Unless overridden, \fIadmindir\fR is /var/lib/dpkg.
.P
While scanning the symbols used by all binaries,
.B dpkg\-shlibdeps
@@ -91,7 +91,7 @@ Shared library information generated by the current build
process that also invo
.BR dpkg\-shlibdeps .
.IP \fIadmindir\fR/info/\fIpackage\fR.shlibs
Package-provided shared library dependency information.
-Unless overriden, \fIadmindir\fR is /var/lib/dpkg.
+Unless overridden, \fIadmindir\fR is /var/lib/dpkg.
.IP /etc/dpkg/shlibs.default
Per-system default shared library dependency information.
.P
@@ -216,7 +216,7 @@ The \fIbinary\fR is linked to a library that it doesn't
need. It's not a
problem but some small performance improvements in binary load time
can be obtained by not linking this library to this binary.
-Furthermore, in some cases, this will lead to a non-versionned dependency
+Furthermore, in some cases, this will lead to a non-versioned dependency
on the library that could have been avoided if the binary was only linked
against the library that it really uses. The exception to this rule is
when several binaries are linked against the same set of libraries but
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 7c2c5cb..7cf6a72 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -138,7 +138,7 @@ contain (e.g. CVS/, .cvsignore, .svn/). The default regexp
is already
very exhaustive, but if you need to replace it, please note that by
default it can match any part of a path, so if you want to match the
begin of a filename or only full filenames, you will need to provide
-the neccessary anchors (e.g. '(^|/)', '($|/)') yourself.
+the necessary anchors (e.g. '(^|/)', '($|/)') yourself.
.TP
.BR \-I [\fIfile-pattern\fP]
If this option is specified, the pattern will be passed to
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
