The branch, master has been updated
via 411db7ad741a17d42316e1c9d1d31cad99eb6123 (commit)
via 6b141855beaaab94be0e0095ca17fd6e8cf93c4e (commit)
via 0f30749238d3c4872dfb747f7727db522cb55ab7 (commit)
via bda692a3d5387cf14cc3c75c7ed9f20fa8e7c085 (commit)
from 3269c079e51ca1fd1bd08becf51f56b6adeb1f80 (commit)
- Log -----------------------------------------------------------------
commit 411db7ad741a17d42316e1c9d1d31cad99eb6123
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Aug 14 05:19:57 2007 +0300
Do not compose strings from translated substrings.
Make the life easier for translators by not composing strings from tiny
translated parts.
commit 6b141855beaaab94be0e0095ca17fd6e8cf93c4e
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Aug 14 05:08:21 2007 +0300
Adjust string to get it merged with a similar one.
commit 0f30749238d3c4872dfb747f7727db522cb55ab7
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Aug 14 04:41:48 2007 +0300
Mark strings for translation.
commit bda692a3d5387cf14cc3c75c7ed9f20fa8e7c085
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Aug 14 04:36:31 2007 +0300
Update TODO list.
Remove obsolete and finished entries.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 20 ++++++++++++++++++++
TODO | 8 --------
dpkg-split/main.c | 2 +-
lib/parsehelp.c | 10 ++++++++--
src/archives.c | 28 +++++++++++++++++-----------
src/query.c | 25 +++++++++++++------------
6 files changed, 59 insertions(+), 34 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4282bbf..85c6880 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2007-08-14 Guillem Jover <[EMAIL PROTECTED]>
+
+ * lib/parsehelp.c (parseerr): Switch from ternary operator to compose
+ a string to a conditional call to the function with two different
+ strings, making life easier for translators.
+ * src/archives.c (tarobject): Likewise.
+ * src/query.c (searchoutput): Switch from a loop with two iterations
+ and ternary operators to compose strings to a conditional with two
+ sequential calls with different strings, making life easier for
+ translators.
+
+2007-08-14 Guillem Jover <[EMAIL PROTECTED]>
+
+ * dpkg-split/main.c (rerr): Adjust string so that it gets merged by
+ gettext with a similar one.
+
+2007-08-14 Guillem Jover <[EMAIL PROTECTED]>
+
+ * src/archives.c (linktosameexistingdir): Mark strings for translation.
+
2007-08-11 Ian Jackson <[EMAIL PROTECTED]>
* src/archives.c (linktosameexistingdir): New function.
diff --git a/TODO b/TODO
index 3e31782..df8aa1b 100644
--- a/TODO
+++ b/TODO
@@ -31,8 +31,6 @@ lenny
* Add multiarch support.
- * Merge back support for Breaks field from Ubuntu.
-
* Merge dpkg-cross functionality.
* Merge dpkg-sig?
@@ -156,7 +154,6 @@ other stuff unlikely to get done soon
* understand Replaces in dselect
* diversions list as control archive entry
* single maintainer script, and new package getting there first
- * dpkg -s show something for virtual packages
* local conffiles, aswell as local files that dpkg should check before
overwriting
* hooks
@@ -169,8 +166,3 @@ other stuff unlikely to get done soon
* `fake' or `null' packages
* dpkg --query | -Q
-obsoleted so not done
- * version numbers not starting digit early.
- * dselect bottom window too large, and/or resize
- * `template' file giving default selections of dselect.
-
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index 4761354..4fb801f 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -88,7 +88,7 @@ struct partqueue *queue= NULL;
int npquiet= 0, msdos= 0;
void rerr(const char *fn) {
- ohshite(_("error reading %s"),fn);
+ ohshite(_("error reading %.250s"), fn);
}
void rerreof(FILE *f, const char *fn) {
diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 1c181bd..6dc7eaa 100644
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -36,8 +36,14 @@ void parseerr
va_list al;
char buf1[768], buf2[1000], *p, *q;
if (file && ferror(file)) ohshite(_("failed to read `%s' at line
%d"),filename,lno);
- sprintf(buf1, _("%s, in file `%.255s' near line %d"),
- warnonly ? _("warning") : _("parse error"), filename, lno);
+
+ if (warnonly)
+ sprintf(buf1, _("warning, in file `%.255s' near line %d"),
+ filename, lno);
+ else
+ sprintf(buf1, _("parse error, in file `%.255s' near line %d"),
+ filename, lno);
+
if (pigp && pigp->name) {
sprintf(buf2, _(" package `%.255s'"), pigp->name);
strcat(buf1,buf2);
diff --git a/src/archives.c b/src/archives.c
index 796c65a..df21d27 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -336,7 +336,8 @@ static int linktosameexistingdir(const struct TarInfo *ti,
statr= stat(fname, &oldstab);
if (statr) {
if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR))
- ohshite("failed to stat (dereference) existing symlink `%.250s'", fname);
+ ohshite(_("failed to stat (dereference) existing symlink `%.250s'"),
+ fname);
return 0;
}
if (!S_ISDIR(oldstab.st_mode)) return 0;
@@ -356,8 +357,8 @@ static int linktosameexistingdir(const struct TarInfo *ti,
statr= stat(symlinkfn->buf, &newstab);
if (statr) {
if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR))
- ohshite("failed to stat (dereference) proposed new symlink target"
- " `%.250s' for symlink `%.250s'", symlinkfn->buf, fname);
+ ohshite(_("failed to stat (dereference) proposed new symlink target"
+ " `%.250s' for symlink `%.250s'"), symlinkfn->buf, fname);
return 0;
}
if (!S_ISDIR(newstab.st_mode)) return 0;
@@ -404,14 +405,19 @@ int tarobject(struct TarInfo *ti) {
if (nifd->namenode->divert && nifd->namenode->divert->camefrom) {
divpkg= nifd->namenode->divert->pkg;
- forcibleerr(fc_overwritediverted,
- _("trying to overwrite `%.250s', which is the "
- "diverted version of `%.250s'%.10s%.100s%.10s"),
- nifd->namenode->name,
- nifd->namenode->divert->camefrom->name,
- divpkg ? _(" (package: ") : "",
- divpkg ? divpkg->name : "",
- divpkg ? ")" : "");
+
+ if (divpkg) {
+ forcibleerr(fc_overwritediverted,
+ _("trying to overwrite `%.250s', which is the "
+ "diverted version of `%.250s' (package: %.100s)"),
+ nifd->namenode->name, nifd->namenode->divert->camefrom->name,
+ divpkg->name);
+ } else {
+ forcibleerr(fc_overwritediverted,
+ _("trying to overwrite `%.250s', which is the "
+ "diverted version of `%.250s'"),
+ nifd->namenode->name,
nifd->namenode->divert->camefrom->name);
+ }
}
usename= namenodetouse(nifd->namenode,tc->pkg)->name + 1; /* Skip the
leading `/' */
diff --git a/src/query.c b/src/query.c
index ff8d94b..4a7f9cb 100644
--- a/src/query.c
+++ b/src/query.c
@@ -245,18 +245,19 @@ static int searchoutput(struct filenamenode *namenode) {
struct filepackages *packageslump;
if (namenode->divert) {
- for (i=0; i<2; i++) {
- if (namenode->divert->pkg) printf(_("diversion by
%s"),namenode->divert->pkg->name);
- else printf(_("local diversion"));
- printf(" %s: %s\n", i ? _("to") : _("from"),
- i ?
- (namenode->divert->useinstead
- ? namenode->divert->useinstead->name
- : namenode->name)
- :
- (namenode->divert->camefrom
- ? namenode->divert->camefrom->name
- : namenode->name));
+ const char *name_from = namenode->divert->camefrom ?
+ namenode->divert->camefrom->name : namenode->name;
+ const char *name_to = namenode->divert->useinstead ?
+ namenode->divert->useinstead->name : namenode->name;
+
+ if (namenode->divert->pkg) {
+ printf(_("diversion by %s from: %s\n"),
+ namenode->divert->pkg->name, name_from);
+ printf(_("diversion by %s to: %s\n"),
+ namenode->divert->pkg->name, name_to);
+ } else {
+ printf(_("local diversion from: %s\n"), name_from);
+ printf(_("local diversion to: %s\n"), name_to);
}
}
found= 0;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
