1 --- poldek-0.30-cvs20080820.23/arg_packages.c~ 2009-03-04 00:02:23.000000000 +0200
2 +++ poldek-0.30-cvs20080820.23/arg_packages.c 2009-03-04 00:02:34.012264942 +0200
4 if (poldek_VERBOSE > 1) {
7 - msgn(2, "%s: %d package(s) found:", mask, n_array_size(pkgs));
8 + msgn(2, _("%s: %d package(s) found:"), mask, n_array_size(pkgs));
9 for (i=0; i < n_array_size(pkgs); i++)
10 msgn(2, " - %s", pkg_snprintf_s(n_array_nth(pkgs, i)));
16 - if (poldek_VERBOSE > 2)
17 - msgn(1, "%s: choosen %s among %d packages", key,
18 + if (poldek_VERBOSE > 2)
19 + msgn(1, _("%s: choosen %s among %d packages"), key,
20 pkg_snprintf_s(pkg), n_array_size(pkgs));
23 n_array_push(topkgs, pkg_link(pkg));
26 --- poldek-0.30-cvs20080820.23/./cli/alias.c~ 2008-02-02 22:39:01.000000000 +0200
27 +++ poldek-0.30-cvs20080820.23/./cli/alias.c 2009-03-04 00:03:40.535590911 +0200
29 logn(LOGWARN, _("%s: could not determine aliased command"),
32 - msgn(3, "%s => aliased %s", cmd->name, cmd->aliasto);
33 + msgn(3, _("%s => aliased %s"), cmd->name, cmd->aliasto);
37 --- poldek-0.30-cvs20080820.23/./cli/su.c~ 2008-02-02 23:16:37.000000000 +0200
38 +++ poldek-0.30-cvs20080820.23/./cli/su.c 2009-03-04 00:04:00.512262048 +0200
43 - msgn(2, "Running as user '%s'\n", user);
44 + msgn(2, _("Running as user '%s'\n"), user);
48 --- poldek-0.30-cvs20080820.23/./conf.c~ 2008-05-24 23:59:54.000000000 +0300
49 +++ poldek-0.30-cvs20080820.23/./conf.c 2009-03-04 00:04:41.845626927 +0200
50 @@ -1133,11 +1133,11 @@
51 add_param(ht_sect, sectnam, name, value, addparam_flags,
54 - msgn(1, "%s: skipped %s::%s", af->path, sectnam, name);
55 + msgn(1, _("%s: skipped %s::%s"), af->path, sectnam, name);
59 - msgn(3, "-- %s EOF --", af->path);
60 + msgn(3, _("-- %s EOF --"), af->path);
64 --- poldek-0.30-cvs20080820.23/./fileindex.c~ 2008-01-23 01:59:52.000000000 +0200
65 +++ poldek-0.30-cvs20080820.23/./fileindex.c 2009-03-04 00:05:59.365623692 +0200
67 if ((c1 || c2) && verbose > 0) {
69 pkg_snprintf(buf, sizeof(buf), pkg1);
70 - msgn(1, "add cnfl: %s %c-%c %s", buf, c2 ? :' ', c1 ? :' ',
71 + msgn(1, _("add cnfl: %s %c-%c %s"), buf, c2 ? :' ', c1 ? :' ',
72 pkg_snprintf_s(pkg2));
78 if (pathprinted == 0) {
79 - msgn(0, "\nPath: %s%s", *cnfl->path == '/' ? "" : "/",
80 + msgn(0, _("\nPath: %s%s"), *cnfl->path == '/' ? "" : "/",
88 - msgn(0, "%d file conflicts found", nconflicts);
89 + msgn(0, _("%d file conflicts found"), nconflicts);
95 if (n_array_size(opkgs) > 5)
96 n += n_snprintf(&pkgstr[n], sizeof(pkgstr) - n,
97 - "[%d packages left]", n_array_size(opkgs) - 5);
98 - logn(LOGERR, "%s: orphaned directory from %s", path, pkgstr);
99 + _("[%d packages left]"), n_array_size(opkgs) - 5);
100 + logn(LOGERR, _("%s: orphaned directory from %s"), path, pkgstr);
102 norphans = n_array_size(paths);
103 - msgn(0, "%d orphaned directories found", norphans);
104 + msgn(0, _("%d orphaned directories found"), norphans);
106 n_hash_free(orphanh);
109 for (i=0; i < size; i++) {
112 - msgn(2, "Looking for path %s -> %s (%s)", pkg_id(pkg), pkg_id(ptab[i]),
113 + msgn(2, _("Looking for path %s -> %s (%s)"), pkg_id(pkg), pkg_id(ptab[i]),
116 n_snprintf(key, sizeof(key), "%s -> %s", pkg_id(pkg), pkg_id(ptab[i]));
117 @@ -843,12 +843,12 @@
118 n += n_snprintf(&pkgstr[n], sizeof(pkgstr) - n,
119 "...", mreq->ncandidates - 3);
121 - logn(LOGERR, "%s: %s: directory not in required packages "
122 - "(missing Requires: %s?)", id, mreq->path, pkgstr);
123 + logn(LOGERR, _("%s: %s: directory not in required packages "
124 + "(missing Requires: %s?)"), id, mreq->path, pkgstr);
128 - msgn(0, "%d semi-orphaned directories found", norphans);
129 + msgn(0, _("%d semi-orphaned directories found"), norphans);
130 n_array_free(pkgids);
131 n_hash_free(missreqh);
133 --- poldek-0.30-cvs20080820.23/./pkgdir/dir/dir.c~ 2009-03-02 18:36:49.000000000 +0200
134 +++ poldek-0.30-cvs20080820.23/./pkgdir/dir/dir.c 2009-03-04 00:06:39.086835080 +0200
137 pkg = search_in_mtime_index(mtime_index, ent->d_name, &st);
139 - msgn(3, "%s: file seems untouched, loaded from previous index",
140 + msgn(3, _("%s: file seems untouched, loaded from previous index"),
141 pkg_filename_s(pkg));
143 remap_groupid(pkg, pkgroups, prev_pkgdir);
146 if (pkg == NULL) { /* mtime changed, but try compare content */
147 if (!pm_rpmhdr_loadfile(path, &h)) {
148 - logn(LOGWARN, "%s: read header failed, skipped", path);
149 + logn(LOGWARN, _("%s: read header failed, skipped"), path);
155 pkg = search_in_prev(prev_pkgdir, h, ent->d_name, &st);
157 - msgn(3, "%s: seems untouched, loaded from previous index",
158 + msgn(3, _("%s: seems untouched, loaded from previous index"),
159 pkg_snprintf_s(pkg));
161 remap_groupid(pkg, pkgroups, prev_pkgdir);
165 n_assert(h); /* loaded in previous if block */
166 - msgn(3, "%s: loading header...", n_basenam(path));
167 + msgn(3, _("%s: loading header..."), n_basenam(path));
168 pkg = pm_rpm_ldhdr(na, h, n_basenam(path), st.st_size, PKG_LDWHOLE);
171 --- poldek-0.30-cvs20080820.23/./pkgdir/pndir/update.c~ 2007-06-24 14:48:07.000000000 +0300
172 +++ poldek-0.30-cvs20080820.23/./pkgdir/pndir/update.c 2009-03-04 00:07:11.142236416 +0200
174 if (memcmp(md, current_md, TNIDX_DIGEST_SIZE) == 0)
175 first_patch_found = 1;
177 - msgn(2, "Check diff (ts = %ld, %ld) %s (searching %s)\n",
178 + msgn(2, _("Check diff (ts = %ld, %ld) %s (searching %s)\n"),
179 (long)pkgdir->ts, (long)ts, md, current_md);
181 if (poldek_verbose() > 3) {
182 --- poldek-0.30-cvs20080820.23/./pkgset.c~ 2008-01-22 14:36:39.000000000 +0200
183 +++ poldek-0.30-cvs20080820.23/./pkgset.c 2009-03-04 00:08:12.872782026 +0200
185 if (verb && poldek_VERBOSE > 2) {
188 - msg(2, "Installation order:\n");
189 + msg(2, _("Installation order:\n"));
190 for (i=0; i < n_array_size(ps->ordered_pkgs); i++) {
191 struct pkg *pkg = n_array_nth(ps->ordered_pkgs, i);
192 msg(2, "%d. %s\n", i, pkg->name);
197 - msgn(0, "Graph saved as %s", outfile);
198 + msgn(0, _("Graph saved as %s"), outfile);
206 - msgn(0, "LanVi graph saved as %s", outfile);
207 + msgn(0, _("LanVi graph saved as %s"), outfile);
211 --- poldek-0.30-cvs20080820.23/./pkgset-req.c~ 2008-05-24 11:12:25.000000000 +0300
212 +++ poldek-0.30-cvs20080820.23/./pkgset-req.c 2009-03-04 00:09:02.085813192 +0200
214 pkgs = pkgmark_get_packages(pms, PKGMARK_UNMETDEPS);
216 n_assert(n_array_size(pkgs));
217 - msgn(4, "Packages with unsatisfied dependencies:");
218 + msgn(4, _("Packages with unsatisfied dependencies:"));
220 for (i=0; i < n_array_size(pkgs); i++) {
221 struct pkg *pkg = n_array_nth(pkgs, i);
223 matches = n_hash_get(cache, streq);
226 - msgn(4, " req %-35s --> NOT FOUND", streq);
227 + msgn(4, _(" req %-35s --> NOT FOUND"), streq);
228 else if (n_array_size(matches) > 0) {
229 msg(4, " req %-35s --> ", streq);
230 for (ii=0; ii < n_array_size(matches); ii++)
234 if (poldek_VERBOSE > 3)
235 - msgn(4, " req %-35s --> NOT FOUND", capreq_snprintf_s(req));
236 + msgn(4, _(" req %-35s --> NOT FOUND"), capreq_snprintf_s(req));
238 pkgset_add_unreq(ps, pkg, req, 0);
239 pkg_set_unmetdeps(pms, pkg);
242 if (!matched && pkgset_pm_satisfies(ps, req)) {
244 - msgn(4, " req %-35s --> PM_CAP", capreq_snprintf_s(req));
245 + msgn(4, _(" req %-35s --> PM_CAP"), capreq_snprintf_s(req));
253 - msgn(4, " cnfl %-35s --> NOT FOUND",capreq_snprintf_s(cnfl));
254 + msgn(4, _(" cnfl %-35s --> NOT FOUND"), capreq_snprintf_s(cnfl));
258 --- poldek-0.30-cvs20080820.23/./pm/pset/pset.c~ 2008-05-13 18:55:32.000000000 +0300
259 +++ poldek-0.30-cvs20080820.23/./pm/pset/pset.c 2009-03-04 00:10:01.492220009 +0200
262 DBGF("in %p(%p) %s\n", pkg, tmp, pkg_id(pkg));
264 - logn(LOGERR, "%s: recno is set, should not happen", pkg_id(pkg));
265 + logn(LOGERR, _("%s: recno is set, should not happen"), pkg_id(pkg));
267 pkgset_add_package(db->ps, pkg);
268 pkgdir_add_package(pkgdir, pkg);
270 else if (!do_pkgtslink(db, ts->cachedir, pkg, path))
273 - msgn(2, "Copying %s to %s", path, pkgdir->path);
274 + msgn(2, _("Copying %s to %s"), path, pkgdir->path);
280 DBGF("un %p(%p) %s\n", pkg, tmp, pkg_id(pkg));
281 n_array_push(db->paths_removed, n_strdup(path));
282 - msgn(2, "Removing %s", path);
283 + msgn(2, _("Removing %s"), path);
288 nchanges = 0; /* count real made changes */
289 n_assert(n_array_size(db->ps->pkgdirs) == 1);
290 pkgdir = n_array_nth(db->ps->pkgdirs, 0);
291 - msgn(0, "Operating on %s", pkgdir->path);
292 + msgn(0, _("Operating on %s"), pkgdir->path);
294 for (i=0; i < n_array_size(db->paths_removed); i++) {
295 const char *path = n_array_nth(db->paths_removed, i);
298 if (!ts->getop(ts, POLDEK_OP_JUSTDB)) {
299 if (unlink(path) != 0) {
300 - logn(LOGERR, "%s: unlink failed: %m", path);
301 + logn(LOGERR, _("%s: unlink failed: %m"), path);
305 --- poldek-0.30-cvs20080820.23/./pm/rpm/misc.c~ 2008-07-22 18:34:53.000000000 +0300
306 +++ poldek-0.30-cvs20080820.23/./pm/rpm/misc.c 2009-03-04 00:10:32.778885699 +0200
311 - msgn(3, "Loading internal capabilities");
312 + msgn(3, _("Loading internal capabilities"));
313 while (functions[i]) {
314 functions[i++](&ds, NULL);
316 --- poldek-0.30-cvs20080820.23/./split.c~ 2008-02-02 23:49:04.000000000 +0200
317 +++ poldek-0.30-cvs20080820.23/./split.c 2009-03-04 00:10:58.952242782 +0200
319 for (i=0; i<n_array_size(stack); i++) {
320 struct pkg *pkg = n_array_nth(stack, i);
321 pkg_set_color(pkg, PKG_COLOR_WHITE);
322 - msgn(3, "%s: rollback", pkg_snprintf_s(pkg));
323 + msgn(3, _("%s: rollback"), pkg_snprintf_s(pkg));
329 if (fnmatch(pd->mask, pkg->name, 0) == 0) {
331 - msgn(2, "split: assign %d pri to %s (mask %s)", pri,
332 + msgn(2, _("split: assign %d pri to %s (mask %s)"), pri,
333 pkg_id(pkg), pd->mask);
336 --- poldek-0.30-cvs20080820.23/./uninstall.c~ 2008-03-02 22:05:56.000000000 +0200
337 +++ poldek-0.30-cvs20080820.23/./uninstall.c 2009-03-04 00:11:59.532317383 +0200
338 @@ -195,12 +195,12 @@
339 if (pkg_isset_mf(uctx->pms, dbpkg, DBPKG_REV_ORPHANED))
340 continue; /* was there */
342 - msgn_i(3, indent, " %s requires %s", pkg_id(pkg), pkg_id(dbpkg));
343 + msgn_i(3, indent, _(" %s requires %s"), pkg_id(pkg), pkg_id(dbpkg));
345 if (pkg_leave_orphans(uctx, dbpkg))
348 - msgn_i(1, indent, "%s marks orphaned %s (req %s)",
349 + msgn_i(1, indent, _("%s marks orphaned %s (req %s)"),
350 pkg_id(pkg), pkg_id(dbpkg), capreq_snprintf_s(req));
352 pkg_set_mf(uctx->pms, dbpkg, DBPKG_REV_ORPHANED);
355 for (i=0; i < n_array_size(uctx->unpkgs); i++) {
356 struct pkg *dbpkg = n_array_nth(uctx->unpkgs, i);
357 - msgn(1, "freedbset %d %s", dbpkg->_refcnt, pkg_id(dbpkg));
358 + msgn(1, _("freedbset %d %s"), dbpkg->_refcnt, pkg_id(dbpkg));
361 n_array_free(uctx->unpkgs);
364 for (i=0; i < n_array_size(uctx->unpkgs); i++) {
365 struct pkg *dbpkg = n_array_nth(uctx->unpkgs, i);
366 - msgn(1, "mark %s", pkg_id(dbpkg));
367 + msgn(1, _("mark %s"), pkg_id(dbpkg));
368 pkg_hand_mark(uctx->ts->pms, dbpkg);
375 - msgn(2, "Trying %s\n", mask);
376 + msgn(2, _("Trying %s\n"), mask);
377 if (resolve_package(uctx, ts, mask, NULL))
381 p = strrchr(tmp, '-');
384 - msgn(2, " Trying %s\n", tmp);
385 + msgn(2, _(" Trying %s\n"), tmp);
387 if (resolve_package(uctx, ts, tmp, NULL))
391 n_snprintf(nmask, sizeof(nmask), "%s#%s-%s", n, v, r);
393 - msgn(2, " Trying %s\n", nmask);
394 + msgn(2, _(" Trying %s\n"), nmask);
395 DBGF("try %s => %s (%s, %s, %s)\n", mask, nmask, n, v, r);
396 matched = resolve_package(uctx, ts, nmask, NULL);
399 n_snprintf(nmask, sizeof(nmask), "%s#%d:%s-%s", n, e, v, r);
401 n_snprintf(nmask, sizeof(nmask), "%s#%s-%s", n, v, r);
402 - msgn(2, " Trying %s (arch=%s)\n", nmask, p);
403 + msgn(2, _(" Trying %s (arch=%s)\n"), nmask, p);
404 matched = resolve_package(uctx, ts, nmask, p);