Merge lp:~jibel/synaptic/bug.519613 into lp:~mvo/synaptic/synaptic--main
- bug.519613
- Merge into synaptic--main
Proposed by
Jean-Baptiste Lallement
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Michael Vogt | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~jibel/synaptic/bug.519613 | ||||
Merge into: | lp:~mvo/synaptic/synaptic--main | ||||
Diff against target: |
5999 lines (+1624/-3538) (has conflicts) 27 files modified
common/Makefile.am (+1/-1) common/rpackage.cc (+5/-2) common/rpackagelister.cc (+215/-53) common/rpackagelister.h (+33/-2) common/rpackageview.cc (+24/-1) common/rpackageview.h (+10/-5) common/sections_trans.cc (+3/-1) config.h.in (+3/-0) configure.in (+13/-0) debian/changelog (+813/-41) debian/control (+7/-5) debian/patches/00list.Ubuntu (+1/-0) debian/patches/01_ubuntu_changelog.dpatch (+21/-9) debian/patches/10_ubuntu_maintenance_gui.dpatch (+187/-0) debian/rules (+2/-1) debian/synaptic.dirs (+1/-0) gtk/Makefile.am (+2/-2) gtk/glade/window_fetch.glade (+1/-0) gtk/glade/window_main.glade (+83/-0) gtk/gtkpkglist.cc (+13/-10) gtk/rgdebinstallprogress.cc (+18/-8) gtk/rgmainwindow.cc (+144/-4) gtk/rgmainwindow.h (+10/-0) gtk/rgpkgdetails.cc (+2/-1) gtk/rguserdialog.cc (+1/-1) po/Makefile.in.in (+11/-12) po/synaptic.pot (+0/-3379) Text conflict in debian/changelog |
||||
To merge this branch: | bzr merge lp:~jibel/synaptic/bug.519613 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt | Approve | ||
Review via email: mp+19551@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote : | # |
Revision history for this message
Michael Vogt (mvo) wrote : | # |
Merging into bzr now, many thanks.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'common/Makefile.am' |
2 | --- common/Makefile.am 2008-08-21 14:32:18 +0000 |
3 | +++ common/Makefile.am 2010-02-17 23:07:19 +0000 |
4 | @@ -3,7 +3,7 @@ |
5 | noinst_LIBRARIES = libsynaptic.a |
6 | |
7 | INCLUDES = -I/usr/include/apt-pkg @RPM_HDRS@ @DEB_HDRS@ @PACKAGE_CFLAGS@ \ |
8 | - $(LIBTAGCOLL_CFLAGS) \ |
9 | + $(LIBEPT_CFLAGS) \ |
10 | -DSYNAPTICLOCALEDIR=\""$(synapticlocaledir)"\" \ |
11 | -DSYNAPTICSTATEDIR=\""$(localstatedir)"\" |
12 | |
13 | |
14 | === modified file 'common/rpackage.cc' |
15 | --- common/rpackage.cc 2010-01-25 10:17:45 +0000 |
16 | +++ common/rpackage.cc 2010-02-17 23:07:19 +0000 |
17 | @@ -183,6 +183,7 @@ |
18 | const char *RPackage::installedFiles() |
19 | { |
20 | static string filelist; |
21 | + vector<string> sV; |
22 | string s; |
23 | |
24 | filelist.erase(filelist.begin(), filelist.end()); |
25 | @@ -194,10 +195,12 @@ |
26 | return ""; |
27 | while (in.eof() == false) { |
28 | getline(in, s); |
29 | - filelist += s + "\n"; |
30 | + sV.push_back( s ); |
31 | } |
32 | + sort(sV.begin(), sV.end()); |
33 | + for (unsigned int i = 1; i < sV.size(); i++) |
34 | + filelist += sV[i] + "\n"; |
35 | |
36 | - in >> filelist; |
37 | return filelist.c_str(); |
38 | } |
39 | filelist = _("The list of installed files is only available for installed packages"); |
40 | |
41 | === modified file 'common/rpackagelister.cc' |
42 | --- common/rpackagelister.cc 2007-06-18 13:12:44 +0000 |
43 | +++ common/rpackagelister.cc 2010-02-17 23:07:19 +0000 |
44 | @@ -36,6 +36,7 @@ |
45 | #include <sys/stat.h> |
46 | #include <unistd.h> |
47 | #include <time.h> |
48 | +#include <algorithm> |
49 | |
50 | #include "rpackagelister.h" |
51 | #include "rpackagecache.h" |
52 | @@ -78,6 +79,9 @@ |
53 | |
54 | RPackageLister::RPackageLister() |
55 | : _records(0), _progMeter(new OpProgress) |
56 | +#ifdef WITH_EPT |
57 | + , _textsearch(0) |
58 | +#endif |
59 | { |
60 | _cache = new RPackageCache(); |
61 | |
62 | @@ -85,7 +89,7 @@ |
63 | _searchData.isRegex = false; |
64 | _viewMode = _config->FindI("Synaptic::ViewMode", 0); |
65 | _updating = true; |
66 | - _sortMode = LIST_SORT_NAME; |
67 | + _sortMode = LIST_SORT_NAME_ASC; |
68 | |
69 | // keep order in sync with rpackageview.h |
70 | _views.push_back(new RPackageViewSections(_packages)); |
71 | @@ -94,8 +98,11 @@ |
72 | _filterView = new RPackageViewFilter(_packages); |
73 | _views.push_back(_filterView); |
74 | _searchView = new RPackageViewSearch(_packages); |
75 | - _views.push_back(_searchView); |
76 | + _views.push_back(_searchView); |
77 | //_views.push_back(new RPackageViewAlphabetic(_packages)); |
78 | +#ifdef WITH_EPT |
79 | + openXapianIndex(); |
80 | +#endif |
81 | |
82 | if (_viewMode >= _views.size()) |
83 | _viewMode = 0; |
84 | @@ -419,7 +426,47 @@ |
85 | return true; |
86 | } |
87 | |
88 | - |
89 | +#ifdef WITH_EPT |
90 | +bool RPackageLister::xapianIndexNeedsUpdate() |
91 | +{ |
92 | + struct stat buf; |
93 | + |
94 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
95 | + std::cerr << "xapainIndexNeedsUpdate()" << std::endl; |
96 | + |
97 | + // check the xapian index |
98 | + if(FileExists("/usr/sbin/update-apt-xapian-index") && |
99 | + (!_textsearch || !_textsearch->hasData())) { |
100 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
101 | + std::cerr << "xapain index not build yet" << std::endl; |
102 | + return true; |
103 | + } |
104 | + |
105 | + // compare timestamps, rebuild everytime, its now cheap(er) |
106 | + // because we use u-a-x-i --update |
107 | + stat(_config->FindFile("Dir::Cache::pkgcache").c_str(), &buf); |
108 | + if(_textsearch->timestamp() < buf.st_mtime) { |
109 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
110 | + std::cerr << "xapian outdated " |
111 | + << buf.st_mtime - _textsearch->timestamp() << std::endl; |
112 | + return true; |
113 | + } |
114 | + |
115 | + return false; |
116 | +} |
117 | + |
118 | +bool RPackageLister::openXapianIndex() |
119 | +{ |
120 | + if(_textsearch) |
121 | + delete _textsearch; |
122 | + try { |
123 | + _textsearch = new ept::textsearch::TextSearch; |
124 | + } catch (Xapian::DatabaseOpeningError) { |
125 | + return false; |
126 | + }; |
127 | + return true; |
128 | +} |
129 | +#endif |
130 | |
131 | void RPackageLister::applyInitialSelection() |
132 | { |
133 | @@ -516,34 +563,6 @@ |
134 | return true; |
135 | } |
136 | |
137 | -static void qsSortByName(vector<RPackage *> &packages, int start, int end) |
138 | -{ |
139 | - int i, j; |
140 | - RPackage *pivot, *tmp; |
141 | - |
142 | - i = start; |
143 | - j = end; |
144 | - pivot = packages[(i + j) / 2]; |
145 | - do { |
146 | - while (strcoll(packages[i]->name(), pivot->name()) < 0) |
147 | - i++; |
148 | - while (strcoll(pivot->name(), packages[j]->name()) < 0) |
149 | - j--; |
150 | - if (i <= j) { |
151 | - tmp = packages[i]; |
152 | - packages[i] = packages[j]; |
153 | - packages[j] = tmp; |
154 | - i++; |
155 | - j--; |
156 | - } |
157 | - } while (i <= j); |
158 | - |
159 | - if (start < j) |
160 | - qsSortByName(packages, start, j); |
161 | - if (i < end) |
162 | - qsSortByName(packages, i, end); |
163 | -} |
164 | - |
165 | void RPackageLister::reapplyFilter() |
166 | { |
167 | // PORTME |
168 | @@ -596,7 +615,7 @@ |
169 | |
170 | struct sectionSortFunc { |
171 | bool operator() (RPackage *x, RPackage *y) { |
172 | - return x->section() < y->section(); |
173 | + return std::strcmp(x->section(), y->section())<0; |
174 | }}; |
175 | |
176 | // version string compare |
177 | @@ -639,6 +658,11 @@ |
178 | } |
179 | }; |
180 | |
181 | +struct nameSortFunc { |
182 | + bool operator() (RPackage *x, RPackage *y) { |
183 | + return std::strcmp(x->name(), y->name())<0; |
184 | +}}; |
185 | + |
186 | |
187 | |
188 | void RPackageLister::sortPackages(vector<RPackage *> &packages, |
189 | @@ -651,9 +675,18 @@ |
190 | if(_config->FindB("Debug::Synaptic::View",false)) |
191 | clog << "RPackageLister::sortPackages(): " << packages.size() << endl; |
192 | |
193 | + /* Always sort by name to have packages ordered inside another sort |
194 | + * criteria */ |
195 | + sort(packages.begin(), packages.end(), |
196 | + sortFunc<nameSortFunc>(true)); |
197 | + |
198 | switch(mode) { |
199 | - case LIST_SORT_NAME: |
200 | - qsSortByName(packages, 0, packages.size() - 1); |
201 | + case LIST_SORT_NAME_ASC: |
202 | + // Do nothing, already done |
203 | + break; |
204 | + case LIST_SORT_NAME_DES: |
205 | + sort(packages.begin(), packages.end(), |
206 | + sortFunc<nameSortFunc>(false)); |
207 | break; |
208 | case LIST_SORT_SIZE_ASC: |
209 | stable_sort(packages.begin(), packages.end(), |
210 | @@ -672,42 +705,34 @@ |
211 | sortFunc<dlSizeSortFunc>(false)); |
212 | break; |
213 | case LIST_SORT_COMPONENT_ASC: |
214 | - qsSortByName(packages, 0, packages.size() - 1); |
215 | stable_sort(packages.begin(), packages.end(), |
216 | sortFunc<componentSortFunc>(true)); |
217 | break; |
218 | case LIST_SORT_COMPONENT_DES: |
219 | - qsSortByName(packages, 0, packages.size() - 1); |
220 | - stable_sort(packages.begin(), packages.end(), |
221 | + stable_sort(packages.begin(), packages.end(), |
222 | sortFunc<componentSortFunc>(false)); |
223 | break; |
224 | case LIST_SORT_SECTION_ASC: |
225 | - qsSortByName(packages, 0, packages.size() - 1); |
226 | stable_sort(packages.begin(), packages.end(), |
227 | sortFunc<sectionSortFunc>(true)); |
228 | break; |
229 | case LIST_SORT_SECTION_DES: |
230 | - qsSortByName(packages, 0, packages.size() - 1); |
231 | stable_sort(packages.begin(), packages.end(), |
232 | sortFunc<sectionSortFunc>(false)); |
233 | break; |
234 | case LIST_SORT_STATUS_ASC: |
235 | - qsSortByName(packages, 0, packages.size() - 1); |
236 | stable_sort(packages.begin(), packages.end(), |
237 | sortFunc<statusSortFunc>(true)); |
238 | break; |
239 | case LIST_SORT_STATUS_DES: |
240 | - qsSortByName(packages, 0, packages.size() - 1); |
241 | stable_sort(packages.begin(), packages.end(), |
242 | sortFunc<statusSortFunc>(false)); |
243 | break; |
244 | case LIST_SORT_SUPPORTED_ASC: |
245 | - qsSortByName(packages, 0, packages.size() - 1); |
246 | stable_sort(packages.begin(), packages.end(), |
247 | supportedSortFunc(true, _pkgStatus)); |
248 | break; |
249 | case LIST_SORT_SUPPORTED_DES: |
250 | - qsSortByName(packages, 0, packages.size() - 1); |
251 | stable_sort(packages.begin(), packages.end(), |
252 | supportedSortFunc(false, _pkgStatus)); |
253 | break; |
254 | @@ -1257,6 +1282,7 @@ |
255 | // Get the source list |
256 | //pkgSourceList List; |
257 | _cache->list()->ReadMainList(); |
258 | + |
259 | // Lock the list directory |
260 | FileFd Lock; |
261 | if (_config->FindB("Debug::NoLocking", false) == false) { |
262 | @@ -1268,12 +1294,26 @@ |
263 | |
264 | _updating = true; |
265 | |
266 | + |
267 | +#ifndef HAVE_RPM |
268 | +// apt-0.7.10 has the new UpdateList code in algorithms, we use it |
269 | + string s; |
270 | + bool res = ListUpdate(*status, *_cache->list(), 5000); |
271 | + if(res == false) |
272 | + { |
273 | + while(!_error->empty()) |
274 | + { |
275 | + bool isError = _error->PopMessage(s); |
276 | + error += s; |
277 | + } |
278 | + } |
279 | + return res; |
280 | +#else |
281 | // Create the download object |
282 | pkgAcquire Fetcher(status); |
283 | |
284 | bool Failed = false; |
285 | |
286 | -#if HAVE_RPM |
287 | if (_cache->list()->GetReleases(&Fetcher) == false) |
288 | return false; |
289 | Fetcher.Run(); |
290 | @@ -1288,21 +1328,13 @@ |
291 | _error->Warning(_("Release files for some repositories could not be " |
292 | "retrieved or authenticated. Such repositories are " |
293 | "being ignored.")); |
294 | -#endif /* HAVE_RPM */ |
295 | |
296 | if (!_cache->list()->GetIndexes(&Fetcher)) |
297 | return false; |
298 | |
299 | -// apt-rpm does not support the pulseInterval |
300 | -#ifdef HAVE_RPM |
301 | // Run it |
302 | if (Fetcher.Run() == pkgAcquire::Failed) |
303 | return false; |
304 | -#else |
305 | - if (Fetcher.Run(50000) == pkgAcquire::Failed) |
306 | - return false; |
307 | -#endif |
308 | - |
309 | |
310 | //bool AuthFailed = false; |
311 | Failed = false; |
312 | @@ -1335,6 +1367,7 @@ |
313 | return false; |
314 | } |
315 | return true; |
316 | +#endif |
317 | } |
318 | |
319 | bool RPackageLister::getDownloadUris(vector<string> &uris) |
320 | @@ -1432,7 +1465,7 @@ |
321 | |
322 | serverError = getServerErrorMessage(errm); |
323 | |
324 | - _error->Warning(tmp.str().c_str()); |
325 | + _error->Warning("%s", tmp.str().c_str()); |
326 | Failed = true; |
327 | } |
328 | |
329 | @@ -1905,4 +1938,133 @@ |
330 | } |
331 | |
332 | |
333 | +#ifdef WITH_EPT |
334 | +bool RPackageLister::limitBySearch(string searchString) |
335 | +{ |
336 | + //cerr << "limitBySearch(): " << searchString << endl; |
337 | + if(!_textsearch->hasData()) |
338 | + return false; |
339 | + |
340 | + return xapianSearch(searchString); |
341 | +} |
342 | + |
343 | +bool RPackageLister::xapianSearch(string unsplitSearchString) |
344 | +{ |
345 | + //std::cerr << "RPackageLister::xapianSearch()" << std::endl; |
346 | + string s; |
347 | + string originalSearchString = unsplitSearchString; |
348 | + |
349 | + ept::textsearch::TextSearch *ts = _textsearch; |
350 | + if(!ts || !ts->hasData()) |
351 | + return false; |
352 | + |
353 | + try { |
354 | + Xapian::Enquire enquire(ts->db()); |
355 | + Xapian::QueryParser parser; |
356 | + parser.add_prefix("name","XP"); |
357 | + parser.add_prefix("section","XS"); |
358 | + Xapian::Query query = parser.parse_query(unsplitSearchString); |
359 | + enquire.set_query(query); |
360 | + |
361 | + // Get a set of tags to expand the query |
362 | + vector<string> expand = ts->expand(enquire); |
363 | + |
364 | + // now expand the query by adding the searching string as a package |
365 | + // name so that those searches appear erlier |
366 | + for (int i=0;i<originalSearchString.size();i++) |
367 | + { |
368 | + if(isblank(originalSearchString[i])) { |
369 | + if(s.size() > 0) { |
370 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
371 | + std::cerr << "adding to querry: XP" << s << std::endl; |
372 | + expand.push_back("XP"+s); |
373 | + } |
374 | + s=""; |
375 | + } else |
376 | + s+=originalSearchString[i]; |
377 | + } |
378 | + // now add to the last found string |
379 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
380 | + std::cerr << "adding: XP" << s << std::endl; |
381 | + expand.push_back("XP"+s); |
382 | + |
383 | + // the last string is always expanded to get better search as you |
384 | + // type results |
385 | + if (s.size() > 0) { |
386 | + Xapian::TermIterator I; |
387 | + int j=0; |
388 | + |
389 | + for(I=_textsearch->db().allterms_begin(s); |
390 | + I != _textsearch->db().allterms_end(s); |
391 | + I++) |
392 | + { |
393 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
394 | + std::cerr << "expanded terms: " << *I << std::endl; |
395 | + expand.push_back(*I); |
396 | + expand.push_back("XP"+*I); |
397 | + // do not expand all alt terms, they can be huge > 100 |
398 | + // and make the search very slow |
399 | + j++; |
400 | + if (j > maxAltTerms) |
401 | + break; |
402 | + } |
403 | + } |
404 | + |
405 | + |
406 | + // Build the expanded query |
407 | + Xapian::Query expansion(Xapian::Query::OP_OR, expand.begin(), expand.end()); |
408 | + enquire.set_query(Xapian::Query(Xapian::Query::OP_OR, query, expansion)); |
409 | + |
410 | + // Retrieve the results |
411 | + bool done = false; |
412 | + int top_percent = 0; |
413 | + _viewPackages.clear(); |
414 | + for (size_t pos = 0; !done; pos += 20) |
415 | + { |
416 | + Xapian::MSet matches = enquire.get_mset(pos, 20); |
417 | + if (matches.size() < 20) |
418 | + done = true; |
419 | + for (Xapian::MSetIterator i = matches.begin(); i != matches.end(); ++i) |
420 | + { |
421 | + RPackage* pkg = getPackage(i.get_document().get_data()); |
422 | + // Filter out results that apt doesn't know |
423 | + if (!pkg || !_selectedView->hasPackage(pkg)) |
424 | + continue; |
425 | + |
426 | + // Save the confidence interval of the top value, to use it as |
427 | + // a reference to compute an adaptive quality cutoff |
428 | + if (top_percent == 0) |
429 | + top_percent = i.get_percent(); |
430 | + |
431 | + // Stop producing if the quality goes below a cutoff point |
432 | + if (i.get_percent() < qualityCutoff * top_percent / 100) |
433 | + { |
434 | + //cerr << "Discarding: " << i.get_percent() << " over " << qualityCutoff * top_percent / 100 << endl; |
435 | + done = true; |
436 | + break; |
437 | + } |
438 | + |
439 | + //cerr << "found: " << pkg->name() << endl; |
440 | + _viewPackages.push_back(pkg); |
441 | + } |
442 | + } |
443 | + return true; |
444 | + } catch (const Xapian::Error & error) { |
445 | + cerr << "Exception in RPackageLister::xapianSearch():" << error.get_msg() << endl; |
446 | + return false; |
447 | + } |
448 | +} |
449 | +#else |
450 | +bool RPackageLister::limitBySearch(string searchString) |
451 | +{ |
452 | + return false; |
453 | +} |
454 | + |
455 | +bool RPackageLister::xapianSearch(string searchString) |
456 | +{ |
457 | + return false; |
458 | +} |
459 | +#endif |
460 | + |
461 | + |
462 | // vim:ts=3:sw=3:et |
463 | |
464 | === modified file 'common/rpackagelister.h' |
465 | --- common/rpackagelister.h 2008-08-21 14:32:18 +0000 |
466 | +++ common/rpackagelister.h 2010-02-17 23:07:19 +0000 |
467 | @@ -36,6 +36,10 @@ |
468 | #include <apt-pkg/depcache.h> |
469 | #include <apt-pkg/acquire.h> |
470 | |
471 | +#ifdef WITH_EPT |
472 | +#include <ept/textsearch/textsearch.h> |
473 | +#endif |
474 | + |
475 | #include "rpackagecache.h" |
476 | #include "rpackage.h" |
477 | #include "rpackagestatus.h" |
478 | @@ -45,6 +49,14 @@ |
479 | |
480 | using namespace std; |
481 | |
482 | +#ifdef WITH_EPT |
483 | +namespace ept { |
484 | +namespace textsearch { |
485 | +class TextSearch; |
486 | +} |
487 | +} |
488 | +#endif |
489 | + |
490 | class OpProgress; |
491 | class RPackageCache; |
492 | class RPackageFilter; |
493 | @@ -102,6 +114,11 @@ |
494 | pkgRecords *_records; |
495 | OpProgress *_progMeter; |
496 | |
497 | +#ifdef WITH_EPT |
498 | + ept::textsearch::TextSearch *_textsearch; |
499 | +#endif |
500 | + |
501 | + |
502 | // Other members. |
503 | vector<RPackage *> _packages; |
504 | vector<int> _packagesIndex; |
505 | @@ -123,13 +140,19 @@ |
506 | |
507 | RPackageViewFilter *_filterView; // the package view that does the filtering |
508 | RPackageViewSearch *_searchView; // the package view that does the (simple) search |
509 | - |
510 | + |
511 | + // helper for the limitBySearch() code |
512 | + static const int qualityCutoff = 25; |
513 | + static const int maxAltTerms = 15; |
514 | + bool xapianSearch(string searchString); |
515 | + |
516 | public: |
517 | |
518 | unsigned int _viewMode; |
519 | |
520 | typedef enum { |
521 | - LIST_SORT_NAME, |
522 | + LIST_SORT_NAME_ASC, |
523 | + LIST_SORT_NAME_DES, |
524 | LIST_SORT_SIZE_ASC, |
525 | LIST_SORT_SIZE_DES, |
526 | LIST_SORT_SUPPORTED_ASC, |
527 | @@ -189,6 +212,9 @@ |
528 | list<pkgState> redoStack; |
529 | |
530 | public: |
531 | + // limit what the current view displays |
532 | + bool limitBySearch(string searchString); |
533 | + |
534 | // clean files older than "Synaptic::delHistory" |
535 | void cleanCommitLog(); |
536 | |
537 | @@ -321,6 +347,11 @@ |
538 | bool writeSelections(ostream &out, bool fullState); |
539 | |
540 | RPackageCache* getCache() { return _cache; }; |
541 | +#ifdef WITH_EPT |
542 | + ept::textsearch::TextSearch* textsearch() { return _textsearch; } |
543 | + bool xapianIndexNeedsUpdate(); |
544 | + bool openXapianIndex(); |
545 | +#endif |
546 | |
547 | RPackageLister(); |
548 | ~RPackageLister(); |
549 | |
550 | === modified file 'common/rpackageview.cc' |
551 | --- common/rpackageview.cc 2009-12-23 15:31:43 +0000 |
552 | +++ common/rpackageview.cc 2010-02-17 23:07:20 +0000 |
553 | @@ -31,6 +31,7 @@ |
554 | #include <map> |
555 | #include <vector> |
556 | #include <sstream> |
557 | +#include <algorithm> |
558 | |
559 | #include "sections_trans.h" |
560 | |
561 | @@ -64,6 +65,11 @@ |
562 | _view.clear(); |
563 | } |
564 | |
565 | +bool RPackageView::hasPackage(RPackage *pkg) |
566 | +{ |
567 | + return find(_selectedView.begin(), _selectedView.end(), pkg) != _selectedView.end(); |
568 | +} |
569 | + |
570 | void RPackageView::clearSelection() |
571 | { |
572 | _hasSelection = false; |
573 | @@ -311,7 +317,6 @@ |
574 | searchProgress.Done(); |
575 | return found; |
576 | } |
577 | - |
578 | //------------------------------------------------------------------ |
579 | |
580 | RPackageViewFilter::RPackageViewFilter(vector<RPackage *> &allPkgs) |
581 | @@ -543,6 +548,19 @@ |
582 | |
583 | filter = new RFilter(); |
584 | filter->preset = true; |
585 | + filter->pattern.addPattern(RPatternPackageFilter::Component, |
586 | + "main", true); |
587 | + filter->pattern.addPattern(RPatternPackageFilter::Component, |
588 | + "restricted", true); |
589 | + filter->pattern.addPattern(RPatternPackageFilter::Origin, |
590 | + "Ubuntu", false); |
591 | + filter->pattern.setAndMode(true); |
592 | + filter->status.setStatus(RStatusPackageFilter::Installed); |
593 | + filter->setName("Community Maintained (installed)"); _("Community Maintained (installed)"); |
594 | + registerFilter(filter); |
595 | + |
596 | + filter = new RFilter(); |
597 | + filter->preset = true; |
598 | filter->status.setStatus(RStatusPackageFilter::NowPolicyBroken); |
599 | filter->setName("Missing Recommends"); _("Missing Recommends"); |
600 | registerFilter(filter); |
601 | @@ -578,4 +596,9 @@ |
602 | _view[subview].push_back(package); |
603 | }; |
604 | |
605 | + |
606 | + |
607 | + |
608 | + |
609 | + |
610 | // vim:sts=3:sw=3 |
611 | |
612 | === modified file 'common/rpackageview.h' |
613 | --- common/rpackageview.h 2009-12-23 14:29:40 +0000 |
614 | +++ common/rpackageview.h 2010-02-17 23:07:20 +0000 |
615 | @@ -29,6 +29,11 @@ |
616 | #include <string> |
617 | #include <map> |
618 | |
619 | +#ifdef WITH_EPT |
620 | +#include <ept/textsearch/textsearch.h> |
621 | +#include <xapian.h> |
622 | +#endif |
623 | + |
624 | #include "rpackage.h" |
625 | #include "rpackagefilter.h" |
626 | |
627 | @@ -66,6 +71,7 @@ |
628 | |
629 | bool hasSelection() { return _hasSelection; }; |
630 | string getSelected() { return _selectedName; }; |
631 | + bool hasPackage(RPackage *pkg); |
632 | virtual bool setSelected(string name); |
633 | |
634 | void showAll() { |
635 | @@ -144,7 +150,6 @@ |
636 | }; |
637 | |
638 | class RPackageViewSearch : public RPackageView { |
639 | - |
640 | struct searchItem { |
641 | vector<string> searchStrings; |
642 | string searchName; |
643 | @@ -155,9 +160,11 @@ |
644 | searchItem _currentSearchItem; |
645 | int found; // nr of found pkgs for the last search |
646 | |
647 | + bool xapianSearch(); |
648 | + |
649 | public: |
650 | - RPackageViewSearch(vector<RPackage *> &allPkgs) |
651 | - : RPackageView(allPkgs), found(0) {}; |
652 | + RPackageViewSearch(vector<RPackage *> &allPkgs) |
653 | + : RPackageView(allPkgs), found(0) {}; |
654 | |
655 | int setSearch(string searchName, int type, string searchString, |
656 | OpProgress &searchProgress); |
657 | @@ -224,8 +231,6 @@ |
658 | void addPackage(RPackage *package); |
659 | }; |
660 | |
661 | - |
662 | - |
663 | #endif |
664 | |
665 | // vim:sts=3:sw=3 |
666 | |
667 | === modified file 'common/sections_trans.cc' |
668 | --- common/sections_trans.cc 2009-09-07 11:00:02 +0000 |
669 | +++ common/sections_trans.cc 2010-02-17 23:07:20 +0000 |
670 | @@ -7,7 +7,7 @@ |
671 | |
672 | #include "sections_trans.h" |
673 | |
674 | -char *transtable[][2] = { |
675 | +const char *transtable[][2] = { |
676 | // TRANSLATORS: Alias for the Debian package section "admin" |
677 | {"admin", _("System Administration")}, |
678 | // TRANSLATORS: Alias for the Debian package section "base" |
679 | @@ -118,6 +118,8 @@ |
680 | {"alien", _("Converted From RPM by Alien")}, |
681 | // TRANSLATORS: Ubuntu translations section |
682 | {"translations", _("Internationalization and localization")}, |
683 | + // TRANSLATORS: Ubuntu metapackages section |
684 | + {"metapackages", _("Meta Packages")}, |
685 | |
686 | // TRANSLATORS: Alias for the Debian package section "non-US" |
687 | // Export to the outside of the USA is not allowed |
688 | |
689 | === modified file 'config.h.in' |
690 | --- config.h.in 2009-10-21 11:14:25 +0000 |
691 | +++ config.h.in 2010-02-17 23:07:19 +0000 |
692 | @@ -118,6 +118,9 @@ |
693 | /* build with dpkg progress bar */ |
694 | #undef WITH_DPKG_STATUSFD |
695 | |
696 | +/* Define if you want to enable the ept functions. */ |
697 | +#undef WITH_EPT |
698 | + |
699 | /* build with launchpad-integration */ |
700 | #undef WITH_LAUNCHPAD_INTEGRATION |
701 | |
702 | |
703 | === modified file 'configure.in' |
704 | --- configure.in 2010-01-25 16:43:43 +0000 |
705 | +++ configure.in 2010-02-17 23:07:19 +0000 |
706 | @@ -129,6 +129,19 @@ |
707 | AC_SUBST(LP_CFLAGS) |
708 | AC_SUBST(LP_LIBS) |
709 | |
710 | +AC_MSG_CHECKING(for --enable-ept) |
711 | +AC_ARG_ENABLE([ept], |
712 | + AC_HELP_STRING(--enable-ept, enable libept functionality), |
713 | + [enable_ept="$enableval"],[enable_ept="yes"]) |
714 | +if test "$enable_ept" != "no"; then |
715 | + AC_MSG_RESULT(no) |
716 | + AC_DEFINE(WITH_EPT, 1, |
717 | + [Define if you want to enable the ept functions.]) |
718 | + LIBEPT_DEFS |
719 | +else |
720 | + AC_MSG_RESULT(yes) |
721 | +fi |
722 | + |
723 | |
724 | dnl Checks for header files. |
725 | AC_HEADER_STDC |
726 | |
727 | === modified file 'debian/changelog' |
728 | --- debian/changelog 2010-02-16 10:14:25 +0000 |
729 | +++ debian/changelog 2010-02-17 23:07:20 +0000 |
730 | @@ -1,3 +1,4 @@ |
731 | +<<<<<<< TREE |
732 | synaptic (0.63.2) UNRELEASED; urgency=low |
733 | |
734 | * po/uk.po: |
735 | @@ -6,16 +7,19 @@ |
736 | -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 16 Feb 2010 11:13:45 +0100 |
737 | |
738 | synaptic (0.63.1) unstable; urgency=low |
739 | +======= |
740 | +synaptic (0.63ubuntu4) lucid; urgency=low |
741 | +>>>>>>> MERGE-SOURCE |
742 | |
743 | - * po/pt_BR.po: |
744 | - - Updated pt_BR.po, thanks to Sergio Cipolla (closes: #561853) |
745 | - * po/sk.po: |
746 | - - Updated sk.po, thanks to helix84 (closes: #559283) |
747 | + * gtk/rgdebinstallprogress.cc: |
748 | + - make the dpkg progress code less cpu intensive |
749 | * po/uk.po |
750 | - add ukrainian translation, thanks to Serhij Dubyk |
751 | - * common/rpackageview.{cc,h}: |
752 | - - remember search history accross package transactions |
753 | - * make the origin filter more fine grained |
754 | + |
755 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Feb 2010 15:23:38 +0100 |
756 | + |
757 | +synaptic (0.63ubuntu3) lucid; urgency=low |
758 | + |
759 | * gtk/rgsummarywindow.cc: |
760 | - move the gtk_tree_view_set_model() down to speed up the |
761 | operation |
762 | @@ -26,10 +30,41 @@ |
763 | * gtk/rgaboutpanel.cc: |
764 | - fix FTBFS with gcc-4.5 (closes: #565077) |
765 | * additions to the (internal) API |
766 | +<<<<<<< TREE |
767 | * gtk/rgdebinstallprogress.cc: |
768 | - make the dpkg progress code less cpu intensive |
769 | |
770 | -- Michael Vogt <mvo@debian.org> Thu, 11 Feb 2010 19:58:40 +0100 |
771 | +======= |
772 | + * debian/patches/10_ubuntu_maintenance_gui.dpatch: |
773 | + - updated to support LTS and new "Supported" flags |
774 | + |
775 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 25 Jan 2010 09:58:35 +0100 |
776 | + |
777 | +synaptic (0.63ubuntu2) lucid; urgency=low |
778 | + |
779 | + * po/pt_BR.po: |
780 | + - Updated pt_BR.po, thanks to Sergio Cipolla (closes: #561853) |
781 | + * po/sk.po: |
782 | + - Updated sk.po, thanks to helix84 (closes: #559283) |
783 | + * common/rpackageview.{cc,h}: |
784 | + - remember search history accross package transactions |
785 | + * make the origin filter more fine grained |
786 | + |
787 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Dec 2009 15:30:54 +0100 |
788 | + |
789 | +synaptic (0.63ubuntu1) lucid; urgency=low |
790 | + |
791 | + * merged from debian, remaining changes: |
792 | + - ubuntu icons for supported applications |
793 | + - launchpad-integration |
794 | + - ubuntu changelog download support |
795 | + - support section metapackages |
796 | + - merged ept branch |
797 | + - x-ubuntu-gettext-domain in desktop file |
798 | + |
799 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Nov 2009 14:10:05 +0100 |
800 | +>>>>>>> MERGE-SOURCE |
801 | |
802 | synaptic (0.63) unstable; urgency=low |
803 | |
804 | @@ -57,40 +92,141 @@ |
805 | |
806 | * debian/control: |
807 | - add build-conflict against librpm-dev |
808 | + - recommends gksu|kdebase-bin (kdsu is fine too) |
809 | + closes: #442421 |
810 | + * add filter for manual installed packages (LP: #122047) |
811 | + * fix typo (thanks to Florentin Duneau), closes: #542122 |
812 | + * po/pt_BR.po: |
813 | + - updated translation, thanks to Sergio Cipolla |
814 | + (closes: #532473) |
815 | + |
816 | + -- Michael Vogt <mvo@debian.org> Thu, 27 Aug 2009 10:00:10 +0200 |
817 | + |
818 | +synaptic (0.62.7ubuntu7~ppa1) karmic; urgency=low |
819 | + |
820 | + * gtk/rgfetchprogress.{cc,h}: |
821 | + - remove the custom progress rendering and replace with |
822 | + stock gtk progress |
823 | + * gtk/rgmainwindow.cc: |
824 | + - use yellowish background in quick search mode |
825 | + - reset quick search when the find dialog is popped up |
826 | + |
827 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 21 Oct 2009 11:03:54 +0200 |
828 | + |
829 | +synaptic (0.62.7ubuntu6) karmic; urgency=low |
830 | + |
831 | + * gtk/glade/window_fetch.glade: |
832 | + - add default_width to avoid fetch window resizing |
833 | + (LP: #450451) |
834 | + |
835 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Oct 2009 10:13:17 +0200 |
836 | + |
837 | +synaptic (0.62.7ubuntu5) karmic; urgency=low |
838 | + |
839 | + * rebuild against latest libapt |
840 | + |
841 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Sep 2009 22:35:18 +0200 |
842 | + |
843 | +synaptic (0.62.7ubuntu4) karmic; urgency=low |
844 | + |
845 | + * common/sections_trans.cc: |
846 | + - fix typo in gnu-r section description |
847 | + * po/fr.po: |
848 | + - updated, thanks to Stéphane Blondon, closes: #543981 |
849 | + * po/sl.po: |
850 | + - updated, thanks to Matej Urbančič |
851 | + * take the "Origin" field from the release file into account |
852 | + when looking for supported packages |
853 | + |
854 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Sep 2009 17:49:45 +0200 |
855 | + |
856 | +synaptic (0.62.7ubuntu3) karmic; urgency=low |
857 | + |
858 | + * common/rpackagelister.cc: |
859 | + - add prefixes for "name" and "section" in the quick search |
860 | + This allows "name:apt" or "section:devel" searches |
861 | + * debian/control: |
862 | - recommends gksu|kdebase-bin (kdsu is fine too) |
863 | closes: #442421 |
864 | * add filter for manual installed packages (LP: #122047) |
865 | * fix typo (thanks to Florentin Duneau), closes: #542122 |
866 | * po/pt_BR.po: |
867 | - - updated translation, thanks to Sergio Cipolla |
868 | + - updated translation, thanks to Sergio Cipolla |
869 | (closes: #532473) |
870 | - |
871 | - -- Michael Vogt <mvo@debian.org> Thu, 27 Aug 2009 10:00:10 +0200 |
872 | + * common/rpackage.{cc,h}: |
873 | + - fix potential segfault |
874 | + |
875 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 04 Sep 2009 11:52:17 +0200 |
876 | + |
877 | +synaptic (0.62.7ubuntu2) karmic; urgency=low |
878 | + |
879 | + * common/rpackagelister.cc: |
880 | + - fixes in the xapian search (thanks to seb128) |
881 | + - more debug output with Debug::Synaptic::Xapian=true |
882 | + |
883 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Jul 2009 16:14:50 +0200 |
884 | + |
885 | +synaptic (0.62.7ubuntu1) karmic; urgency=low |
886 | + |
887 | + * merged from debian |
888 | + * debian/control: |
889 | + - add build-conflict against librpm-dev |
890 | + |
891 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Jul 2009 14:35:17 +0200 |
892 | |
893 | synaptic (0.62.7) unstable; urgency=low |
894 | |
895 | * show progress when searching and not not block the UI |
896 | (LP: #24188) |
897 | * gtk/glade/dialog_authentication.glade: |
898 | - - add two missing "translatable" entries, thanks to |
899 | + - add two missing "translatable" entries, thanks to |
900 | Daniele Forsi) |
901 | * po/sk.po: |
902 | - - updated translation, thanks to helix84, closes: #532790 |
903 | + - updated translation, thanks to helix84, closes: #532790 |
904 | * po/it.po: |
905 | - updated translation, thanks to Milo Casagrande, closes: #534351 |
906 | * po/es.po: |
907 | - - updated translation, thanks to Francisco Javier Cuadrado, |
908 | + - updated translation, thanks to Francisco Javier Cuadrado, |
909 | closes: #533322 |
910 | |
911 | -- Michael Vogt <mvo@debian.org> Thu, 25 Jun 2009 16:17:56 +0200 |
912 | |
913 | +synaptic (0.62.6ubuntu3) karmic; urgency=low |
914 | + |
915 | + * common/rpackagelister.cc: |
916 | + - remove all fuzzy matching in xapianIndexNeedsUpdate() |
917 | + * gtk/rgmainwindow.cc: |
918 | + - run update-apt-xapian-index --udpate under ionice, rebuild |
919 | + the index every time the timestamps do not match |
920 | + |
921 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Jul 2009 13:00:47 +0200 |
922 | + |
923 | +synaptic (0.62.6ubuntu2) karmic; urgency=low |
924 | + |
925 | + * show progress when searching and not not block the UI |
926 | + (LP: #24188) |
927 | + |
928 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Jun 2009 17:17:28 +0200 |
929 | + |
930 | +synaptic (0.62.6ubuntu1) karmic; urgency=low |
931 | + |
932 | + * merge from Debian/unstable, remaining changes: |
933 | + - ubuntu icons for supported applications |
934 | + - launchpad-integration |
935 | + - ubuntu changelog download support |
936 | + - support section metapackages |
937 | + - merged ept branch |
938 | + - x-ubuntu-gettext-domain in desktop file |
939 | + |
940 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 08 Jun 2009 10:47:19 +0200 |
941 | + |
942 | synaptic (0.62.6) unstable; urgency=low |
943 | |
944 | * po/th.po: |
945 | - updated Thai translation, |
946 | thanks to Theppiak Karoonboonyanan, closes: #512605, #441571 |
947 | * po/br.po: |
948 | - - updated breton translation, |
949 | + - updated breton translation, |
950 | thanks to Denis ARNAUD |
951 | * po/sk.po: |
952 | - updated Slovak translation, |
953 | @@ -118,7 +254,7 @@ |
954 | thanks to Daniel Nylander, closes: #384107 |
955 | * gtk/rgdebinstallprogress.cc: |
956 | - if forkpty() show a propper error message |
957 | - (thanks to Evan) |
958 | + (thanks to Evan) |
959 | * gtk/rgfetchprogress.cc: |
960 | - if the ETA is huge report it as unknown (LP: #322871) |
961 | * debian/control: |
962 | @@ -128,6 +264,35 @@ |
963 | |
964 | -- Michael Vogt <mvo@debian.org> Fri, 05 Jun 2009 16:22:48 +0200 |
965 | |
966 | +synaptic (0.62.5ubuntu3) jaunty-proposed; urgency=low |
967 | + |
968 | + * improve the logic when the xapian index needs |
969 | + rebuilding by checking the xapian document count |
970 | + against the available packages (LP: #365151) |
971 | + |
972 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 17 Apr 2009 16:14:30 +0200 |
973 | + |
974 | +synaptic (0.62.5ubuntu2) jaunty; urgency=low |
975 | + |
976 | + * No-change upload to strip translations from .desktop files. (LP: #348225) |
977 | + |
978 | + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 30 Mar 2009 12:57:47 +0200 |
979 | + |
980 | +synaptic (0.62.5ubuntu1) jaunty; urgency=low |
981 | + |
982 | + * po/th.po: |
983 | + - updated Thai translation (closes: #512605) |
984 | + * gtk/rgdebinstallprogress.cc: |
985 | + - if forkpty() show a propper error message |
986 | + (thanks to Evan) |
987 | + * gtk/rgfetchprogress.cc: |
988 | + - if the ETA is huge report it as unknown (LP: #322871) |
989 | + * debian/control: |
990 | + - add depends to hicolor-icon-theme |
991 | + - rebuild against latest libapt/libept |
992 | + |
993 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Feb 2009 16:03:03 +0100 |
994 | + |
995 | synaptic (0.62.5) unstable; urgency=low |
996 | |
997 | * gtk/rgsummarywindow.cc: |
998 | @@ -181,12 +346,33 @@ |
999 | |
1000 | -- Michael Vogt <mvo@debian.org> Tue, 18 Nov 2008 20:35:18 +0100 |
1001 | |
1002 | +synaptic (0.62.2ubuntu2) jaunty; urgency=low |
1003 | + |
1004 | + * gtk/rgpkgdetails.{cc,h}: |
1005 | + - download/show big image when clicking on the |
1006 | + thumbnail |
1007 | + * debian/rules, .bzr-builddeb/default.conf |
1008 | + - bybye arch-build, hello "bzr-buildpackage" |
1009 | + |
1010 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Nov 2008 19:21:16 +0100 |
1011 | + |
1012 | +synaptic (0.62.2ubuntu1) jaunty; urgency=low |
1013 | + |
1014 | + * Merge from debian, remaining changes: |
1015 | + - ubuntu icons for supported applications |
1016 | + - launchpad-integration |
1017 | + - support section metapackages |
1018 | + - x-ubuntu-gettext-domain in desktop file |
1019 | + - support end time calculation |
1020 | + |
1021 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 Nov 2008 12:42:42 +0100 |
1022 | + |
1023 | synaptic (0.62.2) unstable; urgency=low |
1024 | |
1025 | * po/es.po: |
1026 | - - updated spanish translation (thanks to |
1027 | + - updated spanish translation (thanks to |
1028 | Francisco Javier Cuadrado) |
1029 | - * po/cz.po: |
1030 | + * po/cz.po: |
1031 | - updated Czech translation (thanks to Kamil Páral) |
1032 | * gtk/glade/dialog_upgrade.glade: |
1033 | - provide a mnemonics in the upgrade dialog, |
1034 | @@ -213,7 +399,132 @@ |
1035 | |
1036 | -- Michael Vogt <mvo@debian.org> Fri, 14 Nov 2008 11:44:43 +0100 |
1037 | |
1038 | -synaptic (0.62.1) unstable; urgency=low |
1039 | +synaptic (0.62.1ubuntu10) intrepid; urgency=low |
1040 | + |
1041 | + * common/rpackagelister.cc: |
1042 | + - add special handling for "-" char in the xapian |
1043 | + search (thanks to kiko) |
1044 | + - fix hang in quick search for huge result lists |
1045 | + (like "li") LP: #282188 |
1046 | + |
1047 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 21 Oct 2008 15:19:02 +0200 |
1048 | + |
1049 | +synaptic (0.62.1ubuntu9) intrepid; urgency=low |
1050 | + |
1051 | + * gtk/rgmainwindow.cc: |
1052 | + - only xapian search when more than one char is used |
1053 | + in the search querry (LP: #260739) |
1054 | + * common/rpackagelister.{cc,h}: |
1055 | + - expand partial strings in search as you type so that |
1056 | + "ged" finds "gedit" (LP: #261423) |
1057 | + * 10_ubuntu_maintenance_gui.dpatch: |
1058 | + - make sure to look only for immutable release files |
1059 | + when calculating the support time |
1060 | + |
1061 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 22 Sep 2008 15:57:58 +0200 |
1062 | + |
1063 | +synaptic (0.62.1ubuntu8) intrepid; urgency=low |
1064 | + |
1065 | + * common/rpackageview.cc: |
1066 | + - add new "Missing Recommends" default filter |
1067 | + * common/rpackage.cc: |
1068 | + - fix code to get candidate origin |
1069 | + - support getting the candidate release file name |
1070 | + * common/rpackagestatus.cc: |
1071 | + - support maintenanceEndTime() (if the distro supports that) |
1072 | + * 10_ubuntu_maintenance_gui.dpatch: |
1073 | + - add support for displaying when the maintaince ends |
1074 | + |
1075 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 22 Aug 2008 12:40:10 +0200 |
1076 | + |
1077 | +synaptic (0.62.1ubuntu7) intrepid; urgency=low |
1078 | + |
1079 | + * debian/control: |
1080 | + - add apt-xapian-index to the recommends again, we have some |
1081 | + space on the CDs again (thanks to Steve Langasek) |
1082 | + |
1083 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Jun 2008 14:45:42 +0200 |
1084 | + |
1085 | +synaptic (0.62.1ubuntu6) intrepid; urgency=low |
1086 | + |
1087 | + * gtk/rgdebinstallprogress.cc: |
1088 | + - make sure that SIGCHLD is not blocked to work around |
1089 | + kdesudo (LP: #156041) |
1090 | + * common/rpackageview.cc: |
1091 | + - add new "Missing Recommends" default filter |
1092 | + - fix incorrect display of the "Community Maintained" filter |
1093 | + |
1094 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Aug 2008 12:01:56 +0200 |
1095 | + |
1096 | +synaptic (0.62.1ubuntu5) intrepid; urgency=low |
1097 | + |
1098 | + * debian/control: |
1099 | + - make deborphan and apt-xapian-index suggests instead of recommends |
1100 | + to save space on the CD - this means we loose the quick search |
1101 | + feature in the default install |
1102 | + * po/es.po: |
1103 | + - updated spanish translation (thanks to |
1104 | + Francisco Javier Cuadrado) |
1105 | + * gtk/glade/dialog_upgrade.glade: |
1106 | + - provide a mnemonics in the upgrade dialog, |
1107 | + closes: #491179 (thanks to Matt Kraai) |
1108 | + * gtk/glade/window_fetch.glade: |
1109 | + - dialog fix (thanks to Oded Arbel) (LP: #228127) |
1110 | + * gtk/rgdebinstallprogress.cc: |
1111 | + - intercept ctrl-c in the terminal window and ask |
1112 | + if that is really the desired action |
1113 | + * gtk/rgmainwindow.cc: |
1114 | + - fix "Gtk-CRITICAL **: gtk_tree_view_unref_tree_helper" |
1115 | + assertion failure error (LP: #38397, closes: #341645) |
1116 | + |
1117 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 Aug 2008 13:50:48 +0200 |
1118 | + |
1119 | +synaptic (0.62.1ubuntu4) intrepid; urgency=low |
1120 | + |
1121 | + * improve the search as you type to weight packagename in the |
1122 | + search heigher |
1123 | + |
1124 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Jul 2008 16:00:26 +0100 |
1125 | + |
1126 | +synaptic (0.62.1ubuntu3) intrepid; urgency=low |
1127 | + |
1128 | + * do not run the index update when called in backend |
1129 | + (non-interactive) mode |
1130 | + |
1131 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Jul 2008 21:58:28 +0200 |
1132 | + |
1133 | +synaptic (0.62.1ubuntu2) intrepid; urgency=low |
1134 | + |
1135 | + * added support for quick search using xapian (thanks to |
1136 | + Enrico Zini for his help) |
1137 | + |
1138 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 17 Jun 2008 14:37:19 +0200 |
1139 | + |
1140 | +synaptic (0.62.1ubuntu1) intrepid; urgency=low |
1141 | + |
1142 | + * merge from debian, remaining changes: |
1143 | + - ubuntu icons for supported applications |
1144 | + - launchpad-integration |
1145 | + - build against latest apt in ubuntu |
1146 | + - support section metapackages |
1147 | + - x-ubuntu-gettext-domain in desktop file |
1148 | + |
1149 | + * po/es.po: |
1150 | + - updated Spanish translation (thanks to |
1151 | + Francisco Javier Cuadrado) |
1152 | + * debian/control: |
1153 | + - added "menu" to the recommends (closes: #478250) |
1154 | + * gtk/glade/window_main.glade: |
1155 | + - make the main vpane shinkable |
1156 | + * gtk/rgmainwindow.cc: |
1157 | + - do not loose the keyboard focus after a package |
1158 | + action in the listview |
1159 | + * debian/control: |
1160 | + - switch bzr branch to bzr.debian.org |
1161 | + |
1162 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 12 Jun 2008 15:57:44 +0200 |
1163 | + |
1164 | +synaptic (0.62.1ubuntu1) intrepid; urgency=low |
1165 | |
1166 | * po/es.po: |
1167 | - updated Spanish translation (thanks to |
1168 | @@ -230,6 +541,7 @@ |
1169 | |
1170 | -- Michael Vogt <mvo@debian.org> Tue, 18 Jun 2008 10:17:31 +0200 |
1171 | |
1172 | + |
1173 | synaptic (0.62) unstable; urgency=low |
1174 | |
1175 | [ Michael Vogt] |
1176 | @@ -271,6 +583,82 @@ |
1177 | |
1178 | -- James Vega <jamessan@debian.org> Sat, 05 Apr 2008 18:58:52 -0400 |
1179 | |
1180 | +synaptic (0.61ubuntu9) hardy; urgency=low |
1181 | + |
1182 | + * po/cs.po: |
1183 | + - translation update (thanks to Kamil Páral) |
1184 | + * rebuild for liblaunchpad-integration change |
1185 | + |
1186 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Apr 2008 16:25:00 +0200 |
1187 | + |
1188 | +synaptic (0.61ubuntu8) hardy; urgency=low |
1189 | + |
1190 | + * pixmaps/hicolor/16x16/package-purge.png: |
1191 | + - make the icon different from the "remove" icon |
1192 | + * gtk/rgsummarywindow.cc: |
1193 | + - code cleanup and fix potential endless loop (thanks to |
1194 | + Sebastien Bacher) |
1195 | + |
1196 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 01 Apr 2008 14:39:18 +0200 |
1197 | + |
1198 | +synaptic (0.61ubuntu7) hardy; urgency=low |
1199 | + |
1200 | + * do not auto-close on package install errors when run with |
1201 | + closeZvt=true (LP: #183209) |
1202 | + |
1203 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 03 Mar 2008 15:05:55 +0100 |
1204 | + |
1205 | +synaptic (0.61ubuntu6) hardy; urgency=low |
1206 | + |
1207 | + * recommend software-properties-gtk |
1208 | + |
1209 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Feb 2008 11:33:11 +0100 |
1210 | + |
1211 | +synaptic (0.61ubuntu5) hardy; urgency=low |
1212 | + |
1213 | + [ Brian Murray ] |
1214 | + * typo fixes (LP: #64482, LP: #157850, LP: #179914, LP: #179912, LP: #179909) |
1215 | + |
1216 | + [ Michael Vogt ] |
1217 | + * add new RFilePackageFilter |
1218 | + * added default custom filter that shows installed community software |
1219 | + |
1220 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 12 Feb 2008 22:54:39 +0100 |
1221 | + |
1222 | +synaptic (0.61ubuntu4) hardy; urgency=low |
1223 | + |
1224 | + * fix incorect transient settings when run with --no-main-window |
1225 | + (thanks to Robert Colins for reporting) |
1226 | + |
1227 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 31 Jan 2008 10:51:31 +0100 |
1228 | + |
1229 | +synaptic (0.61ubuntu3) hardy; urgency=low |
1230 | + |
1231 | + * use new ListUpdate() code from apt |
1232 | + |
1233 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Jan 2008 21:20:49 +0100 |
1234 | + |
1235 | +synaptic (0.61ubuntu2) hardy; urgency=low |
1236 | + |
1237 | + [ Michael Vogt] |
1238 | + * debian/rules, debian/control: |
1239 | + - use dh_icons and add appropriate b-d on debhelper |
1240 | + * g++ 4.3 fixes (closes: #456044) |
1241 | + |
1242 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2007 20:48:57 +0100 |
1243 | + |
1244 | +synaptic (0.61ubuntu1) hardy; urgency=low |
1245 | + |
1246 | + * merged from debian/unstable, remaining changes: |
1247 | + - ubuntu icons for supported applications |
1248 | + - maintained filed changed |
1249 | + - launchpad-integration |
1250 | + - build against latest apt in ubuntu |
1251 | + - support section metapackages |
1252 | + - x-ubuntu-gettext-domain in desktop file |
1253 | + |
1254 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2007 15:49:12 +0100 |
1255 | + |
1256 | synaptic (0.61) unstable; urgency=low |
1257 | |
1258 | [ Michael Vogt ] |
1259 | @@ -308,6 +696,76 @@ |
1260 | |
1261 | -- Michael Vogt <mvo@debian.org> Thu, 06 Dec 2007 16:00:51 +0100 |
1262 | |
1263 | +synaptic (0.60ubuntu5.1) gutsy-proposed; urgency=low |
1264 | + |
1265 | + * gtk/rgfetchprogress.{cc,h}: |
1266 | + - fix crash in download progress on theme changes (LP: #67995) |
1267 | + |
1268 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Oct 2007 11:14:03 +0200 |
1269 | + |
1270 | +synaptic (0.60ubuntu5) gutsy; urgency=low |
1271 | + |
1272 | + [ Loic Minier ] |
1273 | + * Set has_focus on the close button of the welcome dialog; LP: #148695. |
1274 | + |
1275 | + [ Michael Vogt ] |
1276 | + * gtk/rgmainwindow.cc: |
1277 | + - fix crash in cbInstallFromVersion() (LP: #145685) |
1278 | + |
1279 | + -- Loic Minier <lool@dooz.org> Wed, 03 Oct 2007 22:33:28 +0200 |
1280 | + |
1281 | +synaptic (0.61) unstable; urgency=low |
1282 | + |
1283 | + [ Michael Vogt ] |
1284 | + * fix missing Basque translation (closes: #429460) |
1285 | + * updatd Basque translation (thanks to mikel paskual) |
1286 | + * update galician translation (thanks to Ignacio Casal) |
1287 | + * updated Czech translation (thanks to Vit Pelcak) |
1288 | + * updated Finish translation (thanks to Timo Jyrinki) |
1289 | + * po/POTFILES.in, po/POTFILES.skip: |
1290 | + - updated so that intltool-update -m is happy again (thanks |
1291 | + to Nacho) |
1292 | + * gtk/rgmainwindow.cc: |
1293 | + - add missing space in the wget script (thanks to Avi Rozen) |
1294 | + * make it build with g++ 4.3 |
1295 | + * gtk/rgmainwindow.cc: |
1296 | + - fix crash in cbInstallFromVersion() |
1297 | + * gtk/rgfetchprogress.{cc,h}: |
1298 | + - fix crash in download progress on theme changes |
1299 | + |
1300 | + [ Loic Minier ] |
1301 | + * Set has_focus on the close button of the welcome dialog; closes: #148695. |
1302 | + |
1303 | + -- Loic Minier <lool@dooz.org> Wed, 03 Oct 2007 22:25:09 +0200 |
1304 | + |
1305 | +synaptic (0.60ubuntu3) gutsy; urgency=low |
1306 | + |
1307 | + * build against latest apt |
1308 | + |
1309 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Aug 2007 21:15:40 +0200 |
1310 | + |
1311 | +synaptic (0.60ubuntu2) gutsy; urgency=low |
1312 | + |
1313 | + * debian/control: |
1314 | + - added XS-Vcs-Bzr field |
1315 | + |
1316 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Jul 2007 15:04:48 +0200 |
1317 | + |
1318 | +synaptic (0.60ubuntu1) gutsy; urgency=low |
1319 | + |
1320 | + * merged from debian/unstable, remaining changes: |
1321 | + - 01_ubuntu_changelog: |
1322 | + + default to changelogs.ubuntu.com |
1323 | + - 03_hide_browse_documentation: |
1324 | + + don't show the dwww documentation button |
1325 | + - 04_ubuntu_lpi: |
1326 | + + launchpad integration added |
1327 | + - 06_ubuntu_su_to_root: |
1328 | + + use gksu instead of su-to-root |
1329 | + - ubuntu branding icon |
1330 | + |
1331 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Jun 2007 15:08:09 +0200 |
1332 | + |
1333 | synaptic (0.60) unstable; urgency=low |
1334 | |
1335 | * moved most icons use the icontheme |
1336 | @@ -324,23 +782,17 @@ |
1337 | * added support for GUI configuraton of http proxy |
1338 | * translation updates: |
1339 | - cs.po: thanks to Vít Pelcak |
1340 | - * debian/rules: |
1341 | - - fix automatic version number generation |
1342 | * make description buffer dynamic (thanks to Benjamin Jacobs) |
1343 | * added component filter |
1344 | * added emblem in the description to show support status |
1345 | - * move the desktop file out of settings because it does no longer |
1346 | - fit there with the new control center in gnome 2.17 |
1347 | - * build with gcc 4.3 (closes: #413419) |
1348 | - * do not return a NULL pointer in name() |
1349 | - * when generating the wget script, use wget -c |
1350 | - * po/cs.po: |
1351 | - - updated (thanks to Vit Pelcak) |
1352 | - * gtk/rguserdialog.cc, gtk/rggladewindow.cc: |
1353 | - - do not crash for invalid parent-window-ids |
1354 | + |
1355 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Jan 2007 16:32:32 +0100 |
1356 | + |
1357 | +synaptic (0.57.11.1ubuntu15) gutsy; urgency=low |
1358 | + |
1359 | * gtk/rgpreferenceswindow.cc: |
1360 | - overwrite the http_proxy environ when the user set the proxy |
1361 | - explicitely (thanks to Berend De Schouwer) |
1362 | + explicitely (thanks to Berend De Schouwer, LP#105515) |
1363 | * common/rpackagelister.cc: |
1364 | - added "Volatile::SetSelectionDoReInstall" to support |
1365 | reinstalling from --set-selections too |
1366 | @@ -348,13 +800,218 @@ |
1367 | - only show a package as supported if it is authenticated |
1368 | * po/eu.po: |
1369 | - updated (thanks to dooteo, closes: #368951) |
1370 | - * merged gcc 4.3 compiler fix, closes: #413419 |
1371 | - (thanks to Martin Michlmayr) |
1372 | - * merged support for translated package description |
1373 | - * merged support for automatic removal of unused dependencies |
1374 | - * merged support for native apts install-recommends feature |
1375 | - |
1376 | - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Mar 2007 17:22:30 +0100 |
1377 | + * gtk/rguserdialog.cc, gtk/rggladewindow.cc: |
1378 | + - do not crash for invalid parent-window-ids |
1379 | + |
1380 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Apr 2007 11:16:31 +0200 |
1381 | + |
1382 | +synaptic (0.57.11.1ubuntu14) feisty; urgency=low |
1383 | + |
1384 | + * gtk/rgchangeswindow.cc: |
1385 | + - fix crash in confirm changes (LP#80922) |
1386 | + Thanks to John Millikin for the instructions how to reproduce the |
1387 | + bug |
1388 | + |
1389 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 4 Apr 2007 13:01:23 +0200 |
1390 | + |
1391 | +synaptic (0.57.11.1ubuntu13) feisty; urgency=low |
1392 | + |
1393 | + * when generating the wget script, use wget -c (LP#76462) |
1394 | + * po/cs.po: |
1395 | + - updated (thanks to Vit Pelcak) |
1396 | + * gtk/rgpkgdetails.cc: |
1397 | + - fix chinese descriptions display, thanks to Liu Qishuai |
1398 | + (LP#102228) |
1399 | + * fix drop down boxes in preferences (LP#100072) |
1400 | + * fix terminal window (LP#99877) |
1401 | + * show error and exit if opening the cache fails (LP#90016) |
1402 | + |
1403 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 3 Apr 2007 22:23:48 +0200 |
1404 | + |
1405 | +synaptic (0.57.11.1ubuntu12) feisty; urgency=low |
1406 | + |
1407 | + * data/synaptic.desktop.in: |
1408 | + - fix in the Category to make it show up in g-a-i (LP#88877) |
1409 | + * common/rpackageview.cc: |
1410 | + - fix in the getSections() code (LP##91888) |
1411 | + |
1412 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 20:18:09 +0100 |
1413 | + |
1414 | +synaptic (0.57.11.1ubuntu11) feisty; urgency=low |
1415 | + |
1416 | + * build with gcc 4.3 (closes: #413419) |
1417 | + * do not return a NULL pointer in name() |
1418 | + * remove unneeded pkgActionGroup that seems to cause havoc |
1419 | + |
1420 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Mar 2007 19:02:44 +0100 |
1421 | + |
1422 | +synaptic (0.57.11.1ubuntu10) feisty; urgency=low |
1423 | + |
1424 | + * debian/control: |
1425 | + - changed ubuntu maintainer |
1426 | + - added XS-Vcs-Bzr |
1427 | + * gtk/rgpreferenceswindow.cc: |
1428 | + - fix proxy authentication (thanks to Jan de Mooij) |
1429 | + (LP#86769) |
1430 | + |
1431 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Feb 2007 12:34:12 +0100 |
1432 | + |
1433 | +synaptic (0.57.11.1ubuntu9) feisty; urgency=low |
1434 | + |
1435 | + * remove file descriptor resource leak |
1436 | + * depend on latest apt (needs rebuild to fix resource leak) |
1437 | + * fix crash in "Add downloaded packages" (LP#85934) |
1438 | + |
1439 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:31:31 +0100 |
1440 | + |
1441 | +synaptic (0.57.11.1ubuntu8) feisty; urgency=low |
1442 | + |
1443 | + * move the desktop file back into new control center as it confused |
1444 | + too many people and we want to get rid of Applications/System Tools |
1445 | + (LP: #84984) |
1446 | + * fixed memory corruption problem on reopening the cache |
1447 | + (LP#81624) |
1448 | + |
1449 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 19 Feb 2007 10:33:32 +0100 |
1450 | + |
1451 | +synaptic (0.57.11.1ubuntu7) feisty; urgency=low |
1452 | + |
1453 | + * really use software-properties-gtk if available (LP#84248) |
1454 | + * move the desktop file out of settings because it does no longer |
1455 | + fit there with the new control center in gnome 2.17 |
1456 | + (LP: #83658) |
1457 | + * fix version number generation for the about dialog (lp: #84626) |
1458 | + |
1459 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Feb 2007 19:05:35 +0100 |
1460 | + |
1461 | +synaptic (0.57.11.1ubuntu6) feisty; urgency=low |
1462 | + |
1463 | + * use software-properties-gtk if available |
1464 | + * rebuild against latest apt version |
1465 | + |
1466 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 16:37:48 +0100 |
1467 | + |
1468 | +synaptic (0.57.11.1ubuntu5) feisty; urgency=low |
1469 | + |
1470 | + * fix corner-case bug in --set-selections, --non-interactive (lp: #81428) |
1471 | + |
1472 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 Jan 2007 10:41:48 +0100 |
1473 | + |
1474 | +synaptic (0.57.11.1ubuntu4) feisty; urgency=low |
1475 | + |
1476 | + * debian/rules: |
1477 | + - fix automatic version number generation |
1478 | + |
1479 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 22 Jan 2007 15:27:59 +0100 |
1480 | + |
1481 | +synaptic (0.57.11.1ubuntu2) feisty; urgency=low |
1482 | + |
1483 | + * added "Origins" view (AlwaysEnableUniverseMultiverse spec) |
1484 | + |
1485 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 19:05:08 +0100 |
1486 | + |
1487 | +synaptic (0.57.11.1ubuntu1) feisty; urgency=low |
1488 | + |
1489 | + * merged with debian |
1490 | + |
1491 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 17:30:46 +0100 |
1492 | + |
1493 | +synaptic (0.57.11.1) unstable; urgency=high |
1494 | + |
1495 | + * gtk/rgmainwindow.cc: |
1496 | + - fix crash in "Lock package" |
1497 | + * gtk/rgpreferenceswindow.cc: |
1498 | + - add default font to fix crash |
1499 | + |
1500 | + -- Michael Vogt <mvo@debian.org> Mon, 18 Dec 2006 10:52:08 +0100 |
1501 | + |
1502 | +synaptic (0.57.11ubuntu13) edgy; urgency=low |
1503 | + |
1504 | + * gtk/rgmainwindow.cc: |
1505 | + - fix crash in "Lock package" (lp: 64005) |
1506 | + * gtk/rgpreferenceswindow.cc: |
1507 | + - add default font to fix crash (lp: 65553) |
1508 | + |
1509 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 Oct 2006 16:12:55 +0200 |
1510 | + |
1511 | +synaptic (0.57.11ubuntu12) edgy; urgency=low |
1512 | + |
1513 | + * gtk/gsyncaptic.cc: |
1514 | + - fix in the checking for already runing synaptic (lp: 62754) |
1515 | + |
1516 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Oct 2006 18:09:16 +0200 |
1517 | + |
1518 | +synaptic (0.57.11ubuntu11) edgy; urgency=low |
1519 | + |
1520 | + * common/rpackagelister.cc: |
1521 | + - use pkgActionGroup to fix performance regression in setSelection() |
1522 | + * performance regression fixes (lp: #63171) |
1523 | + |
1524 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Oct 2006 13:57:42 +0200 |
1525 | + |
1526 | +synaptic (0.57.11ubuntu10) edgy; urgency=low |
1527 | + |
1528 | + * common/rpackagelister.cc: |
1529 | + - run refresh() after re-adjusting the size of the packages (lp: #62298) |
1530 | + |
1531 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 17:33:28 +0200 |
1532 | + |
1533 | +synaptic (0.57.11ubuntu9) edgy; urgency=low |
1534 | + |
1535 | + * fix problem with pkgs disappering from the current view when |
1536 | + certain auto-removable packages are marked for removal |
1537 | + |
1538 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 13:39:35 +0200 |
1539 | + |
1540 | +synaptic (0.57.11ubuntu8) edgy; urgency=low |
1541 | + |
1542 | + * redo the auto flag on "restoreState()" too |
1543 | + |
1544 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:55:16 +0200 |
1545 | + |
1546 | +synaptic (0.57.11ubuntu7) edgy; urgency=low |
1547 | + |
1548 | + * auto install/garbage filter added |
1549 | + |
1550 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 15:04:36 +0200 |
1551 | + |
1552 | +synaptic (0.57.11ubuntu6) edgy; urgency=low |
1553 | + |
1554 | + * fix mark/unmark auto |
1555 | + |
1556 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:18:43 +0200 |
1557 | + |
1558 | +synaptic (0.57.11ubuntu5) edgy; urgency=low |
1559 | + |
1560 | + * fix performance regression when canceling a operation |
1561 | + |
1562 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Sep 2006 11:52:30 +0200 |
1563 | + |
1564 | +synaptic (0.57.11ubuntu4) edgy; urgency=low |
1565 | + |
1566 | + * when switching views, don't autoselect "All" |
1567 | + * support the "metapackages" section |
1568 | + |
1569 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 6 Sep 2006 20:30:45 +0200 |
1570 | + |
1571 | +synaptic (0.57.11ubuntu3) edgy; urgency=low |
1572 | + |
1573 | + * make "Fix Missing" and "Set Selections" faster (thanks to seb128 |
1574 | + for discovering this problem) |
1575 | + |
1576 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 4 Sep 2006 15:59:20 +0200 |
1577 | + |
1578 | +synaptic (0.57.11ubuntu2) edgy; urgency=low |
1579 | + |
1580 | + * merged the ddtp support |
1581 | + |
1582 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 16:26:28 +0200 |
1583 | + |
1584 | +synaptic (0.57.11ubuntu1) edgy; urgency=low |
1585 | + |
1586 | + * merged with debian |
1587 | + |
1588 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 27 Jul 2006 15:17:03 +0200 |
1589 | |
1590 | synaptic (0.57.11.1) unstable; urgency=high |
1591 | |
1592 | @@ -378,6 +1035,32 @@ |
1593 | |
1594 | -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 15:12:31 +0200 |
1595 | |
1596 | +synaptic (0.57.10ubuntu3) edgy; urgency=low |
1597 | + |
1598 | + * show broken packages in the status view as well |
1599 | + * don't show a download window if nothing is going to be downloaded |
1600 | + * cleanups |
1601 | + |
1602 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:47:31 +0200 |
1603 | + |
1604 | +synaptic (0.57.10ubuntu2) edgy; urgency=low |
1605 | + |
1606 | + * fixed FTBFS |
1607 | + * build-dep on latest vte |
1608 | + |
1609 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 16:17:25 +0200 |
1610 | + |
1611 | +synaptic (0.57.10ubuntu1) edgy; urgency=low |
1612 | + |
1613 | + * po/ja.po: updated japanese translation (thanks to Daisuke SUZUKI) |
1614 | + * po/sv.po: updated translation (thanks to Daniel Nylander) |
1615 | + * UI and string fixes (thanks to Sebastian Heinlein) |
1616 | + * merged with debian |
1617 | + * merged simple support for the apt auto-mark of automatic dependencies |
1618 | + feature (new "Installed (auto removable)" status) |
1619 | + |
1620 | + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 21:38:16 +0200 |
1621 | + |
1622 | synaptic (0.57.10) unstable; urgency=low |
1623 | |
1624 | * fix a bug in the skip-taskbar handling (thanks to seb128) |
1625 | @@ -403,6 +1086,99 @@ |
1626 | |
1627 | -- Michael Vogt <mvo@debian.org> Tue, 28 Feb 2006 09:44:42 +0100 |
1628 | |
1629 | +synaptic (0.57.8ubuntu11) dapper; urgency=low |
1630 | + |
1631 | + * fix bug that the window is not visisble in the tasklist when run |
1632 | + in "install all upgrades" mode from update-notifier (thanks to |
1633 | + seb128 for reporting) |
1634 | + * hide the "auto-close" checkbutton when runing non-interactively, |
1635 | + because synaptic won't save options then (Ubuntu: #28250) |
1636 | + * better deal with invalid utf8 in the package descriptions |
1637 | + (Ubuntu: #37050, #38399) |
1638 | + * increase the size of the diff dialog textview (ubuntu: #44012) |
1639 | + * search in summary too (ubuntu: #32337) |
1640 | + * fix focus problem (ubuntu: #39971) |
1641 | + |
1642 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 May 2006 11:41:18 +0200 |
1643 | + |
1644 | +synaptic (0.57.8ubuntu10) dapper; urgency=low |
1645 | + |
1646 | + * g++-4.1 fixes (thanks to Martin Michlmayr) (closes: 357863) |
1647 | + * fix the invocation of the external software-properties |
1648 | + |
1649 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Apr 2006 10:02:28 +0200 |
1650 | + |
1651 | +synaptic (0.57.8ubuntu9) dapper; urgency=low |
1652 | + |
1653 | + * fix a bug in the skip-taskbar handling (thanks to seb128) |
1654 | + * fix the column sorting (closes: #361070) |
1655 | + * use the urgency hint for the conffile prompt (ubuntu: #21898) |
1656 | + * better handling of the automatic terminal expanding (ubuntu: #38935) |
1657 | + |
1658 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 12 Apr 2006 20:43:23 +0200 |
1659 | + |
1660 | +synaptic (0.57.8ubuntu8) dapper; urgency=low |
1661 | + |
1662 | + * fix memory corruption problem (ubuntu #37817, #37987) |
1663 | + |
1664 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Apr 2006 19:59:35 +0200 |
1665 | + |
1666 | +synaptic (0.57.8ubuntu7) dapper; urgency=low |
1667 | + |
1668 | + * gtk/window_changes.glade: |
1669 | + - make the dialog icon "info" instead of "warning" (ubuntu: #17085) |
1670 | + * remove http:// when it was entered as part of the proxy uri |
1671 | + (ubuntu: #18038) |
1672 | + * if a dpkg error happens during install run "dpkg --configure -a" |
1673 | + to recover as much as possible (ubuntu: #19021) |
1674 | + * if no terminal activity is detected and the terminal is expanded |
1675 | + set the urgency hint as well (ubuntu: #31436) |
1676 | + * remove http:// when it was entered as part of the proxy uri |
1677 | + * include reinstall markings in the "changes" filter |
1678 | + |
1679 | + -- Michael Vogt <michael.vogt@ubuntu.com> Sun, 2 Apr 2006 11:40:45 +0200 |
1680 | + |
1681 | +synaptic (0.57.8ubuntu6) dapper; urgency=low |
1682 | + |
1683 | + * wording fix (ubuntu #36488) |
1684 | + * if no terminal activity is detected and the terminal is expanded |
1685 | + set the urgency hint as well (ubuntu: #31436) |
1686 | + |
1687 | + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 29 Mar 2006 14:33:19 +0200 |
1688 | + |
1689 | +synaptic (0.57.8ubuntu5) dapper; urgency=low |
1690 | + |
1691 | + * fix problem with fetch window not centered on parent (thanks to |
1692 | + seb128 and glatzor) |
1693 | + * fix a missing set_transient() problem (ubuntu #36030) |
1694 | + |
1695 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Mar 2006 00:10:25 +0100 |
1696 | + |
1697 | +synaptic (0.57.8ubuntu4) dapper; urgency=low |
1698 | + |
1699 | + * fix another set_transient() problem with run with --parent-window-id |
1700 | + (ubuntu #33406) |
1701 | + |
1702 | + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 2 Mar 2006 15:38:08 +0100 |
1703 | + |
1704 | +synaptic (0.57.8ubuntu3) dapper; urgency=low |
1705 | + |
1706 | + * data/synaptic.desktop.in: set X-Ubuntu-Gettext-Domain |
1707 | + * make "mark" the default response in the "Mark change dialog" (ubuntu #31189) |
1708 | + * don't fail if run as non-root, just explain what's wrong |
1709 | + |
1710 | + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Feb 2006 10:35:43 +0100 |
1711 | + |
1712 | +synaptic (0.57.8ubuntu2) dapper; urgency=low |
1713 | + |
1714 | + * po/th.po: updated Thai Translation (thanks to Isriya Paireepairit) |
1715 | + * po/el.po: updated Greek translation (thanks to Kostas Papadimas) |
1716 | + * only clean the list dir if a update was successful |
1717 | + * fix problem that some windows have a skip taskbar hint but no |
1718 | + transient parent (thanks to Seb128 for reporting the problem) |
1719 | + |
1720 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 21 Feb 2006 18:59:52 +0100 |
1721 | + |
1722 | synaptic (0.57.8) unstable; urgency=low |
1723 | |
1724 | * po/pl.po: updated Polish translation (thanks to Emilian Nowak) |
1725 | @@ -415,17 +1191,13 @@ |
1726 | * po/gl.po: added Galician translation (thanks to Nacho Resa) |
1727 | * po/es.po: updated Spanish translation |
1728 | (thanks to Francisco Javier F. Serrador) |
1729 | - * po/th.po: updated Thai Translation (thanks to Isriya Paireepairit) |
1730 | * po/fi.po: updated Finnish translation (thanks to Ilkka Tuohela) |
1731 | - * po/el.po: updated Greek translation (thanks to Kostas Papadimas) |
1732 | * fix version number in about dialog (and make sure this is done |
1733 | automatically in the future) (closes: #348839) |
1734 | * applied patch from Robert Chéramy to fix un-lock problem |
1735 | (closes: #334168) |
1736 | * added --parent-window-id to make embedding easier |
1737 | * wording fixes (malone #22090) |
1738 | - * only clean the list dir if a update was successful |
1739 | - * make "mark" the default response in the "Mark change dialog" |
1740 | |
1741 | -- Michael Vogt <mvo@debian.org> Tue, 28 Feb 2006 09:44:42 +0100 |
1742 | |
1743 | |
1744 | === modified file 'debian/control' |
1745 | --- debian/control 2009-07-21 08:16:20 +0000 |
1746 | +++ debian/control 2010-02-17 23:07:20 +0000 |
1747 | @@ -1,11 +1,13 @@ |
1748 | Source: synaptic |
1749 | Section: admin |
1750 | Priority: optional |
1751 | -Maintainer: Michael Vogt <mvo@debian.org> |
1752 | -Build-Depends: debhelper (>= 5.0.51), libapt-pkg-dev (>= 0.7.0), gettext, libgtk2.0-dev, libvte-dev (>= 0.11.11), libglade2-dev, libxft2-dev, scrollkeeper, intltool, xmlto, libsm-dev , sharutils, dpatch, lsb-release, dpkg (>= 1.13.9) |
1753 | +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1754 | +XSBC-Original-Maintainer: Michael Vogt <mvo@debian.org> |
1755 | +Build-Depends: debhelper (>= 5.0.51), libapt-pkg-dev (>= 0.7.23), gettext, libgtk2.0-dev, libvte-dev (>= 0.11.11), libglade2-dev, libxft2-dev, scrollkeeper, intltool, xmlto, libsm-dev , sharutils, dpatch, lsb-release, dpkg (>= 1.13.9), liblaunchpad-integration-dev, libept-dev (>= 0.5.26ubuntu2) |
1756 | Build-Conflicts: librpm-dev |
1757 | Standards-Version: 3.7.2.2 |
1758 | -Vcs-Bzr: http://bzr.debian.org/synaptic/synaptic/debian-sid |
1759 | +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/synaptic/ubuntu/ |
1760 | +XS-Original-Vcs-Bzr: http://bzr.debian.org/synaptic/synaptic/debian-sid |
1761 | |
1762 | Package: synaptic |
1763 | Architecture: any |
1764 | @@ -13,8 +15,8 @@ |
1765 | Provides: gsynaptic |
1766 | Replaces: gsynaptic |
1767 | Conflicts: gsynaptic, menu (<< 2.1.11) |
1768 | -Recommends: gksu|kdebase-bin, deborphan, libgnome2-perl, menu |
1769 | -Suggests: dwww |
1770 | +Recommends: gksu|kdebase-bin, libgnome2-perl, software-properties-gtk, apt-xapian-index |
1771 | +Suggests: dwww, menu, deborphan |
1772 | Description: Graphical package manager |
1773 | Synaptic is a graphical package management tool based on GTK+ and APT. |
1774 | Synaptic enables you to install, upgrade and remove software packages in |
1775 | |
1776 | === modified file 'debian/patches/00list.Ubuntu' |
1777 | --- debian/patches/00list.Ubuntu 2007-10-04 08:45:12 +0000 |
1778 | +++ debian/patches/00list.Ubuntu 2010-02-17 23:07:20 +0000 |
1779 | @@ -3,3 +3,4 @@ |
1780 | 03_hide_browse_documentation |
1781 | 04_ubuntu_lpi |
1782 | 06_ubuntu_su_to_root |
1783 | +10_ubuntu_maintenance_gui |
1784 | |
1785 | === modified file 'debian/patches/01_ubuntu_changelog.dpatch' |
1786 | --- debian/patches/01_ubuntu_changelog.dpatch 2009-06-04 16:12:33 +0000 |
1787 | +++ debian/patches/01_ubuntu_changelog.dpatch 2010-02-17 23:07:20 +0000 |
1788 | @@ -5,10 +5,10 @@ |
1789 | ## DP: No description. |
1790 | |
1791 | @DPATCH@ |
1792 | -diff -urNad synaptic-0.56/common/rpackage.cc /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc |
1793 | ---- synaptic-0.56/common/rpackage.cc 2005-02-18 13:28:43.000000000 +0100 |
1794 | -+++ /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc 2005-02-18 14:39:17.005309176 +0100 |
1795 | -@@ -810,7 +810,7 @@ |
1796 | +diff -urNad ubuntu~/common/rpackage.cc ubuntu/common/rpackage.cc |
1797 | +--- ubuntu~/common/rpackage.cc 2009-09-18 23:37:47.000000000 +0200 |
1798 | ++++ ubuntu/common/rpackage.cc 2009-09-18 23:40:55.071662698 +0200 |
1799 | +@@ -875,7 +875,7 @@ |
1800 | if(verstr.find(':')!=verstr.npos) |
1801 | verstr=string(verstr, verstr.find(':')+1); |
1802 | char uri[512]; |
1803 | @@ -17,7 +17,10 @@ |
1804 | src_section.c_str(), |
1805 | prefix.c_str(), |
1806 | srcpkg.c_str(), |
1807 | -@@ -1293,7 +1293,7 @@ |
1808 | +diff -urNad ubuntu~/common/rpackagestatus.cc ubuntu/common/rpackagestatus.cc |
1809 | +--- ubuntu~/common/rpackagestatus.cc 2009-09-18 23:37:47.000000000 +0200 |
1810 | ++++ ubuntu/common/rpackagestatus.cc 2009-09-18 23:41:36.086660327 +0200 |
1811 | +@@ -69,7 +69,7 @@ |
1812 | markUnsupported = true; |
1813 | |
1814 | // read supported labels |
1815 | @@ -26,12 +29,21 @@ |
1816 | stringstream sst1(labels); |
1817 | while(!sst1.eof()) { |
1818 | sst1 >> s; |
1819 | -@@ -1301,7 +1301,7 @@ |
1820 | +@@ -77,7 +77,7 @@ |
1821 | + } |
1822 | + |
1823 | + // read supported origins |
1824 | +- origin = _config->Find("Synaptic::supported-origins", "Debian"); |
1825 | ++ origin = _config->Find("Synaptic::supported-origins", "Ubuntu"); |
1826 | + stringstream sst2(origin); |
1827 | + while(!sst2.eof()) { |
1828 | + sst2 >> s; |
1829 | +@@ -85,7 +85,7 @@ |
1830 | } |
1831 | |
1832 | // read supported components |
1833 | - components = _config->Find("Synaptic::supported-components", "main updates/main"); |
1834 | + components = _config->Find("Synaptic::supported-components", "main updates/main restricted"); |
1835 | - stringstream sst2(components); |
1836 | - while(!sst2.eof()) { |
1837 | - sst2 >> s; |
1838 | + stringstream sst3(components); |
1839 | + while(!sst3.eof()) { |
1840 | + sst3 >> s; |
1841 | |
1842 | === modified file 'debian/patches/03_hide_browse_documentation.dpatch' (properties changed: -x to +x) |
1843 | === modified file 'debian/patches/04_ubuntu_lpi.dpatch' (properties changed: -x to +x) |
1844 | === modified file 'debian/patches/06_ubuntu_su_to_root.dpatch' (properties changed: -x to +x) |
1845 | === added file 'debian/patches/10_ubuntu_maintenance_gui.dpatch' |
1846 | --- debian/patches/10_ubuntu_maintenance_gui.dpatch 1970-01-01 00:00:00 +0000 |
1847 | +++ debian/patches/10_ubuntu_maintenance_gui.dpatch 2010-02-17 23:07:20 +0000 |
1848 | @@ -0,0 +1,187 @@ |
1849 | +#! /bin/sh /usr/share/dpatch/dpatch-run |
1850 | +## 10_foo.dpatch |
1851 | +## |
1852 | +## All lines beginning with `## DP:' are a description of the patch. |
1853 | +## DP: No description. |
1854 | + |
1855 | +@DPATCH@ |
1856 | +diff -urNad ubuntu~/common/rpackagestatus.cc ubuntu/common/rpackagestatus.cc |
1857 | +--- ubuntu~/common/rpackagestatus.cc 2010-01-25 12:01:12.070416517 +0100 |
1858 | ++++ ubuntu/common/rpackagestatus.cc 2010-01-25 12:02:01.380407389 +0100 |
1859 | +@@ -185,7 +185,8 @@ |
1860 | + pkgTagSection sec; |
1861 | + time_t release_date = -1; |
1862 | + |
1863 | +- string distro = _config->Find("Synaptic::supported-label"); |
1864 | ++ // FIXME: make this use the "labels" vector in the future |
1865 | ++ string distro = _config->Find("Synaptic::supported-label","Ubuntu"); |
1866 | + string releaseFile = pkg->getReleaseFileForOrigin(distro, release); |
1867 | + if(!FileExists(releaseFile)) { |
1868 | + // happens e.g. when there is no release file and is harmless |
1869 | +@@ -209,10 +210,26 @@ |
1870 | + // now calculate the time until there is support |
1871 | + gmtime_r(&release_date, res); |
1872 | + |
1873 | +- const int support_time =_config->FindI("Synaptic::supported-month", 0); |
1874 | ++ int support_time =_config->FindI("Synaptic::supported-month", 18); |
1875 | + if (support_time <= 0) |
1876 | + return false; |
1877 | + |
1878 | ++ // check if the package overwrites the support time, this has the |
1879 | ++ // format "5y", "18m" etc |
1880 | ++ string support_time_str = pkg->findTagFromPkgRecord("Supported"); |
1881 | ++ size_t len = support_time_str.length(); |
1882 | ++ if(len > 1) { |
1883 | ++ int factor = 1; |
1884 | ++ if (support_time_str[len-1] == 'y') |
1885 | ++ factor = 12; |
1886 | ++ else if (support_time_str[len-1] == 'm') |
1887 | ++ factor = 1; |
1888 | ++ else |
1889 | ++ cerr << "Unknown support tag: " << support_time_str << endl; |
1890 | ++ // and covert to an integer (skipping the last char 'y') |
1891 | ++ support_time = factor * atoi(support_time_str.substr(0, len-1).c_str()); |
1892 | ++ } |
1893 | ++ |
1894 | + res->tm_year += (support_time / 12) + ((res->tm_mon + support_time % 12) / 12); |
1895 | + res->tm_mon = (res->tm_mon + support_time) % 12; |
1896 | + |
1897 | +diff -urNad ubuntu~/gtk/glade/window_main.glade ubuntu/gtk/glade/window_main.glade |
1898 | +--- ubuntu~/gtk/glade/window_main.glade 2010-01-25 12:01:12.100413355 +0100 |
1899 | ++++ ubuntu/gtk/glade/window_main.glade 2010-01-25 12:02:01.561112535 +0100 |
1900 | +@@ -1351,8 +1351,8 @@ |
1901 | + <property name="pixels_above_lines">3</property> |
1902 | + <property name="pixels_below_lines">3</property> |
1903 | + <property name="pixels_inside_wrap">0</property> |
1904 | +- <property name="left_margin">3</property> |
1905 | +- <property name="right_margin">3</property> |
1906 | ++ <property name="left_margin">12</property> |
1907 | ++ <property name="right_margin">12</property> |
1908 | + <property name="indent">0</property> |
1909 | + <property name="text" translatable="yes"></property> |
1910 | + </widget> |
1911 | +diff -urNad ubuntu~/gtk/rgpkgdetails.cc ubuntu/gtk/rgpkgdetails.cc |
1912 | +--- ubuntu~/gtk/rgpkgdetails.cc 2010-01-25 11:59:47.000000000 +0100 |
1913 | ++++ ubuntu/gtk/rgpkgdetails.cc 2010-01-25 12:02:01.561112535 +0100 |
1914 | +@@ -24,6 +24,8 @@ |
1915 | + #include "config.h" |
1916 | + |
1917 | + #include <cassert> |
1918 | ++#include <langinfo.h> |
1919 | ++ |
1920 | + #include "rgwindow.h" |
1921 | + #include "rgmainwindow.h" |
1922 | + #include "rgpkgdetails.h" |
1923 | +@@ -191,33 +193,17 @@ |
1924 | + "scale", 1.1, |
1925 | + NULL); |
1926 | + } |
1927 | ++ if(gtk_text_tag_table_lookup(tag_table, "gray") == NULL) { |
1928 | ++ gtk_text_buffer_create_tag(buf, "gray", |
1929 | ++ "foreground", "darkgray", |
1930 | ++ NULL); |
1931 | ++ } |
1932 | + // set summary |
1933 | + s = utf8(pkg->summary()); |
1934 | + gtk_text_buffer_get_start_iter(buf, &it); |
1935 | + gtk_text_buffer_insert(buf, &it, s, -1); |
1936 | + gtk_text_buffer_get_start_iter(buf, &start); |
1937 | + gtk_text_buffer_apply_tag_by_name(buf, "bold", &start, &it); |
1938 | +- // set emblems |
1939 | +- GdkPixbuf *pixbuf = RGPackageStatus::pkgStatus.getSupportedPix(pkg); |
1940 | +- if(pixbuf != NULL) { |
1941 | +- // insert space |
1942 | +- gtk_text_buffer_insert(buf, &it, " ", 1); |
1943 | +- // make image |
1944 | +- emblem = gtk_image_new_from_pixbuf(pixbuf); |
1945 | +- gtk_image_set_pixel_size(GTK_IMAGE(emblem), 16); |
1946 | +- // set eventbox and tooltip |
1947 | +- GtkWidget *event = gtk_event_box_new(); |
1948 | +- GtkStyle *style = gtk_widget_get_style(textview); |
1949 | +- gtk_widget_modify_bg(event, GTK_STATE_NORMAL, |
1950 | +- &style->base[GTK_STATE_NORMAL]); |
1951 | +- gtk_container_add(GTK_CONTAINER(event), emblem); |
1952 | +- gtk_tooltips_set_tip(tips, event, _("This application is supported by the distribution"), ""); |
1953 | +- // create anchor |
1954 | +- GtkTextChildAnchor *anchor = gtk_text_buffer_create_child_anchor(buf, &it); |
1955 | +- gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(textview), event, anchor); |
1956 | +- gtk_widget_show_all(event); |
1957 | +- } |
1958 | +- |
1959 | + // add button to get screenshot |
1960 | + gtk_text_buffer_insert(buf, &it, "\n", 1); |
1961 | + GtkTextChildAnchor *anchor = gtk_text_buffer_create_child_anchor(buf, &it); |
1962 | +@@ -237,6 +223,51 @@ |
1963 | + s = utf8(pkg->description()); |
1964 | + gtk_text_buffer_insert(buf, &it, s, -1); |
1965 | + |
1966 | ++ // now check if we have a support time |
1967 | ++ gchar *maint_str = NULL; |
1968 | ++ struct tm end_time; |
1969 | ++ if(pkg->label() == "Ubuntu" && pkg->origin() == "Ubuntu") { |
1970 | ++ if(RGPackageStatus::pkgStatus.maintenanceEndTime(pkg, &end_time)) { |
1971 | ++ if (pkg->component() == "main") |
1972 | ++ maint_str = g_strdup_printf(_("\n\n" |
1973 | ++ "Canonical provides critical updates for %s " |
1974 | ++ "until %s %i."), |
1975 | ++ pkg->name(), |
1976 | ++ nl_langinfo(MON_1+end_time.tm_mon), |
1977 | ++ end_time.tm_year + 1900); |
1978 | ++ else if (pkg->component() == "restricted") |
1979 | ++ maint_str = g_strdup_printf(_("\n\n" |
1980 | ++ "Canonical provides critical updates " |
1981 | ++ "supplied by the developers of %s " |
1982 | ++ "until %s %i."), |
1983 | ++ pkg->name(), |
1984 | ++ nl_langinfo(MON_1+end_time.tm_mon), |
1985 | ++ end_time.tm_year + 1900); |
1986 | ++ } else { |
1987 | ++ if (pkg->component() == "main") |
1988 | ++ maint_str = g_strdup_printf(_("\n\n" |
1989 | ++ "Canonical provides critical updates for %s."), |
1990 | ++ pkg->name()); |
1991 | ++ else if (pkg->component() == "restricted") |
1992 | ++ maint_str = g_strdup_printf(_("\n\n" |
1993 | ++ "Canonical provides critical updates " |
1994 | ++ "supplied by the developers of %s."), |
1995 | ++ pkg->name()); |
1996 | ++ else if (pkg->component() == "universe" || |
1997 | ++ pkg->component() == "multiverse") |
1998 | ++ maint_str = g_strdup_printf(_("\n\n" |
1999 | ++ "Canonical does not provide " |
2000 | ++ "updates for %s. " |
2001 | ++ "Some updates may be provided " |
2002 | ++ "by the Ubuntu community."), |
2003 | ++ pkg->name()); |
2004 | ++ } |
2005 | ++ } |
2006 | ++ if(maint_str) |
2007 | ++ gtk_text_buffer_insert_with_tags_by_name(buf, |
2008 | ++ &it, maint_str, -1, |
2009 | ++ "gray", NULL); |
2010 | ++ g_free(maint_str); |
2011 | + |
2012 | + // build dependency lists |
2013 | + vector<DepInformation> deps; |
2014 | +diff -urNad ubuntu~/tests/test_rpackage.cc ubuntu/tests/test_rpackage.cc |
2015 | +--- ubuntu~/tests/test_rpackage.cc 2010-01-25 11:59:47.000000000 +0100 |
2016 | ++++ ubuntu/tests/test_rpackage.cc 2010-01-25 12:02:01.561112535 +0100 |
2017 | +@@ -17,6 +17,7 @@ |
2018 | + RPackage *pkg = lister->getPackage("eog"); |
2019 | + cerr << "pkg: " << pkg->name() << endl; |
2020 | + cerr << "Bugs: " << pkg->findTagFromPkgRecord("Bugs") << endl; |
2021 | ++ cerr << "Supported: " << pkg->findTagFromPkgRecord("Supported") << endl; |
2022 | + |
2023 | + vector<DepInformation> deps = pkg->enumDeps(); |
2024 | + for(unsigned int i=0;i<deps.size();i++) { |
2025 | +@@ -37,4 +38,10 @@ |
2026 | + s = all[i]->getRawRecord(); |
2027 | + } |
2028 | + cerr << "iterating each record: " << float(clock()-now)/CLOCKS_PER_SEC << endl; |
2029 | ++ // read supported info |
2030 | ++ cerr << "Checking for supported info:" << endl; |
2031 | ++ for(int i=0;i<all.size();i++) { |
2032 | ++ if(all[i]->findTagFromPkgRecord("Supported").empty() == false) |
2033 | ++ cerr << "pkg: " << all[i]->name() << " has support info" << endl; |
2034 | ++ } |
2035 | + } |
2036 | |
2037 | === modified file 'debian/rules' |
2038 | --- debian/rules 2008-11-18 18:19:57 +0000 |
2039 | +++ debian/rules 2010-02-17 23:07:20 +0000 |
2040 | @@ -29,6 +29,7 @@ |
2041 | --localstatedir=/var/lib/synaptic \ |
2042 | --sysconfdir=/etc --with-vte --with-pkg-hold \ |
2043 | --with-apt-authentication \ |
2044 | + --enable-ept \ |
2045 | --with-nice-dpkg-status |
2046 | |
2047 | CREATE_SUPPORTED_PIXMAP="true" |
2048 | @@ -37,7 +38,7 @@ |
2049 | # special case for ubuntu |
2050 | ifeq "$(DIST)" "Ubuntu" |
2051 | CONFIGURE_FLAGS = $(COMMON_FLAGS) --with-launchpad-integration |
2052 | - CREATE_SUPPORTED_PIXMAP=uudecode debian/package-supported.png.uu -o $(CURDIR)/debian/synaptic/usr/share/synaptic/pixmaps/package-supported.png |
2053 | + CREATE_SUPPORTED_PIXMAP=uudecode debian/package-supported.png.uu -o $(CURDIR)/debian/synaptic/usr/share/icons/hicolor/16x16/actions/package-supported.png |
2054 | endif |
2055 | |
2056 | |
2057 | |
2058 | === modified file 'debian/synaptic.dirs' |
2059 | --- debian/synaptic.dirs 2008-04-26 08:32:09 +0000 |
2060 | +++ debian/synaptic.dirs 2010-02-17 23:07:20 +0000 |
2061 | @@ -1,1 +1,2 @@ |
2062 | var/lib/synaptic |
2063 | +usr/share/icons/hicolor/16x16/actions/ |
2064 | |
2065 | === modified file 'gtk/Makefile.am' |
2066 | --- gtk/Makefile.am 2008-08-21 14:32:18 +0000 |
2067 | +++ gtk/Makefile.am 2010-02-17 23:07:20 +0000 |
2068 | @@ -7,7 +7,7 @@ |
2069 | -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ |
2070 | -DSYNAPTIC_GLADEDIR=\""$(datadir)/synaptic/glade/"\" \ |
2071 | -DSYNAPTIC_PIXMAPDIR=\""$(datadir)/synaptic/pixmaps/"\" \ |
2072 | - @PACKAGE_CFLAGS@ @VTE_CFLAGS@ @LP_CFLAGS@ $(LIBTAGCOLL_CFLAGS) |
2073 | + @PACKAGE_CFLAGS@ @VTE_CFLAGS@ @LP_CFLAGS@ $(LIBEPT_CFLAGS) |
2074 | |
2075 | sbin_PROGRAMS = synaptic |
2076 | |
2077 | @@ -17,7 +17,7 @@ |
2078 | ${top_builddir}/common/libsynaptic.a\ |
2079 | -lapt-pkg @RPM_LIBS@ @DEB_LIBS@ \ |
2080 | @PACKAGE_LIBS@ @VTE_LIBS@ @LP_LIBS@\ |
2081 | - -lpthread $(LIBTAGCOLL_LIBS) |
2082 | + -lpthread $(LIBEPT_LIBS) |
2083 | |
2084 | synaptic_SOURCES= \ |
2085 | gsynaptic.cc\ |
2086 | |
2087 | === modified file 'gtk/glade/window_fetch.glade' |
2088 | --- gtk/glade/window_fetch.glade 2008-05-08 23:25:25 +0000 |
2089 | +++ gtk/glade/window_fetch.glade 2010-02-17 23:07:21 +0000 |
2090 | @@ -5,6 +5,7 @@ |
2091 | |
2092 | <widget class="GtkWindow" id="window_fetch"> |
2093 | <property name="border_width">6</property> |
2094 | + <property name="default_width">450</property> |
2095 | <property name="title" translatable="yes"></property> |
2096 | <property name="type">GTK_WINDOW_TOPLEVEL</property> |
2097 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> |
2098 | |
2099 | === modified file 'gtk/glade/window_main.glade' |
2100 | --- gtk/glade/window_main.glade 2008-05-21 16:09:02 +0000 |
2101 | +++ gtk/glade/window_main.glade 2010-02-17 23:07:21 +0000 |
2102 | @@ -968,6 +968,85 @@ |
2103 | </child> |
2104 | |
2105 | <child> |
2106 | + <widget class="GtkToolItem" id="toolitem2"> |
2107 | + <property name="visible">True</property> |
2108 | + <property name="visible_horizontal">True</property> |
2109 | + <property name="visible_vertical">True</property> |
2110 | + <property name="is_important">False</property> |
2111 | + |
2112 | + <child> |
2113 | + <widget class="GtkVBox" id="vbox_fast_search"> |
2114 | + <property name="visible">True</property> |
2115 | + <property name="homogeneous">False</property> |
2116 | + <property name="spacing">0</property> |
2117 | + |
2118 | + <child> |
2119 | + <widget class="GtkLabel" id="label_fast_search"> |
2120 | + <property name="visible">True</property> |
2121 | + <property name="label" translatable="yes">Quick search</property> |
2122 | + <property name="use_underline">False</property> |
2123 | + <property name="use_markup">False</property> |
2124 | + <property name="justify">GTK_JUSTIFY_LEFT</property> |
2125 | + <property name="wrap">False</property> |
2126 | + <property name="selectable">False</property> |
2127 | + <property name="xalign">0</property> |
2128 | + <property name="yalign">0.5</property> |
2129 | + <property name="xpad">0</property> |
2130 | + <property name="ypad">0</property> |
2131 | + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> |
2132 | + <property name="width_chars">-1</property> |
2133 | + <property name="single_line_mode">False</property> |
2134 | + <property name="angle">0</property> |
2135 | + </widget> |
2136 | + <packing> |
2137 | + <property name="padding">0</property> |
2138 | + <property name="expand">False</property> |
2139 | + <property name="fill">False</property> |
2140 | + </packing> |
2141 | + </child> |
2142 | + |
2143 | + <child> |
2144 | + <widget class="GtkEntry" id="entry_fast_search"> |
2145 | + <property name="visible">True</property> |
2146 | + <property name="can_focus">True</property> |
2147 | + <property name="editable">True</property> |
2148 | + <property name="visibility">True</property> |
2149 | + <property name="max_length">0</property> |
2150 | + <property name="text" translatable="yes"></property> |
2151 | + <property name="has_frame">True</property> |
2152 | + <property name="invisible_char">●</property> |
2153 | + <property name="activates_default">False</property> |
2154 | + <signal name="changed" handler="on_entry_fast_search_changed" last_modification_time="Wed, 28 May 2008 15:06:32 GMT"/> |
2155 | + </widget> |
2156 | + <packing> |
2157 | + <property name="padding">0</property> |
2158 | + <property name="expand">False</property> |
2159 | + <property name="fill">False</property> |
2160 | + </packing> |
2161 | + </child> |
2162 | + </widget> |
2163 | + </child> |
2164 | + </widget> |
2165 | + <packing> |
2166 | + <property name="expand">False</property> |
2167 | + <property name="homogeneous">False</property> |
2168 | + </packing> |
2169 | + </child> |
2170 | + |
2171 | + <child> |
2172 | + <widget class="GtkSeparatorToolItem" id="separatortoolitem3"> |
2173 | + <property name="visible">True</property> |
2174 | + <property name="draw">True</property> |
2175 | + <property name="visible_horizontal">True</property> |
2176 | + <property name="visible_vertical">True</property> |
2177 | + </widget> |
2178 | + <packing> |
2179 | + <property name="expand">False</property> |
2180 | + <property name="homogeneous">False</property> |
2181 | + </packing> |
2182 | + </child> |
2183 | + |
2184 | + <child> |
2185 | <widget class="GtkToolButton" id="button1"> |
2186 | <property name="visible">True</property> |
2187 | <property name="label" translatable="yes">Search</property> |
2188 | @@ -983,6 +1062,10 @@ |
2189 | <property name="homogeneous">True</property> |
2190 | </packing> |
2191 | </child> |
2192 | + |
2193 | + <child> |
2194 | + <placeholder/> |
2195 | + </child> |
2196 | </widget> |
2197 | <packing> |
2198 | <property name="padding">0</property> |
2199 | |
2200 | === modified file 'gtk/gtkpkglist.cc' |
2201 | --- gtk/gtkpkglist.cc 2008-08-21 14:32:18 +0000 |
2202 | +++ gtk/gtkpkglist.cc 2010-02-17 23:07:20 +0000 |
2203 | @@ -657,31 +657,34 @@ |
2204 | pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SUPPORTED_DES); |
2205 | break; |
2206 | case NAME_COLUMN: |
2207 | - pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME); |
2208 | + if(pkg_list->order) |
2209 | + pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME_DES); |
2210 | + else |
2211 | + pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME_ASC); |
2212 | break; |
2213 | case PKG_SIZE_COLUMN: |
2214 | if(pkg_list->order) |
2215 | + pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SIZE_DES); |
2216 | + else |
2217 | pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SIZE_ASC); |
2218 | - else |
2219 | - pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SIZE_DES); |
2220 | break; |
2221 | case COMPONENT_COLUMN: |
2222 | if(pkg_list->order) |
2223 | + pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_COMPONENT_DES); |
2224 | + else |
2225 | pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_COMPONENT_ASC); |
2226 | - else |
2227 | - pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_COMPONENT_DES); |
2228 | break; |
2229 | case SECTION_COLUMN: |
2230 | if(pkg_list->order) |
2231 | + pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SECTION_DES); |
2232 | + else |
2233 | pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SECTION_ASC); |
2234 | - else |
2235 | - pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_SECTION_DES); |
2236 | break; |
2237 | case PKG_DOWNLOAD_SIZE_COLUMN: |
2238 | if(pkg_list->order) |
2239 | + pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_DLSIZE_DES); |
2240 | + else |
2241 | pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_DLSIZE_ASC); |
2242 | - else |
2243 | - pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_DLSIZE_DES); |
2244 | break; |
2245 | case AVAILABLE_VERSION_COLUMN: |
2246 | if(pkg_list->order) |
2247 | @@ -697,7 +700,7 @@ |
2248 | break; |
2249 | default: |
2250 | //cerr << "unknown sort column: " << pkg_list->sort_column_id << endl; |
2251 | - pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME); |
2252 | + pkg_list->_lister->sortPackages(RPackageLister::LIST_SORT_NAME_ASC); |
2253 | } |
2254 | } |
2255 | |
2256 | |
2257 | === modified file 'gtk/rgdebinstallprogress.cc' |
2258 | --- gtk/rgdebinstallprogress.cc 2010-02-11 14:17:40 +0000 |
2259 | +++ gtk/rgdebinstallprogress.cc 2010-02-17 23:07:20 +0000 |
2260 | @@ -713,16 +713,26 @@ |
2261 | } |
2262 | gtk_widget_show(img); |
2263 | |
2264 | - |
2265 | - // wait for the user to click on "close" |
2266 | - while(!_updateFinished && !autoClose) { |
2267 | + // wait for user action |
2268 | + while(true) { |
2269 | + // events |
2270 | + while (gtk_events_pending()) |
2271 | + gtk_main_iteration(); |
2272 | + |
2273 | + // user clicked "close" button |
2274 | + if(_updateFinished) |
2275 | + break; |
2276 | + |
2277 | + // user has autoClose set *and* there was no error |
2278 | autoClose= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(_autoClose)); |
2279 | - while (gtk_events_pending()) |
2280 | - gtk_main_iteration(); |
2281 | - usleep(5000); |
2282 | + if(autoClose && res != 1) |
2283 | + break; |
2284 | + |
2285 | + // wait a bit |
2286 | + g_usleep(100000); |
2287 | } |
2288 | - |
2289 | - // get the value again, it may have changed |
2290 | + |
2291 | + // set the value again, it may have changed |
2292 | _config->Set("Synaptic::closeZvt", autoClose ? "true" : "false"); |
2293 | |
2294 | // hide and finish |
2295 | |
2296 | === modified file 'gtk/rgmainwindow.cc' |
2297 | --- gtk/rgmainwindow.cc 2009-06-10 07:45:48 +0000 |
2298 | +++ gtk/rgmainwindow.cc 2010-02-17 23:07:20 +0000 |
2299 | @@ -296,7 +296,14 @@ |
2300 | ioprintf(clog, "RGMainWindow::refreshTable(): pkg: '%s' adjust '%i'\n", |
2301 | selectedPkg != NULL ? selectedPkg->name() : "(no pkg)", |
2302 | setAdjustment); |
2303 | - |
2304 | + |
2305 | + const gchar *str = gtk_entry_get_text(GTK_ENTRY(_entry_fast_search)); |
2306 | + if(str != NULL && strlen(str) > 1) { |
2307 | + if(_config->FindB("Debug::Synaptic::View",false)) |
2308 | + cerr << "RGMainWindow::refreshTable: rerun limitBySearch" << endl; |
2309 | + _lister->limitBySearch(str); |
2310 | + } |
2311 | + |
2312 | _pkgList = GTK_TREE_MODEL(gtk_pkg_list_new(_lister)); |
2313 | gtk_tree_view_set_model(GTK_TREE_VIEW(_treeView), |
2314 | GTK_TREE_MODEL(_pkgList)); |
2315 | @@ -757,7 +764,8 @@ |
2316 | RGMainWindow::RGMainWindow(RPackageLister *packLister, string name) |
2317 | : RGGladeWindow(NULL, name), _lister(packLister), _pkgList(0), |
2318 | _treeView(0), _tasksWin(0), _iconLegendPanel(0), _pkgDetails(0), |
2319 | - _logView(0), _installProgress(0), _fetchProgress(0) |
2320 | + _logView(0), _installProgress(0), _fetchProgress(0), |
2321 | + _fastSearchEventID(-1) |
2322 | { |
2323 | assert(_win); |
2324 | |
2325 | @@ -807,11 +815,80 @@ |
2326 | } |
2327 | g_value_unset(&value); |
2328 | |
2329 | + xapianDoIndexUpdate(this); |
2330 | + |
2331 | // apply the proxy settings |
2332 | RGPreferencesWindow::applyProxySettings(); |
2333 | } |
2334 | |
2335 | - |
2336 | +#ifdef WITH_EPT |
2337 | +gboolean RGMainWindow::xapianDoIndexUpdate(void *data) |
2338 | +{ |
2339 | + RGMainWindow *me = (RGMainWindow *) data; |
2340 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
2341 | + std::cerr << "xapianDoIndexUpdate()" << std::endl; |
2342 | + |
2343 | + // no need to update if we run non-interactive |
2344 | + if(_config->FindB("Volatile::Non-Interactive", false) == true) |
2345 | + return false; |
2346 | + |
2347 | + // check if we need a update |
2348 | + if(!me->_lister->xapianIndexNeedsUpdate()) { |
2349 | + // if the cache is not open, check back when it is |
2350 | + if (me->_lister->packagesSize() == 0) |
2351 | + g_timeout_add_seconds(30, xapianDoIndexUpdate, me); |
2352 | + return false; |
2353 | + } |
2354 | + |
2355 | + // do not run if we don't have it |
2356 | + if(!FileExists("/usr/sbin/update-apt-xapian-index")) |
2357 | + return false; |
2358 | + // no permission |
2359 | + if (getuid() != 0) |
2360 | + return false; |
2361 | + |
2362 | + // if we make it to this point, we need a xapian update |
2363 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
2364 | + std::cerr << "running update-apt-xapian-index" << std::endl; |
2365 | + GPid pid; |
2366 | + char *argp[] = {"/usr/bin/nice", |
2367 | + "/usr/bin/ionice","-c3", |
2368 | + "/usr/sbin/update-apt-xapian-index", |
2369 | + "--update", "-q", |
2370 | + NULL}; |
2371 | + if(g_spawn_async(NULL, argp, NULL, |
2372 | + (GSpawnFlags)(G_SPAWN_DO_NOT_REAP_CHILD), |
2373 | + NULL, NULL, &pid, NULL)) { |
2374 | + g_child_watch_add(pid, (GChildWatchFunc)xapianIndexUpdateFinished, me); |
2375 | + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(me->_gladeXML, |
2376 | + "label_fast_search")), |
2377 | + _("Rebuilding search index")); |
2378 | + } |
2379 | + return false; |
2380 | +} |
2381 | +#else |
2382 | +gboolean RGMainWindow::xapianDoIndexUpdate(void *data) |
2383 | +{ |
2384 | + return false; |
2385 | +} |
2386 | +#endif |
2387 | + |
2388 | +void RGMainWindow::xapianIndexUpdateFinished(GPid pid, gint status, void* data) |
2389 | +{ |
2390 | + RGMainWindow *me = (RGMainWindow *) data; |
2391 | + if(_config->FindB("Debug::Synaptic::Xapian",false)) |
2392 | + std::cerr << "xapianIndexUpdateFinished: " |
2393 | + << WEXITSTATUS(status) << std::endl; |
2394 | +#ifdef WITH_EPT |
2395 | + me->_lister->openXapianIndex(); |
2396 | +#endif |
2397 | + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(me->_gladeXML, |
2398 | + "label_fast_search")), |
2399 | + _("Quick search")); |
2400 | + gtk_widget_set_sensitive(glade_xml_get_widget(me->_gladeXML, |
2401 | + "entry_fast_search"), TRUE); |
2402 | + g_spawn_close_pid(pid); |
2403 | +} |
2404 | |
2405 | // needed for the buildTreeView function |
2406 | struct mysort { |
2407 | @@ -1123,6 +1200,9 @@ |
2408 | glade_xml_signal_connect_data(_gladeXML, |
2409 | "on_button_details_clicked", |
2410 | G_CALLBACK(cbDetailsWindow), this); |
2411 | + glade_xml_signal_connect_data(_gladeXML, |
2412 | + "on_entry_fast_search_changed", |
2413 | + G_CALLBACK(cbSearchEntryChanged), this); |
2414 | |
2415 | _propertiesB = glade_xml_get_widget(_gladeXML, "button_details"); |
2416 | assert(_propertiesB); |
2417 | @@ -1638,7 +1718,18 @@ |
2418 | gtk_binding_entry_add_signal(binding_set, GDK_s, GDK_CONTROL_MASK, |
2419 | "start_interactive_search", 0); |
2420 | |
2421 | + _entry_fast_search = glade_xml_get_widget(_gladeXML, "entry_fast_search"); |
2422 | |
2423 | + // only enable fast search if its usable |
2424 | +#ifdef WITH_EPT |
2425 | + if(!_lister->textsearch() || |
2426 | + !_lister->textsearch()->hasData() || |
2427 | + !FileExists("/usr/sbin/update-apt-xapian-index")) { |
2428 | + gtk_widget_set_sensitive(glade_xml_get_widget(_gladeXML, "entry_fast_search"), FALSE); |
2429 | + } |
2430 | +#else |
2431 | + gtk_widget_hide(glade_xml_get_widget(_gladeXML, "vbox_fast_search")); |
2432 | +#endif |
2433 | // stuff for the non-root mode |
2434 | if(getuid() != 0) { |
2435 | GtkWidget *menu; |
2436 | @@ -2330,10 +2421,15 @@ |
2437 | if (me->_findWin == NULL) { |
2438 | me->_findWin = new RGFindWindow(me); |
2439 | } |
2440 | - |
2441 | + |
2442 | me->_findWin->selectText(); |
2443 | int res = gtk_dialog_run(GTK_DIALOG(me->_findWin->window())); |
2444 | if (res == GTK_RESPONSE_OK) { |
2445 | + |
2446 | + // clear the quick search, otherwise both apply and that is |
2447 | + // confusing |
2448 | + gtk_entry_set_text(GTK_ENTRY(me->_entry_fast_search), ""); |
2449 | + |
2450 | string str = me->_findWin->getFindString(); |
2451 | me->setBusyCursor(true); |
2452 | |
2453 | @@ -2820,6 +2916,47 @@ |
2454 | gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb))); |
2455 | } |
2456 | |
2457 | +gboolean RGMainWindow::xapianDoSearch(void *data) |
2458 | +{ |
2459 | + RGMainWindow *me = (RGMainWindow *) data; |
2460 | + const gchar *str = gtk_entry_get_text(GTK_ENTRY(me->_entry_fast_search)); |
2461 | + |
2462 | + me->_fastSearchEventID = -1; |
2463 | + me->setBusyCursor(true); |
2464 | + RGFlushInterface(); |
2465 | + if(str == NULL || strlen(str) < 1) { |
2466 | + // reset the color |
2467 | + gtk_widget_modify_base(me->_entry_fast_search, GTK_STATE_NORMAL, NULL); |
2468 | + // if the user has cleared the search, refresh the view |
2469 | + me->_lister->reapplyFilter(); |
2470 | + me->refreshTable(); |
2471 | + me->setBusyCursor(false); |
2472 | + } else if(strlen(str) > 1) { |
2473 | + // only search when there is more than one char entered, single |
2474 | + // char searches tend to be very slow |
2475 | + me->setBusyCursor(true); |
2476 | + RGFlushInterface(); |
2477 | + me->refreshTable(); |
2478 | + // set color to a light yellow to make it more obvious that a search |
2479 | + // is performed |
2480 | + GdkColor yellowish = {0, 63479,63479,48830}; |
2481 | + gtk_widget_modify_base(me->_entry_fast_search, GTK_STATE_NORMAL, &yellowish); |
2482 | + } |
2483 | + me->setBusyCursor(false); |
2484 | + |
2485 | + return FALSE; |
2486 | +} |
2487 | + |
2488 | +void RGMainWindow::cbSearchEntryChanged(GtkWidget *edit, void *data) |
2489 | +{ |
2490 | + //cerr << "RGMainWindow::cbSearchEntryChanged()" << endl; |
2491 | + RGMainWindow *me = (RGMainWindow *) data; |
2492 | + if(me->_fastSearchEventID > 0) { |
2493 | + g_source_remove(me->_fastSearchEventID); |
2494 | + me->_fastSearchEventID = -1; |
2495 | + } |
2496 | + me->_fastSearchEventID = g_timeout_add(500, xapianDoSearch, me); |
2497 | +} |
2498 | |
2499 | void RGMainWindow::cbUpdateClicked(GtkWidget *self, void *data) |
2500 | { |
2501 | @@ -2886,6 +3023,9 @@ |
2502 | unlink(file); |
2503 | g_free((void *)file); |
2504 | |
2505 | + // check if the index needs to be rebuild |
2506 | + me->xapianDoIndexUpdate(me); |
2507 | + |
2508 | me->setTreeLocked(FALSE); |
2509 | me->refreshTable(); |
2510 | me->refreshSubViewList(); |
2511 | |
2512 | === modified file 'gtk/rgmainwindow.h' |
2513 | --- gtk/rgmainwindow.h 2007-06-18 13:12:44 +0000 |
2514 | +++ gtk/rgmainwindow.h 2010-02-17 23:07:20 +0000 |
2515 | @@ -132,6 +132,10 @@ |
2516 | RGFetchProgress *_fetchProgress; |
2517 | RGWindow *_installProgress; |
2518 | |
2519 | + // fast search stuff |
2520 | + int _fastSearchEventID; |
2521 | + GtkWidget *_entry_fast_search; |
2522 | + |
2523 | // the buttons for the various views |
2524 | GtkWidget *_viewButtons[N_PACKAGE_VIEWS]; |
2525 | |
2526 | @@ -172,6 +176,12 @@ |
2527 | // install a non-standard version (data is a char* of the version) |
2528 | static void cbInstallFromVersion(GtkWidget *self, void *data); |
2529 | |
2530 | + // helpers for search-as-you-type |
2531 | + static void cbSearchEntryChanged(GtkWidget *editable, void *data); |
2532 | + static void xapianIndexUpdateFinished(GPid pid, gint status, void* data); |
2533 | + static gboolean xapianDoSearch(void *data); |
2534 | + static gboolean xapianDoIndexUpdate(void *data); |
2535 | + |
2536 | // RPackageObserver |
2537 | virtual void notifyChange(RPackage *pkg); |
2538 | virtual void notifyPreFilteredChange() { |
2539 | |
2540 | === modified file 'gtk/rgpkgdetails.cc' |
2541 | --- gtk/rgpkgdetails.cc 2008-11-18 20:21:49 +0000 |
2542 | +++ gtk/rgpkgdetails.cc 2010-02-17 23:07:20 +0000 |
2543 | @@ -109,7 +109,8 @@ |
2544 | GtkWidget *win = gtk_dialog_new(); |
2545 | gtk_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); |
2546 | gtk_widget_show(img); |
2547 | - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win)->vbox), img); |
2548 | + GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (win)); |
2549 | + gtk_container_add(GTK_CONTAINER(content_area), img); |
2550 | gtk_dialog_run(GTK_DIALOG(win)); |
2551 | gtk_widget_destroy(win); |
2552 | } |
2553 | |
2554 | === modified file 'gtk/rguserdialog.cc' |
2555 | --- gtk/rguserdialog.cc 2010-02-11 18:27:56 +0000 |
2556 | +++ gtk/rguserdialog.cc 2010-02-17 23:07:21 +0000 |
2557 | @@ -238,7 +238,7 @@ |
2558 | |
2559 | // honor foreign parent windows (to make embedding easy) |
2560 | int id = _config->FindI("Volatile::ParentWindowId", -1); |
2561 | - if (id > 0 && _parentWindow == NULL) { |
2562 | + if (id > 0 && !GTK_WIDGET_VISIBLE(_parentWindow)) { |
2563 | GdkWindow *win = gdk_window_foreign_new(id); |
2564 | if(win) { |
2565 | gtk_widget_realize(_dialog); |
2566 | |
2567 | === modified file 'pixmaps/hicolor/16x16/package-purge.png' |
2568 | Binary files pixmaps/hicolor/16x16/package-purge.png 2006-08-08 10:55:03 +0000 and pixmaps/hicolor/16x16/package-purge.png 2010-02-17 23:07:21 +0000 differ |
2569 | === modified file 'po/Makefile.in.in' |
2570 | --- po/Makefile.in.in 2008-08-21 14:32:18 +0000 |
2571 | +++ po/Makefile.in.in 2010-02-17 23:07:21 +0000 |
2572 | @@ -21,7 +21,7 @@ |
2573 | PACKAGE = @PACKAGE@ |
2574 | VERSION = @VERSION@ |
2575 | |
2576 | -SHELL = /bin/sh |
2577 | +SHELL = @SHELL@ |
2578 | |
2579 | srcdir = @srcdir@ |
2580 | top_srcdir = @top_srcdir@ |
2581 | @@ -54,16 +54,16 @@ |
2582 | |
2583 | ALL_LINGUAS = @ALL_LINGUAS@ |
2584 | |
2585 | -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) |
2586 | - |
2587 | -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) |
2588 | - |
2589 | -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) |
2590 | - |
2591 | -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) |
2592 | - |
2593 | -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) |
2594 | -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS |
2595 | +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) |
2596 | + |
2597 | +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) |
2598 | + |
2599 | +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) |
2600 | + |
2601 | +POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) |
2602 | + |
2603 | +DISTFILES = Makefile.in.in POTFILES.in $(POFILES) |
2604 | +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS |
2605 | |
2606 | POTFILES = \ |
2607 | # This comment gets stripped out |
2608 | @@ -101,7 +101,6 @@ |
2609 | install-data: install-data-@USE_NLS@ |
2610 | install-data-no: all |
2611 | install-data-yes: all |
2612 | - $(mkdir_p) $(DESTDIR)$(itlocaledir) |
2613 | linguas="$(USE_LINGUAS)"; \ |
2614 | for lang in $$linguas; do \ |
2615 | dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ |
2616 | |
2617 | === removed file 'po/synaptic.pot' |
2618 | --- po/synaptic.pot 2010-01-25 16:50:07 +0000 |
2619 | +++ po/synaptic.pot 1970-01-01 00:00:00 +0000 |
2620 | @@ -1,3379 +0,0 @@ |
2621 | -# SOME DESCRIPTIVE TITLE. |
2622 | -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
2623 | -# This file is distributed under the same license as the PACKAGE package. |
2624 | -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
2625 | -# |
2626 | -#, fuzzy |
2627 | -msgid "" |
2628 | -msgstr "" |
2629 | -"Project-Id-Version: PACKAGE VERSION\n" |
2630 | -"Report-Msgid-Bugs-To: \n" |
2631 | -"POT-Creation-Date: 2010-01-25 17:47+0100\n" |
2632 | -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
2633 | -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
2634 | -"Language-Team: LANGUAGE <LL@li.org>\n" |
2635 | -"MIME-Version: 1.0\n" |
2636 | -"Content-Type: text/plain; charset=CHARSET\n" |
2637 | -"Content-Transfer-Encoding: 8bit\n" |
2638 | -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
2639 | - |
2640 | -#. TRANSLATORS: Alias for the Debian package section "admin" |
2641 | -#: ../common/sections_trans.cc:12 |
2642 | -msgid "System Administration" |
2643 | -msgstr "" |
2644 | - |
2645 | -#. TRANSLATORS: Alias for the Debian package section "base" |
2646 | -#: ../common/sections_trans.cc:14 |
2647 | -msgid "Base System" |
2648 | -msgstr "" |
2649 | - |
2650 | -#. TRANSLATORS: Alias for the Debian package section "cli-mono" |
2651 | -#: ../common/sections_trans.cc:16 |
2652 | -msgid "Mono/CLI Infrastructure" |
2653 | -msgstr "" |
2654 | - |
2655 | -#. TRANSLATORS: Alias for the Debian package section "comm" |
2656 | -#: ../common/sections_trans.cc:18 |
2657 | -msgid "Communication" |
2658 | -msgstr "" |
2659 | - |
2660 | -#. TRANSLATORS: Alias for the Debian package section "database" |
2661 | -#: ../common/sections_trans.cc:20 |
2662 | -msgid "Databases" |
2663 | -msgstr "" |
2664 | - |
2665 | -#. TRANSLATORS: Alias for the Debian package section "devel" |
2666 | -#: ../common/sections_trans.cc:22 |
2667 | -msgid "Development" |
2668 | -msgstr "" |
2669 | - |
2670 | -#. TRANSLATORS: Alias for the Debian package section "doc" |
2671 | -#: ../common/sections_trans.cc:24 |
2672 | -msgid "Documentation" |
2673 | -msgstr "" |
2674 | - |
2675 | -#. TRANSLATORS: Alias for the Debian package section "debug" |
2676 | -#: ../common/sections_trans.cc:26 |
2677 | -msgid "Debug" |
2678 | -msgstr "" |
2679 | - |
2680 | -#. TRANSLATORS: Alias for the Debian package section "editors" |
2681 | -#: ../common/sections_trans.cc:28 |
2682 | -msgid "Editors" |
2683 | -msgstr "" |
2684 | - |
2685 | -#. TRANSLATORS: Alias for the Debian package section "electronics" |
2686 | -#: ../common/sections_trans.cc:30 |
2687 | -msgid "Electronics" |
2688 | -msgstr "" |
2689 | - |
2690 | -#. TRANSLATORS: Alias for the Debian package section "embedded" |
2691 | -#: ../common/sections_trans.cc:32 |
2692 | -msgid "Embedded Devices" |
2693 | -msgstr "" |
2694 | - |
2695 | -#. TRANSLATORS: Alias for the Debian package section "fonts" |
2696 | -#: ../common/sections_trans.cc:34 |
2697 | -msgid "Fonts" |
2698 | -msgstr "" |
2699 | - |
2700 | -#. TRANSLATORS: Alias for the Debian package section "games" |
2701 | -#: ../common/sections_trans.cc:36 |
2702 | -msgid "Games and Amusement" |
2703 | -msgstr "" |
2704 | - |
2705 | -#. TRANSLATORS: Alias for the Debian package section "gnome" |
2706 | -#: ../common/sections_trans.cc:38 |
2707 | -msgid "GNOME Desktop Environment" |
2708 | -msgstr "" |
2709 | - |
2710 | -#. TRANSLATORS: Alias for the Debian package section "graphics" |
2711 | -#: ../common/sections_trans.cc:40 |
2712 | -msgid "Graphics" |
2713 | -msgstr "" |
2714 | - |
2715 | -#. TRANSLATORS: Alias for the Debian package section "gnu-r" |
2716 | -#: ../common/sections_trans.cc:42 |
2717 | -msgid "GNU R statistical system" |
2718 | -msgstr "" |
2719 | - |
2720 | -#. TRANSLATORS: Alias for the Debian package section "gnustep" |
2721 | -#: ../common/sections_trans.cc:44 |
2722 | -msgid "Gnustep Desktop Environment" |
2723 | -msgstr "" |
2724 | - |
2725 | -#. TRANSLATORS: Alias for the Debian package section "hamradio" |
2726 | -#: ../common/sections_trans.cc:46 |
2727 | -msgid "Amateur Radio" |
2728 | -msgstr "" |
2729 | - |
2730 | -#. TRANSLATORS: Alias for the Debian package section "haskell" |
2731 | -#: ../common/sections_trans.cc:48 |
2732 | -msgid "Haskell Programming Language" |
2733 | -msgstr "" |
2734 | - |
2735 | -#. TRANSLATORS: Alias for the Debian package section "httpd" |
2736 | -#: ../common/sections_trans.cc:50 |
2737 | -msgid "Web servers" |
2738 | -msgstr "" |
2739 | - |
2740 | -#. TRANSLATORS: Alias for the Debian package section "interpreters" |
2741 | -#: ../common/sections_trans.cc:52 |
2742 | -msgid "Interpreted Computer Languages" |
2743 | -msgstr "" |
2744 | - |
2745 | -#. TRANSLATORS: Alias for the Debian package section "java" |
2746 | -#: ../common/sections_trans.cc:54 |
2747 | -msgid "Java Programming Language" |
2748 | -msgstr "" |
2749 | - |
2750 | -#. TRANSLATORS: Alias for the Debian package section "KDE" |
2751 | -#: ../common/sections_trans.cc:56 |
2752 | -msgid "KDE Desktop Environment" |
2753 | -msgstr "" |
2754 | - |
2755 | -#. TRANSLATORS: Alias for the Debian package section "kernel" |
2756 | -#: ../common/sections_trans.cc:58 |
2757 | -msgid "Kernel and modules" |
2758 | -msgstr "" |
2759 | - |
2760 | -#. TRANSLATORS: Alias for the Debian package section "libdevel" |
2761 | -#: ../common/sections_trans.cc:60 |
2762 | -msgid "Libraries - Development" |
2763 | -msgstr "" |
2764 | - |
2765 | -#. TRANSLATORS: Alias for the Debian package section "libs" |
2766 | -#: ../common/sections_trans.cc:62 |
2767 | -msgid "Libraries" |
2768 | -msgstr "" |
2769 | - |
2770 | -#. TRANSLATORS: Alias for the Debian package section "lisp" |
2771 | -#: ../common/sections_trans.cc:64 |
2772 | -msgid "Lisp Programming Language" |
2773 | -msgstr "" |
2774 | - |
2775 | -#. TRANSLATORS: Alias for the Debian package section "localization" |
2776 | -#: ../common/sections_trans.cc:66 |
2777 | -msgid "Localization" |
2778 | -msgstr "" |
2779 | - |
2780 | -#. TRANSLATORS: Alias for the Debian package section "mail" |
2781 | -#: ../common/sections_trans.cc:68 |
2782 | -msgid "Email" |
2783 | -msgstr "" |
2784 | - |
2785 | -#. TRANSLATORS: Alias for the Debian package section "math" |
2786 | -#: ../common/sections_trans.cc:70 |
2787 | -msgid "Mathematics" |
2788 | -msgstr "" |
2789 | - |
2790 | -#. TRANSLATORS: Alias for the Debian package section "misc" |
2791 | -#: ../common/sections_trans.cc:72 |
2792 | -msgid "Miscellaneous - Text Based" |
2793 | -msgstr "" |
2794 | - |
2795 | -#. TRANSLATORS: Alias for the Debian package section "net" |
2796 | -#: ../common/sections_trans.cc:74 |
2797 | -msgid "Networking" |
2798 | -msgstr "" |
2799 | - |
2800 | -#. TRANSLATORS: Alias for the Debian package section "news" |
2801 | -#: ../common/sections_trans.cc:76 |
2802 | -msgid "Newsgroup" |
2803 | -msgstr "" |
2804 | - |
2805 | -#. TRANSLATORS: Alias for the Debian package section "ocaml" |
2806 | -#: ../common/sections_trans.cc:78 |
2807 | -msgid "OCaml Programming Language" |
2808 | -msgstr "" |
2809 | - |
2810 | -#. TRANSLATORS: Alias for the Debian package section "oldlibs" |
2811 | -#: ../common/sections_trans.cc:80 |
2812 | -msgid "Libraries - Old" |
2813 | -msgstr "" |
2814 | - |
2815 | -#. TRANSLATORS: Alias for the Debian package section "otherosfs" |
2816 | -#: ../common/sections_trans.cc:82 |
2817 | -msgid "Cross Platform" |
2818 | -msgstr "" |
2819 | - |
2820 | -#. TRANSLATORS: Alias for the Debian package section "perl" |
2821 | -#: ../common/sections_trans.cc:84 |
2822 | -msgid "Perl Programming Language" |
2823 | -msgstr "" |
2824 | - |
2825 | -#. TRANSLATORS: Alias for the Debian package section "php" |
2826 | -#: ../common/sections_trans.cc:86 |
2827 | -msgid "PHP Programming Language" |
2828 | -msgstr "" |
2829 | - |
2830 | -#. TRANSLATORS: Alias for the Debian package section "python" |
2831 | -#: ../common/sections_trans.cc:88 |
2832 | -msgid "Python Programming Language" |
2833 | -msgstr "" |
2834 | - |
2835 | -#. TRANSLATORS: Alias for the Debian package section "ruby" |
2836 | -#: ../common/sections_trans.cc:90 |
2837 | -msgid "Ruby Programming Language" |
2838 | -msgstr "" |
2839 | - |
2840 | -#. TRANSLATORS: Alias for the Debian package section "science" |
2841 | -#: ../common/sections_trans.cc:92 |
2842 | -msgid "Science" |
2843 | -msgstr "" |
2844 | - |
2845 | -#. TRANSLATORS: Alias for the Debian package section "shells" |
2846 | -#: ../common/sections_trans.cc:94 |
2847 | -msgid "Shells" |
2848 | -msgstr "" |
2849 | - |
2850 | -#. TRANSLATORS: Alias for the Debian package section "sound" |
2851 | -#: ../common/sections_trans.cc:96 |
2852 | -msgid "Multimedia" |
2853 | -msgstr "" |
2854 | - |
2855 | -#. TRANSLATORS: Alias for the Debian package section "tex" |
2856 | -#: ../common/sections_trans.cc:98 |
2857 | -msgid "TeX Authoring" |
2858 | -msgstr "" |
2859 | - |
2860 | -#. TRANSLATORS: Alias for the Debian package section "text" |
2861 | -#: ../common/sections_trans.cc:100 |
2862 | -msgid "Word Processing" |
2863 | -msgstr "" |
2864 | - |
2865 | -#. TRANSLATORS: Alias for the Debian package section "utils" |
2866 | -#: ../common/sections_trans.cc:102 |
2867 | -msgid "Utilities" |
2868 | -msgstr "" |
2869 | - |
2870 | -#. TRANSLATORS: Alias for the Debian package section "vcs" |
2871 | -#: ../common/sections_trans.cc:104 |
2872 | -msgid "Version Control Systems" |
2873 | -msgstr "" |
2874 | - |
2875 | -#. TRANSLATORS: Alias for the Debian package section "video" |
2876 | -#: ../common/sections_trans.cc:106 |
2877 | -msgid "Video software" |
2878 | -msgstr "" |
2879 | - |
2880 | -#. TRANSLATORS: Alias for the Debian package section "web" |
2881 | -#: ../common/sections_trans.cc:108 |
2882 | -msgid "World Wide Web" |
2883 | -msgstr "" |
2884 | - |
2885 | -#. TRANSLATORS: Alias for the Debian package section "x11" |
2886 | -#: ../common/sections_trans.cc:110 |
2887 | -msgid "Miscellaneous - Graphical" |
2888 | -msgstr "" |
2889 | - |
2890 | -#. TRANSLATORS: Alias for the Debian package section "xfce" |
2891 | -#: ../common/sections_trans.cc:112 |
2892 | -msgid "Xfce Desktop Environment" |
2893 | -msgstr "" |
2894 | - |
2895 | -#. TRANSLATORS: Alias for the Debian package section "zope" |
2896 | -#: ../common/sections_trans.cc:114 |
2897 | -msgid "Zope/Plone Environment" |
2898 | -msgstr "" |
2899 | - |
2900 | -#. TRANSLATORS: The section of the package is not known |
2901 | -#: ../common/sections_trans.cc:116 ../common/rpackage.cc:110 |
2902 | -#: ../common/rpackageview.cc:573 |
2903 | -msgid "Unknown" |
2904 | -msgstr "" |
2905 | - |
2906 | -#. TRANSLATORS: Alias for the Debian package section "alien" |
2907 | -#: ../common/sections_trans.cc:118 |
2908 | -msgid "Converted From RPM by Alien" |
2909 | -msgstr "" |
2910 | - |
2911 | -#. TRANSLATORS: Ubuntu translations section |
2912 | -#: ../common/sections_trans.cc:120 |
2913 | -msgid "Internationalization and localization" |
2914 | -msgstr "" |
2915 | - |
2916 | -#. TRANSLATORS: Alias for the Debian package section "non-US" |
2917 | -#. Export to the outside of the USA is not allowed |
2918 | -#. or restricted |
2919 | -#: ../common/sections_trans.cc:125 ../common/sections_trans.cc:143 |
2920 | -#: ../common/sections_trans.cc:147 |
2921 | -msgid "Restricted On Export" |
2922 | -msgstr "" |
2923 | - |
2924 | -#. TRANSLATORS: Alias for the Debian package section "non free" |
2925 | -#: ../common/sections_trans.cc:127 ../common/sections_trans.cc:144 |
2926 | -msgid "non free" |
2927 | -msgstr "" |
2928 | - |
2929 | -#. TRANSLATORS: Alias for the Debian package section "contrib" |
2930 | -#. Free software that depends on non-free software |
2931 | -#: ../common/sections_trans.cc:130 ../common/sections_trans.cc:148 |
2932 | -msgid "contrib" |
2933 | -msgstr "" |
2934 | - |
2935 | -#: ../common/indexcopy.cc:51 ../common/rpmindexcopy.cc:75 |
2936 | -#, c-format |
2937 | -msgid "Stat failed for %s" |
2938 | -msgstr "" |
2939 | - |
2940 | -#: ../common/indexcopy.cc:78 ../common/rpmindexcopy.cc:107 |
2941 | -msgid "Unable to create a tmp file" |
2942 | -msgstr "" |
2943 | - |
2944 | -#: ../common/indexcopy.cc:107 |
2945 | -msgid "gzip failed, perhaps the disk is full." |
2946 | -msgstr "" |
2947 | - |
2948 | -#: ../common/indexcopy.cc:128 |
2949 | -msgid "Failed to reopen fd" |
2950 | -msgstr "" |
2951 | - |
2952 | -#: ../common/indexcopy.cc:218 ../common/indexcopy.cc:242 |
2953 | -#: ../common/rpmindexcopy.cc:169 ../common/rpmindexcopy.cc:205 |
2954 | -msgid "Failed to rename" |
2955 | -msgstr "" |
2956 | - |
2957 | -#: ../common/indexcopy.cc:266 |
2958 | -msgid "No valid records were found." |
2959 | -msgstr "" |
2960 | - |
2961 | -#: ../common/indexcopy.cc:441 |
2962 | -msgid "Cannot find filename or size tag" |
2963 | -msgstr "" |
2964 | - |
2965 | -#: ../common/indexcopy.cc:485 |
2966 | -msgid "Error parsing file record" |
2967 | -msgstr "" |
2968 | - |
2969 | -#: ../common/rcdscanner.cc:112 ../common/rcdscanner.cc:162 |
2970 | -#, c-format |
2971 | -msgid "Failed to open %s.new" |
2972 | -msgstr "" |
2973 | - |
2974 | -#: ../common/rcdscanner.cc:137 ../common/rcdscanner.cc:247 |
2975 | -#, c-format |
2976 | -msgid "Failed to rename %s.new to %s" |
2977 | -msgstr "" |
2978 | - |
2979 | -#: ../common/rcdscanner.cc:202 ../common/rcdscanner.cc:235 |
2980 | -msgid "Internal error" |
2981 | -msgstr "" |
2982 | - |
2983 | -#: ../common/rcdscanner.cc:260 |
2984 | -msgid "Preparing..." |
2985 | -msgstr "" |
2986 | - |
2987 | -#: ../common/rcdscanner.cc:273 |
2988 | -#, c-format |
2989 | -msgid "Unable to read the cdrom database %s" |
2990 | -msgstr "" |
2991 | - |
2992 | -#: ../common/rcdscanner.cc:280 ../common/rcdscanner.cc:322 |
2993 | -#: ../common/rcdscanner.cc:421 |
2994 | -msgid "Unmounting CD-ROM..." |
2995 | -msgstr "" |
2996 | - |
2997 | -#: ../common/rcdscanner.cc:283 |
2998 | -msgid "Waiting for disc..." |
2999 | -msgstr "" |
3000 | - |
3001 | -#: ../common/rcdscanner.cc:284 |
3002 | -msgid "Insert a disc in the drive." |
3003 | -msgstr "" |
3004 | - |
3005 | -#. Mount the new CDROM |
3006 | -#: ../common/rcdscanner.cc:288 |
3007 | -msgid "Mounting CD-ROM..." |
3008 | -msgstr "" |
3009 | - |
3010 | -#: ../common/rcdscanner.cc:291 |
3011 | -msgid "Failed to mount the cdrom." |
3012 | -msgstr "" |
3013 | - |
3014 | -#: ../common/rcdscanner.cc:295 |
3015 | -msgid "Identifying disc..." |
3016 | -msgstr "" |
3017 | - |
3018 | -#: ../common/rcdscanner.cc:298 |
3019 | -msgid "Couldn't identify disc." |
3020 | -msgstr "" |
3021 | - |
3022 | -#: ../common/rcdscanner.cc:301 |
3023 | -msgid "Scanning disc..." |
3024 | -msgstr "" |
3025 | - |
3026 | -#: ../common/rcdscanner.cc:316 |
3027 | -msgid "Cleaning package lists..." |
3028 | -msgstr "" |
3029 | - |
3030 | -#: ../common/rcdscanner.cc:329 |
3031 | -msgid "" |
3032 | -"Unable to locate any package files. Perhaps this is not an APT enabled disc." |
3033 | -msgstr "" |
3034 | - |
3035 | -#: ../common/rcdscanner.cc:380 |
3036 | -msgid "Disc not successfully scanned." |
3037 | -msgstr "" |
3038 | - |
3039 | -#: ../common/rcdscanner.cc:384 |
3040 | -msgid "Empty disc name." |
3041 | -msgstr "" |
3042 | - |
3043 | -#: ../common/rcdscanner.cc:387 |
3044 | -msgid "Registering disc..." |
3045 | -msgstr "" |
3046 | - |
3047 | -#: ../common/rcdscanner.cc:401 |
3048 | -msgid "Copying package lists..." |
3049 | -msgstr "" |
3050 | - |
3051 | -#: ../common/rcdscanner.cc:410 |
3052 | -msgid "Writing sources list..." |
3053 | -msgstr "" |
3054 | - |
3055 | -#: ../common/rcdscanner.cc:425 |
3056 | -msgid "Done!" |
3057 | -msgstr "" |
3058 | - |
3059 | -#: ../common/rcdscanner.cc:523 |
3060 | -#, c-format |
3061 | -msgid "Failed to stat %s%s" |
3062 | -msgstr "" |
3063 | - |
3064 | -#: ../common/rcdscanner.cc:625 ../common/rcdscanner.cc:721 |
3065 | -#, c-format |
3066 | -msgid "Unable to change to %s" |
3067 | -msgstr "" |
3068 | - |
3069 | -#: ../common/rcdscanner.cc:663 ../common/rsources.cc:177 |
3070 | -#, c-format |
3071 | -msgid "Unable to read %s" |
3072 | -msgstr "" |
3073 | - |
3074 | -#: ../common/rconfiguration.cc:88 ../common/rconfiguration.cc:241 |
3075 | -#, c-format |
3076 | -msgid "ERROR: couldn't open %s for writing" |
3077 | -msgstr "" |
3078 | - |
3079 | -#: ../common/rconfiguration.cc:114 |
3080 | -msgid "ERROR: Could not get password entry for superuser" |
3081 | -msgstr "" |
3082 | - |
3083 | -#: ../common/rconfiguration.cc:123 |
3084 | -#, c-format |
3085 | -msgid "ERROR: could not create configuration directory %s" |
3086 | -msgstr "" |
3087 | - |
3088 | -#: ../common/rconfiguration.cc:147 |
3089 | -#, c-format |
3090 | -msgid "ERROR: could not create state directory %s" |
3091 | -msgstr "" |
3092 | - |
3093 | -#: ../common/rconfiguration.cc:164 |
3094 | -#, c-format |
3095 | -msgid "ERROR: could not create tmp directory %s" |
3096 | -msgstr "" |
3097 | - |
3098 | -#: ../common/rconfiguration.cc:182 |
3099 | -#, c-format |
3100 | -msgid "ERROR: could not create log directory %s" |
3101 | -msgstr "" |
3102 | - |
3103 | -#: ../common/rconfiguration.cc:266 |
3104 | -#, c-format |
3105 | -msgid "couldn't open %s for writing" |
3106 | -msgstr "" |
3107 | - |
3108 | -#: ../common/rinstallprogress.cc:41 |
3109 | -msgid "" |
3110 | -"\n" |
3111 | -"Successfully applied all changes. You can close the window now." |
3112 | -msgstr "" |
3113 | - |
3114 | -#: ../common/rinstallprogress.cc:42 |
3115 | -msgid "" |
3116 | -"\n" |
3117 | -"Not all changes and updates succeeded. For further details of the failure, " |
3118 | -"please expand the 'Details' panel below." |
3119 | -msgstr "" |
3120 | - |
3121 | -#: ../common/rinstallprogress.cc:44 |
3122 | -msgid "" |
3123 | -"\n" |
3124 | -"Successfully installed all packages of the current medium. To continue the " |
3125 | -"installation with the next medium close this window." |
3126 | -msgstr "" |
3127 | - |
3128 | -#: ../common/rpackage.cc:203 |
3129 | -msgid "The list of installed files is only available for installed packages" |
3130 | -msgstr "" |
3131 | - |
3132 | -#: ../common/rpackage.cc:463 |
3133 | -msgid "or dependency" |
3134 | -msgstr "" |
3135 | - |
3136 | -#: ../common/rpackage.cc:580 |
3137 | -#, c-format |
3138 | -msgid "" |
3139 | -"\n" |
3140 | -"Package %s has no available version, but exists in the database.\n" |
3141 | -"This typically means that the package was mentioned in a dependency and " |
3142 | -"never uploaded, has been obsoleted or is not available with the contents of " |
3143 | -"sources.list\n" |
3144 | -msgstr "" |
3145 | - |
3146 | -#. TRANSLATORS: dependency error message, example: |
3147 | -#. "apt 0.5.4 but 0.5.3 is to be installed" |
3148 | -#: ../common/rpackage.cc:617 |
3149 | -#, c-format |
3150 | -msgid "\t%s %s but %s is to be installed" |
3151 | -msgstr "" |
3152 | - |
3153 | -#. TRANSLATORS: dependency error message, example: |
3154 | -#. "Depends: apt 0.5.4 but 0.5.3 is to be installed" |
3155 | -#: ../common/rpackage.cc:623 |
3156 | -#, c-format |
3157 | -msgid " %s: %s %s but %s is to be installed" |
3158 | -msgstr "" |
3159 | - |
3160 | -#. TRANSLATORS: dependency error message, example: |
3161 | -#. "apt 0.5.4 but it is not installable" |
3162 | -#: ../common/rpackage.cc:633 |
3163 | -#, c-format |
3164 | -msgid "\t%s %s but it is not installable" |
3165 | -msgstr "" |
3166 | - |
3167 | -#. TRANSLATORS: dependency error message, example: |
3168 | -#. "apt but it is a virtual package" |
3169 | -#: ../common/rpackage.cc:645 |
3170 | -#, c-format |
3171 | -msgid "\t%s but it is a virtual package" |
3172 | -msgstr "" |
3173 | - |
3174 | -#. TRANSLATORS: dependency error message, example: |
3175 | -#. "Depends: apt but it is a virtual package" |
3176 | -#: ../common/rpackage.cc:650 |
3177 | -#, c-format |
3178 | -msgid "%s: %s but it is a virtual package" |
3179 | -msgstr "" |
3180 | - |
3181 | -#. TRANSLATORS: dependency error message, example: |
3182 | -#. "apt but it is not going to be installed" |
3183 | -#: ../common/rpackage.cc:655 |
3184 | -#, c-format |
3185 | -msgid "\t%s but it is not going to be installed" |
3186 | -msgstr "" |
3187 | - |
3188 | -#. TRANSLATORS: dependency error message, example: |
3189 | -#. "Depends: apt but it is not going to be installed" |
3190 | -#: ../common/rpackage.cc:660 |
3191 | -#, c-format |
3192 | -msgid "%s: %s but it is not going to be installed" |
3193 | -msgstr "" |
3194 | - |
3195 | -#: ../common/rpackage.cc:679 |
3196 | -msgid " or" |
3197 | -msgstr "" |
3198 | - |
3199 | -#: ../common/rpackage.cc:1017 |
3200 | -msgid "Invalid record in the preferences file, no Package header" |
3201 | -msgstr "" |
3202 | - |
3203 | -#: ../common/rpackage.h:53 ../common/rpackagefilter.cc:48 |
3204 | -msgid "Depends" |
3205 | -msgstr "" |
3206 | - |
3207 | -#: ../common/rpackage.h:54 |
3208 | -msgid "PreDepends" |
3209 | -msgstr "" |
3210 | - |
3211 | -#: ../common/rpackage.h:55 ../common/rpackagefilter.cc:53 |
3212 | -msgid "Suggests" |
3213 | -msgstr "" |
3214 | - |
3215 | -#: ../common/rpackage.h:56 ../common/rpackagefilter.cc:52 |
3216 | -msgid "Recommends" |
3217 | -msgstr "" |
3218 | - |
3219 | -#: ../common/rpackage.h:57 ../common/rpackagefilter.cc:50 |
3220 | -msgid "Conflicts" |
3221 | -msgstr "" |
3222 | - |
3223 | -#: ../common/rpackage.h:58 ../common/rpackagefilter.cc:51 |
3224 | -msgid "Replaces" |
3225 | -msgstr "" |
3226 | - |
3227 | -#: ../common/rpackage.h:59 |
3228 | -msgid "Obsoletes" |
3229 | -msgstr "" |
3230 | - |
3231 | -#: ../common/rpackage.h:60 |
3232 | -msgid "Breaks" |
3233 | -msgstr "" |
3234 | - |
3235 | -#: ../common/rpackage.h:61 |
3236 | -msgid "Enhances" |
3237 | -msgstr "" |
3238 | - |
3239 | -#. make sure this is always the last member |
3240 | -#: ../common/rpackage.h:69 |
3241 | -msgid "Dependency of" |
3242 | -msgstr "" |
3243 | - |
3244 | -#: ../common/rpackagestatus.cc:49 |
3245 | -msgid "Marked for installation" |
3246 | -msgstr "" |
3247 | - |
3248 | -#: ../common/rpackagestatus.cc:50 |
3249 | -msgid "Marked for re-installation" |
3250 | -msgstr "" |
3251 | - |
3252 | -#: ../common/rpackagestatus.cc:51 |
3253 | -msgid "Marked for upgrade" |
3254 | -msgstr "" |
3255 | - |
3256 | -#: ../common/rpackagestatus.cc:52 |
3257 | -msgid "Marked for downgrade" |
3258 | -msgstr "" |
3259 | - |
3260 | -#: ../common/rpackagestatus.cc:53 |
3261 | -msgid "Marked for removal" |
3262 | -msgstr "" |
3263 | - |
3264 | -#: ../common/rpackagestatus.cc:54 |
3265 | -msgid "Marked for complete removal" |
3266 | -msgstr "" |
3267 | - |
3268 | -#: ../common/rpackagestatus.cc:55 ../common/rpackageview.cc:136 |
3269 | -#: ../gtk/glade/window_filters.glade.h:41 |
3270 | -msgid "Not installed" |
3271 | -msgstr "" |
3272 | - |
3273 | -#: ../common/rpackagestatus.cc:56 |
3274 | -msgid "Not installed (locked)" |
3275 | -msgstr "" |
3276 | - |
3277 | -#: ../common/rpackagestatus.cc:57 ../common/rpackageview.cc:131 |
3278 | -#: ../gtk/gsynaptic.cc:565 ../gtk/glade/window_filters.glade.h:30 |
3279 | -msgid "Installed" |
3280 | -msgstr "" |
3281 | - |
3282 | -#: ../common/rpackagestatus.cc:58 ../common/rpackageview.cc:167 |
3283 | -#: ../gtk/gsynaptic.cc:554 |
3284 | -msgid "Installed (upgradable)" |
3285 | -msgstr "" |
3286 | - |
3287 | -#: ../common/rpackagestatus.cc:59 |
3288 | -msgid "Installed (locked to the current version)" |
3289 | -msgstr "" |
3290 | - |
3291 | -#: ../common/rpackagestatus.cc:60 ../common/rpackageview.cc:514 |
3292 | -#: ../gtk/glade/window_filters.glade.h:14 |
3293 | -msgid "Broken" |
3294 | -msgstr "" |
3295 | - |
3296 | -#: ../common/rpackagestatus.cc:61 |
3297 | -msgid "Not installed (new in repository)" |
3298 | -msgstr "" |
3299 | - |
3300 | -#: ../common/rpackagecache.cc:62 |
3301 | -msgid "" |
3302 | -"The list of sources could not be read.\n" |
3303 | -"Go to the repository dialog to correct the problem." |
3304 | -msgstr "" |
3305 | - |
3306 | -#: ../common/rpackagecache.cc:73 |
3307 | -msgid "The package lists or status file could not be parsed or opened." |
3308 | -msgstr "" |
3309 | - |
3310 | -#: ../common/rpackagecache.cc:108 |
3311 | -msgid "Internal Error, non-zero counts" |
3312 | -msgstr "" |
3313 | - |
3314 | -#: ../common/rpackagefilter.cc:44 ../gtk/rgpreferenceswindow.cc:1046 |
3315 | -#: ../gtk/glade/window_find.glade.h:5 |
3316 | -msgid "Name" |
3317 | -msgstr "" |
3318 | - |
3319 | -#: ../common/rpackagefilter.cc:45 ../gtk/rgpreferenceswindow.cc:51 |
3320 | -#: ../gtk/rgmainwindow.cc:1044 ../gtk/rgvendorswindow.cc:62 |
3321 | -#: ../gtk/rgvendorswindow.cc:94 ../gtk/glade/window_main.glade.h:21 |
3322 | -#: ../gtk/glade/window_filters.glade.h:20 |
3323 | -#: ../gtk/glade/window_details.glade.h:16 ../gtk/rgfiltermanager.h:70 |
3324 | -msgid "Description" |
3325 | -msgstr "" |
3326 | - |
3327 | -#: ../common/rpackagefilter.cc:46 ../gtk/glade/window_find.glade.h:4 |
3328 | -#: ../gtk/glade/window_filters.glade.h:37 ../gtk/rgfiltermanager.h:71 |
3329 | -msgid "Maintainer" |
3330 | -msgstr "" |
3331 | - |
3332 | -#: ../common/rpackagefilter.cc:47 ../gtk/glade/window_find.glade.h:8 |
3333 | -msgid "Version" |
3334 | -msgstr "" |
3335 | - |
3336 | -#: ../common/rpackagefilter.cc:49 |
3337 | -msgid "Provides" |
3338 | -msgstr "" |
3339 | - |
3340 | -#: ../common/rpackagefilter.cc:54 |
3341 | -msgid "ReverseDepends" |
3342 | -msgstr "" |
3343 | - |
3344 | -#. Reverse Depends |
3345 | -#: ../common/rpackagefilter.cc:55 ../common/rpackageview.h:124 |
3346 | -#: ../gtk/glade/window_main.glade.h:36 ../gtk/glade/window_filters.glade.h:45 |
3347 | -#: ../gtk/rgfiltermanager.h:80 |
3348 | -msgid "Origin" |
3349 | -msgstr "" |
3350 | - |
3351 | -#. Origin (e.g. security.debian.org) |
3352 | -#: ../common/rpackagefilter.cc:56 ../gtk/rgpreferenceswindow.cc:50 |
3353 | -#: ../gtk/rgmainwindow.cc:937 ../gtk/glade/window_filters.glade.h:15 |
3354 | -#: ../gtk/rgfiltermanager.h:81 |
3355 | -msgid "Component" |
3356 | -msgstr "" |
3357 | - |
3358 | -#: ../common/rpackagefilter.cc:61 ../common/rpackageview.h:140 |
3359 | -#: ../gtk/rgpreferenceswindow.cc:49 ../gtk/rgfetchprogress.cc:91 |
3360 | -#: ../gtk/glade/window_filters.glade.h:64 |
3361 | -msgid "Status" |
3362 | -msgstr "" |
3363 | - |
3364 | -#. g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL); |
3365 | -#: ../common/rpackagefilter.cc:62 ../gtk/rgfiltermanager.cc:180 |
3366 | -msgid "Pattern" |
3367 | -msgstr "" |
3368 | - |
3369 | -#: ../common/rpackagefilter.cc:63 ../gtk/rgpreferenceswindow.cc:49 |
3370 | -#: ../gtk/rgmainwindow.cc:916 ../gtk/glade/window_filters.glade.h:63 |
3371 | -msgid "Section" |
3372 | -msgstr "" |
3373 | - |
3374 | -#: ../common/rpackagefilter.cc:64 |
3375 | -msgid "Priority" |
3376 | -msgstr "" |
3377 | - |
3378 | -#: ../common/rpackagefilter.cc:65 |
3379 | -msgid "ReducedView" |
3380 | -msgstr "" |
3381 | - |
3382 | -#: ../common/rpackagefilter.cc:66 |
3383 | -msgid "File" |
3384 | -msgstr "" |
3385 | - |
3386 | -#: ../common/rpackagefilter.cc:759 |
3387 | -#, c-format |
3388 | -msgid "Bad regular expression '%s' in ReducedView file." |
3389 | -msgstr "" |
3390 | - |
3391 | -#: ../common/rpackagelister.cc:317 ../common/rpackagelister.cc:323 |
3392 | -#: ../common/rpackagelister.cc:333 |
3393 | -#, c-format |
3394 | -msgid "Internal error opening cache (%d). Please report." |
3395 | -msgstr "" |
3396 | - |
3397 | -#: ../common/rpackagelister.cc:472 |
3398 | -msgid "Unable to correct dependencies" |
3399 | -msgstr "" |
3400 | - |
3401 | -#: ../common/rpackagelister.cc:474 |
3402 | -msgid "" |
3403 | -"Unable to mark upgrades\n" |
3404 | -"Check your system for errors." |
3405 | -msgstr "" |
3406 | - |
3407 | -#: ../common/rpackagelister.cc:486 |
3408 | -msgid "Internal Error, AllUpgrade broke stuff. Please report." |
3409 | -msgstr "" |
3410 | - |
3411 | -#: ../common/rpackagelister.cc:504 |
3412 | -msgid "dist upgrade Failed" |
3413 | -msgstr "" |
3414 | - |
3415 | -#: ../common/rpackagelister.cc:1266 |
3416 | -msgid "Unable to lock the list directory" |
3417 | -msgstr "" |
3418 | - |
3419 | -#: ../common/rpackagelister.cc:1288 |
3420 | -msgid "" |
3421 | -"Release files for some repositories could not be retrieved or authenticated. " |
3422 | -"Such repositories are being ignored." |
3423 | -msgstr "" |
3424 | - |
3425 | -#: ../common/rpackagelister.cc:1379 ../gtk/rgrepositorywin.cc:356 |
3426 | -msgid "Ignoring invalid record(s) in sources.list file!" |
3427 | -msgstr "" |
3428 | - |
3429 | -#. TRANSLATORS: Error message after a failed download. |
3430 | -#. The first %s is the URL and the second |
3431 | -#. one is a detailed error message that |
3432 | -#. is provided by apt |
3433 | -#: ../common/rpackagelister.cc:1430 |
3434 | -#, c-format |
3435 | -msgid "" |
3436 | -"Failed to fetch %s\n" |
3437 | -" %s\n" |
3438 | -"\n" |
3439 | -msgstr "" |
3440 | - |
3441 | -#: ../common/rpackagelister.cc:1454 |
3442 | -msgid "Some of the packages could not be retrieved from the server(s).\n" |
3443 | -msgstr "" |
3444 | - |
3445 | -#: ../common/rpackagelister.cc:1457 |
3446 | -msgid "Do you want to continue, ignoring these packages?" |
3447 | -msgstr "" |
3448 | - |
3449 | -#: ../common/rpackagelister.cc:1464 |
3450 | -msgid "Unable to correct missing packages" |
3451 | -msgstr "" |
3452 | - |
3453 | -#. _logEntry += _("\n<b>Removed the following ESSENTIAL packages:</b>\n"); |
3454 | -#: ../common/rpackagelister.cc:1602 |
3455 | -msgid "" |
3456 | -"\n" |
3457 | -"Removed the following ESSENTIAL packages:\n" |
3458 | -msgstr "" |
3459 | - |
3460 | -#. _logEntry += _("\n<b>Downgraded the following packages:</b>\n"); |
3461 | -#: ../common/rpackagelister.cc:1611 |
3462 | -msgid "" |
3463 | -"\n" |
3464 | -"Downgraded the following packages:\n" |
3465 | -msgstr "" |
3466 | - |
3467 | -#. _logEntry += _("\n<b>Completely removed the following packages:</b>\n"); |
3468 | -#: ../common/rpackagelister.cc:1620 |
3469 | -msgid "" |
3470 | -"\n" |
3471 | -"Completely removed the following packages:\n" |
3472 | -msgstr "" |
3473 | - |
3474 | -#. _logEntry += _("\n<b>Removed the following packages:</b>\n"); |
3475 | -#: ../common/rpackagelister.cc:1629 |
3476 | -msgid "" |
3477 | -"\n" |
3478 | -"Removed the following packages:\n" |
3479 | -msgstr "" |
3480 | - |
3481 | -#. _logEntry += _("\n<b>Upgraded the following packages:</b>\n"); |
3482 | -#: ../common/rpackagelister.cc:1638 |
3483 | -msgid "" |
3484 | -"\n" |
3485 | -"Upgraded the following packages:\n" |
3486 | -msgstr "" |
3487 | - |
3488 | -#. _logEntry += _("\n<b>Installed the following packages:</b>\n"); |
3489 | -#: ../common/rpackagelister.cc:1649 |
3490 | -msgid "" |
3491 | -"\n" |
3492 | -"Installed the following packages:\n" |
3493 | -msgstr "" |
3494 | - |
3495 | -#. _logEntry += _("\n<b>Reinstalled the following packages:</b>\n"); |
3496 | -#: ../common/rpackagelister.cc:1659 |
3497 | -msgid "" |
3498 | -"\n" |
3499 | -"Reinstalled the following packages:\n" |
3500 | -msgstr "" |
3501 | - |
3502 | -#: ../common/rpackagelister.cc:1676 |
3503 | -msgid "Unable to lock the download directory" |
3504 | -msgstr "" |
3505 | - |
3506 | -#: ../common/rpackagelister.cc:1760 |
3507 | -#, c-format |
3508 | -msgid "Line %u too long in markings file." |
3509 | -msgstr "" |
3510 | - |
3511 | -#: ../common/rpackagelister.cc:1774 ../common/rpackagelister.cc:1778 |
3512 | -#, c-format |
3513 | -msgid "Malformed line %u in markings file" |
3514 | -msgstr "" |
3515 | - |
3516 | -#: ../common/rpackagelister.cc:1790 |
3517 | -msgid "Setting markings..." |
3518 | -msgstr "" |
3519 | - |
3520 | -#: ../common/rpmindexcopy.cc:135 |
3521 | -msgid "bzip2 failed, perhaps the disk is full." |
3522 | -msgstr "" |
3523 | - |
3524 | -#: ../common/rpackageview.h:100 |
3525 | -msgid "Sections" |
3526 | -msgstr "" |
3527 | - |
3528 | -#: ../common/rpackageview.h:110 |
3529 | -msgid "Alphabetic" |
3530 | -msgstr "" |
3531 | - |
3532 | -#: ../common/rpackageview.h:166 |
3533 | -msgid "Search History" |
3534 | -msgstr "" |
3535 | - |
3536 | -#: ../common/rpackageview.h:221 |
3537 | -msgid "Custom" |
3538 | -msgstr "" |
3539 | - |
3540 | -#: ../common/rpackageview.cc:129 |
3541 | -msgid "Installed (unsupported)" |
3542 | -msgstr "" |
3543 | - |
3544 | -#: ../common/rpackageview.cc:134 |
3545 | -msgid "Not installed (unsupported)" |
3546 | -msgstr "" |
3547 | - |
3548 | -#: ../common/rpackageview.cc:143 |
3549 | -msgid "Installed (auto removable)" |
3550 | -msgstr "" |
3551 | - |
3552 | -#: ../common/rpackageview.cc:150 |
3553 | -msgid "Installed (manual)" |
3554 | -msgstr "" |
3555 | - |
3556 | -#: ../common/rpackageview.cc:156 |
3557 | -msgid "Broken dependencies" |
3558 | -msgstr "" |
3559 | - |
3560 | -#: ../common/rpackageview.cc:158 ../gtk/glade/window_filters.glade.h:39 |
3561 | -msgid "New in repository" |
3562 | -msgstr "" |
3563 | - |
3564 | -#: ../common/rpackageview.cc:160 ../gtk/glade/window_filters.glade.h:55 |
3565 | -msgid "Pinned" |
3566 | -msgstr "" |
3567 | - |
3568 | -#: ../common/rpackageview.cc:164 |
3569 | -msgid "Installed (local or obsolete)" |
3570 | -msgstr "" |
3571 | - |
3572 | -#: ../common/rpackageview.cc:170 |
3573 | -msgid "Not installed (residual config)" |
3574 | -msgstr "" |
3575 | - |
3576 | -#. setup search progress (0 done, _all.size() in total, 1 subtask) |
3577 | -#: ../common/rpackageview.cc:304 |
3578 | -msgid "Searching" |
3579 | -msgstr "" |
3580 | - |
3581 | -#: ../common/rpackageview.cc:492 |
3582 | -msgid "Search Filter" |
3583 | -msgstr "" |
3584 | - |
3585 | -#: ../common/rpackageview.cc:500 |
3586 | -msgid "Tasks" |
3587 | -msgstr "" |
3588 | - |
3589 | -#: ../common/rpackageview.cc:506 |
3590 | -msgid "Reduced View" |
3591 | -msgstr "" |
3592 | - |
3593 | -#: ../common/rpackageview.cc:523 ../gtk/gsynaptic.cc:579 |
3594 | -#: ../gtk/rgsummarywindow.cc:356 |
3595 | -msgid "Marked Changes" |
3596 | -msgstr "" |
3597 | - |
3598 | -#. TRANSLATORS: This is a filter that will give you all packages |
3599 | -#. with debconf support (that can be reconfigured with debconf) |
3600 | -#: ../common/rpackageview.cc:534 |
3601 | -msgid "Package with Debconf" |
3602 | -msgstr "" |
3603 | - |
3604 | -#: ../common/rpackageview.cc:541 ../gtk/glade/window_filters.glade.h:68 |
3605 | -msgid "Upgradable (upstream)" |
3606 | -msgstr "" |
3607 | - |
3608 | -#: ../common/rpackageview.cc:547 |
3609 | -msgid "Missing Recommends" |
3610 | -msgstr "" |
3611 | - |
3612 | -#: ../common/rpackageview.cc:561 |
3613 | -msgid "Local" |
3614 | -msgstr "" |
3615 | - |
3616 | -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2114 |
3617 | -#: ../gtk/rgmainwindow.cc:2795 ../gtk/rgmainwindow.cc:2881 |
3618 | -#: ../gtk/rgmainwindow.cc:3054 |
3619 | -#, c-format |
3620 | -msgid "Can't read %s" |
3621 | -msgstr "" |
3622 | - |
3623 | -#: ../common/rsources.cc:131 |
3624 | -#, c-format |
3625 | -msgid "Syntax error in line %s" |
3626 | -msgstr "" |
3627 | - |
3628 | -#: ../common/rsources.cc:469 |
3629 | -#, c-format |
3630 | -msgid "Vendor block %s is invalid" |
3631 | -msgstr "" |
3632 | - |
3633 | -#: ../gtk/gsynaptic.cc:73 |
3634 | -msgid "Usage: synaptic [options]\n" |
3635 | -msgstr "" |
3636 | - |
3637 | -#: ../gtk/gsynaptic.cc:74 |
3638 | -msgid "-h This help text\n" |
3639 | -msgstr "" |
3640 | - |
3641 | -#: ../gtk/gsynaptic.cc:75 |
3642 | -msgid "-r Open in the repository screen\n" |
3643 | -msgstr "" |
3644 | - |
3645 | -#: ../gtk/gsynaptic.cc:76 |
3646 | -msgid "-f=? Give an alternative filter file\n" |
3647 | -msgstr "" |
3648 | - |
3649 | -#: ../gtk/gsynaptic.cc:77 |
3650 | -msgid "" |
3651 | -"-t Give an alternative main window title (e.g. hostname with `uname -n`)\n" |
3652 | -msgstr "" |
3653 | - |
3654 | -#: ../gtk/gsynaptic.cc:78 |
3655 | -msgid "-i=? Start with the initial Filter with given name\n" |
3656 | -msgstr "" |
3657 | - |
3658 | -#: ../gtk/gsynaptic.cc:79 |
3659 | -msgid "-o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" |
3660 | -msgstr "" |
3661 | - |
3662 | -#: ../gtk/gsynaptic.cc:80 |
3663 | -msgid "--upgrade-mode Call Upgrade and display changes\n" |
3664 | -msgstr "" |
3665 | - |
3666 | -#: ../gtk/gsynaptic.cc:81 |
3667 | -msgid "--dist-upgrade-mode Call DistUpgrade and display changes\n" |
3668 | -msgstr "" |
3669 | - |
3670 | -#: ../gtk/gsynaptic.cc:82 |
3671 | -msgid "--update-at-startup Call \"Reload\" on startup\n" |
3672 | -msgstr "" |
3673 | - |
3674 | -#: ../gtk/gsynaptic.cc:83 |
3675 | -msgid "--non-interactive Never prompt for user input\n" |
3676 | -msgstr "" |
3677 | - |
3678 | -#: ../gtk/gsynaptic.cc:84 |
3679 | -msgid "--task-window Open with task window\n" |
3680 | -msgstr "" |
3681 | - |
3682 | -#: ../gtk/gsynaptic.cc:85 |
3683 | -msgid "--add-cdrom Add a cdrom at startup (needs path for cdrom)\n" |
3684 | -msgstr "" |
3685 | - |
3686 | -#: ../gtk/gsynaptic.cc:86 |
3687 | -msgid "--ask-cdrom Ask for adding a cdrom and exit\n" |
3688 | -msgstr "" |
3689 | - |
3690 | -#: ../gtk/gsynaptic.cc:87 |
3691 | -msgid "--test-me-harder Run test in a loop\n" |
3692 | -msgstr "" |
3693 | - |
3694 | -#: ../gtk/gsynaptic.cc:336 ../gtk/gsynaptic.cc:342 |
3695 | -msgid "Another synaptic is running" |
3696 | -msgstr "" |
3697 | - |
3698 | -#: ../gtk/gsynaptic.cc:337 |
3699 | -msgid "" |
3700 | -"There is another synaptic running in interactive mode. Please close it " |
3701 | -"first. " |
3702 | -msgstr "" |
3703 | - |
3704 | -#: ../gtk/gsynaptic.cc:343 |
3705 | -msgid "" |
3706 | -"There is another synaptic running in non-interactive mode. Please wait for " |
3707 | -"it to finish first." |
3708 | -msgstr "" |
3709 | - |
3710 | -#: ../gtk/gsynaptic.cc:368 |
3711 | -msgid "Unable to get exclusive lock" |
3712 | -msgstr "" |
3713 | - |
3714 | -#: ../gtk/gsynaptic.cc:369 |
3715 | -msgid "" |
3716 | -"This usually means that another package management application (like apt-get " |
3717 | -"or aptitude) is already running. Please close that application first." |
3718 | -msgstr "" |
3719 | - |
3720 | -#: ../gtk/gsynaptic.cc:412 |
3721 | -msgid "Starting without administrative privileges" |
3722 | -msgstr "" |
3723 | - |
3724 | -#: ../gtk/gsynaptic.cc:414 |
3725 | -msgid "" |
3726 | -"You will not be able to apply any changes. But you can still export the " |
3727 | -"marked changes or create a download script for them." |
3728 | -msgstr "" |
3729 | - |
3730 | -#: ../gtk/gsynaptic.cc:480 |
3731 | -msgid "Synaptic Package Manager " |
3732 | -msgstr "" |
3733 | - |
3734 | -#: ../gtk/rgcdscanner.cc:63 ../gtk/rgpkgcdrom.cc:86 |
3735 | -msgid "Scanning CD-ROM" |
3736 | -msgstr "" |
3737 | - |
3738 | -#: ../gtk/rgcdscanner.cc:109 |
3739 | -msgid "Invalid disc name!" |
3740 | -msgstr "" |
3741 | - |
3742 | -#: ../gtk/rgcdscanner.cc:121 ../gtk/rgpkgcdrom.cc:122 |
3743 | -msgid "Disc Label" |
3744 | -msgstr "" |
3745 | - |
3746 | -#: ../gtk/rgaboutpanel.cc:64 ../gtk/glade/window_about.glade.h:5 |
3747 | -msgid "Credits" |
3748 | -msgstr "" |
3749 | - |
3750 | -#. skipTaskbar(true); |
3751 | -#: ../gtk/rgaboutpanel.cc:82 ../gtk/glade/window_about.glade.h:4 |
3752 | -msgid "About Synaptic" |
3753 | -msgstr "" |
3754 | - |
3755 | -#: ../gtk/rgchangeswindow.cc:53 |
3756 | -msgid "Package changes" |
3757 | -msgstr "" |
3758 | - |
3759 | -#: ../gtk/rgchangeswindow.cc:94 ../gtk/rgsummarywindow.cc:79 |
3760 | -msgid "Warning" |
3761 | -msgstr "" |
3762 | - |
3763 | -#: ../gtk/rgchangeswindow.cc:95 ../gtk/rgsummarywindow.cc:80 |
3764 | -msgid "" |
3765 | -"You are about to install software that <b>can't be authenticated</b>! Doing " |
3766 | -"this could allow a malicious individual to damage or take control of your " |
3767 | -"system." |
3768 | -msgstr "" |
3769 | - |
3770 | -#: ../gtk/rgchangeswindow.cc:106 ../gtk/rgsummarywindow.cc:92 |
3771 | -msgid "NOT AUTHENTICATED" |
3772 | -msgstr "" |
3773 | - |
3774 | -#. removed |
3775 | -#: ../gtk/rgchangeswindow.cc:117 |
3776 | -msgid "To be removed" |
3777 | -msgstr "" |
3778 | - |
3779 | -#: ../gtk/rgchangeswindow.cc:134 |
3780 | -msgid "To be downgraded" |
3781 | -msgstr "" |
3782 | - |
3783 | -#: ../gtk/rgchangeswindow.cc:146 ../gtk/rgsummarywindow.cc:173 |
3784 | -msgid "To be installed" |
3785 | -msgstr "" |
3786 | - |
3787 | -#: ../gtk/rgchangeswindow.cc:158 ../gtk/rgsummarywindow.cc:161 |
3788 | -msgid "To be upgraded" |
3789 | -msgstr "" |
3790 | - |
3791 | -#: ../gtk/rgchangeswindow.cc:170 ../gtk/rgsummarywindow.cc:185 |
3792 | -msgid "To be re-installed" |
3793 | -msgstr "" |
3794 | - |
3795 | -#: ../gtk/rgchangeswindow.cc:181 |
3796 | -msgid "To be kept" |
3797 | -msgstr "" |
3798 | - |
3799 | -#: ../gtk/rgdebinstallprogress.cc:215 |
3800 | -#, c-format |
3801 | -msgid "" |
3802 | -"Replace configuration file\n" |
3803 | -"'%s'?" |
3804 | -msgstr "" |
3805 | - |
3806 | -#: ../gtk/rgdebinstallprogress.cc:216 |
3807 | -#, c-format |
3808 | -msgid "" |
3809 | -"The configuration file %s was modified (by you or by a script). An updated " |
3810 | -"version is shipped in this package. If you want to keep your current version " |
3811 | -"say 'Keep'. Do you want to replace the current file and install the new " |
3812 | -"package maintainers version? " |
3813 | -msgstr "" |
3814 | - |
3815 | -#: ../gtk/rgdebinstallprogress.cc:369 ../gtk/rginstallprogress.cc:286 |
3816 | -#: ../gtk/rgterminstallprogress.cc:62 |
3817 | -msgid "Applying Changes" |
3818 | -msgstr "" |
3819 | - |
3820 | -#: ../gtk/rgdebinstallprogress.cc:456 |
3821 | -msgid "Ctrl-c pressed" |
3822 | -msgstr "" |
3823 | - |
3824 | -#: ../gtk/rgdebinstallprogress.cc:457 |
3825 | -msgid "" |
3826 | -"This will abort the operation and may leave the system in a broken state. " |
3827 | -"Are you sure you want to do that?" |
3828 | -msgstr "" |
3829 | - |
3830 | -#. error from dpkg, needs to be parsed different |
3831 | -#: ../gtk/rgdebinstallprogress.cc:511 |
3832 | -#, c-format |
3833 | -msgid "Error in package %s" |
3834 | -msgstr "" |
3835 | - |
3836 | -#. running dpkg --configure -a |
3837 | -#: ../gtk/rgdebinstallprogress.cc:518 |
3838 | -msgid "Trying to recover from package failure" |
3839 | -msgstr "" |
3840 | - |
3841 | -#: ../gtk/rgdebinstallprogress.cc:609 |
3842 | -msgid "Error failed to fork pty" |
3843 | -msgstr "" |
3844 | - |
3845 | -#: ../gtk/rgdebinstallprogress.cc:626 |
3846 | -msgid "A package failed to install. Trying to recover:" |
3847 | -msgstr "" |
3848 | - |
3849 | -#: ../gtk/rgdebinstallprogress.cc:685 ../gtk/rgdebinstallprogress.cc:688 |
3850 | -msgid "Changes applied" |
3851 | -msgstr "" |
3852 | - |
3853 | -#: ../gtk/rgdebinstallprogress.cc:744 |
3854 | -msgid "" |
3855 | -"The marked changes are now being applied. This can take some time. Please " |
3856 | -"wait." |
3857 | -msgstr "" |
3858 | - |
3859 | -#: ../gtk/rgdebinstallprogress.cc:749 |
3860 | -msgid "Installing and removing software" |
3861 | -msgstr "" |
3862 | - |
3863 | -#: ../gtk/rgdebinstallprogress.cc:751 |
3864 | -msgid "Removing software" |
3865 | -msgstr "" |
3866 | - |
3867 | -#: ../gtk/rgdebinstallprogress.cc:753 |
3868 | -msgid "Installing software" |
3869 | -msgstr "" |
3870 | - |
3871 | -#: ../gtk/rgpreferenceswindow.cc:49 |
3872 | -msgid "Supported" |
3873 | -msgstr "" |
3874 | - |
3875 | -#: ../gtk/rgpreferenceswindow.cc:49 ../gtk/glade/window_filters.glade.h:47 |
3876 | -msgid "Package Name" |
3877 | -msgstr "" |
3878 | - |
3879 | -#: ../gtk/rgpreferenceswindow.cc:50 ../gtk/rgmainwindow.cc:959 |
3880 | -msgid "Installed Version" |
3881 | -msgstr "" |
3882 | - |
3883 | -#: ../gtk/rgpreferenceswindow.cc:50 |
3884 | -msgid "Available Version" |
3885 | -msgstr "" |
3886 | - |
3887 | -#: ../gtk/rgpreferenceswindow.cc:51 |
3888 | -msgid "Installed Size" |
3889 | -msgstr "" |
3890 | - |
3891 | -#: ../gtk/rgpreferenceswindow.cc:51 |
3892 | -msgid "Download Size" |
3893 | -msgstr "" |
3894 | - |
3895 | -#: ../gtk/rgpreferenceswindow.cc:407 ../gtk/rgmainwindow.cc:1779 |
3896 | -#: ../gtk/rgterminstallprogress.cc:151 |
3897 | -msgid "An error occurred while saving configurations." |
3898 | -msgstr "" |
3899 | - |
3900 | -#: ../gtk/rgpreferenceswindow.cc:457 |
3901 | -msgid "Choose font" |
3902 | -msgstr "" |
3903 | - |
3904 | -#: ../gtk/rgpreferenceswindow.cc:886 |
3905 | -msgid "Color selection" |
3906 | -msgstr "" |
3907 | - |
3908 | -#: ../gtk/rgpreferenceswindow.cc:987 |
3909 | -msgid "" |
3910 | -"Prefer package versions from the selected distribution when upgrading " |
3911 | -"packages. If you manually force a version from a different distribution, the " |
3912 | -"package version will follow that distribution until it enters the default " |
3913 | -"distribution." |
3914 | -msgstr "" |
3915 | - |
3916 | -#: ../gtk/rgpreferenceswindow.cc:995 |
3917 | -msgid "" |
3918 | -"Never upgrade to a new version automatically. Be _very_ careful with this " |
3919 | -"option as you will not get security updates automatically! If you manually " |
3920 | -"force a version the package version will follow the chosen distribution." |
3921 | -msgstr "" |
3922 | - |
3923 | -#: ../gtk/rgpreferenceswindow.cc:1003 |
3924 | -msgid "Let synaptic pick the best version for you. If unsure use this option. " |
3925 | -msgstr "" |
3926 | - |
3927 | -#: ../gtk/rgpreferenceswindow.cc:1040 |
3928 | -msgid "Visible" |
3929 | -msgstr "" |
3930 | - |
3931 | -#: ../gtk/rgpreferenceswindow.cc:1118 |
3932 | -#: ../gtk/glade/window_preferences.glade.h:66 |
3933 | -msgid "Preferences" |
3934 | -msgstr "" |
3935 | - |
3936 | -#: ../gtk/rgfetchprogress.cc:103 ../gtk/rgmainwindow.cc:1001 |
3937 | -msgid "Size" |
3938 | -msgstr "" |
3939 | - |
3940 | -#: ../gtk/rgfetchprogress.cc:110 ../gtk/rgmainwindow.cc:894 |
3941 | -msgid "Package" |
3942 | -msgstr "" |
3943 | - |
3944 | -#: ../gtk/rgfetchprogress.cc:117 ../gtk/rgrepositorywin.cc:181 |
3945 | -msgid "URI" |
3946 | -msgstr "" |
3947 | - |
3948 | -#: ../gtk/rgfetchprogress.cc:201 |
3949 | -#, c-format |
3950 | -msgid "" |
3951 | -"Please insert the disk labeled:\n" |
3952 | -"%s\n" |
3953 | -"in drive %s" |
3954 | -msgstr "" |
3955 | - |
3956 | -#: ../gtk/rgfetchprogress.cc:329 |
3957 | -#, c-format |
3958 | -msgid "Download rate: %s/s - %s remaining" |
3959 | -msgstr "" |
3960 | - |
3961 | -#: ../gtk/rgfetchprogress.cc:335 |
3962 | -msgid "Download rate: unknown" |
3963 | -msgstr "" |
3964 | - |
3965 | -#: ../gtk/rgfetchprogress.cc:337 |
3966 | -#, c-format |
3967 | -msgid "Downloading file %li of %li" |
3968 | -msgstr "" |
3969 | - |
3970 | -#: ../gtk/rgfetchprogress.cc:390 |
3971 | -msgid "Queued" |
3972 | -msgstr "" |
3973 | - |
3974 | -#: ../gtk/rgfetchprogress.cc:393 |
3975 | -msgid "Done" |
3976 | -msgstr "" |
3977 | - |
3978 | -#: ../gtk/rgfetchprogress.cc:396 |
3979 | -msgid "Hit" |
3980 | -msgstr "" |
3981 | - |
3982 | -#: ../gtk/rgfetchprogress.cc:399 |
3983 | -msgid "Failed" |
3984 | -msgstr "" |
3985 | - |
3986 | -#: ../gtk/rgfiltermanager.cc:40 ../gtk/glade/window_filters.glade.h:24 |
3987 | -msgid "Filters" |
3988 | -msgstr "" |
3989 | - |
3990 | -#: ../gtk/rgfiltermanager.cc:165 |
3991 | -msgid "Field" |
3992 | -msgstr "" |
3993 | - |
3994 | -#: ../gtk/rgfiltermanager.cc:172 |
3995 | -msgid "Operator" |
3996 | -msgstr "" |
3997 | - |
3998 | -#: ../gtk/rgfiltermanager.cc:750 |
3999 | -#, c-format |
4000 | -msgid "New Filter %i" |
4001 | -msgstr "" |
4002 | - |
4003 | -#: ../gtk/rginstallprogress.cc:44 |
4004 | -#: ../gtk/glade/window_rginstall_progress_msgs.glade.h:2 |
4005 | -msgid "Package Manager output" |
4006 | -msgstr "" |
4007 | - |
4008 | -#: ../gtk/rginstallprogress.cc:85 |
4009 | -#, c-format |
4010 | -msgid "" |
4011 | -"\n" |
4012 | -"While installing package %s:\n" |
4013 | -"\n" |
4014 | -msgstr "" |
4015 | - |
4016 | -#: ../gtk/rginstallprogress.cc:89 |
4017 | -#, c-format |
4018 | -msgid "" |
4019 | -"\n" |
4020 | -"While preparing for installation:\n" |
4021 | -"\n" |
4022 | -msgstr "" |
4023 | - |
4024 | -#: ../gtk/rginstallprogress.cc:131 |
4025 | -#, c-format |
4026 | -msgid "" |
4027 | -"APT system reports:\n" |
4028 | -"%s" |
4029 | -msgstr "" |
4030 | - |
4031 | -#: ../gtk/rglogview.cc:282 |
4032 | -msgid "Not found" |
4033 | -msgstr "" |
4034 | - |
4035 | -#: ../gtk/rglogview.cc:284 |
4036 | -msgid "" |
4037 | -"Expression was found, please see the list on the left for matching entries." |
4038 | -msgstr "" |
4039 | - |
4040 | -#: ../gtk/rgpkgdetails.cc:148 |
4041 | -#, c-format |
4042 | -msgid "%s Properties" |
4043 | -msgstr "" |
4044 | - |
4045 | -#: ../gtk/rgpkgdetails.cc:213 |
4046 | -msgid "This application is supported by the distribution" |
4047 | -msgstr "" |
4048 | - |
4049 | -#: ../gtk/rgpkgdetails.cc:223 |
4050 | -msgid "Get Screenshot" |
4051 | -msgstr "" |
4052 | - |
4053 | -#. TRANSLATORS: this the format of the available versions in |
4054 | -#. the "Properties/Available versions" window |
4055 | -#. e.g. "0.56 (unstable)" |
4056 | -#. "0.53.4 (testing)" |
4057 | -#: ../gtk/rgpkgdetails.cc:273 |
4058 | -#, c-format |
4059 | -msgid "%s (%s)" |
4060 | -msgstr "" |
4061 | - |
4062 | -#: ../gtk/rgmainwindow.cc:170 |
4063 | -msgid "All" |
4064 | -msgstr "" |
4065 | - |
4066 | -#: ../gtk/rgmainwindow.cc:366 ../gtk/glade/window_main.glade.h:34 |
4067 | -#: ../gtk/glade/window_details.glade.h:19 |
4068 | -msgid "No package is selected.\n" |
4069 | -msgstr "" |
4070 | - |
4071 | -#: ../gtk/rgmainwindow.cc:526 |
4072 | -#, c-format |
4073 | -msgid "Select the version of %s that should be forced for installation" |
4074 | -msgstr "" |
4075 | - |
4076 | -#: ../gtk/rgmainwindow.cc:528 |
4077 | -msgid "" |
4078 | -"The package manager always selects the most applicable version available. If " |
4079 | -"you force a different version from the default one, errors in the dependency " |
4080 | -"handling can occur." |
4081 | -msgstr "" |
4082 | - |
4083 | -#. TRANSLATORS: Column header for the column "Status" in the package list |
4084 | -#: ../gtk/rgmainwindow.cc:859 |
4085 | -msgid "S" |
4086 | -msgstr "" |
4087 | - |
4088 | -#: ../gtk/rgmainwindow.cc:980 |
4089 | -msgid "Latest Version" |
4090 | -msgstr "" |
4091 | - |
4092 | -#: ../gtk/rgmainwindow.cc:1022 |
4093 | -msgid "Download" |
4094 | -msgstr "" |
4095 | - |
4096 | -#: ../gtk/rgmainwindow.cc:1297 |
4097 | -msgid "" |
4098 | -"Reload the package information to become informed about new, removed or " |
4099 | -"upgraded software packages." |
4100 | -msgstr "" |
4101 | - |
4102 | -#: ../gtk/rgmainwindow.cc:1303 |
4103 | -msgid "Mark all possible upgrades" |
4104 | -msgstr "" |
4105 | - |
4106 | -#: ../gtk/rgmainwindow.cc:1307 ../gtk/glade/window_summary.glade.h:5 |
4107 | -msgid "Apply all marked changes" |
4108 | -msgstr "" |
4109 | - |
4110 | -#: ../gtk/rgmainwindow.cc:1488 |
4111 | -msgid "Unmark" |
4112 | -msgstr "" |
4113 | - |
4114 | -#: ../gtk/rgmainwindow.cc:1496 |
4115 | -msgid "Mark for Installation" |
4116 | -msgstr "" |
4117 | - |
4118 | -#: ../gtk/rgmainwindow.cc:1504 |
4119 | -msgid "Mark for Reinstallation" |
4120 | -msgstr "" |
4121 | - |
4122 | -#: ../gtk/rgmainwindow.cc:1513 |
4123 | -msgid "Mark for Upgrade" |
4124 | -msgstr "" |
4125 | - |
4126 | -#: ../gtk/rgmainwindow.cc:1521 |
4127 | -msgid "Mark for Removal" |
4128 | -msgstr "" |
4129 | - |
4130 | -#: ../gtk/rgmainwindow.cc:1530 |
4131 | -msgid "Mark for Complete Removal" |
4132 | -msgstr "" |
4133 | - |
4134 | -#: ../gtk/rgmainwindow.cc:1542 |
4135 | -msgid "Remove Including Orphaned Dependencies" |
4136 | -msgstr "" |
4137 | - |
4138 | -#: ../gtk/rgmainwindow.cc:1554 |
4139 | -msgid "Hold Current Version" |
4140 | -msgstr "" |
4141 | - |
4142 | -#: ../gtk/rgmainwindow.cc:1563 ../gtk/glade/window_main.glade.h:37 |
4143 | -#: ../gtk/glade/window_filters.glade.h:57 |
4144 | -msgid "Properties" |
4145 | -msgstr "" |
4146 | - |
4147 | -#: ../gtk/rgmainwindow.cc:1575 |
4148 | -msgid "Mark Recommended for Installation" |
4149 | -msgstr "" |
4150 | - |
4151 | -#: ../gtk/rgmainwindow.cc:1579 |
4152 | -msgid "Mark Suggested for Installation" |
4153 | -msgstr "" |
4154 | - |
4155 | -#: ../gtk/rgmainwindow.cc:1683 |
4156 | -msgid "" |
4157 | -"Removing this package may render the system unusable.\n" |
4158 | -"Are you sure you want to do that?" |
4159 | -msgstr "" |
4160 | - |
4161 | -#: ../gtk/rgmainwindow.cc:1723 |
4162 | -#, c-format |
4163 | -msgid "" |
4164 | -"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to " |
4165 | -"remove; %s will be freed" |
4166 | -msgstr "" |
4167 | - |
4168 | -#: ../gtk/rgmainwindow.cc:1729 |
4169 | -#, c-format |
4170 | -msgid "" |
4171 | -"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to " |
4172 | -"remove; %s will be used" |
4173 | -msgstr "" |
4174 | - |
4175 | -#: ../gtk/rgmainwindow.cc:1735 |
4176 | -#, c-format |
4177 | -msgid "" |
4178 | -"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to " |
4179 | -"remove" |
4180 | -msgstr "" |
4181 | - |
4182 | -#: ../gtk/rgmainwindow.cc:1796 |
4183 | -#, c-format |
4184 | -msgid "" |
4185 | -"You have %d broken package on your system!\n" |
4186 | -"\n" |
4187 | -"Use the \"Broken\" filter to locate it." |
4188 | -msgid_plural "" |
4189 | -"You have %i broken packages on your system!\n" |
4190 | -"\n" |
4191 | -"Use the \"Broken\" filter to locate them." |
4192 | -msgstr[0] "" |
4193 | -msgstr[1] "" |
4194 | - |
4195 | -#: ../gtk/rgmainwindow.cc:1959 |
4196 | -msgid "Downloading Changelog" |
4197 | -msgstr "" |
4198 | - |
4199 | -#: ../gtk/rgmainwindow.cc:1960 |
4200 | -msgid "" |
4201 | -"The changelog contains information about the changes and closed bugs in each " |
4202 | -"version of the package." |
4203 | -msgstr "" |
4204 | - |
4205 | -#. TRANSLATORS: Title of the changelog dialog - %s is the name of the package |
4206 | -#: ../gtk/rgmainwindow.cc:1973 |
4207 | -#, c-format |
4208 | -msgid "%s Changelog" |
4209 | -msgstr "" |
4210 | - |
4211 | -#: ../gtk/rgmainwindow.cc:2064 |
4212 | -msgid "Do you want to add another CD-ROM?" |
4213 | -msgstr "" |
4214 | - |
4215 | -#: ../gtk/rgmainwindow.cc:2101 |
4216 | -msgid "Open changes" |
4217 | -msgstr "" |
4218 | - |
4219 | -#: ../gtk/rgmainwindow.cc:2138 ../gtk/rgmainwindow.cc:2713 |
4220 | -#: ../gtk/rgmainwindow.cc:2849 ../gtk/rgmainwindow.cc:3027 |
4221 | -#, c-format |
4222 | -msgid "Can't write %s" |
4223 | -msgstr "" |
4224 | - |
4225 | -#: ../gtk/rgmainwindow.cc:2157 |
4226 | -msgid "Save changes" |
4227 | -msgstr "" |
4228 | - |
4229 | -#: ../gtk/rgmainwindow.cc:2164 |
4230 | -msgid "Save full state, not only changes" |
4231 | -msgstr "" |
4232 | - |
4233 | -#: ../gtk/rgmainwindow.cc:2281 |
4234 | -msgid "Repositories changed" |
4235 | -msgstr "" |
4236 | - |
4237 | -#. TRANSLATORS: this message appears when the user added/removed |
4238 | -#. a repository (sources.list entry) a reload (apt-get update) is |
4239 | -#. needed then |
4240 | -#: ../gtk/rgmainwindow.cc:2285 |
4241 | -msgid "" |
4242 | -"The repository information has changed. You have to click on the \"Reload\" " |
4243 | -"button for your changes to take effect" |
4244 | -msgstr "" |
4245 | - |
4246 | -#: ../gtk/rgmainwindow.cc:2296 |
4247 | -msgid "Never show this message again" |
4248 | -msgstr "" |
4249 | - |
4250 | -#: ../gtk/rgmainwindow.cc:2355 |
4251 | -#, c-format |
4252 | -msgid "Found %i packages" |
4253 | -msgstr "" |
4254 | - |
4255 | -#: ../gtk/rgmainwindow.cc:2396 |
4256 | -msgid "Starting help viewer..." |
4257 | -msgstr "" |
4258 | - |
4259 | -#: ../gtk/rgmainwindow.cc:2416 |
4260 | -msgid "" |
4261 | -"No help viewer is installed!\n" |
4262 | -"\n" |
4263 | -"You need either the GNOME help viewer 'yelp', the 'konqueror' browser or the " |
4264 | -"'mozilla' browser to view the synaptic manual.\n" |
4265 | -"\n" |
4266 | -"Alternatively you can open the man page with 'man synaptic' from the command " |
4267 | -"line or view the html version located in the 'synaptic/html' folder." |
4268 | -msgstr "" |
4269 | - |
4270 | -#: ../gtk/rgmainwindow.cc:2568 |
4271 | -msgid "" |
4272 | -"Cannot start configuration tool!\n" |
4273 | -"You have to install the required package 'libgnome2-perl'." |
4274 | -msgstr "" |
4275 | - |
4276 | -#: ../gtk/rgmainwindow.cc:2574 |
4277 | -msgid "Starting package configuration tool..." |
4278 | -msgstr "" |
4279 | - |
4280 | -#. cout << "RGMainWindow::pkgHelpClicked()" << endl; |
4281 | -#: ../gtk/rgmainwindow.cc:2589 |
4282 | -msgid "Starting package documentation viewer..." |
4283 | -msgstr "" |
4284 | - |
4285 | -#: ../gtk/rgmainwindow.cc:2601 |
4286 | -msgid "" |
4287 | -"You have to install the package \"dwww\" to browse the documentation of a " |
4288 | -"package" |
4289 | -msgstr "" |
4290 | - |
4291 | -#: ../gtk/rgmainwindow.cc:2677 |
4292 | -msgid "" |
4293 | -"Could not apply changes!\n" |
4294 | -"Fix broken packages first." |
4295 | -msgstr "" |
4296 | - |
4297 | -#: ../gtk/rgmainwindow.cc:2698 |
4298 | -msgid "Applying marked changes. This may take a while..." |
4299 | -msgstr "" |
4300 | - |
4301 | -#: ../gtk/rgmainwindow.cc:2702 |
4302 | -msgid "Downloading Package Files" |
4303 | -msgstr "" |
4304 | - |
4305 | -#: ../gtk/rgmainwindow.cc:2778 |
4306 | -msgid "Do you want to quit Synaptic?" |
4307 | -msgstr "" |
4308 | - |
4309 | -#: ../gtk/rgmainwindow.cc:2834 |
4310 | -msgid "Downloading Package Information" |
4311 | -msgstr "" |
4312 | - |
4313 | -#: ../gtk/rgmainwindow.cc:2835 |
4314 | -msgid "" |
4315 | -"The repositories will be checked for new, removed or upgraded software " |
4316 | -"packages." |
4317 | -msgstr "" |
4318 | - |
4319 | -#: ../gtk/rgmainwindow.cc:2838 |
4320 | -msgid "Reloading package information..." |
4321 | -msgstr "" |
4322 | - |
4323 | -#: ../gtk/rgmainwindow.cc:2906 |
4324 | -msgid "Failed to resolve dependency problems!" |
4325 | -msgstr "" |
4326 | - |
4327 | -#: ../gtk/rgmainwindow.cc:2908 |
4328 | -msgid "Successfully fixed dependency problems" |
4329 | -msgstr "" |
4330 | - |
4331 | -#: ../gtk/rgmainwindow.cc:2924 |
4332 | -msgid "" |
4333 | -"Could not upgrade the system!\n" |
4334 | -"Fix broken packages first." |
4335 | -msgstr "" |
4336 | - |
4337 | -#: ../gtk/rgmainwindow.cc:2973 |
4338 | -msgid "Marking all available upgrades..." |
4339 | -msgstr "" |
4340 | - |
4341 | -#: ../gtk/rgmainwindow.cc:2992 |
4342 | -msgid "Successfully marked available upgrades" |
4343 | -msgstr "" |
4344 | - |
4345 | -#: ../gtk/rgmainwindow.cc:2994 |
4346 | -msgid "Failed to mark all available upgrades!" |
4347 | -msgstr "" |
4348 | - |
4349 | -#: ../gtk/rgmainwindow.cc:3373 |
4350 | -msgid "Save script" |
4351 | -msgstr "" |
4352 | - |
4353 | -#: ../gtk/rgmainwindow.cc:3400 |
4354 | -msgid "Select directory" |
4355 | -msgstr "" |
4356 | - |
4357 | -#: ../gtk/rgmainwindow.cc:3412 |
4358 | -msgid "Please select a directory" |
4359 | -msgstr "" |
4360 | - |
4361 | -#: ../gtk/rgrepositorywin.cc:92 |
4362 | -msgid "" |
4363 | -"You are adding the \"universe\" component.\n" |
4364 | -"\n" |
4365 | -" Packages in this component are not supported. Are you sure?" |
4366 | -msgstr "" |
4367 | - |
4368 | -#: ../gtk/rgrepositorywin.cc:124 ../gtk/glade/window_repositories.glade.h:3 |
4369 | -msgid "Repositories" |
4370 | -msgstr "" |
4371 | - |
4372 | -#: ../gtk/rgrepositorywin.cc:148 |
4373 | -msgid "Enabled" |
4374 | -msgstr "" |
4375 | - |
4376 | -#: ../gtk/rgrepositorywin.cc:158 |
4377 | -msgid "Type" |
4378 | -msgstr "" |
4379 | - |
4380 | -#: ../gtk/rgrepositorywin.cc:168 ../gtk/rgvendorswindow.cc:62 |
4381 | -#: ../gtk/rgvendorswindow.cc:80 |
4382 | -msgid "Vendor" |
4383 | -msgstr "" |
4384 | - |
4385 | -#: ../gtk/rgrepositorywin.cc:191 ../gtk/glade/window_preferences.glade.h:36 |
4386 | -msgid "Distribution" |
4387 | -msgstr "" |
4388 | - |
4389 | -#: ../gtk/rgrepositorywin.cc:202 |
4390 | -msgid "Section(s)" |
4391 | -msgstr "" |
4392 | - |
4393 | -#: ../gtk/rgrepositorywin.cc:253 |
4394 | -msgid "Binary (deb)" |
4395 | -msgstr "" |
4396 | - |
4397 | -#: ../gtk/rgrepositorywin.cc:258 |
4398 | -msgid "Source (deb-src)" |
4399 | -msgstr "" |
4400 | - |
4401 | -#: ../gtk/rgrepositorywin.cc:267 ../gtk/rgrepositorywin.cc:409 |
4402 | -#: ../gtk/glade/window_repositories.glade.h:1 |
4403 | -msgid "(no vendor)" |
4404 | -msgstr "" |
4405 | - |
4406 | -#: ../gtk/rgrepositorywin.cc:363 |
4407 | -msgid "Cannot read vendors.list file" |
4408 | -msgstr "" |
4409 | - |
4410 | -#: ../gtk/rgrepositorywin.cc:536 |
4411 | -msgid "Unknown source type" |
4412 | -msgstr "" |
4413 | - |
4414 | -#: ../gtk/rgsummarywindow.cc:108 |
4415 | -msgid "<b>(ESSENTIAL) to be removed</b>" |
4416 | -msgstr "" |
4417 | - |
4418 | -#: ../gtk/rgsummarywindow.cc:122 |
4419 | -msgid "<b>To be DOWNGRADED</b>" |
4420 | -msgstr "" |
4421 | - |
4422 | -#: ../gtk/rgsummarywindow.cc:135 |
4423 | -msgid "<b>To be removed</b>" |
4424 | -msgstr "" |
4425 | - |
4426 | -#: ../gtk/rgsummarywindow.cc:148 |
4427 | -msgid "<b>To be completely removed (including configuration files)</b>" |
4428 | -msgstr "" |
4429 | - |
4430 | -#: ../gtk/rgsummarywindow.cc:200 |
4431 | -msgid "Unchanged" |
4432 | -msgstr "" |
4433 | - |
4434 | -#: ../gtk/rgsummarywindow.cc:245 |
4435 | -#, c-format |
4436 | -msgid "<b>%s</b> (<b>essential</b>) will be removed\n" |
4437 | -msgstr "" |
4438 | - |
4439 | -#: ../gtk/rgsummarywindow.cc:254 |
4440 | -#, c-format |
4441 | -msgid "<b>%s</b> will be <b>downgraded</b>\n" |
4442 | -msgstr "" |
4443 | - |
4444 | -#: ../gtk/rgsummarywindow.cc:262 |
4445 | -#, c-format |
4446 | -msgid "<b>%s</b> will be removed with configuration\n" |
4447 | -msgstr "" |
4448 | - |
4449 | -#: ../gtk/rgsummarywindow.cc:270 |
4450 | -#, c-format |
4451 | -msgid "<b>%s</b> will be removed\n" |
4452 | -msgstr "" |
4453 | - |
4454 | -#: ../gtk/rgsummarywindow.cc:279 |
4455 | -#, c-format |
4456 | -msgid "<b>%s</b> (version <i>%s</i>) will be upgraded to version <i>%s</i>\n" |
4457 | -msgstr "" |
4458 | - |
4459 | -#: ../gtk/rgsummarywindow.cc:290 |
4460 | -#, c-format |
4461 | -msgid "<b>%s</b> (version <i>%s</i>) will be installed\n" |
4462 | -msgstr "" |
4463 | - |
4464 | -#: ../gtk/rgsummarywindow.cc:298 |
4465 | -#, c-format |
4466 | -msgid "<b>%s</b> (version <i>%s</i>) will be re-installed\n" |
4467 | -msgstr "" |
4468 | - |
4469 | -#: ../gtk/rgsummarywindow.cc:318 |
4470 | -msgid "_Hide Details" |
4471 | -msgstr "" |
4472 | - |
4473 | -#: ../gtk/rgsummarywindow.cc:322 ../gtk/glade/window_summary.glade.h:11 |
4474 | -msgid "_Show Details" |
4475 | -msgstr "" |
4476 | - |
4477 | -#: ../gtk/rgsummarywindow.cc:335 |
4478 | -msgid "Summary" |
4479 | -msgstr "" |
4480 | - |
4481 | -#: ../gtk/rgsummarywindow.cc:393 |
4482 | -#, c-format |
4483 | -msgid "%d package is locked\n" |
4484 | -msgid_plural "%d packages are locked\n" |
4485 | -msgstr[0] "" |
4486 | -msgstr[1] "" |
4487 | - |
4488 | -#: ../gtk/rgsummarywindow.cc:400 |
4489 | -#, c-format |
4490 | -msgid "%d package will be held back and not upgraded\n" |
4491 | -msgid_plural "%d packages will be held back and not upgraded\n" |
4492 | -msgstr[0] "" |
4493 | -msgstr[1] "" |
4494 | - |
4495 | -#: ../gtk/rgsummarywindow.cc:407 |
4496 | -#, c-format |
4497 | -msgid "%d new package will be installed\n" |
4498 | -msgid_plural "%d new packages will be installed\n" |
4499 | -msgstr[0] "" |
4500 | -msgstr[1] "" |
4501 | - |
4502 | -#: ../gtk/rgsummarywindow.cc:414 |
4503 | -#, c-format |
4504 | -msgid "%d new package will be re-installed\n" |
4505 | -msgid_plural "%d new packages will be re-installed\n" |
4506 | -msgstr[0] "" |
4507 | -msgstr[1] "" |
4508 | - |
4509 | -#: ../gtk/rgsummarywindow.cc:421 |
4510 | -#, c-format |
4511 | -msgid "%d package will be upgraded\n" |
4512 | -msgid_plural "%d packages will be upgraded\n" |
4513 | -msgstr[0] "" |
4514 | -msgstr[1] "" |
4515 | - |
4516 | -#: ../gtk/rgsummarywindow.cc:428 |
4517 | -#, c-format |
4518 | -msgid "%d package will be removed\n" |
4519 | -msgid_plural "%d packages will be removed\n" |
4520 | -msgstr[0] "" |
4521 | -msgstr[1] "" |
4522 | - |
4523 | -#: ../gtk/rgsummarywindow.cc:435 |
4524 | -#, c-format |
4525 | -msgid "%d package will be <b>downgraded</b>\n" |
4526 | -msgid_plural "%d packages will be <b>downgraded</b>\n" |
4527 | -msgstr[0] "" |
4528 | -msgstr[1] "" |
4529 | - |
4530 | -#: ../gtk/rgsummarywindow.cc:443 |
4531 | -#, c-format |
4532 | -msgid "<b>Warning:</b> %d essential package will be removed\n" |
4533 | -msgid_plural "<b>Warning:</b> %d essential packages will be removed\n" |
4534 | -msgstr[0] "" |
4535 | -msgstr[1] "" |
4536 | - |
4537 | -#: ../gtk/rgsummarywindow.cc:455 |
4538 | -#, c-format |
4539 | -msgid "%s of extra space will be used" |
4540 | -msgstr "" |
4541 | - |
4542 | -#: ../gtk/rgsummarywindow.cc:458 |
4543 | -#, c-format |
4544 | -msgid "%s of extra space will be freed" |
4545 | -msgstr "" |
4546 | - |
4547 | -#: ../gtk/rgsummarywindow.cc:463 |
4548 | -#, c-format |
4549 | -msgid "" |
4550 | -"\n" |
4551 | -"%s have to be downloaded" |
4552 | -msgstr "" |
4553 | - |
4554 | -#: ../gtk/rgsummarywindow.cc:488 |
4555 | -msgid "" |
4556 | -"Essential packages will be removed.\n" |
4557 | -"This may render your system unusable!\n" |
4558 | -msgstr "" |
4559 | - |
4560 | -#: ../gtk/rguserdialog.cc:75 |
4561 | -msgid "An error occurred" |
4562 | -msgstr "" |
4563 | - |
4564 | -#: ../gtk/rguserdialog.cc:76 |
4565 | -msgid "The following details are provided:" |
4566 | -msgstr "" |
4567 | - |
4568 | -#: ../gtk/rgvendorswindow.cc:39 |
4569 | -msgid "Setup Vendors" |
4570 | -msgstr "" |
4571 | - |
4572 | -#: ../gtk/rgvendorswindow.cc:62 ../gtk/rgvendorswindow.cc:107 |
4573 | -msgid "FingerPrint" |
4574 | -msgstr "" |
4575 | - |
4576 | -#: ../gtk/rgvendorswindow.cc:128 |
4577 | -msgid "OK" |
4578 | -msgstr "" |
4579 | - |
4580 | -#: ../gtk/rgvendorswindow.cc:132 |
4581 | -msgid "Add" |
4582 | -msgstr "" |
4583 | - |
4584 | -#: ../gtk/rgvendorswindow.cc:136 |
4585 | -msgid "Remove" |
4586 | -msgstr "" |
4587 | - |
4588 | -#: ../gtk/rgvendorswindow.cc:140 |
4589 | -msgid "Cancel" |
4590 | -msgstr "" |
4591 | - |
4592 | -#. TRANSLATORS: this is a abbreviation for "not applicable" (on forms) |
4593 | -#. happens when e.g. a package has no installed version (or no |
4594 | -#. downloadable version) |
4595 | -#: ../gtk/rggladewindow.cc:110 ../gtk/rggladewindow.cc:128 |
4596 | -#: ../gtk/rggladewindow.cc:191 |
4597 | -msgid "N/A" |
4598 | -msgstr "" |
4599 | - |
4600 | -#: ../gtk/rgfindwindow.cc:130 |
4601 | -msgid "Find" |
4602 | -msgstr "" |
4603 | - |
4604 | -#. TRANSLATORS: Title of the task window - %s is the task (e.g. "desktop" or "mail server") |
4605 | -#: ../gtk/rgtaskswin.cc:141 |
4606 | -#, c-format |
4607 | -msgid "Description %s" |
4608 | -msgstr "" |
4609 | - |
4610 | -#: ../gtk/glade/window_main.glade.h:1 |
4611 | -#: ../gtk/glade/window_preferences.glade.h:2 |
4612 | -#: ../gtk/glade/window_summary.glade.h:2 ../gtk/glade/window_filters.glade.h:2 |
4613 | -#: ../gtk/glade/window_details.glade.h:1 |
4614 | -msgid " " |
4615 | -msgstr "" |
4616 | - |
4617 | -#: ../gtk/glade/window_main.glade.h:2 ../gtk/glade/window_details.glade.h:2 |
4618 | -msgid "<b>Installed Version</b>" |
4619 | -msgstr "" |
4620 | - |
4621 | -#: ../gtk/glade/window_main.glade.h:3 ../gtk/glade/window_details.glade.h:3 |
4622 | -msgid "<b>Latest Available Version</b>" |
4623 | -msgstr "" |
4624 | - |
4625 | -#: ../gtk/glade/window_main.glade.h:4 ../gtk/glade/window_details.glade.h:4 |
4626 | -msgid "<b>Maintainer:</b>" |
4627 | -msgstr "" |
4628 | - |
4629 | -#: ../gtk/glade/window_main.glade.h:5 ../gtk/glade/window_details.glade.h:5 |
4630 | -msgid "" |
4631 | -"<b>Note:</b> To install a version that is different from the default one, " |
4632 | -"choose <b>Package -> Force Version...</b> from the menu." |
4633 | -msgstr "" |
4634 | - |
4635 | -#: ../gtk/glade/window_main.glade.h:6 ../gtk/glade/window_details.glade.h:6 |
4636 | -msgid "<b>Package:</b>" |
4637 | -msgstr "" |
4638 | - |
4639 | -#: ../gtk/glade/window_main.glade.h:7 ../gtk/glade/window_details.glade.h:7 |
4640 | -msgid "<b>Priority:</b>" |
4641 | -msgstr "" |
4642 | - |
4643 | -#: ../gtk/glade/window_main.glade.h:8 ../gtk/glade/window_details.glade.h:8 |
4644 | -msgid "<b>Section:</b>" |
4645 | -msgstr "" |
4646 | - |
4647 | -#: ../gtk/glade/window_main.glade.h:9 ../gtk/glade/window_details.glade.h:9 |
4648 | -msgid "<b>Status:</b>" |
4649 | -msgstr "" |
4650 | - |
4651 | -#: ../gtk/glade/window_main.glade.h:10 ../gtk/glade/window_details.glade.h:10 |
4652 | -msgid "<b>Tags:</b>" |
4653 | -msgstr "" |
4654 | - |
4655 | -#: ../gtk/glade/window_main.glade.h:11 |
4656 | -msgid "A_pply Marked Changes" |
4657 | -msgstr "" |
4658 | - |
4659 | -#: ../gtk/glade/window_main.glade.h:12 |
4660 | -msgid "Add downloaded packages" |
4661 | -msgstr "" |
4662 | - |
4663 | -#: ../gtk/glade/window_main.glade.h:13 |
4664 | -msgid "" |
4665 | -"Add packages downloaded with the \"Generate package download script\" " |
4666 | -"feature to the system" |
4667 | -msgstr "" |
4668 | - |
4669 | -#: ../gtk/glade/window_main.glade.h:14 |
4670 | -msgid "Apply" |
4671 | -msgstr "" |
4672 | - |
4673 | -#: ../gtk/glade/window_main.glade.h:15 |
4674 | -msgid "Automatically installed" |
4675 | -msgstr "" |
4676 | - |
4677 | -#: ../gtk/glade/window_main.glade.h:16 ../gtk/glade/window_details.glade.h:11 |
4678 | -msgid "Available versions:" |
4679 | -msgstr "" |
4680 | - |
4681 | -#: ../gtk/glade/window_main.glade.h:17 ../gtk/glade/window_details.glade.h:12 |
4682 | -msgid "Common" |
4683 | -msgstr "" |
4684 | - |
4685 | -#: ../gtk/glade/window_main.glade.h:18 |
4686 | -msgid "Dependants" |
4687 | -msgstr "" |
4688 | - |
4689 | -#: ../gtk/glade/window_main.glade.h:19 ../gtk/glade/window_find.glade.h:1 |
4690 | -#: ../gtk/glade/window_filters.glade.h:18 |
4691 | -#: ../gtk/glade/window_details.glade.h:13 ../gtk/rgfiltermanager.h:73 |
4692 | -msgid "Dependencies" |
4693 | -msgstr "" |
4694 | - |
4695 | -#: ../gtk/glade/window_main.glade.h:20 ../gtk/glade/window_details.glade.h:14 |
4696 | -msgid "Dependencies of the Latest Version" |
4697 | -msgstr "" |
4698 | - |
4699 | -#: ../gtk/glade/window_main.glade.h:22 ../gtk/glade/window_details.glade.h:17 |
4700 | -msgid "Download:" |
4701 | -msgstr "" |
4702 | - |
4703 | -#: ../gtk/glade/window_main.glade.h:23 |
4704 | -msgid "" |
4705 | -"Generate a shell script so that you can download the selected packages on a " |
4706 | -"different computer" |
4707 | -msgstr "" |
4708 | - |
4709 | -#: ../gtk/glade/window_main.glade.h:24 |
4710 | -msgid "Generate package download script" |
4711 | -msgstr "" |
4712 | - |
4713 | -#: ../gtk/glade/window_main.glade.h:25 |
4714 | -msgid "Icon _Legend" |
4715 | -msgstr "" |
4716 | - |
4717 | -#: ../gtk/glade/window_main.glade.h:26 ../gtk/glade/window_details.glade.h:18 |
4718 | -msgid "Installed Files" |
4719 | -msgstr "" |
4720 | - |
4721 | -#: ../gtk/glade/window_main.glade.h:27 |
4722 | -msgid "Mark All Upgrades" |
4723 | -msgstr "" |
4724 | - |
4725 | -#: ../gtk/glade/window_main.glade.h:28 |
4726 | -msgid "Mark Packages by _Task..." |
4727 | -msgstr "" |
4728 | - |
4729 | -#: ../gtk/glade/window_main.glade.h:29 |
4730 | -msgid "Mark for Co_mplete Removal" |
4731 | -msgstr "" |
4732 | - |
4733 | -#: ../gtk/glade/window_main.glade.h:30 |
4734 | -msgid "Mark for R_einstallation" |
4735 | -msgstr "" |
4736 | - |
4737 | -#: ../gtk/glade/window_main.glade.h:31 |
4738 | -msgid "Mark for _Installation" |
4739 | -msgstr "" |
4740 | - |
4741 | -#: ../gtk/glade/window_main.glade.h:32 |
4742 | -msgid "Mark for _Removal" |
4743 | -msgstr "" |
4744 | - |
4745 | -#: ../gtk/glade/window_main.glade.h:33 |
4746 | -msgid "Mark for _Upgrade" |
4747 | -msgstr "" |
4748 | - |
4749 | -#: ../gtk/glade/window_main.glade.h:38 ../gtk/glade/window_find.glade.h:6 |
4750 | -#: ../gtk/glade/window_filters.glade.h:58 |
4751 | -#: ../gtk/glade/window_details.glade.h:21 |
4752 | -msgid "Provided Packages" |
4753 | -msgstr "" |
4754 | - |
4755 | -#: ../gtk/glade/window_main.glade.h:39 |
4756 | -msgid "Reload" |
4757 | -msgstr "" |
4758 | - |
4759 | -#: ../gtk/glade/window_main.glade.h:40 |
4760 | -msgid "S_earch Results" |
4761 | -msgstr "" |
4762 | - |
4763 | -#: ../gtk/glade/window_main.glade.h:41 |
4764 | -msgid "S_tatus" |
4765 | -msgstr "" |
4766 | - |
4767 | -#: ../gtk/glade/window_main.glade.h:42 |
4768 | -msgid "Save Markings _As..." |
4769 | -msgstr "" |
4770 | - |
4771 | -#: ../gtk/glade/window_main.glade.h:43 |
4772 | -msgid "Search" |
4773 | -msgstr "" |
4774 | - |
4775 | -#: ../gtk/glade/window_main.glade.h:44 ../gtk/glade/window_details.glade.h:22 |
4776 | -msgid "Size:" |
4777 | -msgstr "" |
4778 | - |
4779 | -#: ../gtk/glade/window_main.glade.h:45 |
4780 | -msgid "Synaptic" |
4781 | -msgstr "" |
4782 | - |
4783 | -#: ../gtk/glade/window_main.glade.h:46 |
4784 | -msgid "Text Be_side Icons" |
4785 | -msgstr "" |
4786 | - |
4787 | -#: ../gtk/glade/window_main.glade.h:47 |
4788 | -msgid "Text _Below Icons" |
4789 | -msgstr "" |
4790 | - |
4791 | -#: ../gtk/glade/window_main.glade.h:48 |
4792 | -msgid "U_nmark" |
4793 | -msgstr "" |
4794 | - |
4795 | -#: ../gtk/glade/window_main.glade.h:49 |
4796 | -msgid "U_nmark All" |
4797 | -msgstr "" |
4798 | - |
4799 | -#: ../gtk/glade/window_main.glade.h:50 ../gtk/glade/window_details.glade.h:23 |
4800 | -msgid "Version:" |
4801 | -msgstr "" |
4802 | - |
4803 | -#: ../gtk/glade/window_main.glade.h:51 ../gtk/glade/window_details.glade.h:24 |
4804 | -msgid "Versions" |
4805 | -msgstr "" |
4806 | - |
4807 | -#: ../gtk/glade/window_main.glade.h:52 |
4808 | -msgid "_About" |
4809 | -msgstr "" |
4810 | - |
4811 | -#: ../gtk/glade/window_main.glade.h:53 |
4812 | -msgid "_Add CD-ROM..." |
4813 | -msgstr "" |
4814 | - |
4815 | -#: ../gtk/glade/window_main.glade.h:54 |
4816 | -msgid "_Browse Documentation" |
4817 | -msgstr "" |
4818 | - |
4819 | -#: ../gtk/glade/window_main.glade.h:55 |
4820 | -msgid "_Configure..." |
4821 | -msgstr "" |
4822 | - |
4823 | -#: ../gtk/glade/window_main.glade.h:56 |
4824 | -msgid "_Contents" |
4825 | -msgstr "" |
4826 | - |
4827 | -#: ../gtk/glade/window_main.glade.h:57 |
4828 | -msgid "_Custom Filters" |
4829 | -msgstr "" |
4830 | - |
4831 | -#: ../gtk/glade/window_main.glade.h:58 |
4832 | -msgid "_Download Changelog" |
4833 | -msgstr "" |
4834 | - |
4835 | -#: ../gtk/glade/window_main.glade.h:59 |
4836 | -msgid "_Edit" |
4837 | -msgstr "" |
4838 | - |
4839 | -#: ../gtk/glade/window_main.glade.h:60 |
4840 | -msgid "_File" |
4841 | -msgstr "" |
4842 | - |
4843 | -#: ../gtk/glade/window_main.glade.h:61 |
4844 | -msgid "_Filters" |
4845 | -msgstr "" |
4846 | - |
4847 | -#: ../gtk/glade/window_main.glade.h:62 |
4848 | -msgid "_Fix Broken Packages" |
4849 | -msgstr "" |
4850 | - |
4851 | -#: ../gtk/glade/window_main.glade.h:63 |
4852 | -msgid "_Force Version..." |
4853 | -msgstr "" |
4854 | - |
4855 | -#: ../gtk/glade/window_main.glade.h:64 |
4856 | -msgid "_Help" |
4857 | -msgstr "" |
4858 | - |
4859 | -#: ../gtk/glade/window_main.glade.h:65 |
4860 | -msgid "_Hide" |
4861 | -msgstr "" |
4862 | - |
4863 | -#: ../gtk/glade/window_main.glade.h:66 |
4864 | -msgid "_History" |
4865 | -msgstr "" |
4866 | - |
4867 | -#: ../gtk/glade/window_main.glade.h:67 |
4868 | -msgid "_Icons Only" |
4869 | -msgstr "" |
4870 | - |
4871 | -#: ../gtk/glade/window_main.glade.h:68 |
4872 | -msgid "_Lock Version" |
4873 | -msgstr "" |
4874 | - |
4875 | -#: ../gtk/glade/window_main.glade.h:69 |
4876 | -msgid "_Mark All Upgrades..." |
4877 | -msgstr "" |
4878 | - |
4879 | -#: ../gtk/glade/window_main.glade.h:70 |
4880 | -msgid "_Package" |
4881 | -msgstr "" |
4882 | - |
4883 | -#: ../gtk/glade/window_main.glade.h:71 |
4884 | -msgid "_Properties" |
4885 | -msgstr "" |
4886 | - |
4887 | -#: ../gtk/glade/window_main.glade.h:72 |
4888 | -msgid "_Quick Introduction" |
4889 | -msgstr "" |
4890 | - |
4891 | -#: ../gtk/glade/window_main.glade.h:73 |
4892 | -msgid "_Quit" |
4893 | -msgstr "" |
4894 | - |
4895 | -#: ../gtk/glade/window_main.glade.h:74 |
4896 | -msgid "_Read Markings..." |
4897 | -msgstr "" |
4898 | - |
4899 | -#: ../gtk/glade/window_main.glade.h:75 |
4900 | -msgid "_Redo" |
4901 | -msgstr "" |
4902 | - |
4903 | -#: ../gtk/glade/window_main.glade.h:76 |
4904 | -msgid "_Reload Package Information" |
4905 | -msgstr "" |
4906 | - |
4907 | -#: ../gtk/glade/window_main.glade.h:77 |
4908 | -msgid "_Repositories" |
4909 | -msgstr "" |
4910 | - |
4911 | -#: ../gtk/glade/window_main.glade.h:78 |
4912 | -msgid "_Save Markings" |
4913 | -msgstr "" |
4914 | - |
4915 | -#: ../gtk/glade/window_main.glade.h:79 |
4916 | -msgid "_Search..." |
4917 | -msgstr "" |
4918 | - |
4919 | -#: ../gtk/glade/window_main.glade.h:80 |
4920 | -msgid "_Sections" |
4921 | -msgstr "" |
4922 | - |
4923 | -#: ../gtk/glade/window_main.glade.h:81 |
4924 | -msgid "_Set Internal Option..." |
4925 | -msgstr "" |
4926 | - |
4927 | -#: ../gtk/glade/window_main.glade.h:82 |
4928 | -msgid "_Settings" |
4929 | -msgstr "" |
4930 | - |
4931 | -#: ../gtk/glade/window_main.glade.h:83 |
4932 | -msgid "_Text Only" |
4933 | -msgstr "" |
4934 | - |
4935 | -#: ../gtk/glade/window_main.glade.h:84 |
4936 | -msgid "_Toolbar" |
4937 | -msgstr "" |
4938 | - |
4939 | -#: ../gtk/glade/window_main.glade.h:85 |
4940 | -msgid "_Undo" |
4941 | -msgstr "" |
4942 | - |
4943 | -#: ../gtk/glade/window_about.glade.h:1 |
4944 | -msgid "" |
4945 | -"<span size=\"small\">Copyright (c) 2001-2004 Connectiva S/A \n" |
4946 | -"Copyright (c) 2002-2004 Michael Vogt</span>" |
4947 | -msgstr "" |
4948 | - |
4949 | -#: ../gtk/glade/window_about.glade.h:3 |
4950 | -msgid "<span size=\"xx-large\" weight=\"bold\">Synaptic version</span>" |
4951 | -msgstr "" |
4952 | - |
4953 | -#: ../gtk/glade/window_about.glade.h:6 |
4954 | -msgid "Debtag support is enabled." |
4955 | -msgstr "" |
4956 | - |
4957 | -#: ../gtk/glade/window_about.glade.h:7 |
4958 | -msgid "Documented by" |
4959 | -msgstr "" |
4960 | - |
4961 | -#: ../gtk/glade/window_about.glade.h:8 |
4962 | -msgid "" |
4963 | -"Man page:\n" |
4964 | -"Wybo Dekker <wybo@servalys.nl>\n" |
4965 | -"Michael Vogt <mvo@debian.org>\n" |
4966 | -"Sebastian Heinlein <sebastian.heinlein@web.de>\n" |
4967 | -"\n" |
4968 | -"Manual:\n" |
4969 | -"Sebastian Heinlein <sebastian.heinlein@web.de>" |
4970 | -msgstr "" |
4971 | - |
4972 | -#: ../gtk/glade/window_about.glade.h:15 |
4973 | -msgid "" |
4974 | -"Original author:\n" |
4975 | -"Alfredo K. Kojima <kojima@windowmaker.org>\n" |
4976 | -"\n" |
4977 | -"Maintainers:\n" |
4978 | -"Michael Vogt <mvo@debian.org>\n" |
4979 | -"Gustavo Niemeyer <niemeyer@conectiva.com>\n" |
4980 | -"Sebastian Heinlein <sebastian.heinlein@web.de>\n" |
4981 | -"\n" |
4982 | -"Contributors:\n" |
4983 | -"Enrico Zini <enrico@debian.org>\n" |
4984 | -"Panu Matilainen <pmatilai@welho.com>\n" |
4985 | -"Sviatoslav Sviridov <svd@lintec.minsk.by>" |
4986 | -msgstr "" |
4987 | - |
4988 | -#: ../gtk/glade/window_about.glade.h:27 |
4989 | -msgid "Package management software using apt." |
4990 | -msgstr "" |
4991 | - |
4992 | -#: ../gtk/glade/window_about.glade.h:28 |
4993 | -msgid "" |
4994 | -"This software is licensed under the terms of the GNU General Public License, " |
4995 | -"Version 2" |
4996 | -msgstr "" |
4997 | - |
4998 | -#: ../gtk/glade/window_about.glade.h:29 |
4999 | -msgid "Translated by" |
5000 | -msgstr "" |
The diff has been truncated for viewing.
I had to do some indentation work so use -w when diffing.