]> git.pld-linux.org Git - packages/poldek.git/blame - poldek-po.patch
projects / packages / poldek.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- add th-obsolete to config
[packages/poldek.git] / poldek-po.patch
CommitLineData
63cf5e9d
ER		 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
3@@ -428,7 +428,7 @@
4 if (poldek_VERBOSE > 1) {
5 int i;
6
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)));
11 }
12@@ -628,10 +628,10 @@
13 }
14 }
15
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));
21-
22+
23 n_array_push(topkgs, pkg_link(pkg));
24 }
25
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
28@@ -159,7 +159,7 @@
29 logn(LOGWARN, _("%s: could not determine aliased command"),
30 cmd->name);
31 else
32- msgn(3, "%s => aliased %s", cmd->name, cmd->aliasto);
33+ msgn(3, _("%s => aliased %s"), cmd->name, cmd->aliasto);
34 }
35 }
36
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
39@@ -115,7 +115,7 @@
40 return 0;
41 }
42
43- msgn(2, "Running as user '%s'\n", user);
44+ msgn(2, _("Running as user '%s'\n"), user);
45 return 1;
46 }
47
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,
52 af->path, nline);
53 } else
54- msgn(1, "%s: skipped %s::%s", af->path, sectnam, name);
55+ msgn(1, _("%s: skipped %s::%s"), af->path, sectnam, name);
56 }
57
58
59- msgn(3, "-- %s EOF --", af->path);
60+ msgn(3, _("-- %s EOF --"), af->path);
61
62
63 if (ht) {
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
66@@ -335,7 +335,7 @@
67 if ((c1 || c2) && verbose > 0) {
68 char buf[256];
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));
73 }
74 #endif
75@@ -527,7 +527,7 @@
76 continue;
77 }
78 if (pathprinted == 0) {
79- msgn(0, "\nPath: %s%s", *cnfl->path == '/' ? "" : "/",
80+ msgn(0, _("\nPath: %s%s"), *cnfl->path == '/' ? "" : "/",
81 cnfl->path);
82 pathprinted = 1;
83 }
84@@ -537,7 +537,7 @@
85 }
86 }
87 n_array_free(paths);
88- msgn(0, "%d file conflicts found", nconflicts);
89+ msgn(0, _("%d file conflicts found"), nconflicts);
90 return nconflicts;
91 }
92
93@@ -643,11 +643,11 @@
94
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);
101 }
102 norphans = n_array_size(paths);
103- msgn(0, "%d orphaned directories found", norphans);
104+ msgn(0, _("%d orphaned directories found"), norphans);
105 n_array_free(paths);
106 n_hash_free(orphanh);
107
108@@ -721,7 +721,7 @@
109 for (i=0; i < size; i++) {
110 char key[PATH_MAX];
111
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]),
114 path);
115
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);
120
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);
125 norphans++;
126 }
127 }
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);
132 return norphans;
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
135@@ -221,7 +221,7 @@
136 if (mtime_index) {
137 pkg = search_in_mtime_index(mtime_index, ent->d_name, &st);
138 if (pkg) {
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));
142 pkg = pkg_link(pkg);
143 remap_groupid(pkg, pkgroups, prev_pkgdir);
144@@ -230,7 +230,7 @@
145
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);
150 continue;
151 }
152
153@@ -240,7 +240,7 @@
154 if (prev_pkgdir) {
155 pkg = search_in_prev(prev_pkgdir, h, ent->d_name, &st);
156 if (pkg) {
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));
160 pkg = pkg_link(pkg);
161 remap_groupid(pkg, pkgroups, prev_pkgdir);
162@@ -253,7 +253,7 @@
163
164 nnew++;
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);
169 n_assert(pkg);
170
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
173@@ -304,7 +304,7 @@
174 if (memcmp(md, current_md, TNIDX_DIGEST_SIZE) == 0)
175 first_patch_found = 1;
176 else {
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);
180
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
184@@ -391,7 +391,7 @@
185 if (verb && poldek_VERBOSE > 2) {
186 int i;
187
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);
193@@ -697,7 +697,7 @@
194 n_buf_free(nbuf);
195
196 if (outfile)
197- msgn(0, "Graph saved as %s", outfile);
198+ msgn(0, _("Graph saved as %s"), outfile);
199
200 return 1;
201 }
202@@ -754,7 +754,7 @@
203 n_buf_free(nbuf);
204
205 if (outfile)
206- msgn(0, "LanVi graph saved as %s", outfile);
207+ msgn(0, _("LanVi graph saved as %s"), outfile);
208
209 return 1;
210 }
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
213@@ -118,7 +118,7 @@
214 pkgs = pkgmark_get_packages(pms, PKGMARK_UNMETDEPS);
215 if (pkgs) {
216 n_assert(n_array_size(pkgs));
217- msgn(4, "Packages with unsatisfied dependencies:");
218+ msgn(4, _("Packages with unsatisfied dependencies:"));
219
220 for (i=0; i < n_array_size(pkgs); i++) {
221 struct pkg *pkg = n_array_nth(pkgs, i);
222@@ -184,7 +184,7 @@
223 matches = n_hash_get(cache, streq);
224
225 if (!matches)
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++)
231@@ -213,7 +213,7 @@
232 l_err_notfound:
233 nerrors++;
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));
237
238 pkgset_add_unreq(ps, pkg, req, 0);
239 pkg_set_unmetdeps(pms, pkg);
240@@ -397,7 +397,7 @@
241
242 if (!matched && pkgset_pm_satisfies(ps, req)) {
243 matched = 1;
244- msgn(4, " req %-35s --> PM_CAP", capreq_snprintf_s(req));
245+ msgn(4, _(" req %-35s --> PM_CAP"), capreq_snprintf_s(req));
246
247 *suspkgs = NULL;
248 *npkgs = 0;
249@@ -591,7 +591,7 @@
250 }
251
252 } else {
253- msgn(4, " cnfl %-35s --> NOT FOUND",capreq_snprintf_s(cnfl));
254+ msgn(4, _(" cnfl %-35s --> NOT FOUND"), capreq_snprintf_s(cnfl));
255 }
256 }
257 }
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
260@@ -584,7 +584,7 @@
261
262 DBGF("in %p(%p) %s\n", pkg, tmp, pkg_id(pkg));
263 if (pkg->recno > 0)
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));
266
267 pkgset_add_package(db->ps, pkg);
268 pkgdir_add_package(pkgdir, pkg);
269@@ -600,7 +600,7 @@
270 else if (!do_pkgtslink(db, ts->cachedir, pkg, path))
271 return 0;
272
273- msgn(2, "Copying %s to %s", path, pkgdir->path);
274+ msgn(2, _("Copying %s to %s"), path, pkgdir->path);
275 }
276 //dumpdir(pkgdir);
277 return 1;
278@@ -643,7 +643,7 @@
279
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);
284 }
285 }
286 return 1;
287@@ -677,7 +677,7 @@
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);
293
294 for (i=0; i < n_array_size(db->paths_removed); i++) {
295 const char *path = n_array_nth(db->paths_removed, i);
296@@ -688,7 +688,7 @@
297
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);
302 rc = 0;
303 break;
304 }
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
307@@ -121,7 +121,7 @@
308 };
309
310 i = 0;
311- msgn(3, "Loading internal capabilities");
312+ msgn(3, _("Loading internal capabilities"));
313 while (functions[i]) {
314 functions[i++](&ds, NULL);
315 }
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
318@@ -313,7 +313,7 @@
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));
324 }
325 rc = 0;
326 }
327@@ -464,7 +464,7 @@
328
329 if (fnmatch(pd->mask, pkg->name, 0) == 0) {
330 pri = pd->pri;
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);
334 nmached++;
335 break;
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 */
341
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));
344
345 if (pkg_leave_orphans(uctx, dbpkg))
346 continue;
347
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));
351
352 pkg_set_mf(uctx->pms, dbpkg, DBPKG_REV_ORPHANED);
353@@ -380,7 +380,7 @@
354 int i;
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));
359 }
360 #endif
361 n_array_free(uctx->unpkgs);
362@@ -395,7 +395,7 @@
363
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);
369 n++;
370 }
371@@ -534,7 +534,7 @@
372 int32_t e = 0;
373 int matched = 0;
374
375- msgn(2, "Trying %s\n", mask);
376+ msgn(2, _("Trying %s\n"), mask);
377 if (resolve_package(uctx, ts, mask, NULL))
378 return 1;
379
380@@ -546,7 +546,7 @@
381 p = strrchr(tmp, '-');
382 *p = '#';
383
384- msgn(2, " Trying %s\n", tmp);
385+ msgn(2, _(" Trying %s\n"), tmp);
386
387 if (resolve_package(uctx, ts, tmp, NULL))
388 return 1;
389@@ -558,7 +558,7 @@
390 else
391 n_snprintf(nmask, sizeof(nmask), "%s#%s-%s", n, v, r);
392
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);
397
398@@ -570,7 +570,7 @@
399 n_snprintf(nmask, sizeof(nmask), "%s#%d:%s-%s", n, e, v, r);
400 else
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);
405 }
406 }
RPM packages management helper tool
This page took 0.078171 seconds and 4 git commands to generate.