Merge lp:~mvo/gdebi/py3compat2 into lp:gdebi

Proposed by Michael Vogt
Status: Merged
Merged at revision: 442
Proposed branch: lp:~mvo/gdebi/py3compat2
Merge into: lp:gdebi
Prerequisite: lp:~mvo/gdebi/py3compat
Diff against target: 54651 lines (+13182/-13430)
78 files modified
GDebi/GDebiCli.py (+8/-10)
GDebi/GDebiCommon.py (+30/-21)
GDebi/GDebiGtk.py (+108/-54)
GDebi/GDebiKDE.py (+1/-2)
TODO (+0/-22)
data/gdebi.glade (+0/-1438)
data/gdebi.gladep (+0/-8)
data/gdebi.ui (+61/-54)
data/gdebi.xml.in (+0/-7)
debian/changelog (+27/-0)
debian/compat (+1/-1)
debian/control (+2/-2)
debian/copyright (+2/-2)
debian/gdebi.install (+1/-1)
gdebi (+12/-9)
gdebi-gtk (+6/-0)
gdebi-kde (+1/-0)
po/POTFILES.in (+0/-1)
po/an.po (+203/-184)
po/ar.po (+210/-192)
po/ast.po (+218/-202)
po/bg.po (+214/-192)
po/bn.po (+241/-224)
po/bs.po (+216/-200)
po/ca.po (+222/-204)
po/ca@valencia.po (+218/-196)
po/cs.po (+225/-213)
po/da.po (+222/-209)
po/de.po (+226/-211)
po/el.po (+216/-201)
po/en_AU.po (+215/-195)
po/en_CA.po (+217/-203)
po/en_GB.po (+219/-205)
po/eo.po (+219/-204)
po/es.po (+224/-210)
po/et.po (+210/-192)
po/eu.po (+211/-193)
po/fa.po (+210/-192)
po/fi.po (+216/-197)
po/fo.po (+220/-202)
po/fr.po (+219/-207)
po/gdebi.pot (+201/-183)
po/gl.po (+223/-209)
po/he.po (+217/-205)
po/hr.po (+216/-195)
po/hu.po (+223/-210)
po/hy.po (+203/-184)
po/id.po (+217/-198)
po/it.po (+218/-204)
po/ja.po (+262/-215)
po/ko.po (+251/-216)
po/ku.po (+216/-195)
po/lt.po (+219/-204)
po/mr.po (+203/-184)
po/ms.po (+216/-195)
po/nb.po (+211/-193)
po/nl.po (+220/-205)
po/oc.po (+214/-192)
po/pl.po (+221/-206)
po/pt.po (+217/-199)
po/pt_BR.po (+218/-202)
po/ro.po (+216/-199)
po/ru.po (+224/-209)
po/si.po (+203/-184)
po/sk.po (+216/-201)
po/sl.po (+209/-187)
po/sr.po (+222/-203)
po/sv.po (+221/-205)
po/te.po (+221/-202)
po/th.po (+212/-194)
po/tl.po (+210/-192)
po/tr.po (+217/-198)
po/uk.po (+218/-205)
po/ur.po (+215/-198)
po/zh_CN.po (+223/-206)
po/zh_HK.po (+217/-197)
po/zh_TW.po (+218/-196)
tests/test_gdebi_gtk_lintian.py (+63/-0)
To merge this branch: bzr merge lp:~mvo/gdebi/py3compat2
Reviewer Review Type Date Requested Status
gdebi-developers Pending
Review via email: mp+155050@code.launchpad.net

Description of the change

This branch makes the code py3 compatible. I can run the gtk and cli version successfully now (can't test
kde, not sure what the status of the qt bindings for py3 is).

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

The branch has a bunch of additional changes from pep8 cleanup it seems, sorry for that.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GDebi/GDebiCli.py'
2--- GDebi/GDebiCli.py 2013-03-22 20:07:20 +0000
3+++ GDebi/GDebiCli.py 2013-03-22 20:07:20 +0000
4@@ -48,7 +48,9 @@
5 # set architecture to architecture in root-dir
6 if options.rootdir and os.path.exists(options.rootdir+"/usr/bin/dpkg"):
7 arch = Popen([options.rootdir+"/usr/bin/dpkg",
8- "--print-architecture"], stdout=PIPE).communicate()[0]
9+ "--print-architecture"],
10+ stdout=PIPE,
11+ universal_newlines=True).communicate()[0]
12 if arch:
13 apt_pkg.config.set("APT::Architecture",arch.strip())
14 if options.apt_opts:
15@@ -91,12 +93,12 @@
16
17 def show_description(self):
18 try:
19- print self._deb["Description"]
20+ print(self._deb["Description"])
21 except KeyError:
22- print _("No description is available")
23+ print(_("No description is available"))
24
25 def show_dependencies(self):
26- print self.get_dependencies_info()
27+ print(self.get_dependencies_info())
28
29 def get_dependencies_info(self):
30 s = ""
31@@ -126,12 +128,8 @@
32 iprogress = apt.progress.base.InstallProgress()
33 try:
34 res = self._cache.commit(fprogress,iprogress)
35-<<<<<<< TREE
36- except (apt.cache.FetchFailedException, SystemError), e:
37-=======
38+ except(apt.cache.FetchFailedException, SystemError) as e:
39 logging.debug("commit() returned %s" % res)
40- except(apt.cache.FetchFailedException, SystemError) as e:
41->>>>>>> MERGE-SOURCE
42 sys.stderr.write(_("Error during install: '%s'") % e)
43 return 1
44
45@@ -155,7 +153,7 @@
46 if not app.open(sys.argv[1]):
47 sys.exit(1)
48 msg = _("Do you want to install the software package? [y/N]:")
49- print msg,
50+ print(msg,)
51 sys.stdout.flush()
52 res = sys.stdin.readline()
53 try:
54
55=== modified file 'GDebi/GDebiCommon.py'
56--- GDebi/GDebiCommon.py 2013-03-22 20:07:20 +0000
57+++ GDebi/GDebiCommon.py 2013-03-22 20:07:20 +0000
58@@ -24,6 +24,7 @@
59 import gettext
60 import logging
61 import os
62+import sys
63 from mimetypes import guess_type
64
65 import apt_pkg
66@@ -32,21 +33,29 @@
67 from .DebPackage import DebPackage
68
69
70-def _(str):
71- return utf8(gettext.gettext(str))
72-
73-
74-def utf8(str):
75- if isinstance(str, unicode):
76- return str
77- try:
78- return unicode(str, 'UTF-8')
79- except:
80- # assume latin1 as fallback
81- return unicode(str, 'latin1')
82+if sys.version_info[0] == 2:
83+ def _(str):
84+ return utf8(gettext.gettext(str))
85+
86+
87+ def py2utf8(str):
88+ if isinstance(str, unicode):
89+ return str
90+ try:
91+ return unicode(str, 'UTF-8')
92+ except:
93+ # assume latin1 as fallback
94+ return unicode(str, 'latin1')
95+ utf8 = py2utf8
96+else:
97+ from gettext import gettext as _
98+ def py3utf8(s):
99+ return s
100+ utf8 = py3utf8
101
102
103 class GDebiCommon(object):
104+
105 # cprogress may be different in child classes
106 def __init__(self, datadir, options, file=""):
107 self.cprogress = None
108@@ -63,14 +72,14 @@
109 def openCache(self):
110 self._cache = Cache(self.cprogress)
111 if self._cache._depcache.broken_count > 0:
112- self.error_header = _("Broken dependencies")
113- self.error_body = _("Your system has broken dependencies. "
114- "This application can not continue until "
115- "this is fixed. "
116- "To fix it run 'gksudo synaptic' or "
117- "'sudo apt-get install -f' "
118- "in a terminal window.")
119- return False
120+ self.error_header = _("Broken dependencies")
121+ self.error_body = _("Your system has broken dependencies. "
122+ "This application can not continue until "
123+ "this is fixed. "
124+ "To fix it run 'gksudo synaptic' or "
125+ "'sudo apt-get install -f' "
126+ "in a terminal window.")
127+ return False
128 return True
129
130 def open(self, file, downloaded=False):
131@@ -138,7 +147,7 @@
132 provides.add(i[0])
133 provides = set(pkg.provides).difference(provides)
134 if provides:
135- for package in self._cache.keys():
136+ for package in list(self._cache.keys()):
137 if self._cache[package].installed:
138 for dep in self._cache[package].installed.dependencies:
139 for d in dep.or_dependencies:
140
141=== modified file 'GDebi/GDebiGtk.py'
142--- GDebi/GDebiGtk.py 2013-03-22 20:07:20 +0000
143+++ GDebi/GDebiGtk.py 2013-03-22 20:07:20 +0000
144@@ -27,12 +27,16 @@
145 import os
146 import posix
147 import re
148-import string
149 import sys
150 import time
151 import tempfile
152 import threading
153-import urllib
154+# py3 compat
155+try:
156+ from urllib import url2pathname
157+ url2pathname # pyflakes
158+except ImportError:
159+ from urllib.request import url2pathname
160
161 import gi
162 gi.require_version("Gtk", "3.0")
163@@ -53,7 +57,7 @@
164 from .GDebiCommon import GDebiCommon, utf8
165
166 # the timeout when the termial is expanded if no activity from dpkg
167-# is happening
168+# is happening
169 GDEBI_TERMINAL_TIMEOUT=4*60.0
170
171 # HACK - there are two ubuntu specific patches, one for VTE, one
172@@ -68,7 +72,8 @@
173 class GDebiGtk(SimpleGtkbuilderApp, GDebiCommon):
174
175 def __init__(self, datadir, options, file=""):
176- GDebiCommon.__init__(self,datadir,options,file)
177+ GDebiCommon.__init__(self,datadir, options, file)
178+
179 SimpleGtkbuilderApp.__init__(
180 self, path=os.path.join(datadir, "gdebi.ui"), domain="gdebi")
181
182@@ -83,7 +88,7 @@
183
184 # create terminal
185 self.vte_terminal = Vte.Terminal()
186- # FIXME: this sucks but without it the terminal window is only
187+ # FIXME: this sucks but without it the terminal window is only
188 # 1 line height
189 self.vte_terminal.set_size_request(80*10, 25*10)
190 menu = Gtk.Menu()
191@@ -122,7 +127,7 @@
192 self.show_alert(Gtk.MessageType.ERROR, self.error_header, self.error_body)
193 sys.exit(1)
194 self.statusbar_main.push(self.context, "")
195-
196+
197 # setup the details treeview
198 self.details_list = Gtk.ListStore(GObject.TYPE_STRING)
199 column = Gtk.TreeViewColumn("")
200@@ -144,6 +149,7 @@
201
202 if file != "" and os.path.exists(file):
203 self.open(file)
204+
205 self.window_main.set_sensitive(True)
206
207 def _show_busy_cursor(self, show_busy_cursor):
208@@ -152,8 +158,8 @@
209 return
210 if show_busy_cursor:
211 win.set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
212- while Gtk.events_pending():
213- Gtk.main_iteration()
214+ while Gtk.events_pending():
215+ Gtk.main_iteration()
216 else:
217 win.set_cursor(None)
218
219@@ -171,7 +177,7 @@
220 if (gio_file.get_uri_scheme() == "file"):
221 return file
222 if (os.getuid()==0):
223- self.show_alert(Gtk.MessageType.ERROR,
224+ self.show_alert(Gtk.MessageType.ERROR,
225 _("Can not download as root"),
226 _("Remote packages can not be downloaded when "
227 "running as root. Please try again as a "
228@@ -192,7 +198,7 @@
229 file = gio_dest.get_path()
230 self.dialog_gio_download.hide()
231 except Exception as e:
232- self.show_alert(Gtk.MessageType.ERROR,
233+ self.show_alert(Gtk.MessageType.ERROR,
234 _("Download failed"),
235 _("Downloading the package failed: "
236 "file '%s' '%s'") % (file, e))
237@@ -201,7 +207,7 @@
238
239 def _get_file_path_from_dnd_dropped_uri(self, uri):
240 """ helper to get a useful path from a drop uri"""
241- path = urllib.url2pathname(uri) # escape special chars
242+ path = url2pathname(uri) # escape special chars
243 path = path.strip('\r\n\x00') # remove \r\n and NULL
244 # get the path to file
245 if path.startswith('file:\\\\\\'): # windows
246@@ -211,7 +217,7 @@
247 elif path.startswith('file:'): # xffm
248 path = path[5:] # 5 is len('file:')
249 return path
250-
251+
252 def on_menuitem_quit_activate(self, widget):
253 try:
254 Gtk.main_quit()
255@@ -230,18 +236,19 @@
256 if path.endswith(".deb"):
257 self.open(path)
258
259- def open(self, file, downloaded=False):
260+ def open(self, filename, downloaded=False):
261 self._show_busy_cursor(True)
262- res = GDebiCommon.open(self, file, downloaded)
263+ res = GDebiCommon.open(self, filename, downloaded)
264 self._show_busy_cursor(False)
265 if res == False:
266- self.show_alert(Gtk.MessageType.ERROR, self.error_header, self.error_body)
267+ self.show_alert(
268+ Gtk.MessageType.ERROR, self.error_header, self.error_body)
269 return False
270-
271+
272 self.statusbar_main.push(self.context, "")
273
274 # set window title
275- self.window_main.set_title(_("Package Installer - %s") %
276+ self.window_main.set_title(_("Package Installer - %s") %
277 self._deb.pkgname)
278
279 # set name and ungrey some widgets
280@@ -259,7 +266,7 @@
281 raw_desc[0] = ""
282 long_desc = "%s\n" % summary
283 for line in raw_desc:
284- tmp = string.strip(line)
285+ tmp = line.strip()
286 if tmp == ".":
287 long_desc += "\n"
288 else:
289@@ -313,6 +320,11 @@
290 # and the file content textview
291 font_desc = Pango.FontDescription('monospace')
292 self.textview_file_content.modify_font(font_desc)
293+ self.textview_lintian_output.modify_font(font_desc)
294+
295+ # run lintian async
296+ if self._options and self._options.non_interactive is False:
297+ self._run_lintian(filename)
298
299 # check the deps
300 if not self._deb.check():
301@@ -320,7 +332,7 @@
302 "<span foreground=\"red\" weight=\"bold\">"+
303 _("Error: ") +
304 #glib.markup_escape_text(self._deb._failure_string) +
305- self._deb._failure_string +
306+ self._deb._failure_string +
307 "</span>")
308 self.button_install.set_label(_("_Install Package"))
309
310@@ -374,7 +386,7 @@
311 self.button_details.hide()
312 else:
313 self.button_details.show()
314-
315+
316 self.label_status.set_markup(self.deps)
317 #img = Gtk.Image()
318 #img.set_from_stock(Gtk.STOCK_APPLY,Gtk.IconSize.BUTTON)
319@@ -384,6 +396,45 @@
320 self.button_install.grab_default()
321 self.button_remove.hide()
322
323+ def _run_lintian(self, filename):
324+ buf = self.textview_lintian_output.get_buffer()
325+ if not os.path.exists("/usr/bin/lintian"):
326+ buf.set_text(
327+ _("No lintian available.\n"
328+ "Please install using sudo apt-get install lintian"))
329+ return
330+ buf.set_text(_("Running lintian..."))
331+ self._lintian_output = ""
332+ self._lintian_exit_status = None
333+ cmd = ["/usr/bin/lintian", filename]
334+ (pid, stdin, stdout, stderr) = GLib.spawn_async(
335+ cmd, flags=GObject.SPAWN_DO_NOT_REAP_CHILD,
336+ standard_output=True, standard_error=True)
337+ for fd in [stdout, stderr]:
338+ channel = GLib.IOChannel(filedes=fd)
339+ channel.set_flags(GLib.IOFlags.NONBLOCK)
340+ channel.add_watch(GLib.IOCondition.IN, self._on_lintian_output)
341+ GObject.child_watch_add(
342+ pid, self._on_lintian_finished)
343+
344+ def _on_lintian_finished(self, pid, condition):
345+ exit_status = os.WEXITSTATUS(condition)
346+ self._lintian_exit_status = exit_status
347+ text = _("\nLintian finished with exit status %s") % exit_status
348+ self._lintian_output += text
349+ buf = self.textview_lintian_output.get_buffer()
350+ buf.set_text(self._lintian_output)
351+
352+ def _on_lintian_output(self, gio_file, condition):
353+ if condition & GLib.IOCondition.IN:
354+ # we get bytes from gio
355+ content = gio_file.read().decode("utf-8")
356+ if content:
357+ self._lintian_output += content
358+ buf = self.textview_lintian_output.get_buffer()
359+ buf.set_text(self._lintian_output)
360+ return True
361+
362 def on_treeview_files_cursor_changed(self, treeview):
363 " the selection in the files list chanaged "
364 model = treeview.get_model()
365@@ -405,10 +456,12 @@
366 except Exception as e:
367 data = _("Error reading file content '%s'") % e
368 elif parent_path == 1:
369+ self._show_busy_cursor(True)
370 try:
371 data = self._deb.data_content(name)
372 except Exception as e:
373 data = _("Error reading file content '%s'") % e
374+ self._show_busy_cursor(False)
375 else:
376 assert False, "NOT REACHED"
377 if not data:
378@@ -435,9 +488,9 @@
379 # build dialog
380 self.window_main.set_sensitive(False)
381 fs = Gtk.FileChooserDialog(parent=self.window_main,
382- buttons=(Gtk.STOCK_CANCEL,
383- Gtk.ResponseType.CANCEL,
384- Gtk.STOCK_OPEN,
385+ buttons=(Gtk.STOCK_CANCEL,
386+ Gtk.ResponseType.CANCEL,
387+ Gtk.STOCK_OPEN,
388 Gtk.ResponseType.OK),
389 action=Gtk.FileChooserAction.OPEN,
390 title=_("Open Software Package"))
391@@ -449,7 +502,9 @@
392 #fs.add_filter(filter)
393 fs.set_filter(filter)
394 # run it!
395- if fs.run() == Gtk.ResponseType.OK:
396+ res = fs.run()
397+ fs.hide()
398+ if res == Gtk.ResponseType.OK:
399 #print fs.get_filename()
400 self.open(fs.get_filename())
401 fs.destroy()
402@@ -464,7 +519,7 @@
403 self.window_main.set_sensitive(True)
404
405 def on_copy_activate(self, widget):
406- clipboard = Gtk.Clipboard.get(Gdk.atom_intern('CLIPBOARD', True))
407+ clipboard = Gtk.Clipboard.get(Gdk.atom_intern('CLIPBOARD', True))
408 buf = self.textview_description.get_buffer()
409 if buf.get_has_selection():
410 buf.copy_clipboard(clipboard)
411@@ -533,7 +588,7 @@
412 scrolled = Gtk.ScrolledWindow()
413 textview = Gtk.TextView()
414 textview.set_cursor_visible(False)
415- textview.set_editable(False)
416+ textview.set_editable(False)
417 buf = textview.get_buffer()
418 buf.set_text("\n".join(self.unauthenticated))
419 scrolled.add(textview)
420@@ -582,13 +637,13 @@
421 self.statusbar_main.push(self.context, msgstring)
422 self.show_alert(Gtk.MessageType.ERROR, self.error_header, self.error_body)
423 return False
424-
425+
426 # lock for install
427 self.window_main.set_sensitive(False)
428 self.button_deb_install_close.set_sensitive(False)
429 # clear terminal
430 #self.vte_terminal.feed(str(0x1b)+"[2J")
431-
432+
433 # Get whether we auto close from synaptic's config file and
434 # update the toggle button as neccessary
435 config = apt_pkg.Configuration()
436@@ -600,7 +655,7 @@
437 config["Synaptic::closeZvt"] = "false"
438 self.synaptic_config = config.subtree("Synaptic")
439 self.checkbutton_autoclose.set_active(self.synaptic_config.find_b("closeZvt"))
440-
441+
442 self.dialog_deb_install.set_transient_for(self.window_main)
443 self.dialog_deb_install.show_all()
444
445@@ -636,13 +691,13 @@
446 if not res:
447 self.show_alert(Gtk.MessageType.ERROR, header, body, msg,
448 parent=self.dialog_deb_install)
449-
450+
451 self.label_install_status.set_markup("<span foreground=\"red\" weight=\"bold\">%s</span>" % header)
452 self.button_deb_install_close.set_sensitive(True)
453 self.button_deb_install_close.grab_default()
454 self.statusbar_main.push(self.context,_("Failed to install package file"))
455- return
456-
457+ return
458+
459 # install the package itself
460 self.dialog_deb_install.set_title(self.window_main.get_title())
461 if install:
462@@ -681,10 +736,10 @@
463 self.label_install_status.set_markup("<i>"+_("Package '%s' was removed") % os.path.basename(self._deb.pkgname)+"</i>")
464 else:
465 if install:
466- self.label_install_status.set_markup("<b>"+_("Failed to install package '%s'") %
467+ self.label_install_status.set_markup("<b>"+_("Failed to install package '%s'") %
468 os.path.basename(self._deb.filename)+"</b>")
469 else:
470- self.label_install_status.set_markup("<b>"+_("Failed to remove package '%s'") %
471+ self.label_install_status.set_markup("<b>"+_("Failed to remove package '%s'") %
472 os.path.basename(self._deb.pkgname)+"</b>")
473 self.expander_install.set_expanded(True)
474 if install:
475@@ -716,7 +771,7 @@
476
477 def on_button_remove_clicked(self, widget):
478 self.dpkg_action(widget, False)
479-
480+
481 def on_button_deb_install_close_clicked(self, widget):
482 # Set the autoclose option when we close
483 autoclose = self.checkbutton_autoclose.get_active()
484@@ -729,17 +784,17 @@
485 self._gio_cancellable.cancel()
486 self.dialog_deb_install.hide()
487 self.window_main.set_sensitive(True)
488-
489+
490 def on_checkbutton_autoclose_clicked(self, widget):
491 if self.action_completed:
492- self.on_button_deb_install_close_clicked(None)
493+ self.on_button_deb_install_close_clicked(None)
494
495 def on_window_main_delete_event(self, *args):
496 if self.window_main.get_property("sensitive"):
497 if Gtk.main_level() > 0:
498 Gtk.main_quit()
499 return False
500- else:
501+ else:
502 return True
503
504 def show_alert(self, type, header, body=None, details=None, parent=None):
505@@ -752,26 +807,26 @@
506 if not body == None:
507 message = "%s\n\n%s" % (message, body)
508 self.label_hig.set_markup(message)
509-
510+
511 if not details == None:
512 buffer = self.textview_hig.get_buffer()
513 buffer.set_text(str(details))
514 self.expander_hig.set_expanded(False)
515 self.expander_hig.show()
516-
517+
518 if type == Gtk.MessageType.ERROR:
519 self.image_hig.set_property("stock", "gtk-dialog-error")
520 elif type == Gtk.MessageType.WARNING:
521 self.image_hig.set_property("stock", "gtk-dialog-warning")
522 elif type == Gtk.MessageType.INFO:
523 self.image_hig.set_property("stock", "gtk-dialog-info")
524-
525+
526 res = self.dialog_hig.run()
527 self.dialog_hig.hide()
528 if res == Gtk.ResponseType.CLOSE:
529 return True
530 return False
531-
532+
533 def write_synaptic_config_file(self, config, path):
534 if not os.path.exists(path):
535 return
536@@ -789,7 +844,7 @@
537
538 def menu_action(self, widget, terminal):
539 terminal.copy_clipboard()
540-
541+
542 # embedded classes
543 class DpkgActionProgress(object):
544 def __init__(self, debfile, status, progress, term, expander, install=True):
545@@ -836,7 +891,7 @@
546
547 # the command
548 argv = ["/usr/bin/dpkg", "--auto-deconfigure"]
549- # ubuntu supports VTE_PTY_KEEP_FD, see
550+ # ubuntu supports VTE_PTY_KEEP_FD, see
551 # https://bugzilla.gnome.org/320128 for the upstream bug
552 if UBUNTU:
553 argv += ["--status-fd", "%s"%writefd]
554@@ -855,8 +910,8 @@
555 self.term.connect("child-exited", finish_dpkg, lock)
556 (res, pid) =self.term.fork_command_full(
557 Vte.PtyFlags.DEFAULT,
558- "/",
559- argv,
560+ "/",
561+ argv,
562 env,
563 GLib.SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
564 # FIXME: add setup_func that closes all fds excpet for writefd
565@@ -869,7 +924,7 @@
566 while lock.locked():
567 while True:
568 try:
569- read += os.read(readfd,1)
570+ read += os.read(readfd,1).decode("utf-8")
571 except OSError as e:
572 # resource temporarly unavailable is ignored
573 from errno import EAGAIN
574@@ -893,11 +948,11 @@
575 Gtk.main_iteration()
576 time.sleep(0.2)
577 # if the terminal has not reacted for some time, do something
578- if (not self.term_expander.get_expanded() and
579+ if (not self.term_expander.get_expanded() and
580 (self.time_last_update + GDEBI_TERMINAL_TIMEOUT) < time.time()):
581 self.term_expander.set_expanded(True)
582 self.progress.set_fraction(1.0)
583-
584+
585 class InstallProgressAdapter(InstallProgress):
586 def __init__(self,progress,term,label,term_expander):
587 InstallProgress.__init__(self)
588@@ -939,7 +994,7 @@
589 InstallProgress.update_interface(self)
590 while Gtk.events_pending():
591 Gtk.main_iteration()
592- if (not self.term_expander.get_expanded() and
593+ if (not self.term_expander.get_expanded() and
594 (self.time_last_update + GDEBI_TERMINAL_TIMEOUT) < time.time()):
595 self.term_expander.set_expanded(True)
596 # sleep just long enough to not create a busy loop
597@@ -963,7 +1018,7 @@
598 while not self.finished:
599 self.update_interface()
600 return self.apt_status
601-
602+
603 class FetchProgressAdapter(apt.progress.base.AcquireProgress):
604 def __init__(self,progress,action,main):
605 super(GDebiGtk.FetchProgressAdapter, self).__init__()
606@@ -1032,16 +1087,15 @@
607 apt_pkg.pkgsystem_lock()
608 app.dialog_deb_install.set_transient_for(app.window_main)
609 app.dialog_deb_install.show_all()
610-
611+
612 # install the dependecnies
613 fprogress = app.FetchProgressAdapter(app.progressbar_install,
614 app.label_action,
615 app.dialog_deb_install)
616- iprogress = app.InstallProgressAdapter(app.progressbar_install,
617+ iprogress = app.InstallProgressAdapter(app.progressbar_install,
618 app.vte_terminal,
619 app.label_action,
620 app.expander_install)
621 res = app._cache.commit(fprogress,iprogress)
622 print("commit retured: %s" % res)
623-
624 Gtk.main()
625
626=== modified file 'GDebi/GDebiKDE.py'
627--- GDebi/GDebiKDE.py 2013-03-22 20:07:20 +0000
628+++ GDebi/GDebiKDE.py 2013-03-22 20:07:20 +0000
629@@ -327,11 +327,10 @@
630 executable = os.path.curdir + "/gdebi-kde"
631 else:
632 executable = "/usr/bin/gdebi-kde"
633- print "executable " + executable
634 su_cmd = "/usr/bin/kdesudo"
635 if not os.access(su_cmd, os.X_OK):
636 su_cmd = "/usr/lib/kde4/libexec/kdesu"
637- os.execl(su_cmd, os.path.basename(su_cmd), executable, "-n", self._deb.filename)
638+ os.execl(su_cmd, os.path.basename(su_cmd), executable, "--", "-n", self._deb.filename)
639 self.kapp.exit()
640
641 if not self.try_acquire_lock():
642
643=== removed file 'TODO'
644--- TODO 2007-02-06 18:30:22 +0000
645+++ TODO 1970-01-01 00:00:00 +0000
646@@ -1,22 +0,0 @@
647-* add "--assume-yes" option
648-* add check for removal of essential packages
649-* add downgrade(?)
650-* rename to "debonair" ?
651-* install-progress: error reporting, conf-file prompts
652-* code cleanup
653-* basic description formating (summary, " ." lines)
654-* conflict/replace situation not handled correctly (refuses to do anything)
655-
656-Longer term:
657-------------
658-* do the cache calculation stuff in the background (thread)
659-* support for something simialar like the n770 people (install user,
660- installed stuff goes to /var/lib/install). makes us much more secure,
661- but less flexible
662-* support remote location of packages - gnomevfs vs urllib
663-
664-
665-Done:
666------
667-* deal with packages that conflict with their own provides
668- (e.g. C/P/R: ftp-server) [DONE]
669
670=== removed file 'data/gdebi.glade'
671--- data/gdebi.glade 2011-01-31 20:40:19 +0000
672+++ data/gdebi.glade 1970-01-01 00:00:00 +0000
673@@ -1,1438 +0,0 @@
674-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
675-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
676-
677-<glade-interface>
678-
679-<widget class="GtkWindow" id="window_main">
680- <property name="title" translatable="yes">Package Installer</property>
681- <property name="type">GTK_WINDOW_TOPLEVEL</property>
682- <property name="window_position">GTK_WIN_POS_NONE</property>
683- <property name="modal">False</property>
684- <property name="default_width">550</property>
685- <property name="default_height">400</property>
686- <property name="resizable">True</property>
687- <property name="destroy_with_parent">False</property>
688- <property name="decorated">True</property>
689- <property name="skip_taskbar_hint">False</property>
690- <property name="skip_pager_hint">False</property>
691- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
692- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
693- <property name="focus_on_map">True</property>
694- <property name="urgency_hint">False</property>
695- <signal name="delete_event" handler="on_window_main_delete_event" last_modification_time="Tue, 07 Feb 2006 22:58:37 GMT"/>
696- <signal name="drag_data_received" handler="on_window_main_drag_data_received" last_modification_time="Sun, 22 Jan 2006 19:32:55 GMT"/>
697-
698- <child>
699- <widget class="GtkVBox" id="vbox1">
700- <property name="visible">True</property>
701- <property name="homogeneous">False</property>
702- <property name="spacing">0</property>
703-
704- <child>
705- <widget class="GtkMenuBar" id="menubar1">
706- <property name="visible">True</property>
707- <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
708- <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
709-
710- <child>
711- <widget class="GtkMenuItem" id="menuitem1">
712- <property name="visible">True</property>
713- <property name="label" translatable="yes">_File</property>
714- <property name="use_underline">True</property>
715-
716- <child>
717- <widget class="GtkMenu" id="menuitem1_menu">
718-
719- <child>
720- <widget class="GtkImageMenuItem" id="open2">
721- <property name="visible">True</property>
722- <property name="label" translatable="yes">Open...</property>
723- <property name="use_underline">True</property>
724- <signal name="activate" handler="on_open_activate" last_modification_time="Fri, 23 Jan 2009 08:53:31 GMT"/>
725- <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
726-
727- <child internal-child="image">
728- <widget class="GtkImage" id="image3">
729- <property name="visible">True</property>
730- <property name="stock">gtk-open</property>
731- <property name="icon_size">1</property>
732- <property name="xalign">0.5</property>
733- <property name="yalign">0.5</property>
734- <property name="xpad">0</property>
735- <property name="ypad">0</property>
736- </widget>
737- </child>
738- </widget>
739- </child>
740-
741- <child>
742- <widget class="GtkImageMenuItem" id="refresh1">
743- <property name="visible">True</property>
744- <property name="label" translatable="yes">_Refresh</property>
745- <property name="use_underline">True</property>
746- <signal name="activate" handler="on_refresh_activate" last_modification_time="Fri, 23 Jan 2009 08:26:08 GMT"/>
747- <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
748-
749- <child internal-child="image">
750- <widget class="GtkImage" id="image4">
751- <property name="visible">True</property>
752- <property name="stock">gtk-refresh</property>
753- <property name="icon_size">1</property>
754- <property name="xalign">0.5</property>
755- <property name="yalign">0.5</property>
756- <property name="xpad">0</property>
757- <property name="ypad">0</property>
758- </widget>
759- </child>
760- </widget>
761- </child>
762-
763- <child>
764- <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
765- <property name="visible">True</property>
766- </widget>
767- </child>
768-
769- <child>
770- <widget class="GtkImageMenuItem" id="quit1">
771- <property name="visible">True</property>
772- <property name="label">gtk-quit</property>
773- <property name="use_stock">True</property>
774- <signal name="activate" handler="gtk_main_quit" last_modification_time="Fri, 14 Oct 2005 09:36:47 GMT"/>
775- </widget>
776- </child>
777- </widget>
778- </child>
779- </widget>
780- </child>
781-
782- <child>
783- <widget class="GtkMenuItem" id="menuitem4">
784- <property name="visible">True</property>
785- <property name="label" translatable="yes">_Help</property>
786- <property name="use_underline">True</property>
787-
788- <child>
789- <widget class="GtkMenu" id="menuitem4_menu">
790-
791- <child>
792- <widget class="GtkImageMenuItem" id="about1">
793- <property name="visible">True</property>
794- <property name="label">gtk-about</property>
795- <property name="use_stock">True</property>
796- <signal name="activate" handler="on_about_activate" last_modification_time="Fri, 14 Oct 2005 11:53:00 GMT"/>
797- </widget>
798- </child>
799- </widget>
800- </child>
801- </widget>
802- </child>
803- </widget>
804- <packing>
805- <property name="padding">0</property>
806- <property name="expand">False</property>
807- <property name="fill">False</property>
808- </packing>
809- </child>
810-
811- <child>
812- <widget class="GtkHBox" id="hbox_main">
813- <property name="border_width">6</property>
814- <property name="visible">True</property>
815- <property name="homogeneous">False</property>
816- <property name="spacing">18</property>
817-
818- <child>
819- <widget class="GtkTable" id="table1">
820- <property name="visible">True</property>
821- <property name="n_rows">3</property>
822- <property name="n_columns">2</property>
823- <property name="homogeneous">False</property>
824- <property name="row_spacing">6</property>
825- <property name="column_spacing">12</property>
826-
827- <child>
828- <widget class="GtkLabel" id="label1">
829- <property name="visible">True</property>
830- <property name="label" translatable="yes">Package:</property>
831- <property name="use_underline">False</property>
832- <property name="use_markup">False</property>
833- <property name="justify">GTK_JUSTIFY_LEFT</property>
834- <property name="wrap">False</property>
835- <property name="selectable">False</property>
836- <property name="xalign">0</property>
837- <property name="yalign">0.5</property>
838- <property name="xpad">0</property>
839- <property name="ypad">0</property>
840- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
841- <property name="width_chars">-1</property>
842- <property name="single_line_mode">False</property>
843- <property name="angle">0</property>
844- </widget>
845- <packing>
846- <property name="left_attach">0</property>
847- <property name="right_attach">1</property>
848- <property name="top_attach">0</property>
849- <property name="bottom_attach">1</property>
850- <property name="x_options">fill</property>
851- <property name="y_options"></property>
852- </packing>
853- </child>
854-
855- <child>
856- <widget class="GtkLabel" id="label_name">
857- <property name="visible">True</property>
858- <property name="can_focus">True</property>
859- <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt; &lt;/big&gt;&lt;/b&gt;</property>
860- <property name="use_underline">False</property>
861- <property name="use_markup">True</property>
862- <property name="justify">GTK_JUSTIFY_LEFT</property>
863- <property name="wrap">False</property>
864- <property name="selectable">True</property>
865- <property name="xalign">0</property>
866- <property name="yalign">0.5</property>
867- <property name="xpad">0</property>
868- <property name="ypad">0</property>
869- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
870- <property name="width_chars">-1</property>
871- <property name="single_line_mode">False</property>
872- <property name="angle">0</property>
873- </widget>
874- <packing>
875- <property name="left_attach">1</property>
876- <property name="right_attach">2</property>
877- <property name="top_attach">0</property>
878- <property name="bottom_attach">1</property>
879- <property name="x_options">fill</property>
880- <property name="y_options"></property>
881- </packing>
882- </child>
883-
884- <child>
885- <widget class="GtkHBox" id="hbox2">
886- <property name="visible">True</property>
887- <property name="homogeneous">False</property>
888- <property name="spacing">12</property>
889-
890- <child>
891- <widget class="GtkLabel" id="label_status">
892- <property name="visible">True</property>
893- <property name="can_focus">True</property>
894- <property name="label" translatable="yes"> </property>
895- <property name="use_underline">False</property>
896- <property name="use_markup">False</property>
897- <property name="justify">GTK_JUSTIFY_LEFT</property>
898- <property name="wrap">True</property>
899- <property name="selectable">True</property>
900- <property name="xalign">0</property>
901- <property name="yalign">0.5</property>
902- <property name="xpad">0</property>
903- <property name="ypad">0</property>
904- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
905- <property name="width_chars">-1</property>
906- <property name="single_line_mode">False</property>
907- <property name="angle">0</property>
908- </widget>
909- <packing>
910- <property name="padding">0</property>
911- <property name="expand">True</property>
912- <property name="fill">True</property>
913- </packing>
914- </child>
915-
916- <child>
917- <widget class="GtkButton" id="button_details">
918- <property name="can_focus">True</property>
919- <property name="label" translatable="yes">_Details</property>
920- <property name="use_underline">True</property>
921- <property name="relief">GTK_RELIEF_NORMAL</property>
922- <property name="focus_on_click">True</property>
923- <signal name="clicked" handler="on_button_details_clicked" last_modification_time="Fri, 11 Nov 2005 15:22:53 GMT"/>
924- </widget>
925- <packing>
926- <property name="padding">0</property>
927- <property name="expand">False</property>
928- <property name="fill">False</property>
929- </packing>
930- </child>
931- </widget>
932- <packing>
933- <property name="left_attach">1</property>
934- <property name="right_attach">2</property>
935- <property name="top_attach">2</property>
936- <property name="bottom_attach">3</property>
937- <property name="x_options">fill</property>
938- </packing>
939- </child>
940-
941- <child>
942- <widget class="GtkLabel" id="label3">
943- <property name="visible">True</property>
944- <property name="label" translatable="yes">Status:</property>
945- <property name="use_underline">False</property>
946- <property name="use_markup">False</property>
947- <property name="justify">GTK_JUSTIFY_LEFT</property>
948- <property name="wrap">False</property>
949- <property name="selectable">False</property>
950- <property name="xalign">0</property>
951- <property name="yalign">0.5</property>
952- <property name="xpad">0</property>
953- <property name="ypad">0</property>
954- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
955- <property name="width_chars">-1</property>
956- <property name="single_line_mode">False</property>
957- <property name="angle">0</property>
958- </widget>
959- <packing>
960- <property name="left_attach">0</property>
961- <property name="right_attach">1</property>
962- <property name="top_attach">2</property>
963- <property name="bottom_attach">3</property>
964- <property name="x_options">fill</property>
965- <property name="y_options"></property>
966- </packing>
967- </child>
968-
969- <child>
970- <widget class="GtkLabel" id="label24">
971- <property name="label" translatable="yes">Description:</property>
972- <property name="use_underline">False</property>
973- <property name="use_markup">False</property>
974- <property name="justify">GTK_JUSTIFY_LEFT</property>
975- <property name="wrap">False</property>
976- <property name="selectable">False</property>
977- <property name="xalign">0</property>
978- <property name="yalign">0.5</property>
979- <property name="xpad">0</property>
980- <property name="ypad">0</property>
981- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
982- <property name="width_chars">-1</property>
983- <property name="single_line_mode">False</property>
984- <property name="angle">0</property>
985- </widget>
986- <packing>
987- <property name="left_attach">0</property>
988- <property name="right_attach">1</property>
989- <property name="top_attach">1</property>
990- <property name="bottom_attach">2</property>
991- <property name="x_options">fill</property>
992- <property name="y_options"></property>
993- </packing>
994- </child>
995-
996- <child>
997- <widget class="GtkLabel" id="label_desc">
998- <property name="can_focus">True</property>
999- <property name="label" translatable="yes"></property>
1000- <property name="use_underline">False</property>
1001- <property name="use_markup">False</property>
1002- <property name="justify">GTK_JUSTIFY_LEFT</property>
1003- <property name="wrap">False</property>
1004- <property name="selectable">True</property>
1005- <property name="xalign">0</property>
1006- <property name="yalign">0.5</property>
1007- <property name="xpad">0</property>
1008- <property name="ypad">0</property>
1009- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1010- <property name="width_chars">-1</property>
1011- <property name="single_line_mode">False</property>
1012- <property name="angle">0</property>
1013- </widget>
1014- <packing>
1015- <property name="left_attach">1</property>
1016- <property name="right_attach">2</property>
1017- <property name="top_attach">1</property>
1018- <property name="bottom_attach">2</property>
1019- <property name="y_options"></property>
1020- </packing>
1021- </child>
1022- </widget>
1023- <packing>
1024- <property name="padding">0</property>
1025- <property name="expand">True</property>
1026- <property name="fill">True</property>
1027- </packing>
1028- </child>
1029-
1030- <child>
1031- <widget class="GtkVBox" id="vbox5">
1032- <property name="visible">True</property>
1033- <property name="homogeneous">False</property>
1034- <property name="spacing">0</property>
1035-
1036- <child>
1037- <widget class="GtkButton" id="button_install">
1038- <property name="visible">True</property>
1039- <property name="sensitive">False</property>
1040- <property name="can_default">True</property>
1041- <property name="can_focus">True</property>
1042- <property name="label" translatable="yes">_Install Package</property>
1043- <property name="use_underline">True</property>
1044- <property name="relief">GTK_RELIEF_NORMAL</property>
1045- <property name="focus_on_click">True</property>
1046- <signal name="clicked" handler="on_button_install_clicked" last_modification_time="Fri, 14 Oct 2005 09:08:21 GMT"/>
1047- </widget>
1048- <packing>
1049- <property name="padding">0</property>
1050- <property name="expand">False</property>
1051- <property name="fill">False</property>
1052- </packing>
1053- </child>
1054-
1055- <child>
1056- <placeholder/>
1057- </child>
1058- </widget>
1059- <packing>
1060- <property name="padding">0</property>
1061- <property name="expand">False</property>
1062- <property name="fill">False</property>
1063- </packing>
1064- </child>
1065- </widget>
1066- <packing>
1067- <property name="padding">0</property>
1068- <property name="expand">False</property>
1069- <property name="fill">False</property>
1070- </packing>
1071- </child>
1072-
1073- <child>
1074- <widget class="GtkNotebook" id="notebook_details">
1075- <property name="border_width">6</property>
1076- <property name="visible">True</property>
1077- <property name="can_focus">True</property>
1078- <property name="show_tabs">True</property>
1079- <property name="show_border">True</property>
1080- <property name="tab_pos">GTK_POS_TOP</property>
1081- <property name="scrollable">False</property>
1082- <property name="enable_popup">False</property>
1083-
1084- <child>
1085- <widget class="GtkScrolledWindow" id="scrolledwindow1">
1086- <property name="border_width">6</property>
1087- <property name="visible">True</property>
1088- <property name="can_focus">True</property>
1089- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1090- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1091- <property name="shadow_type">GTK_SHADOW_IN</property>
1092- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
1093-
1094- <child>
1095- <widget class="GtkTextView" id="textview_description">
1096- <property name="visible">True</property>
1097- <property name="can_focus">True</property>
1098- <property name="editable">False</property>
1099- <property name="overwrite">False</property>
1100- <property name="accepts_tab">True</property>
1101- <property name="justification">GTK_JUSTIFY_LEFT</property>
1102- <property name="wrap_mode">GTK_WRAP_WORD</property>
1103- <property name="cursor_visible">False</property>
1104- <property name="pixels_above_lines">4</property>
1105- <property name="pixels_below_lines">4</property>
1106- <property name="pixels_inside_wrap">0</property>
1107- <property name="left_margin">4</property>
1108- <property name="right_margin">4</property>
1109- <property name="indent">0</property>
1110- <property name="text" translatable="yes"></property>
1111- </widget>
1112- </child>
1113- </widget>
1114- <packing>
1115- <property name="tab_expand">False</property>
1116- <property name="tab_fill">True</property>
1117- </packing>
1118- </child>
1119-
1120- <child>
1121- <widget class="GtkLabel" id="label11">
1122- <property name="visible">True</property>
1123- <property name="label" translatable="yes">Description</property>
1124- <property name="use_underline">False</property>
1125- <property name="use_markup">False</property>
1126- <property name="justify">GTK_JUSTIFY_LEFT</property>
1127- <property name="wrap">False</property>
1128- <property name="selectable">False</property>
1129- <property name="xalign">0.5</property>
1130- <property name="yalign">0.5</property>
1131- <property name="xpad">0</property>
1132- <property name="ypad">0</property>
1133- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1134- <property name="width_chars">-1</property>
1135- <property name="single_line_mode">False</property>
1136- <property name="angle">0</property>
1137- </widget>
1138- <packing>
1139- <property name="type">tab</property>
1140- </packing>
1141- </child>
1142-
1143- <child>
1144- <widget class="GtkTable" id="table2">
1145- <property name="border_width">6</property>
1146- <property name="visible">True</property>
1147- <property name="n_rows">5</property>
1148- <property name="n_columns">2</property>
1149- <property name="homogeneous">False</property>
1150- <property name="row_spacing">6</property>
1151- <property name="column_spacing">6</property>
1152-
1153- <child>
1154- <widget class="GtkLabel" id="label23">
1155- <property name="visible">True</property>
1156- <property name="label" translatable="yes">&lt;b&gt;Version:&lt;/b&gt;</property>
1157- <property name="use_underline">False</property>
1158- <property name="use_markup">True</property>
1159- <property name="justify">GTK_JUSTIFY_LEFT</property>
1160- <property name="wrap">False</property>
1161- <property name="selectable">False</property>
1162- <property name="xalign">0</property>
1163- <property name="yalign">0.5</property>
1164- <property name="xpad">0</property>
1165- <property name="ypad">0</property>
1166- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1167- <property name="width_chars">-1</property>
1168- <property name="single_line_mode">False</property>
1169- <property name="angle">0</property>
1170- </widget>
1171- <packing>
1172- <property name="left_attach">0</property>
1173- <property name="right_attach">1</property>
1174- <property name="top_attach">0</property>
1175- <property name="bottom_attach">1</property>
1176- <property name="x_options">fill</property>
1177- <property name="y_options"></property>
1178- </packing>
1179- </child>
1180-
1181- <child>
1182- <widget class="GtkLabel" id="label15">
1183- <property name="visible">True</property>
1184- <property name="label" translatable="yes">&lt;b&gt;Maintainer:&lt;/b&gt;</property>
1185- <property name="use_underline">False</property>
1186- <property name="use_markup">True</property>
1187- <property name="justify">GTK_JUSTIFY_LEFT</property>
1188- <property name="wrap">False</property>
1189- <property name="selectable">False</property>
1190- <property name="xalign">0</property>
1191- <property name="yalign">0.5</property>
1192- <property name="xpad">0</property>
1193- <property name="ypad">0</property>
1194- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1195- <property name="width_chars">-1</property>
1196- <property name="single_line_mode">False</property>
1197- <property name="angle">0</property>
1198- </widget>
1199- <packing>
1200- <property name="left_attach">0</property>
1201- <property name="right_attach">1</property>
1202- <property name="top_attach">1</property>
1203- <property name="bottom_attach">2</property>
1204- <property name="x_options">fill</property>
1205- <property name="y_options"></property>
1206- </packing>
1207- </child>
1208-
1209- <child>
1210- <widget class="GtkLabel" id="label16">
1211- <property name="visible">True</property>
1212- <property name="label" translatable="yes">&lt;b&gt;Priority:&lt;/b&gt;</property>
1213- <property name="use_underline">False</property>
1214- <property name="use_markup">True</property>
1215- <property name="justify">GTK_JUSTIFY_LEFT</property>
1216- <property name="wrap">False</property>
1217- <property name="selectable">False</property>
1218- <property name="xalign">0</property>
1219- <property name="yalign">0.5</property>
1220- <property name="xpad">0</property>
1221- <property name="ypad">0</property>
1222- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1223- <property name="width_chars">-1</property>
1224- <property name="single_line_mode">False</property>
1225- <property name="angle">0</property>
1226- </widget>
1227- <packing>
1228- <property name="left_attach">0</property>
1229- <property name="right_attach">1</property>
1230- <property name="top_attach">2</property>
1231- <property name="bottom_attach">3</property>
1232- <property name="x_options">fill</property>
1233- <property name="y_options"></property>
1234- </packing>
1235- </child>
1236-
1237- <child>
1238- <widget class="GtkLabel" id="label17">
1239- <property name="visible">True</property>
1240- <property name="label" translatable="yes">&lt;b&gt;Section:&lt;/b&gt;</property>
1241- <property name="use_underline">False</property>
1242- <property name="use_markup">True</property>
1243- <property name="justify">GTK_JUSTIFY_LEFT</property>
1244- <property name="wrap">False</property>
1245- <property name="selectable">False</property>
1246- <property name="xalign">0</property>
1247- <property name="yalign">0.5</property>
1248- <property name="xpad">0</property>
1249- <property name="ypad">0</property>
1250- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1251- <property name="width_chars">-1</property>
1252- <property name="single_line_mode">False</property>
1253- <property name="angle">0</property>
1254- </widget>
1255- <packing>
1256- <property name="left_attach">0</property>
1257- <property name="right_attach">1</property>
1258- <property name="top_attach">3</property>
1259- <property name="bottom_attach">4</property>
1260- <property name="x_options">fill</property>
1261- <property name="y_options"></property>
1262- </packing>
1263- </child>
1264-
1265- <child>
1266- <widget class="GtkLabel" id="label21">
1267- <property name="visible">True</property>
1268- <property name="label" translatable="yes">&lt;b&gt;Size:&lt;/b&gt;</property>
1269- <property name="use_underline">False</property>
1270- <property name="use_markup">True</property>
1271- <property name="justify">GTK_JUSTIFY_LEFT</property>
1272- <property name="wrap">False</property>
1273- <property name="selectable">False</property>
1274- <property name="xalign">0</property>
1275- <property name="yalign">0.5</property>
1276- <property name="xpad">0</property>
1277- <property name="ypad">0</property>
1278- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1279- <property name="width_chars">-1</property>
1280- <property name="single_line_mode">False</property>
1281- <property name="angle">0</property>
1282- </widget>
1283- <packing>
1284- <property name="left_attach">0</property>
1285- <property name="right_attach">1</property>
1286- <property name="top_attach">4</property>
1287- <property name="bottom_attach">5</property>
1288- <property name="x_options">fill</property>
1289- <property name="y_options"></property>
1290- </packing>
1291- </child>
1292-
1293- <child>
1294- <widget class="GtkLabel" id="label_maintainer">
1295- <property name="visible">True</property>
1296- <property name="label" translatable="yes"> </property>
1297- <property name="use_underline">False</property>
1298- <property name="use_markup">False</property>
1299- <property name="justify">GTK_JUSTIFY_LEFT</property>
1300- <property name="wrap">False</property>
1301- <property name="selectable">False</property>
1302- <property name="xalign">0</property>
1303- <property name="yalign">0.5</property>
1304- <property name="xpad">0</property>
1305- <property name="ypad">0</property>
1306- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1307- <property name="width_chars">-1</property>
1308- <property name="single_line_mode">False</property>
1309- <property name="angle">0</property>
1310- </widget>
1311- <packing>
1312- <property name="left_attach">1</property>
1313- <property name="right_attach">2</property>
1314- <property name="top_attach">1</property>
1315- <property name="bottom_attach">2</property>
1316- <property name="x_options">fill</property>
1317- <property name="y_options"></property>
1318- </packing>
1319- </child>
1320-
1321- <child>
1322- <widget class="GtkLabel" id="label_priority">
1323- <property name="visible">True</property>
1324- <property name="label" translatable="yes"> </property>
1325- <property name="use_underline">False</property>
1326- <property name="use_markup">False</property>
1327- <property name="justify">GTK_JUSTIFY_LEFT</property>
1328- <property name="wrap">False</property>
1329- <property name="selectable">False</property>
1330- <property name="xalign">0</property>
1331- <property name="yalign">0.5</property>
1332- <property name="xpad">0</property>
1333- <property name="ypad">0</property>
1334- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1335- <property name="width_chars">-1</property>
1336- <property name="single_line_mode">False</property>
1337- <property name="angle">0</property>
1338- </widget>
1339- <packing>
1340- <property name="left_attach">1</property>
1341- <property name="right_attach">2</property>
1342- <property name="top_attach">2</property>
1343- <property name="bottom_attach">3</property>
1344- <property name="x_options">fill</property>
1345- <property name="y_options"></property>
1346- </packing>
1347- </child>
1348-
1349- <child>
1350- <widget class="GtkLabel" id="label_section">
1351- <property name="visible">True</property>
1352- <property name="label" translatable="yes"> </property>
1353- <property name="use_underline">False</property>
1354- <property name="use_markup">False</property>
1355- <property name="justify">GTK_JUSTIFY_LEFT</property>
1356- <property name="wrap">False</property>
1357- <property name="selectable">False</property>
1358- <property name="xalign">0</property>
1359- <property name="yalign">0.5</property>
1360- <property name="xpad">0</property>
1361- <property name="ypad">0</property>
1362- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1363- <property name="width_chars">-1</property>
1364- <property name="single_line_mode">False</property>
1365- <property name="angle">0</property>
1366- </widget>
1367- <packing>
1368- <property name="left_attach">1</property>
1369- <property name="right_attach">2</property>
1370- <property name="top_attach">3</property>
1371- <property name="bottom_attach">4</property>
1372- <property name="x_options">fill</property>
1373- <property name="y_options"></property>
1374- </packing>
1375- </child>
1376-
1377- <child>
1378- <widget class="GtkLabel" id="label_version">
1379- <property name="visible">True</property>
1380- <property name="label" translatable="yes"> </property>
1381- <property name="use_underline">False</property>
1382- <property name="use_markup">False</property>
1383- <property name="justify">GTK_JUSTIFY_LEFT</property>
1384- <property name="wrap">False</property>
1385- <property name="selectable">False</property>
1386- <property name="xalign">0</property>
1387- <property name="yalign">0.5</property>
1388- <property name="xpad">0</property>
1389- <property name="ypad">0</property>
1390- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1391- <property name="width_chars">-1</property>
1392- <property name="single_line_mode">False</property>
1393- <property name="angle">0</property>
1394- </widget>
1395- <packing>
1396- <property name="left_attach">1</property>
1397- <property name="right_attach">2</property>
1398- <property name="top_attach">0</property>
1399- <property name="bottom_attach">1</property>
1400- <property name="x_options">fill</property>
1401- <property name="y_options"></property>
1402- </packing>
1403- </child>
1404-
1405- <child>
1406- <widget class="GtkLabel" id="label_size">
1407- <property name="visible">True</property>
1408- <property name="label" translatable="yes"> </property>
1409- <property name="use_underline">False</property>
1410- <property name="use_markup">False</property>
1411- <property name="justify">GTK_JUSTIFY_LEFT</property>
1412- <property name="wrap">False</property>
1413- <property name="selectable">False</property>
1414- <property name="xalign">0</property>
1415- <property name="yalign">0.5</property>
1416- <property name="xpad">0</property>
1417- <property name="ypad">0</property>
1418- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1419- <property name="width_chars">-1</property>
1420- <property name="single_line_mode">False</property>
1421- <property name="angle">0</property>
1422- </widget>
1423- <packing>
1424- <property name="left_attach">1</property>
1425- <property name="right_attach">2</property>
1426- <property name="top_attach">4</property>
1427- <property name="bottom_attach">5</property>
1428- <property name="y_options"></property>
1429- </packing>
1430- </child>
1431- </widget>
1432- <packing>
1433- <property name="tab_expand">False</property>
1434- <property name="tab_fill">True</property>
1435- </packing>
1436- </child>
1437-
1438- <child>
1439- <widget class="GtkLabel" id="label12">
1440- <property name="visible">True</property>
1441- <property name="label" translatable="yes">Details</property>
1442- <property name="use_underline">False</property>
1443- <property name="use_markup">False</property>
1444- <property name="justify">GTK_JUSTIFY_LEFT</property>
1445- <property name="wrap">False</property>
1446- <property name="selectable">False</property>
1447- <property name="xalign">0.5</property>
1448- <property name="yalign">0.5</property>
1449- <property name="xpad">0</property>
1450- <property name="ypad">0</property>
1451- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1452- <property name="width_chars">-1</property>
1453- <property name="single_line_mode">False</property>
1454- <property name="angle">0</property>
1455- </widget>
1456- <packing>
1457- <property name="type">tab</property>
1458- </packing>
1459- </child>
1460-
1461- <child>
1462- <widget class="GtkScrolledWindow" id="scrolledwindow3">
1463- <property name="border_width">6</property>
1464- <property name="visible">True</property>
1465- <property name="can_focus">True</property>
1466- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1467- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1468- <property name="shadow_type">GTK_SHADOW_IN</property>
1469- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
1470-
1471- <child>
1472- <widget class="GtkTextView" id="textview_filelist">
1473- <property name="visible">True</property>
1474- <property name="can_focus">True</property>
1475- <property name="editable">False</property>
1476- <property name="overwrite">False</property>
1477- <property name="accepts_tab">True</property>
1478- <property name="justification">GTK_JUSTIFY_LEFT</property>
1479- <property name="wrap_mode">GTK_WRAP_NONE</property>
1480- <property name="cursor_visible">True</property>
1481- <property name="pixels_above_lines">0</property>
1482- <property name="pixels_below_lines">0</property>
1483- <property name="pixels_inside_wrap">0</property>
1484- <property name="left_margin">6</property>
1485- <property name="right_margin">6</property>
1486- <property name="indent">0</property>
1487- <property name="text" translatable="yes"></property>
1488- </widget>
1489- </child>
1490- </widget>
1491- <packing>
1492- <property name="tab_expand">False</property>
1493- <property name="tab_fill">True</property>
1494- </packing>
1495- </child>
1496-
1497- <child>
1498- <widget class="GtkLabel" id="label13">
1499- <property name="visible">True</property>
1500- <property name="label" translatable="yes">Included Files</property>
1501- <property name="use_underline">False</property>
1502- <property name="use_markup">False</property>
1503- <property name="justify">GTK_JUSTIFY_LEFT</property>
1504- <property name="wrap">False</property>
1505- <property name="selectable">False</property>
1506- <property name="xalign">0.5</property>
1507- <property name="yalign">0.5</property>
1508- <property name="xpad">0</property>
1509- <property name="ypad">0</property>
1510- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1511- <property name="width_chars">-1</property>
1512- <property name="single_line_mode">False</property>
1513- <property name="angle">0</property>
1514- </widget>
1515- <packing>
1516- <property name="type">tab</property>
1517- </packing>
1518- </child>
1519- </widget>
1520- <packing>
1521- <property name="padding">0</property>
1522- <property name="expand">True</property>
1523- <property name="fill">True</property>
1524- </packing>
1525- </child>
1526-
1527- <child>
1528- <widget class="GtkHBox" id="hbox3">
1529- <property name="visible">True</property>
1530- <property name="homogeneous">False</property>
1531- <property name="spacing">0</property>
1532-
1533- <child>
1534- <widget class="GtkProgressBar" id="progressbar_cache">
1535- <property name="visible">True</property>
1536- <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
1537- <property name="fraction">0</property>
1538- <property name="pulse_step">0.10000000149</property>
1539- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1540- </widget>
1541- <packing>
1542- <property name="padding">0</property>
1543- <property name="expand">False</property>
1544- <property name="fill">False</property>
1545- </packing>
1546- </child>
1547-
1548- <child>
1549- <widget class="GtkStatusbar" id="statusbar_main">
1550- <property name="visible">True</property>
1551- <property name="has_resize_grip">True</property>
1552- </widget>
1553- <packing>
1554- <property name="padding">0</property>
1555- <property name="expand">True</property>
1556- <property name="fill">True</property>
1557- </packing>
1558- </child>
1559- </widget>
1560- <packing>
1561- <property name="padding">0</property>
1562- <property name="expand">False</property>
1563- <property name="fill">False</property>
1564- </packing>
1565- </child>
1566- </widget>
1567- </child>
1568-</widget>
1569-
1570-<widget class="GtkAboutDialog" id="dialog_about">
1571- <property name="border_width">5</property>
1572- <property name="destroy_with_parent">False</property>
1573- <property name="name" translatable="yes">gdebi</property>
1574- <property name="copyright">(c) 2005-2009 Canonical Ltd</property>
1575- <property name="comments" translatable="yes">Install and view software packages</property>
1576- <property name="license" translatable="yes">GPL, see /usr/share/common-licenses/GPL</property>
1577- <property name="wrap_license">False</property>
1578- <property name="website">www.ubuntu.com</property>
1579- <property name="authors">Michael Vogt
1580-Sebastian Heinlein
1581-Luca Falavigna
1582-</property>
1583- <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
1584- <property name="logo">gdebi.png</property>
1585-</widget>
1586-
1587-<widget class="GtkDialog" id="dialog_deb_install">
1588- <property name="border_width">6</property>
1589- <property name="title" translatable="yes"></property>
1590- <property name="type">GTK_WINDOW_TOPLEVEL</property>
1591- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
1592- <property name="modal">True</property>
1593- <property name="resizable">False</property>
1594- <property name="destroy_with_parent">False</property>
1595- <property name="decorated">True</property>
1596- <property name="skip_taskbar_hint">True</property>
1597- <property name="skip_pager_hint">True</property>
1598- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1599- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1600- <property name="focus_on_map">True</property>
1601- <property name="urgency_hint">False</property>
1602- <property name="has_separator">False</property>
1603-
1604- <child internal-child="vbox">
1605- <widget class="GtkVBox" id="dialog-vbox1">
1606- <property name="visible">True</property>
1607- <property name="homogeneous">False</property>
1608- <property name="spacing">6</property>
1609-
1610- <child internal-child="action_area">
1611- <widget class="GtkHButtonBox" id="dialog-action_area1">
1612- <property name="visible">True</property>
1613- <property name="layout_style">GTK_BUTTONBOX_END</property>
1614-
1615- <child>
1616- <widget class="GtkButton" id="button_deb_install_close">
1617- <property name="visible">True</property>
1618- <property name="can_default">True</property>
1619- <property name="can_focus">True</property>
1620- <property name="label">gtk-close</property>
1621- <property name="use_stock">True</property>
1622- <property name="relief">GTK_RELIEF_NORMAL</property>
1623- <property name="focus_on_click">True</property>
1624- <property name="response_id">-7</property>
1625- <signal name="clicked" handler="on_button_deb_install_close_clicked" last_modification_time="Fri, 14 Oct 2005 15:07:57 GMT"/>
1626- </widget>
1627- </child>
1628- </widget>
1629- <packing>
1630- <property name="padding">0</property>
1631- <property name="expand">False</property>
1632- <property name="fill">True</property>
1633- <property name="pack_type">GTK_PACK_END</property>
1634- </packing>
1635- </child>
1636-
1637- <child>
1638- <widget class="GtkVBox" id="vbox6">
1639- <property name="border_width">6</property>
1640- <property name="visible">True</property>
1641- <property name="homogeneous">False</property>
1642- <property name="spacing">6</property>
1643-
1644- <child>
1645- <widget class="GtkVBox" id="vbox3">
1646- <property name="visible">True</property>
1647- <property name="homogeneous">False</property>
1648- <property name="spacing">6</property>
1649-
1650- <child>
1651- <widget class="GtkLabel" id="label_action">
1652- <property name="visible">True</property>
1653- <property name="label" translatable="yes"></property>
1654- <property name="use_underline">False</property>
1655- <property name="use_markup">False</property>
1656- <property name="justify">GTK_JUSTIFY_LEFT</property>
1657- <property name="wrap">False</property>
1658- <property name="selectable">False</property>
1659- <property name="xalign">0</property>
1660- <property name="yalign">0.5</property>
1661- <property name="xpad">0</property>
1662- <property name="ypad">0</property>
1663- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1664- <property name="width_chars">-1</property>
1665- <property name="single_line_mode">False</property>
1666- <property name="angle">0</property>
1667- </widget>
1668- <packing>
1669- <property name="padding">0</property>
1670- <property name="expand">False</property>
1671- <property name="fill">False</property>
1672- </packing>
1673- </child>
1674-
1675- <child>
1676- <widget class="GtkProgressBar" id="progressbar_install">
1677- <property name="width_request">400</property>
1678- <property name="visible">True</property>
1679- <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
1680- <property name="fraction">0</property>
1681- <property name="pulse_step">0.10000000149</property>
1682- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1683- </widget>
1684- <packing>
1685- <property name="padding">0</property>
1686- <property name="expand">True</property>
1687- <property name="fill">False</property>
1688- </packing>
1689- </child>
1690-
1691- <child>
1692- <widget class="GtkLabel" id="label_install_status">
1693- <property name="visible">True</property>
1694- <property name="label" translatable="yes"></property>
1695- <property name="use_underline">False</property>
1696- <property name="use_markup">False</property>
1697- <property name="justify">GTK_JUSTIFY_LEFT</property>
1698- <property name="wrap">False</property>
1699- <property name="selectable">False</property>
1700- <property name="xalign">0</property>
1701- <property name="yalign">0.5</property>
1702- <property name="xpad">0</property>
1703- <property name="ypad">0</property>
1704- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1705- <property name="width_chars">-1</property>
1706- <property name="single_line_mode">False</property>
1707- <property name="angle">0</property>
1708- </widget>
1709- <packing>
1710- <property name="padding">0</property>
1711- <property name="expand">False</property>
1712- <property name="fill">False</property>
1713- </packing>
1714- </child>
1715- </widget>
1716- <packing>
1717- <property name="padding">0</property>
1718- <property name="expand">True</property>
1719- <property name="fill">True</property>
1720- </packing>
1721- </child>
1722-
1723- <child>
1724- <widget class="GtkExpander" id="expander_install">
1725- <property name="visible">True</property>
1726- <property name="can_focus">True</property>
1727- <property name="expanded">False</property>
1728- <property name="spacing">6</property>
1729-
1730- <child>
1731- <widget class="Custom" id="custom_vte">
1732- <property name="visible">True</property>
1733- <property name="creation_function">create_vte</property>
1734- <property name="int1">0</property>
1735- <property name="int2">0</property>
1736- <property name="last_modification_time">Fri, 14 Oct 2005 12:40:08 GMT</property>
1737- </widget>
1738- </child>
1739-
1740- <child>
1741- <widget class="GtkLabel" id="label9">
1742- <property name="visible">True</property>
1743- <property name="label" translatable="yes">Terminal</property>
1744- <property name="use_underline">False</property>
1745- <property name="use_markup">False</property>
1746- <property name="justify">GTK_JUSTIFY_LEFT</property>
1747- <property name="wrap">False</property>
1748- <property name="selectable">False</property>
1749- <property name="xalign">0.5</property>
1750- <property name="yalign">0.5</property>
1751- <property name="xpad">0</property>
1752- <property name="ypad">0</property>
1753- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1754- <property name="width_chars">-1</property>
1755- <property name="single_line_mode">False</property>
1756- <property name="angle">0</property>
1757- </widget>
1758- <packing>
1759- <property name="type">label_item</property>
1760- </packing>
1761- </child>
1762- </widget>
1763- <packing>
1764- <property name="padding">0</property>
1765- <property name="expand">True</property>
1766- <property name="fill">True</property>
1767- </packing>
1768- </child>
1769-
1770- <child>
1771- <widget class="GtkCheckButton" id="checkbutton_autoclose">
1772- <property name="visible">True</property>
1773- <property name="can_focus">True</property>
1774- <property name="label" translatable="yes">Automatically close after the changes have been successfully applied</property>
1775- <property name="use_underline">True</property>
1776- <property name="relief">GTK_RELIEF_NORMAL</property>
1777- <property name="focus_on_click">True</property>
1778- <property name="active">False</property>
1779- <property name="inconsistent">False</property>
1780- <property name="draw_indicator">True</property>
1781- <signal name="clicked" handler="on_checkbutton_autoclose_clicked" last_modification_time="Thu, 26 Mar 2009 16:25:55 GMT"/>
1782- </widget>
1783- <packing>
1784- <property name="padding">0</property>
1785- <property name="expand">False</property>
1786- <property name="fill">False</property>
1787- </packing>
1788- </child>
1789- </widget>
1790- <packing>
1791- <property name="padding">0</property>
1792- <property name="expand">True</property>
1793- <property name="fill">True</property>
1794- </packing>
1795- </child>
1796- </widget>
1797- </child>
1798-</widget>
1799-
1800-<widget class="GtkDialog" id="dialog_details">
1801- <property name="border_width">6</property>
1802- <property name="title" translatable="yes">Details</property>
1803- <property name="type">GTK_WINDOW_TOPLEVEL</property>
1804- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
1805- <property name="modal">False</property>
1806- <property name="default_width">400</property>
1807- <property name="default_height">200</property>
1808- <property name="resizable">True</property>
1809- <property name="destroy_with_parent">False</property>
1810- <property name="decorated">True</property>
1811- <property name="skip_taskbar_hint">False</property>
1812- <property name="skip_pager_hint">False</property>
1813- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1814- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1815- <property name="focus_on_map">True</property>
1816- <property name="urgency_hint">False</property>
1817- <property name="has_separator">False</property>
1818-
1819- <child internal-child="vbox">
1820- <widget class="GtkVBox" id="dialog-vbox2">
1821- <property name="visible">True</property>
1822- <property name="homogeneous">False</property>
1823- <property name="spacing">6</property>
1824-
1825- <child internal-child="action_area">
1826- <widget class="GtkHButtonBox" id="dialog-action_area2">
1827- <property name="visible">True</property>
1828- <property name="layout_style">GTK_BUTTONBOX_END</property>
1829-
1830- <child>
1831- <widget class="GtkButton" id="okbutton1">
1832- <property name="visible">True</property>
1833- <property name="can_default">True</property>
1834- <property name="can_focus">True</property>
1835- <property name="label">gtk-close</property>
1836- <property name="use_stock">True</property>
1837- <property name="relief">GTK_RELIEF_NORMAL</property>
1838- <property name="focus_on_click">True</property>
1839- <property name="response_id">-7</property>
1840- </widget>
1841- </child>
1842- </widget>
1843- <packing>
1844- <property name="padding">0</property>
1845- <property name="expand">False</property>
1846- <property name="fill">True</property>
1847- <property name="pack_type">GTK_PACK_END</property>
1848- </packing>
1849- </child>
1850-
1851- <child>
1852- <widget class="GtkVBox" id="vbox4">
1853- <property name="border_width">6</property>
1854- <property name="visible">True</property>
1855- <property name="homogeneous">False</property>
1856- <property name="spacing">6</property>
1857-
1858- <child>
1859- <widget class="GtkLabel" id="label10">
1860- <property name="visible">True</property>
1861- <property name="label" translatable="yes">&lt;b&gt;To install the following changes are required:&lt;/b&gt;</property>
1862- <property name="use_underline">False</property>
1863- <property name="use_markup">True</property>
1864- <property name="justify">GTK_JUSTIFY_LEFT</property>
1865- <property name="wrap">False</property>
1866- <property name="selectable">False</property>
1867- <property name="xalign">0</property>
1868- <property name="yalign">0.5</property>
1869- <property name="xpad">0</property>
1870- <property name="ypad">0</property>
1871- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1872- <property name="width_chars">-1</property>
1873- <property name="single_line_mode">False</property>
1874- <property name="angle">0</property>
1875- </widget>
1876- <packing>
1877- <property name="padding">0</property>
1878- <property name="expand">False</property>
1879- <property name="fill">False</property>
1880- </packing>
1881- </child>
1882-
1883- <child>
1884- <widget class="GtkScrolledWindow" id="scrolledwindow2">
1885- <property name="visible">True</property>
1886- <property name="can_focus">True</property>
1887- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1888- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1889- <property name="shadow_type">GTK_SHADOW_IN</property>
1890- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
1891-
1892- <child>
1893- <widget class="GtkTreeView" id="treeview_details">
1894- <property name="visible">True</property>
1895- <property name="can_focus">True</property>
1896- <property name="headers_visible">False</property>
1897- <property name="rules_hint">False</property>
1898- <property name="reorderable">False</property>
1899- <property name="enable_search">True</property>
1900- <property name="fixed_height_mode">False</property>
1901- <property name="hover_selection">False</property>
1902- <property name="hover_expand">False</property>
1903- </widget>
1904- </child>
1905- </widget>
1906- <packing>
1907- <property name="padding">0</property>
1908- <property name="expand">True</property>
1909- <property name="fill">True</property>
1910- </packing>
1911- </child>
1912- </widget>
1913- <packing>
1914- <property name="padding">0</property>
1915- <property name="expand">True</property>
1916- <property name="fill">True</property>
1917- </packing>
1918- </child>
1919- </widget>
1920- </child>
1921-</widget>
1922-
1923-<widget class="GtkDialog" id="dialog_hig">
1924- <property name="border_width">6</property>
1925- <property name="title" translatable="yes"></property>
1926- <property name="type">GTK_WINDOW_TOPLEVEL</property>
1927- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
1928- <property name="modal">False</property>
1929- <property name="resizable">False</property>
1930- <property name="destroy_with_parent">False</property>
1931- <property name="decorated">True</property>
1932- <property name="skip_taskbar_hint">True</property>
1933- <property name="skip_pager_hint">True</property>
1934- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1935- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1936- <property name="focus_on_map">True</property>
1937- <property name="urgency_hint">False</property>
1938- <property name="has_separator">False</property>
1939-
1940- <child internal-child="vbox">
1941- <widget class="GtkVBox" id="vbox7">
1942- <property name="visible">True</property>
1943- <property name="homogeneous">False</property>
1944- <property name="spacing">12</property>
1945-
1946- <child internal-child="action_area">
1947- <widget class="GtkHButtonBox" id="hbuttonbox1">
1948- <property name="visible">True</property>
1949- <property name="layout_style">GTK_BUTTONBOX_END</property>
1950-
1951- <child>
1952- <widget class="GtkButton" id="button2">
1953- <property name="visible">True</property>
1954- <property name="can_default">True</property>
1955- <property name="can_focus">True</property>
1956- <property name="label">gtk-close</property>
1957- <property name="use_stock">True</property>
1958- <property name="relief">GTK_RELIEF_NORMAL</property>
1959- <property name="focus_on_click">True</property>
1960- <property name="response_id">-7</property>
1961- </widget>
1962- </child>
1963- </widget>
1964- <packing>
1965- <property name="padding">0</property>
1966- <property name="expand">False</property>
1967- <property name="fill">True</property>
1968- <property name="pack_type">GTK_PACK_END</property>
1969- </packing>
1970- </child>
1971-
1972- <child>
1973- <widget class="GtkHBox" id="hbox5">
1974- <property name="border_width">6</property>
1975- <property name="visible">True</property>
1976- <property name="homogeneous">False</property>
1977- <property name="spacing">12</property>
1978-
1979- <child>
1980- <widget class="GtkImage" id="image_hig">
1981- <property name="visible">True</property>
1982- <property name="stock">gtk-dialog-error</property>
1983- <property name="icon_size">6</property>
1984- <property name="xalign">0</property>
1985- <property name="yalign">0</property>
1986- <property name="xpad">0</property>
1987- <property name="ypad">0</property>
1988- </widget>
1989- <packing>
1990- <property name="padding">0</property>
1991- <property name="expand">False</property>
1992- <property name="fill">True</property>
1993- </packing>
1994- </child>
1995-
1996- <child>
1997- <widget class="GtkVBox" id="vbox8">
1998- <property name="visible">True</property>
1999- <property name="homogeneous">False</property>
2000- <property name="spacing">12</property>
2001-
2002- <child>
2003- <widget class="GtkLabel" id="label_hig">
2004- <property name="visible">True</property>
2005- <property name="label" translatable="yes"></property>
2006- <property name="use_underline">False</property>
2007- <property name="use_markup">True</property>
2008- <property name="justify">GTK_JUSTIFY_LEFT</property>
2009- <property name="wrap">True</property>
2010- <property name="selectable">False</property>
2011- <property name="xalign">0.5</property>
2012- <property name="yalign">0.5</property>
2013- <property name="xpad">0</property>
2014- <property name="ypad">0</property>
2015- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2016- <property name="width_chars">-1</property>
2017- <property name="single_line_mode">False</property>
2018- <property name="angle">0</property>
2019- </widget>
2020- <packing>
2021- <property name="padding">0</property>
2022- <property name="expand">False</property>
2023- <property name="fill">True</property>
2024- </packing>
2025- </child>
2026-
2027- <child>
2028- <widget class="GtkExpander" id="expander_hig">
2029- <property name="can_focus">True</property>
2030- <property name="expanded">True</property>
2031- <property name="spacing">6</property>
2032-
2033- <child>
2034- <widget class="GtkScrolledWindow" id="scrolledwindow4">
2035- <property name="visible">True</property>
2036- <property name="can_focus">True</property>
2037- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2038- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2039- <property name="shadow_type">GTK_SHADOW_IN</property>
2040- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
2041-
2042- <child>
2043- <widget class="GtkTextView" id="textview_hig">
2044- <property name="visible">True</property>
2045- <property name="can_focus">True</property>
2046- <property name="editable">False</property>
2047- <property name="overwrite">False</property>
2048- <property name="accepts_tab">True</property>
2049- <property name="justification">GTK_JUSTIFY_LEFT</property>
2050- <property name="wrap_mode">GTK_WRAP_NONE</property>
2051- <property name="cursor_visible">True</property>
2052- <property name="pixels_above_lines">0</property>
2053- <property name="pixels_below_lines">0</property>
2054- <property name="pixels_inside_wrap">0</property>
2055- <property name="left_margin">0</property>
2056- <property name="right_margin">0</property>
2057- <property name="indent">0</property>
2058- <property name="text" translatable="yes"></property>
2059- </widget>
2060- </child>
2061- </widget>
2062- </child>
2063-
2064- <child>
2065- <widget class="GtkLabel" id="label27">
2066- <property name="visible">True</property>
2067- <property name="label" translatable="yes">Details</property>
2068- <property name="use_underline">False</property>
2069- <property name="use_markup">False</property>
2070- <property name="justify">GTK_JUSTIFY_LEFT</property>
2071- <property name="wrap">False</property>
2072- <property name="selectable">False</property>
2073- <property name="xalign">0.5</property>
2074- <property name="yalign">0.5</property>
2075- <property name="xpad">0</property>
2076- <property name="ypad">0</property>
2077- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2078- <property name="width_chars">-1</property>
2079- <property name="single_line_mode">False</property>
2080- <property name="angle">0</property>
2081- </widget>
2082- <packing>
2083- <property name="type">label_item</property>
2084- </packing>
2085- </child>
2086- </widget>
2087- <packing>
2088- <property name="padding">0</property>
2089- <property name="expand">True</property>
2090- <property name="fill">True</property>
2091- </packing>
2092- </child>
2093- </widget>
2094- <packing>
2095- <property name="padding">0</property>
2096- <property name="expand">False</property>
2097- <property name="fill">False</property>
2098- </packing>
2099- </child>
2100- </widget>
2101- <packing>
2102- <property name="padding">0</property>
2103- <property name="expand">True</property>
2104- <property name="fill">True</property>
2105- </packing>
2106- </child>
2107- </widget>
2108- </child>
2109-</widget>
2110-
2111-</glade-interface>
2112
2113=== removed file 'data/gdebi.gladep'
2114--- data/gdebi.gladep 2005-10-14 13:28:32 +0000
2115+++ data/gdebi.gladep 1970-01-01 00:00:00 +0000
2116@@ -1,8 +0,0 @@
2117-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
2118-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
2119-
2120-<glade-project>
2121- <name></name>
2122- <program_name></program_name>
2123- <gnome_support>FALSE</gnome_support>
2124-</glade-project>
2125
2126=== modified file 'data/gdebi.ui'
2127--- data/gdebi.ui 2012-09-13 21:32:07 +0000
2128+++ data/gdebi.ui 2013-03-22 20:07:20 +0000
2129@@ -1,6 +1,6 @@
2130 <?xml version="1.0" encoding="UTF-8"?>
2131 <interface>
2132- <requires lib="gtk+" version="2.16"/>
2133+ <!-- interface-requires gtk+ 3.0 -->
2134 <object class="GtkAccelGroup" id="accelgroup1"/>
2135 <object class="GtkAboutDialog" id="dialog_about">
2136 <property name="can_focus">False</property>
2137@@ -69,7 +69,6 @@
2138 <property name="can_focus">True</property>
2139 <property name="can_default">True</property>
2140 <property name="receives_default">False</property>
2141- <property name="use_action_appearance">False</property>
2142 <property name="use_stock">True</property>
2143 <signal name="clicked" handler="on_button_deb_install_close_clicked" swapped="no"/>
2144 </object>
2145@@ -180,8 +179,8 @@
2146 <property name="visible">True</property>
2147 <property name="can_focus">True</property>
2148 <property name="receives_default">False</property>
2149- <property name="use_action_appearance">False</property>
2150 <property name="use_underline">True</property>
2151+ <property name="xalign">0.5</property>
2152 <property name="draw_indicator">True</property>
2153 <signal name="clicked" handler="on_checkbutton_autoclose_clicked" swapped="no"/>
2154 </object>
2155@@ -230,7 +229,6 @@
2156 <property name="can_focus">True</property>
2157 <property name="can_default">True</property>
2158 <property name="receives_default">False</property>
2159- <property name="use_action_appearance">False</property>
2160 <property name="use_stock">True</property>
2161 </object>
2162 <packing>
2163@@ -328,7 +326,6 @@
2164 <property name="can_focus">True</property>
2165 <property name="can_default">True</property>
2166 <property name="receives_default">True</property>
2167- <property name="use_action_appearance">False</property>
2168 <property name="use_stock">True</property>
2169 </object>
2170 <packing>
2171@@ -439,7 +436,6 @@
2172 <property name="can_focus">True</property>
2173 <property name="can_default">True</property>
2174 <property name="receives_default">False</property>
2175- <property name="use_action_appearance">False</property>
2176 <property name="use_stock">True</property>
2177 </object>
2178 <packing>
2179@@ -589,7 +585,6 @@
2180 <object class="GtkMenuItem" id="menuitem1">
2181 <property name="visible">True</property>
2182 <property name="can_focus">False</property>
2183- <property name="use_action_appearance">False</property>
2184 <property name="label" translatable="yes">_File</property>
2185 <property name="use_underline">True</property>
2186 <child type="submenu">
2187@@ -600,7 +595,6 @@
2188 <property name="label" translatable="yes">_Open…</property>
2189 <property name="visible">True</property>
2190 <property name="can_focus">False</property>
2191- <property name="use_action_appearance">False</property>
2192 <property name="use_underline">True</property>
2193 <property name="image">image1</property>
2194 <property name="use_stock">False</property>
2195@@ -614,7 +608,6 @@
2196 <property name="label" translatable="yes">_Refresh</property>
2197 <property name="visible">True</property>
2198 <property name="can_focus">False</property>
2199- <property name="use_action_appearance">False</property>
2200 <property name="use_underline">True</property>
2201 <property name="image">image2</property>
2202 <property name="use_stock">False</property>
2203@@ -634,7 +627,6 @@
2204 <property name="label">gtk-quit</property>
2205 <property name="visible">True</property>
2206 <property name="can_focus">False</property>
2207- <property name="use_action_appearance">False</property>
2208 <property name="use_underline">True</property>
2209 <property name="use_stock">True</property>
2210 <property name="accel_group">accelgroup1</property>
2211@@ -649,7 +641,6 @@
2212 <object class="GtkMenuItem" id="menuitem3">
2213 <property name="visible">True</property>
2214 <property name="can_focus">False</property>
2215- <property name="use_action_appearance">False</property>
2216 <property name="label" translatable="yes">_Edit</property>
2217 <property name="use_underline">True</property>
2218 <child type="submenu">
2219@@ -660,7 +651,6 @@
2220 <property name="label">gtk-copy</property>
2221 <property name="visible">True</property>
2222 <property name="can_focus">False</property>
2223- <property name="use_action_appearance">False</property>
2224 <property name="use_underline">True</property>
2225 <property name="use_stock">True</property>
2226 <property name="accel_group">accelgroup1</property>
2227@@ -675,7 +665,6 @@
2228 <object class="GtkMenuItem" id="menuitem4">
2229 <property name="visible">True</property>
2230 <property name="can_focus">False</property>
2231- <property name="use_action_appearance">False</property>
2232 <property name="label" translatable="yes">_Help</property>
2233 <property name="use_underline">True</property>
2234 <child type="submenu">
2235@@ -686,7 +675,6 @@
2236 <property name="label">gtk-about</property>
2237 <property name="visible">True</property>
2238 <property name="can_focus">False</property>
2239- <property name="use_action_appearance">False</property>
2240 <property name="use_underline">True</property>
2241 <property name="use_stock">True</property>
2242 <property name="accel_group">accelgroup1</property>
2243@@ -727,7 +715,7 @@
2244 </object>
2245 <packing>
2246 <property name="x_options">GTK_FILL</property>
2247- <property name="y_options"></property>
2248+ <property name="y_options"/>
2249 </packing>
2250 </child>
2251 <child>
2252@@ -737,14 +725,12 @@
2253 <property name="xalign">0</property>
2254 <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt; &lt;/big&gt;&lt;/b&gt;</property>
2255 <property name="use_markup">True</property>
2256- <property name="selectable">False</property>
2257- <property name="sensitive">True</property>
2258 </object>
2259 <packing>
2260 <property name="left_attach">1</property>
2261 <property name="right_attach">2</property>
2262 <property name="x_options">GTK_FILL</property>
2263- <property name="y_options"></property>
2264+ <property name="y_options"/>
2265 </packing>
2266 </child>
2267 <child>
2268@@ -758,8 +744,6 @@
2269 <property name="xalign">0</property>
2270 <property name="yalign">0</property>
2271 <property name="wrap">True</property>
2272- <property name="selectable">False</property>
2273- <property name="sensitive">True</property>
2274 </object>
2275 <packing>
2276 <property name="expand">True</property>
2277@@ -777,7 +761,6 @@
2278 <property name="label" translatable="yes">_Details</property>
2279 <property name="can_focus">True</property>
2280 <property name="receives_default">True</property>
2281- <property name="use_action_appearance">False</property>
2282 <property name="use_underline">True</property>
2283 <signal name="clicked" handler="on_button_details_clicked" swapped="no"/>
2284 </object>
2285@@ -804,7 +787,7 @@
2286 <property name="top_attach">2</property>
2287 <property name="bottom_attach">3</property>
2288 <property name="x_options">GTK_FILL</property>
2289- <property name="y_options"></property>
2290+ <property name="y_options"/>
2291 </packing>
2292 </child>
2293 <child>
2294@@ -832,7 +815,7 @@
2295 <property name="top_attach">1</property>
2296 <property name="bottom_attach">2</property>
2297 <property name="x_options">GTK_FILL</property>
2298- <property name="y_options"></property>
2299+ <property name="y_options"/>
2300 </packing>
2301 </child>
2302 <child>
2303@@ -846,7 +829,7 @@
2304 <property name="right_attach">2</property>
2305 <property name="top_attach">1</property>
2306 <property name="bottom_attach">2</property>
2307- <property name="y_options"></property>
2308+ <property name="y_options"/>
2309 </packing>
2310 </child>
2311 </object>
2312@@ -869,7 +852,6 @@
2313 <property name="can_focus">True</property>
2314 <property name="can_default">True</property>
2315 <property name="receives_default">False</property>
2316- <property name="use_action_appearance">False</property>
2317 <property name="use_underline">True</property>
2318 <signal name="clicked" handler="on_button_install_clicked" swapped="no"/>
2319 </object>
2320@@ -880,13 +862,28 @@
2321 </packing>
2322 </child>
2323 <child>
2324+ <object class="GtkButton" id="button_remove">
2325+ <property name="label" translatable="yes">_Remove Package</property>
2326+ <property name="sensitive">False</property>
2327+ <property name="can_focus">True</property>
2328+ <property name="can_default">True</property>
2329+ <property name="receives_default">False</property>
2330+ <property name="use_underline">True</property>
2331+ <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
2332+ </object>
2333+ <packing>
2334+ <property name="expand">False</property>
2335+ <property name="fill">False</property>
2336+ <property name="position">1</property>
2337+ </packing>
2338+ </child>
2339+ <child>
2340 <object class="GtkButton" id="button_download">
2341 <property name="label" translatable="yes">_Download Package</property>
2342 <property name="sensitive">False</property>
2343 <property name="can_focus">True</property>
2344 <property name="can_default">True</property>
2345 <property name="receives_default">False</property>
2346- <property name="use_action_appearance">False</property>
2347 <property name="use_underline">True</property>
2348 <signal name="clicked" handler="on_button_download_clicked" swapped="no"/>
2349 </object>
2350@@ -897,24 +894,6 @@
2351 </packing>
2352 </child>
2353 <child>
2354- <object class="GtkButton" id="button_remove">
2355- <property name="label" translatable="yes">_Remove Package</property>
2356- <property name="visible">False</property>
2357- <property name="sensitive">False</property>
2358- <property name="can_focus">True</property>
2359- <property name="can_default">True</property>
2360- <property name="receives_default">False</property>
2361- <property name="use_action_appearance">False</property>
2362- <property name="use_underline">True</property>
2363- <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
2364- </object>
2365- <packing>
2366- <property name="expand">False</property>
2367- <property name="fill">False</property>
2368- <property name="position">1</property>
2369- </packing>
2370- </child>
2371- <child>
2372 <placeholder/>
2373 </child>
2374 </object>
2375@@ -987,7 +966,7 @@
2376 </object>
2377 <packing>
2378 <property name="x_options">GTK_FILL</property>
2379- <property name="y_options"></property>
2380+ <property name="y_options"/>
2381 </packing>
2382 </child>
2383 <child>
2384@@ -1002,7 +981,7 @@
2385 <property name="top_attach">1</property>
2386 <property name="bottom_attach">2</property>
2387 <property name="x_options">GTK_FILL</property>
2388- <property name="y_options"></property>
2389+ <property name="y_options"/>
2390 </packing>
2391 </child>
2392 <child>
2393@@ -1017,7 +996,7 @@
2394 <property name="top_attach">2</property>
2395 <property name="bottom_attach">3</property>
2396 <property name="x_options">GTK_FILL</property>
2397- <property name="y_options"></property>
2398+ <property name="y_options"/>
2399 </packing>
2400 </child>
2401 <child>
2402@@ -1032,7 +1011,7 @@
2403 <property name="top_attach">3</property>
2404 <property name="bottom_attach">4</property>
2405 <property name="x_options">GTK_FILL</property>
2406- <property name="y_options"></property>
2407+ <property name="y_options"/>
2408 </packing>
2409 </child>
2410 <child>
2411@@ -1047,7 +1026,7 @@
2412 <property name="top_attach">4</property>
2413 <property name="bottom_attach">5</property>
2414 <property name="x_options">GTK_FILL</property>
2415- <property name="y_options"></property>
2416+ <property name="y_options"/>
2417 </packing>
2418 </child>
2419 <child>
2420@@ -1063,7 +1042,7 @@
2421 <property name="top_attach">1</property>
2422 <property name="bottom_attach">2</property>
2423 <property name="x_options">GTK_FILL</property>
2424- <property name="y_options"></property>
2425+ <property name="y_options"/>
2426 </packing>
2427 </child>
2428 <child>
2429@@ -1079,7 +1058,7 @@
2430 <property name="top_attach">2</property>
2431 <property name="bottom_attach">3</property>
2432 <property name="x_options">GTK_FILL</property>
2433- <property name="y_options"></property>
2434+ <property name="y_options"/>
2435 </packing>
2436 </child>
2437 <child>
2438@@ -1095,7 +1074,7 @@
2439 <property name="top_attach">3</property>
2440 <property name="bottom_attach">4</property>
2441 <property name="x_options">GTK_FILL</property>
2442- <property name="y_options"></property>
2443+ <property name="y_options"/>
2444 </packing>
2445 </child>
2446 <child>
2447@@ -1109,7 +1088,7 @@
2448 <property name="left_attach">1</property>
2449 <property name="right_attach">2</property>
2450 <property name="x_options">GTK_FILL</property>
2451- <property name="y_options"></property>
2452+ <property name="y_options"/>
2453 </packing>
2454 </child>
2455 <child>
2456@@ -1124,7 +1103,7 @@
2457 <property name="right_attach">2</property>
2458 <property name="top_attach">4</property>
2459 <property name="bottom_attach">5</property>
2460- <property name="y_options"></property>
2461+ <property name="y_options"/>
2462 </packing>
2463 </child>
2464 </object>
2465@@ -1216,6 +1195,34 @@
2466 <property name="tab_fill">False</property>
2467 </packing>
2468 </child>
2469+ <child>
2470+ <object class="GtkScrolledWindow" id="scrolledwindow3">
2471+ <property name="visible">True</property>
2472+ <property name="can_focus">True</property>
2473+ <property name="shadow_type">in</property>
2474+ <child>
2475+ <object class="GtkTextView" id="textview_lintian_output">
2476+ <property name="visible">True</property>
2477+ <property name="can_focus">True</property>
2478+ <property name="editable">False</property>
2479+ </object>
2480+ </child>
2481+ </object>
2482+ <packing>
2483+ <property name="position">3</property>
2484+ </packing>
2485+ </child>
2486+ <child type="tab">
2487+ <object class="GtkLabel" id="label_lintian">
2488+ <property name="visible">True</property>
2489+ <property name="can_focus">False</property>
2490+ <property name="label" translatable="yes">Lintian output</property>
2491+ </object>
2492+ <packing>
2493+ <property name="position">3</property>
2494+ <property name="tab_fill">False</property>
2495+ </packing>
2496+ </child>
2497 </object>
2498 <packing>
2499 <property name="expand">True</property>
2500
2501=== removed file 'data/gdebi.xml.in'
2502--- data/gdebi.xml.in 2006-03-08 16:41:01 +0000
2503+++ data/gdebi.xml.in 1970-01-01 00:00:00 +0000
2504@@ -1,7 +0,0 @@
2505-<?xml version="1.0"?>
2506-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
2507- <mime-type type="application/x-deb">
2508- <_comment>Software package</_comment>
2509- <glob pattern="*.deb"/>
2510- </mime-type>
2511-</mime-info>
2512
2513=== modified file 'debian/changelog'
2514--- debian/changelog 2012-11-02 16:36:21 +0000
2515+++ debian/changelog 2013-03-22 20:07:20 +0000
2516@@ -1,3 +1,30 @@
2517+gdebi (0.9~exp2) experimental; urgency=low
2518+
2519+ * GDebi/GDebiKDE.py:
2520+ - Fix kdesudo invocation (Closes: #694681).
2521+ - Remove debug statement.
2522+ * data/gdebi.glade, data/gdebi.gladep, data/gdebi.xml.in:
2523+ - Remove unused files.
2524+ * po/POTFILES.in:
2525+ - Remove reference to dropped files.
2526+ * debian/compat:
2527+ - Bump compatibility level to 9.
2528+ * debian/control:
2529+ - Bump Standards-Version to 3.9.4.
2530+ * debian/copyright:
2531+ - Update copyright years.
2532+
2533+ -- Luca Falavigna <dktrkranz@debian.org> Sat, 09 Feb 2013 14:39:31 +0100
2534+
2535+gdebi (0.9~exp1) experimental; urgency=low
2536+
2537+ * lp:~mvo/gdebi/py3compat:
2538+ - prepare for python3 and start adding tests
2539+ * lp:~mvo/gdebi/add-lintian
2540+ - add a lintian tab
2541+
2542+ -- Michael Vogt <mvo@debian.org> Fri, 30 Nov 2012 20:42:48 +0100
2543+
2544 gdebi (0.8.7) unstable; urgency=low
2545
2546 [ Michael Vogt ]
2547
2548=== modified file 'debian/compat'
2549--- debian/compat 2011-02-06 23:06:22 +0000
2550+++ debian/compat 2013-03-22 20:07:20 +0000
2551@@ -1,1 +1,1 @@
2552-8
2553+9
2554
2555=== modified file 'debian/control'
2556--- debian/control 2013-03-22 20:07:20 +0000
2557+++ debian/control 2013-03-22 20:07:20 +0000
2558@@ -4,12 +4,12 @@
2559 Maintainer: Ubuntu Developers <ubuntu-dev-team@lists.alioth.debian.org>
2560 Uploaders: Luca Falavigna <dktrkranz@debian.org>,
2561 Michael Vogt <mvo@debian.org>
2562-Build-Depends: debhelper (>= 8),
2563+Build-Depends: debhelper (>= 9),
2564 python (>= 2.6.6-3~),
2565 python-setuptools,
2566 intltool
2567 X-Python-Version: >= 2.6
2568-Standards-Version: 3.9.3
2569+Standards-Version: 3.9.4
2570 Vcs-Bzr: https://code.launchpad.net/~gdebi-developers/gdebi/trunk
2571
2572 Package: gdebi-core
2573
2574=== modified file 'debian/copyright'
2575--- debian/copyright 2012-02-29 21:18:24 +0000
2576+++ debian/copyright 2013-03-22 20:07:20 +0000
2577@@ -3,9 +3,9 @@
2578 Source: https://code.launchpad.net/gdebi
2579
2580 Files: *
2581-Copyright: 2005-2009, Canonical Ltd
2582+Copyright: 2005-2013, Canonical Ltd
2583 2004, Martin Böhm
2584- 2009-2011, Luca Falavigna
2585+ 2009-2013, Luca Falavigna
2586 License: GPL-2+
2587 This program is free software; you can redistribute it
2588 and/or modify it under the terms of the GNU General Public
2589
2590=== modified file 'debian/gdebi.install'
2591--- debian/gdebi.install 2011-08-17 14:58:06 +0000
2592+++ debian/gdebi.install 2013-03-22 20:07:20 +0000
2593@@ -2,6 +2,6 @@
2594 usr/share/gdebi/gdebi.ui
2595 usr/share/gdebi/gdebi.png
2596 usr/share/gdebi/GDebi/SimpleGtkbuilderApp.py
2597-usr/share/gdebi/GDebi/GDebi.py
2598+usr/share/gdebi/GDebi/GDebiGtk.py
2599 usr/share/applications/*.desktop
2600 usr/share/application-registry
2601
2602=== modified file 'gdebi'
2603--- gdebi 2013-03-22 20:07:20 +0000
2604+++ gdebi 2013-03-22 20:07:20 +0000
2605@@ -22,9 +22,12 @@
2606 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2607 #
2608
2609-import warnings
2610-from warnings import warn
2611-warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
2612+# silly py3 compat, py3.3 should make this unneeded
2613+try:
2614+ unicode
2615+except NameError:
2616+ unicode = lambda *args: args[0]
2617+
2618 import sys
2619 import apt
2620 import os.path
2621@@ -79,20 +82,20 @@
2622 try:
2623 debi = GDebiCli(options)
2624 except SystemError as e:
2625- print "Error opening the cache:\n%s" % e
2626+ print("Error opening the cache:\n%s" % e)
2627 sys.exit(1)
2628 if not debi.open(args[0]):
2629 sys.exit(1)
2630
2631 if options.apt_line == True:
2632 (install, remove, unauthenticated) = debi._deb.required_changes
2633- print " ".join(install)
2634- print " ".join([pkg+"-" for pkg in remove])
2635+ print(" ".join(install))
2636+ print(" ".join([pkg+"-" for pkg in remove]))
2637 sys.exit(0)
2638
2639 if options.non_interactive == True:
2640 if os.getuid() != 0:
2641- print _("Need to be root to install packages")
2642+ print(_("Need to be root to install packages"))
2643 sys.exit(1)
2644 sys.exit(debi.install())
2645
2646@@ -101,10 +104,10 @@
2647 debi.show_description()
2648 # check if we actually can install it
2649 if os.getuid() != 0:
2650- print _("Need to be root to install packages")
2651+ print(_("Need to be root to install packages"))
2652 sys.exit(1)
2653 msg = _("Do you want to install the software package? [y/N]:")
2654- print msg,
2655+ sys.stdout.write(msg)
2656 sys.stdout.flush()
2657 res = sys.stdin.readline()
2658 try:
2659
2660=== modified file 'gdebi-gtk'
2661--- gdebi-gtk 2013-03-22 20:07:20 +0000
2662+++ gdebi-gtk 2013-03-22 20:07:20 +0000
2663@@ -22,6 +22,12 @@
2664 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2665 #
2666
2667+# silly py3 compat, py3.3 should make this unneeded
2668+try:
2669+ unicode
2670+except NameError:
2671+ unicode = lambda *args: args[0]
2672+
2673 import sys
2674 import apt
2675 import os.path
2676
2677=== modified file 'gdebi-kde'
2678--- gdebi-kde 2013-03-22 20:07:20 +0000
2679+++ gdebi-kde 2013-03-22 20:07:20 +0000
2680@@ -49,6 +49,7 @@
2681 class OptionParsed:
2682 non_interactive = False
2683
2684+
2685 if __name__ == "__main__":
2686
2687 localesApp="gdebi"
2688
2689=== modified file 'po/POTFILES.in'
2690--- po/POTFILES.in 2013-03-22 20:07:20 +0000
2691+++ po/POTFILES.in 2013-03-22 20:07:20 +0000
2692@@ -2,7 +2,6 @@
2693 gdebi
2694 gdebi-gtk
2695 [type: gettext/glade] data/gdebi.ui
2696-data/gdebi.xml.in
2697 data/gdebi.desktop.in
2698 gdebi-gtk
2699 GDebi/DebPackage.py
2700
2701=== modified file 'po/an.po'
2702--- po/an.po 2012-10-11 19:56:20 +0000
2703+++ po/an.po 2013-03-22 20:07:20 +0000
2704@@ -6,11 +6,12 @@
2705 msgid ""
2706 msgstr ""
2707 "Project-Id-Version: gdebi\n"
2708-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2709-"POT-Creation-Date: 2011-09-02 22:18+0200\n"
2710+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
2711+"POT-Creation-Date: 2013-02-09 14:24+0100\n"
2712 "PO-Revision-Date: 2011-04-29 11:01+0000\n"
2713 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2714 "Language-Team: Aragonese <an@li.org>\n"
2715+"Language: an\n"
2716 "MIME-Version: 1.0\n"
2717 "Content-Type: text/plain; charset=UTF-8\n"
2718 "Content-Transfer-Encoding: 8bit\n"
2719@@ -49,11 +50,11 @@
2720 msgid "gdebi error, file not found: %s\n"
2721 msgstr ""
2722
2723-#: ../gdebi:95 ../gdebi:105
2724+#: ../gdebi:95 ../gdebi:104
2725 msgid "Need to be root to install packages"
2726 msgstr ""
2727
2728-#: ../gdebi:107 ../GDebi/GDebiCli.py:154
2729+#: ../gdebi:106 ../GDebi/GDebiCli.py:153
2730 msgid "Do you want to install the software package? [y/N]:"
2731 msgstr ""
2732
2733@@ -81,126 +82,126 @@
2734 "'sudo apt-get update' and 'sudo apt-get install -f'."
2735 msgstr ""
2736
2737-#: ../data/gdebi.ui.h:1
2738-msgid " "
2739+#: ../data/gdebi.ui.h:1 ../data/gdebi.desktop.in.h:3
2740+msgid "Install and view software packages"
2741 msgstr ""
2742
2743 #: ../data/gdebi.ui.h:2
2744-msgid "<b><big> </big></b>"
2745-msgstr ""
2746-
2747-#: ../data/gdebi.ui.h:3 ../GDebi/GDebiKDE.py:141
2748-msgid "<b>Maintainer:</b>"
2749-msgstr ""
2750-
2751-#: ../data/gdebi.ui.h:4 ../GDebi/GDebiKDE.py:142
2752-msgid "<b>Priority:</b>"
2753-msgstr ""
2754-
2755-#: ../data/gdebi.ui.h:5 ../GDebi/GDebiKDE.py:143
2756-msgid "<b>Section:</b>"
2757-msgstr ""
2758-
2759-#: ../data/gdebi.ui.h:6 ../GDebi/GDebiKDE.py:144
2760-msgid "<b>Size:</b>"
2761-msgstr ""
2762-
2763-#: ../data/gdebi.ui.h:7 ../GDebi/GDebiKDE.py:295
2764+msgid "GPL, see /usr/share/common-licenses/GPL"
2765+msgstr ""
2766+
2767+#: ../data/gdebi.ui.h:3
2768+msgid "Terminal"
2769+msgstr ""
2770+
2771+#: ../data/gdebi.ui.h:4
2772+msgid "Automatically close after the changes have been successfully applied"
2773+msgstr ""
2774+
2775+#: ../data/gdebi.ui.h:5 ../GDebi/GDebiKDE.py:157 ../GDebi/GDebiKDE.py:159
2776+#: ../GDebi/GDebiKDE.py:321
2777+msgid "Details"
2778+msgstr ""
2779+
2780+#: ../data/gdebi.ui.h:6 ../GDebi/GDebiKDE.py:320
2781 msgid "<b>To install the following changes are required:</b>"
2782 msgstr ""
2783
2784-#: ../data/gdebi.ui.h:8 ../GDebi/GDebiKDE.py:140
2785-msgid "<b>Version:</b>"
2786+#: ../data/gdebi.ui.h:7 ../data/gdebi.desktop.in.h:2
2787+msgid "Package Installer"
2788+msgstr ""
2789+
2790+#: ../data/gdebi.ui.h:8
2791+msgid "_File"
2792 msgstr ""
2793
2794 #: ../data/gdebi.ui.h:9
2795-msgid "Automatically close after the changes have been successfully applied"
2796+msgid "_Open…"
2797 msgstr ""
2798
2799-#: ../data/gdebi.ui.h:10 ../GDebi/GDebiKDE.py:134
2800-msgid "Description"
2801+#: ../data/gdebi.ui.h:10
2802+msgid "_Refresh"
2803 msgstr ""
2804
2805 #: ../data/gdebi.ui.h:11
2806-msgid "Description:"
2807-msgstr ""
2808-
2809-#: ../data/gdebi.ui.h:12 ../GDebi/GDebiKDE.py:133 ../GDebi/GDebiKDE.py:135
2810-#: ../GDebi/GDebiKDE.py:296
2811-msgid "Details"
2812-msgstr ""
2813-
2814-#: ../data/gdebi.ui.h:13
2815-msgid "GPL, see /usr/share/common-licenses/GPL"
2816-msgstr ""
2817-
2818-#: ../data/gdebi.ui.h:14
2819-msgid "Included files"
2820-msgstr ""
2821-
2822-#: ../data/gdebi.ui.h:15 ../data/gdebi.desktop.in.h:2
2823-msgid "Install and view software packages"
2824-msgstr ""
2825-
2826-#: ../data/gdebi.ui.h:16 ../data/gdebi.desktop.in.h:3
2827-msgid "Package Installer"
2828+msgid "_Edit"
2829+msgstr ""
2830+
2831+#: ../data/gdebi.ui.h:12
2832+msgid "_Help"
2833 msgstr ""
2834
2835 #. first, we load all the default descriptions -- pyuic doesn't use
2836 #. gettext as default (FIXME, copy code from language-selector)
2837-#: ../data/gdebi.ui.h:17 ../GDebi/GDebiKDE.py:131
2838+#: ../data/gdebi.ui.h:13 ../GDebi/GDebiKDE.py:155
2839 msgid "Package:"
2840 msgstr ""
2841
2842-#: ../data/gdebi.ui.h:18 ../GDebi/GDebiKDE.py:132
2843+#: ../data/gdebi.ui.h:14
2844+msgid "<b><big> </big></b>"
2845+msgstr ""
2846+
2847+#: ../data/gdebi.ui.h:15
2848+msgid "_Details"
2849+msgstr ""
2850+
2851+#: ../data/gdebi.ui.h:16 ../GDebi/GDebiKDE.py:156
2852 msgid "Status:"
2853 msgstr ""
2854
2855-#: ../data/gdebi.ui.h:19
2856-msgid "Terminal"
2857-msgstr ""
2858-
2859-#: ../data/gdebi.ui.h:20
2860-msgid "_Details"
2861-msgstr ""
2862-
2863-#: ../data/gdebi.ui.h:21
2864-msgid "_Download Package"
2865-msgstr ""
2866-
2867-#: ../data/gdebi.ui.h:22
2868-msgid "_Edit"
2869-msgstr ""
2870-
2871-#: ../data/gdebi.ui.h:23
2872-msgid "_File"
2873-msgstr ""
2874-
2875-#: ../data/gdebi.ui.h:24
2876-msgid "_Help"
2877+#: ../data/gdebi.ui.h:17
2878+msgid "Description:"
2879 msgstr ""
2880
2881 #. img = Gtk.Image()
2882 #. img.set_from_stock(Gtk.STOCK_APPLY,Gtk.IconSize.BUTTON)
2883 #. self.button_install.set_image(img)
2884-#: ../data/gdebi.ui.h:25 ../GDebi/GDebi.py:327 ../GDebi/GDebi.py:384
2885+#: ../data/gdebi.ui.h:18 ../GDebi/GDebiGtk.py:335 ../GDebi/GDebiGtk.py:392
2886 msgid "_Install Package"
2887 msgstr ""
2888
2889-#: ../data/gdebi.ui.h:26
2890-msgid "_Open…"
2891+#: ../data/gdebi.ui.h:19
2892+msgid "_Remove Package"
2893+msgstr ""
2894+
2895+#: ../data/gdebi.ui.h:20
2896+msgid "_Download Package"
2897+msgstr ""
2898+
2899+#: ../data/gdebi.ui.h:21 ../GDebi/GDebiKDE.py:158
2900+msgid "Description"
2901+msgstr ""
2902+
2903+#: ../data/gdebi.ui.h:22 ../GDebi/GDebiKDE.py:164
2904+msgid "<b>Version:</b>"
2905+msgstr ""
2906+
2907+#: ../data/gdebi.ui.h:23 ../GDebi/GDebiKDE.py:165
2908+msgid "<b>Maintainer:</b>"
2909+msgstr ""
2910+
2911+#: ../data/gdebi.ui.h:24 ../GDebi/GDebiKDE.py:166
2912+msgid "<b>Priority:</b>"
2913+msgstr ""
2914+
2915+#: ../data/gdebi.ui.h:25 ../GDebi/GDebiKDE.py:167
2916+msgid "<b>Section:</b>"
2917+msgstr ""
2918+
2919+#: ../data/gdebi.ui.h:26 ../GDebi/GDebiKDE.py:168
2920+msgid "<b>Size:</b>"
2921 msgstr ""
2922
2923 #: ../data/gdebi.ui.h:27
2924-msgid "_Refresh"
2925+msgid " "
2926 msgstr ""
2927
2928 #: ../data/gdebi.ui.h:28
2929-msgid "_Remove Package"
2930+msgid "Included files"
2931 msgstr ""
2932
2933-#: ../data/gdebi.xml.in.h:1
2934-msgid "Software package"
2935+#: ../data/gdebi.ui.h:29
2936+msgid "Lintian output"
2937 msgstr ""
2938
2939 #: ../data/gdebi.desktop.in.h:1
2940@@ -209,138 +210,155 @@
2941
2942 #. Translators: it's for missing entries in the deb package,
2943 #. e.g. a missing "Maintainer" field
2944-#: ../GDebi/DebPackage.py:39
2945+#: ../GDebi/DebPackage.py:38
2946 #, python-format
2947 msgid "%s is not available"
2948 msgstr ""
2949
2950-#: ../GDebi/GDebi.py:92
2951+#: ../GDebi/GDebiGtk.py:93
2952 msgid "Copy selected text"
2953 msgstr ""
2954
2955-#: ../GDebi/GDebi.py:103
2956+#: ../GDebi/GDebiGtk.py:104
2957 msgid "Loading..."
2958 msgstr ""
2959
2960-#: ../GDebi/GDebi.py:175
2961+#: ../GDebi/GDebiGtk.py:179
2962 msgid "Can not download as root"
2963 msgstr ""
2964
2965-#: ../GDebi/GDebi.py:176
2966+#: ../GDebi/GDebiGtk.py:180
2967 msgid ""
2968 "Remote packages can not be downloaded when running as root. Please try again "
2969 "as a normal user."
2970 msgstr ""
2971
2972-#: ../GDebi/GDebi.py:189
2973+#: ../GDebi/GDebiGtk.py:193
2974 msgid "Downloading package"
2975 msgstr ""
2976
2977-#: ../GDebi/GDebi.py:196
2978+#: ../GDebi/GDebiGtk.py:200
2979 msgid "Download failed"
2980 msgstr ""
2981
2982-#: ../GDebi/GDebi.py:197
2983+#: ../GDebi/GDebiGtk.py:201
2984 #, python-format
2985 msgid "Downloading the package failed: file '%s' '%s'"
2986 msgstr ""
2987
2988 #. set window title
2989 #. set name
2990-#: ../GDebi/GDebi.py:246 ../GDebi/GDebiKDE.py:184
2991+#: ../GDebi/GDebiGtk.py:249 ../GDebi/GDebiKDE.py:208
2992 #, python-format
2993 msgid "Package Installer - %s"
2994 msgstr ""
2995
2996-#: ../GDebi/GDebi.py:303
2997+#: ../GDebi/GDebiGtk.py:306
2998 msgid "Package control data"
2999 msgstr ""
3000
3001-#: ../GDebi/GDebi.py:306
3002+#: ../GDebi/GDebiGtk.py:309
3003 msgid "Upstream data"
3004 msgstr ""
3005
3006-#: ../GDebi/GDebi.py:312
3007+#: ../GDebi/GDebiGtk.py:315
3008 msgid "Error reading filelist"
3009 msgstr ""
3010
3011-#: ../GDebi/GDebi.py:323
3012+#: ../GDebi/GDebiGtk.py:331
3013 msgid "Error: "
3014 msgstr ""
3015
3016-#: ../GDebi/GDebi.py:338
3017+#: ../GDebi/GDebiGtk.py:346
3018 msgid "Error: no longer provides "
3019 msgstr ""
3020
3021-#: ../GDebi/GDebi.py:354
3022+#: ../GDebi/GDebiGtk.py:362
3023 msgid "Same version is already installed"
3024 msgstr ""
3025
3026-#: ../GDebi/GDebi.py:355
3027+#: ../GDebi/GDebiGtk.py:363
3028 msgid "_Reinstall Package"
3029 msgstr ""
3030
3031-#: ../GDebi/GDebi.py:401
3032+#: ../GDebi/GDebiGtk.py:401
3033+msgid ""
3034+"No lintian available.\n"
3035+"Please install using sudo apt-get install lintian"
3036+msgstr ""
3037+
3038+#: ../GDebi/GDebiGtk.py:404
3039+msgid "Running lintian..."
3040+msgstr ""
3041+
3042+#: ../GDebi/GDebiGtk.py:421
3043+#, python-format
3044+msgid ""
3045+"\n"
3046+"Lintian finished with exit status %s"
3047+msgstr ""
3048+
3049+#: ../GDebi/GDebiGtk.py:449
3050 msgid "Selection is a directory"
3051 msgstr ""
3052
3053-#: ../GDebi/GDebi.py:406 ../GDebi/GDebi.py:411
3054+#: ../GDebi/GDebiGtk.py:454 ../GDebi/GDebiGtk.py:460
3055 #, python-format
3056 msgid "Error reading file content '%s'"
3057 msgstr ""
3058
3059-#: ../GDebi/GDebi.py:415
3060+#: ../GDebi/GDebiGtk.py:465
3061 msgid "File content can not be extracted"
3062 msgstr ""
3063
3064-#: ../GDebi/GDebi.py:426
3065+#: ../GDebi/GDebiGtk.py:476
3066 #, python-format
3067 msgid "<b>To be removed: %s</b>"
3068 msgstr ""
3069
3070-#: ../GDebi/GDebi.py:428 ../GDebi/GDebiKDE.py:290
3071+#: ../GDebi/GDebiGtk.py:478 ../GDebi/GDebiKDE.py:314
3072 #, python-format
3073 msgid "To be installed: %s"
3074 msgstr ""
3075
3076-#: ../GDebi/GDebi.py:443
3077+#: ../GDebi/GDebiGtk.py:493
3078 msgid "Open Software Package"
3079 msgstr ""
3080
3081-#: ../GDebi/GDebi.py:448
3082+#: ../GDebi/GDebiGtk.py:498
3083 msgid "Software packages"
3084 msgstr ""
3085
3086-#: ../GDebi/GDebi.py:495
3087+#: ../GDebi/GDebiGtk.py:547
3088 msgid "Dependency problems"
3089 msgstr ""
3090
3091-#: ../GDebi/GDebi.py:496
3092+#: ../GDebi/GDebiGtk.py:548
3093 #, python-format
3094 msgid "One or more packages are required by %s, it cannot be removed."
3095 msgstr ""
3096
3097-#: ../GDebi/GDebi.py:504
3098+#: ../GDebi/GDebiGtk.py:556
3099 msgid "File not found"
3100 msgstr ""
3101
3102-#: ../GDebi/GDebi.py:505
3103+#: ../GDebi/GDebiGtk.py:557
3104 msgid "You tried to install a file that does not (or no longer) exist. "
3105 msgstr ""
3106
3107-#: ../GDebi/GDebi.py:516
3108+#: ../GDebi/GDebiGtk.py:568
3109 msgid "Installing package file..."
3110 msgstr ""
3111
3112-#: ../GDebi/GDebi.py:518
3113+#: ../GDebi/GDebiGtk.py:570
3114 msgid "Removing package..."
3115 msgstr ""
3116
3117-#: ../GDebi/GDebi.py:521
3118+#: ../GDebi/GDebiGtk.py:573
3119 msgid "Install unauthenticated software?"
3120 msgstr ""
3121
3122-#: ../GDebi/GDebi.py:522
3123+#: ../GDebi/GDebiGtk.py:574
3124 msgid ""
3125 "Malicious software can damage your data and take control of your system.\n"
3126 "\n"
3127@@ -348,57 +366,58 @@
3128 "nature."
3129 msgstr ""
3130
3131-#: ../GDebi/GDebi.py:550
3132+#: ../GDebi/GDebiGtk.py:602
3133 msgid "You need to grant administrative rights to install software"
3134 msgstr ""
3135
3136-#: ../GDebi/GDebi.py:551
3137+#: ../GDebi/GDebiGtk.py:603
3138 msgid ""
3139 "\n"
3140 "It is a possible security risk to install packages files manually.\n"
3141 "Install software from trustworthy software distributors only.\n"
3142 msgstr ""
3143
3144-#: ../GDebi/GDebi.py:556
3145+#: ../GDebi/GDebiGtk.py:608
3146 msgid "You need to grant administrative rights to remove software"
3147 msgstr ""
3148
3149-#: ../GDebi/GDebi.py:557
3150+#: ../GDebi/GDebiGtk.py:609
3151 msgid "It is a possible risk to remove packages."
3152 msgstr ""
3153
3154-#: ../GDebi/GDebi.py:579 ../GDebi/GDebi.py:643
3155+#: ../GDebi/GDebiGtk.py:631 ../GDebi/GDebiGtk.py:695
3156 msgid "Failed to install package file"
3157 msgstr ""
3158
3159-#: ../GDebi/GDebi.py:581
3160+#: ../GDebi/GDebiGtk.py:633
3161 msgid "Failed to remove package"
3162 msgstr ""
3163
3164-#: ../GDebi/GDebi.py:627 ../GDebi/GDebiKDE.py:342
3165+#. errMsg = "%s" % msg
3166+#: ../GDebi/GDebiGtk.py:679 ../GDebi/GDebiKDE.py:370
3167 msgid "Could not download all required files"
3168 msgstr ""
3169
3170-#: ../GDebi/GDebi.py:628 ../GDebi/GDebiKDE.py:343
3171+#: ../GDebi/GDebiGtk.py:680 ../GDebi/GDebiKDE.py:371
3172 msgid "Please check your internet connection or installation medium."
3173 msgstr ""
3174
3175-#: ../GDebi/GDebi.py:632 ../GDebi/GDebiKDE.py:347
3176+#: ../GDebi/GDebiGtk.py:684 ../GDebi/GDebiKDE.py:376
3177 msgid "Could not install all dependencies"
3178 msgstr ""
3179
3180-#: ../GDebi/GDebi.py:633 ../GDebi/GDebiKDE.py:348
3181+#: ../GDebi/GDebiGtk.py:685 ../GDebi/GDebiKDE.py:377
3182 msgid ""
3183 "Usually this is related to an error of the software distributor. See the "
3184 "terminal window for more details."
3185 msgstr ""
3186
3187-#: ../GDebi/GDebi.py:649
3188+#: ../GDebi/GDebiGtk.py:701
3189 #, python-format
3190 msgid "Installing %s"
3191 msgstr ""
3192
3193-#: ../GDebi/GDebi.py:652
3194+#: ../GDebi/GDebiGtk.py:704
3195 #, python-format
3196 msgid "Removing %s"
3197 msgstr ""
3198@@ -407,176 +426,176 @@
3199 #. show the button
3200 #. self.button_deb_install_close.set_sensitive(True)
3201 #. self.button_deb_install_close.grab_default()
3202-#: ../GDebi/GDebi.py:674 ../GDebi/GDebiKDE.py:367
3203+#: ../GDebi/GDebiGtk.py:726 ../GDebi/GDebiKDE.py:396
3204 msgid "Installation finished"
3205 msgstr ""
3206
3207-#: ../GDebi/GDebi.py:676
3208+#: ../GDebi/GDebiGtk.py:728
3209 msgid "Removal finished"
3210 msgstr ""
3211
3212-#: ../GDebi/GDebi.py:679
3213+#: ../GDebi/GDebiGtk.py:731
3214 #, python-format
3215 msgid "Package '%s' was installed"
3216 msgstr ""
3217
3218-#: ../GDebi/GDebi.py:681
3219+#: ../GDebi/GDebiGtk.py:733
3220 #, python-format
3221 msgid "Package '%s' was removed"
3222 msgstr ""
3223
3224-#: ../GDebi/GDebi.py:684 ../GDebi/GDebiKDE.py:371
3225+#: ../GDebi/GDebiGtk.py:736 ../GDebi/GDebiKDE.py:400
3226 #, python-format
3227 msgid "Failed to install package '%s'"
3228 msgstr ""
3229
3230-#: ../GDebi/GDebi.py:687
3231+#: ../GDebi/GDebiGtk.py:739
3232 #, python-format
3233 msgid "Failed to remove package '%s'"
3234 msgstr ""
3235
3236-#: ../GDebi/GDebi.py:691
3237+#: ../GDebi/GDebiGtk.py:743
3238 msgid "Installation complete"
3239 msgstr ""
3240
3241-#: ../GDebi/GDebi.py:693
3242+#: ../GDebi/GDebiGtk.py:745
3243 msgid "Removal complete"
3244 msgstr ""
3245
3246-#: ../GDebi/GDebi.py:701 ../GDebi/GDebiKDE.py:381
3247+#: ../GDebi/GDebiGtk.py:753 ../GDebi/GDebiKDE.py:410
3248 msgid "Failed to completely install all dependencies"
3249 msgstr ""
3250
3251-#: ../GDebi/GDebi.py:703
3252+#: ../GDebi/GDebiGtk.py:755
3253 msgid "Failed to completely remove package"
3254 msgstr ""
3255
3256-#: ../GDebi/GDebi.py:704 ../GDebi/GDebiKDE.py:382
3257+#: ../GDebi/GDebiGtk.py:756 ../GDebi/GDebiKDE.py:411
3258 msgid "To fix this run 'sudo apt-get install -f' in a terminal window."
3259 msgstr ""
3260
3261 #. ui
3262-#: ../GDebi/GDebi.py:823 ../GDebi/KDEAptDialogs.py:73
3263+#: ../GDebi/GDebiGtk.py:875 ../GDebi/KDEAptDialogs.py:70
3264 #, python-format
3265 msgid "Installing '%s'..."
3266 msgstr ""
3267
3268-#: ../GDebi/GDebi.py:826
3269+#: ../GDebi/GDebiGtk.py:878
3270 #, python-format
3271 msgid "Removing '%s'..."
3272 msgstr ""
3273
3274-#: ../GDebi/GDebi.py:930 ../GDebi/KDEAptDialogs.py:141
3275+#: ../GDebi/GDebiGtk.py:982 ../GDebi/KDEAptDialogs.py:138
3276 msgid "Installing dependencies..."
3277 msgstr ""
3278
3279-#: ../GDebi/GDebi.py:975 ../GDebi/KDEAptDialogs.py:204
3280-#: ../GDebi/KDEAptDialogs.py:217 ../GDebi/KDEAptDialogs.py:219
3281+#: ../GDebi/GDebiGtk.py:1027 ../GDebi/KDEAptDialogs.py:201
3282+#: ../GDebi/KDEAptDialogs.py:214 ../GDebi/KDEAptDialogs.py:216
3283 msgid "Downloading additional package files..."
3284 msgstr ""
3285
3286-#: ../GDebi/GDebi.py:984 ../GDebi/KDEAptDialogs.py:217
3287+#: ../GDebi/GDebiGtk.py:1036 ../GDebi/KDEAptDialogs.py:214
3288 #, python-format
3289 msgid "File %s of %s at %sB/s"
3290 msgstr ""
3291
3292-#: ../GDebi/GDebi.py:986 ../GDebi/KDEAptDialogs.py:219
3293+#: ../GDebi/GDebiGtk.py:1038 ../GDebi/KDEAptDialogs.py:216
3294 #, python-format
3295 msgid "File %s of %s"
3296 msgstr ""
3297
3298 #. print "mediaChange %s %s" % (medium, drive)
3299-#: ../GDebi/GDebi.py:993 ../GDebi/KDEAptDialogs.py:224
3300+#: ../GDebi/GDebiGtk.py:1045 ../GDebi/KDEAptDialogs.py:221
3301 #, python-format
3302 msgid "Please insert '%s' into the drive '%s'"
3303 msgstr ""
3304
3305-#: ../GDebi/GDebiCli.py:59
3306+#: ../GDebi/GDebiCli.py:57
3307 msgid "Configuration items must be specified with a =<value>\n"
3308 msgstr ""
3309
3310-#: ../GDebi/GDebiCli.py:65
3311+#: ../GDebi/GDebiCli.py:63
3312 #, python-format
3313 msgid "Couldn't set APT option %s to %s\n"
3314 msgstr ""
3315
3316-#: ../GDebi/GDebiCli.py:78
3317+#: ../GDebi/GDebiCli.py:76
3318 #, python-format
3319 msgid "Unknown package type '%s', exiting\n"
3320 msgstr ""
3321
3322+#: ../GDebi/GDebiCli.py:80
3323+msgid "Failed to open the software package\n"
3324+msgstr ""
3325+
3326 #: ../GDebi/GDebiCli.py:81
3327-msgid "Failed to open the software package\n"
3328-msgstr ""
3329-
3330-#: ../GDebi/GDebiCli.py:82
3331 msgid ""
3332 "The package might be corrupted or you are not allowed to open the file. "
3333 "Check the permissions of the file.\n"
3334 msgstr ""
3335
3336-#: ../GDebi/GDebiCli.py:88
3337+#: ../GDebi/GDebiCli.py:87
3338 msgid "This package is uninstallable\n"
3339 msgstr ""
3340
3341-#: ../GDebi/GDebiCli.py:97 ../GDebi/GDebiKDE.py:220
3342+#: ../GDebi/GDebiCli.py:96 ../GDebi/GDebiKDE.py:244
3343 msgid "No description is available"
3344 msgstr ""
3345
3346-#: ../GDebi/GDebiCli.py:103
3347+#: ../GDebi/GDebiCli.py:106
3348 msgid "The following packages are UNAUTHENTICATED: "
3349 msgstr ""
3350
3351-#: ../GDebi/GDebiCli.py:107
3352+#: ../GDebi/GDebiCli.py:110
3353 msgid "Requires the REMOVAL of the following packages: "
3354 msgstr ""
3355
3356-#: ../GDebi/GDebiCli.py:112
3357+#: ../GDebi/GDebiCli.py:115
3358 msgid "Requires the installation of the following packages: "
3359 msgstr ""
3360
3361-#: ../GDebi/GDebiCli.py:126 ../GDebi/GDebiCli.py:129
3362+#: ../GDebi/GDebiCli.py:131
3363 #, python-format
3364 msgid "Error during install: '%s'"
3365 msgstr ""
3366
3367-#: ../GDebi/GDebiKDE.py:136
3368+#: ../GDebi/GDebiKDE.py:160
3369 msgid "Included Files"
3370 msgstr ""
3371
3372-#: ../GDebi/GDebiKDE.py:138 ../GDebi/GDebiKDE.py:278
3373+#: ../GDebi/GDebiKDE.py:162 ../GDebi/GDebiKDE.py:302
3374 msgid "&Install Package"
3375 msgstr ""
3376
3377-#: ../GDebi/GDebiKDE.py:139
3378+#: ../GDebi/GDebiKDE.py:163
3379 msgid "&Download Package"
3380 msgstr ""
3381
3382-#: ../GDebi/GDebiKDE.py:164
3383+#: ../GDebi/GDebiKDE.py:188
3384 msgid "The package file does not exist"
3385 msgstr ""
3386
3387-#: ../GDebi/GDebiKDE.py:165
3388+#: ../GDebi/GDebiKDE.py:189
3389 msgid ""
3390 "A nonexistent file has been selected for installation. Please select an "
3391 "existing .deb package file."
3392 msgstr ""
3393
3394 #. self.textLabel1_3_2.setText(_("Same version is already installed"))
3395-#: ../GDebi/GDebiKDE.py:246
3396+#: ../GDebi/GDebiKDE.py:270
3397 msgid "&Reinstall Package"
3398 msgstr ""
3399
3400-#: ../GDebi/GDebiKDE.py:281
3401+#: ../GDebi/GDebiKDE.py:305
3402 msgid "Re&install Package"
3403 msgstr ""
3404
3405-#: ../GDebi/GDebiKDE.py:292
3406+#: ../GDebi/GDebiKDE.py:316
3407 #, python-format
3408 msgid "To be removed: %s"
3409 msgstr ""
3410
3411-#: ../GDebi/GDebiKDE.py:369
3412+#: ../GDebi/GDebiKDE.py:398
3413 msgid "<b>"
3414 msgstr ""
3415
3416@@ -591,82 +610,82 @@
3417 "in a terminal window."
3418 msgstr ""
3419
3420-#: ../GDebi/GDebiCommon.py:84
3421+#: ../GDebi/GDebiCommon.py:86
3422 #, python-format
3423 msgid "'%s' is not a Debian package"
3424 msgstr ""
3425
3426-#: ../GDebi/GDebiCommon.py:85
3427+#: ../GDebi/GDebiCommon.py:87
3428 #, python-format
3429 msgid ""
3430 "The MIME type of this file is '%s' and can not be installed on this system."
3431 msgstr ""
3432
3433-#: ../GDebi/GDebiCommon.py:89
3434+#: ../GDebi/GDebiCommon.py:91
3435 #, python-format
3436 msgid "Could not open '%s'"
3437 msgstr ""
3438
3439-#: ../GDebi/GDebiCommon.py:90
3440+#: ../GDebi/GDebiCommon.py:92
3441 msgid ""
3442 "The package might be corrupted or you are not allowed to open the file. "
3443 "Check the permissions of the file."
3444 msgstr ""
3445
3446-#: ../GDebi/GDebiCommon.py:109
3447+#: ../GDebi/GDebiCommon.py:111
3448 msgid "Same version is available in a software channel"
3449 msgstr ""
3450
3451-#: ../GDebi/GDebiCommon.py:110
3452+#: ../GDebi/GDebiCommon.py:112
3453 msgid "You are recommended to install the software from the channel instead."
3454 msgstr ""
3455
3456-#: ../GDebi/GDebiCommon.py:114
3457+#: ../GDebi/GDebiCommon.py:116
3458 msgid "An older version is available in a software channel"
3459 msgstr ""
3460
3461-#: ../GDebi/GDebiCommon.py:115
3462+#: ../GDebi/GDebiCommon.py:117
3463 msgid ""
3464 "Generally you are recommended to install the version from the software "
3465 "channel, since it is usually better supported."
3466 msgstr ""
3467
3468-#: ../GDebi/GDebiCommon.py:120
3469+#: ../GDebi/GDebiCommon.py:122
3470 msgid "A later version is available in a software channel"
3471 msgstr ""
3472
3473-#: ../GDebi/GDebiCommon.py:122
3474+#: ../GDebi/GDebiCommon.py:124
3475 msgid ""
3476 "You are strongly advised to install the version from the software channel, "
3477 "since it is usually better supported."
3478 msgstr ""
3479
3480-#: ../GDebi/GDebiCommon.py:164
3481+#: ../GDebi/GDebiCommon.py:166
3482 msgid "All dependencies are satisfied"
3483 msgstr ""
3484
3485 #. FIXME: use ngettext here
3486-#: ../GDebi/GDebiCommon.py:167
3487+#: ../GDebi/GDebiCommon.py:169
3488 #, python-format
3489 msgid "Requires the <b>removal</b> of %s packages\n"
3490 msgstr ""
3491
3492-#: ../GDebi/GDebiCommon.py:169
3493+#: ../GDebi/GDebiCommon.py:171
3494 #, python-format
3495 msgid "Requires the installation of %s packages"
3496 msgstr ""
3497
3498-#: ../GDebi/GDebiCommon.py:177 ../GDebi/GDebiCommon.py:195
3499+#: ../GDebi/GDebiCommon.py:179 ../GDebi/GDebiCommon.py:197
3500 msgid "Only one software management tool is allowed to run at the same time"
3501 msgstr ""
3502
3503-#: ../GDebi/GDebiCommon.py:179 ../GDebi/GDebiCommon.py:197
3504+#: ../GDebi/GDebiCommon.py:181 ../GDebi/GDebiCommon.py:199
3505 msgid ""
3506 "Please close the other application e.g. 'Update Manager', 'aptitude' or "
3507 "'Synaptic' first."
3508 msgstr ""
3509
3510 #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
3511-#: ../GDebi/KDEAptDialogs.py:226
3512+#: ../GDebi/KDEAptDialogs.py:223
3513 msgid "Media Change"
3514 msgstr ""
3515
3516=== modified file 'po/ar.po'
3517--- po/ar.po 2012-10-11 19:56:20 +0000
3518+++ po/ar.po 2013-03-22 20:07:20 +0000
3519@@ -6,11 +6,12 @@
3520 msgid ""
3521 msgstr ""
3522 "Project-Id-Version: gdebi\n"
3523-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3524-"POT-Creation-Date: 2011-09-02 22:18+0200\n"
3525+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
3526+"POT-Creation-Date: 2013-02-09 14:24+0100\n"
3527 "PO-Revision-Date: 2011-01-03 18:48+0000\n"
3528 "Last-Translator: dali--info <Unknown>\n"
3529 "Language-Team: Arabic <ar@li.org>\n"
3530+"Language: ar\n"
3531 "MIME-Version: 1.0\n"
3532 "Content-Type: text/plain; charset=UTF-8\n"
3533 "Content-Transfer-Encoding: 8bit\n"
3534@@ -51,11 +52,11 @@
3535 msgid "gdebi error, file not found: %s\n"
3536 msgstr ""
3537
3538-#: ../gdebi:95 ../gdebi:105
3539+#: ../gdebi:95 ../gdebi:104
3540 msgid "Need to be root to install packages"
3541 msgstr "تحتاج أن تكون root لتثبيت الحزم"
3542
3543-#: ../gdebi:107 ../GDebi/GDebiCli.py:154
3544+#: ../gdebi:106 ../GDebi/GDebiCli.py:153
3545 msgid "Do you want to install the software package? [y/N]:"
3546 msgstr "هل تريد تثبيت حزمة البرنامج؟ [Y/N]."
3547
3548@@ -83,126 +84,126 @@
3549 "'sudo apt-get update' and 'sudo apt-get install -f'."
3550 msgstr ""
3551
3552-#: ../data/gdebi.ui.h:1
3553-msgid " "
3554-msgstr " "
3555+#: ../data/gdebi.ui.h:1 ../data/gdebi.desktop.in.h:3
3556+msgid "Install and view software packages"
3557+msgstr "تثبيت و عرض حزم البرامج"
3558
3559 #: ../data/gdebi.ui.h:2
3560-msgid "<b><big> </big></b>"
3561-msgstr ""
3562-
3563-#: ../data/gdebi.ui.h:3 ../GDebi/GDebiKDE.py:141
3564-msgid "<b>Maintainer:</b>"
3565-msgstr ""
3566-
3567-#: ../data/gdebi.ui.h:4 ../GDebi/GDebiKDE.py:142
3568-msgid "<b>Priority:</b>"
3569-msgstr ""
3570-
3571-#: ../data/gdebi.ui.h:5 ../GDebi/GDebiKDE.py:143
3572-msgid "<b>Section:</b>"
3573-msgstr ""
3574-
3575-#: ../data/gdebi.ui.h:6 ../GDebi/GDebiKDE.py:144
3576-msgid "<b>Size:</b>"
3577-msgstr ""
3578-
3579-#: ../data/gdebi.ui.h:7 ../GDebi/GDebiKDE.py:295
3580-msgid "<b>To install the following changes are required:</b>"
3581-msgstr "<b>لتطبيق التغيرات التالية يتطلب:</b>"
3582-
3583-#: ../data/gdebi.ui.h:8 ../GDebi/GDebiKDE.py:140
3584-msgid "<b>Version:</b>"
3585-msgstr ""
3586-
3587-#: ../data/gdebi.ui.h:9
3588+msgid "GPL, see /usr/share/common-licenses/GPL"
3589+msgstr "رخصة جنو العامة، راجع /usr/share/common-licenses/GPL"
3590+
3591+#: ../data/gdebi.ui.h:3
3592+msgid "Terminal"
3593+msgstr "الطرفيّة"
3594+
3595+#: ../data/gdebi.ui.h:4
3596 msgid "Automatically close after the changes have been successfully applied"
3597 msgstr "إغلاق تلقائي بعد تطبيق التغيرات بنجاح."
3598
3599-#: ../data/gdebi.ui.h:10 ../GDebi/GDebiKDE.py:134
3600-msgid "Description"
3601-msgstr "الوصف"
3602-
3603-#: ../data/gdebi.ui.h:11
3604-msgid "Description:"
3605-msgstr ""
3606-
3607-#: ../data/gdebi.ui.h:12 ../GDebi/GDebiKDE.py:133 ../GDebi/GDebiKDE.py:135
3608-#: ../GDebi/GDebiKDE.py:296
3609+#: ../data/gdebi.ui.h:5 ../GDebi/GDebiKDE.py:157 ../GDebi/GDebiKDE.py:159
3610+#: ../GDebi/GDebiKDE.py:321
3611 msgid "Details"
3612 msgstr "التفاصيل"
3613
3614-#: ../data/gdebi.ui.h:13
3615-msgid "GPL, see /usr/share/common-licenses/GPL"
3616-msgstr "رخصة جنو العامة، راجع /usr/share/common-licenses/GPL"
3617-
3618-#: ../data/gdebi.ui.h:14
3619-msgid "Included files"
3620-msgstr ""
3621-
3622-#: ../data/gdebi.ui.h:15 ../data/gdebi.desktop.in.h:2
3623-msgid "Install and view software packages"
3624-msgstr "تثبيت و عرض حزم البرامج"
3625-
3626-#: ../data/gdebi.ui.h:16 ../data/gdebi.desktop.in.h:3
3627+#: ../data/gdebi.ui.h:6 ../GDebi/GDebiKDE.py:320
3628+msgid "<b>To install the following changes are required:</b>"
3629+msgstr "<b>لتطبيق التغيرات التالية يتطلب:</b>"
3630+
3631+#: ../data/gdebi.ui.h:7 ../data/gdebi.desktop.in.h:2
3632 msgid "Package Installer"
3633 msgstr ""
3634
3635+#: ../data/gdebi.ui.h:8
3636+msgid "_File"
3637+msgstr "_ملف"
3638+
3639+#: ../data/gdebi.ui.h:9
3640+msgid "_Open…"
3641+msgstr ""
3642+
3643+#: ../data/gdebi.ui.h:10
3644+msgid "_Refresh"
3645+msgstr ""
3646+
3647+#: ../data/gdebi.ui.h:11
3648+msgid "_Edit"
3649+msgstr ""
3650+
3651+#: ../data/gdebi.ui.h:12
3652+msgid "_Help"
3653+msgstr "_مساعدة"
3654+
3655 #. first, we load all the default descriptions -- pyuic doesn't use
3656 #. gettext as default (FIXME, copy code from language-selector)
3657-#: ../data/gdebi.ui.h:17 ../GDebi/GDebiKDE.py:131
3658+#: ../data/gdebi.ui.h:13 ../GDebi/GDebiKDE.py:155
3659 msgid "Package:"
3660 msgstr "الحزمة:"
3661
3662-#: ../data/gdebi.ui.h:18 ../GDebi/GDebiKDE.py:132
3663+#: ../data/gdebi.ui.h:14
3664+msgid "<b><big> </big></b>"
3665+msgstr ""
3666+
3667+#: ../data/gdebi.ui.h:15
3668+msgid "_Details"
3669+msgstr ""
3670+
3671+#: ../data/gdebi.ui.h:16 ../GDebi/GDebiKDE.py:156
3672 msgid "Status:"
3673 msgstr "الحالة:"
3674
3675-#: ../data/gdebi.ui.h:19
3676-msgid "Terminal"
3677-msgstr "الطرفيّة"
3678-
3679-#: ../data/gdebi.ui.h:20
3680-msgid "_Details"
3681-msgstr ""
3682-
3683-#: ../data/gdebi.ui.h:21
3684-msgid "_Download Package"
3685-msgstr ""
3686-
3687-#: ../data/gdebi.ui.h:22
3688-msgid "_Edit"
3689-msgstr ""
3690-
3691-#: ../data/gdebi.ui.h:23
3692-msgid "_File"
3693-msgstr "_ملف"
3694-
3695-#: ../data/gdebi.ui.h:24
3696-msgid "_Help"
3697-msgstr "_مساعدة"
3698+#: ../data/gdebi.ui.h:17
3699+msgid "Description:"
3700+msgstr ""
3701
3702 #. img = Gtk.Image()
3703 #. img.set_from_stock(Gtk.STOCK_APPLY,Gtk.IconSize.BUTTON)
3704 #. self.button_install.set_image(img)
3705-#: ../data/gdebi.ui.h:25 ../GDebi/GDebi.py:327 ../GDebi/GDebi.py:384
3706+#: ../data/gdebi.ui.h:18 ../GDebi/GDebiGtk.py:335 ../GDebi/GDebiGtk.py:392
3707 msgid "_Install Package"
3708 msgstr ""
3709
3710-#: ../data/gdebi.ui.h:26
3711-msgid "_Open…"
3712+#: ../data/gdebi.ui.h:19
3713+msgid "_Remove Package"
3714+msgstr ""
3715+
3716+#: ../data/gdebi.ui.h:20
3717+msgid "_Download Package"
3718+msgstr ""
3719+
3720+#: ../data/gdebi.ui.h:21 ../GDebi/GDebiKDE.py:158
3721+msgid "Description"
3722+msgstr "الوصف"
3723+
3724+#: ../data/gdebi.ui.h:22 ../GDebi/GDebiKDE.py:164
3725+msgid "<b>Version:</b>"
3726+msgstr ""
3727+
3728+#: ../data/gdebi.ui.h:23 ../GDebi/GDebiKDE.py:165
3729+msgid "<b>Maintainer:</b>"
3730+msgstr ""
3731+
3732+#: ../data/gdebi.ui.h:24 ../GDebi/GDebiKDE.py:166
3733+msgid "<b>Priority:</b>"
3734+msgstr ""
3735+
3736+#: ../data/gdebi.ui.h:25 ../GDebi/GDebiKDE.py:167
3737+msgid "<b>Section:</b>"
3738+msgstr ""
3739+
3740+#: ../data/gdebi.ui.h:26 ../GDebi/GDebiKDE.py:168
3741+msgid "<b>Size:</b>"
3742 msgstr ""
3743
3744 #: ../data/gdebi.ui.h:27
3745-msgid "_Refresh"
3746-msgstr ""
3747+msgid " "
3748+msgstr " "
3749
3750 #: ../data/gdebi.ui.h:28
3751-msgid "_Remove Package"
3752+msgid "Included files"
3753 msgstr ""
3754
3755-#: ../data/gdebi.xml.in.h:1
3756-msgid "Software package"
3757+#: ../data/gdebi.ui.h:29
3758+msgid "Lintian output"
3759 msgstr ""
3760
3761 #: ../data/gdebi.desktop.in.h:1
3762@@ -211,138 +212,155 @@
3763
3764 #. Translators: it's for missing entries in the deb package,
3765 #. e.g. a missing "Maintainer" field
3766-#: ../GDebi/DebPackage.py:39
3767+#: ../GDebi/DebPackage.py:38
3768 #, python-format
3769 msgid "%s is not available"
3770 msgstr "%s غير متاح."
3771
3772-#: ../GDebi/GDebi.py:92
3773+#: ../GDebi/GDebiGtk.py:93
3774 msgid "Copy selected text"
3775 msgstr ""
3776
3777-#: ../GDebi/GDebi.py:103
3778+#: ../GDebi/GDebiGtk.py:104
3779 msgid "Loading..."
3780 msgstr ""
3781
3782-#: ../GDebi/GDebi.py:175
3783+#: ../GDebi/GDebiGtk.py:179
3784 msgid "Can not download as root"
3785 msgstr ""
3786
3787-#: ../GDebi/GDebi.py:176
3788+#: ../GDebi/GDebiGtk.py:180
3789 msgid ""
3790 "Remote packages can not be downloaded when running as root. Please try again "
3791 "as a normal user."
3792 msgstr ""
3793
3794-#: ../GDebi/GDebi.py:189
3795+#: ../GDebi/GDebiGtk.py:193
3796 msgid "Downloading package"
3797 msgstr ""
3798
3799-#: ../GDebi/GDebi.py:196
3800+#: ../GDebi/GDebiGtk.py:200
3801 msgid "Download failed"
3802 msgstr ""
3803
3804-#: ../GDebi/GDebi.py:197
3805+#: ../GDebi/GDebiGtk.py:201
3806 #, python-format
3807 msgid "Downloading the package failed: file '%s' '%s'"
3808 msgstr ""
3809
3810 #. set window title
3811 #. set name
3812-#: ../GDebi/GDebi.py:246 ../GDebi/GDebiKDE.py:184
3813+#: ../GDebi/GDebiGtk.py:249 ../GDebi/GDebiKDE.py:208
3814 #, python-format
3815 msgid "Package Installer - %s"
3816 msgstr ""
3817
3818-#: ../GDebi/GDebi.py:303
3819+#: ../GDebi/GDebiGtk.py:306
3820 msgid "Package control data"
3821 msgstr ""
3822
3823-#: ../GDebi/GDebi.py:306
3824+#: ../GDebi/GDebiGtk.py:309
3825 msgid "Upstream data"
3826 msgstr ""
3827
3828-#: ../GDebi/GDebi.py:312
3829+#: ../GDebi/GDebiGtk.py:315
3830 msgid "Error reading filelist"
3831 msgstr ""
3832
3833-#: ../GDebi/GDebi.py:323
3834+#: ../GDebi/GDebiGtk.py:331
3835 msgid "Error: "
3836 msgstr ""
3837
3838-#: ../GDebi/GDebi.py:338
3839+#: ../GDebi/GDebiGtk.py:346
3840 msgid "Error: no longer provides "
3841 msgstr ""
3842
3843-#: ../GDebi/GDebi.py:354
3844+#: ../GDebi/GDebiGtk.py:362
3845 msgid "Same version is already installed"
3846 msgstr ""
3847
3848-#: ../GDebi/GDebi.py:355
3849+#: ../GDebi/GDebiGtk.py:363
3850 msgid "_Reinstall Package"
3851 msgstr ""
3852
3853-#: ../GDebi/GDebi.py:401
3854+#: ../GDebi/GDebiGtk.py:401
3855+msgid ""
3856+"No lintian available.\n"
3857+"Please install using sudo apt-get install lintian"
3858+msgstr ""
3859+
3860+#: ../GDebi/GDebiGtk.py:404
3861+msgid "Running lintian..."
3862+msgstr ""
3863+
3864+#: ../GDebi/GDebiGtk.py:421
3865+#, python-format
3866+msgid ""
3867+"\n"
3868+"Lintian finished with exit status %s"
3869+msgstr ""
3870+
3871+#: ../GDebi/GDebiGtk.py:449
3872 msgid "Selection is a directory"
3873 msgstr ""
3874
3875-#: ../GDebi/GDebi.py:406 ../GDebi/GDebi.py:411
3876+#: ../GDebi/GDebiGtk.py:454 ../GDebi/GDebiGtk.py:460
3877 #, python-format
3878 msgid "Error reading file content '%s'"
3879 msgstr ""
3880
3881-#: ../GDebi/GDebi.py:415
3882+#: ../GDebi/GDebiGtk.py:465
3883 msgid "File content can not be extracted"
3884 msgstr "لا يمكن إستخراج محتويات الملف"
3885
3886-#: ../GDebi/GDebi.py:426
3887+#: ../GDebi/GDebiGtk.py:476
3888 #, python-format
3889 msgid "<b>To be removed: %s</b>"
3890 msgstr "<b>ستُحذف: %s</b>"
3891
3892-#: ../GDebi/GDebi.py:428 ../GDebi/GDebiKDE.py:290
3893+#: ../GDebi/GDebiGtk.py:478 ../GDebi/GDebiKDE.py:314
3894 #, python-format
3895 msgid "To be installed: %s"
3896 msgstr "ستُثبّت: %s"
3897
3898-#: ../GDebi/GDebi.py:443
3899+#: ../GDebi/GDebiGtk.py:493
3900 msgid "Open Software Package"
3901 msgstr ""
3902
3903-#: ../GDebi/GDebi.py:448
3904+#: ../GDebi/GDebiGtk.py:498
3905 msgid "Software packages"
3906 msgstr ""
3907
3908-#: ../GDebi/GDebi.py:495
3909+#: ../GDebi/GDebiGtk.py:547
3910 msgid "Dependency problems"
3911 msgstr ""
3912
3913-#: ../GDebi/GDebi.py:496
3914+#: ../GDebi/GDebiGtk.py:548
3915 #, python-format
3916 msgid "One or more packages are required by %s, it cannot be removed."
3917 msgstr ""
3918
3919-#: ../GDebi/GDebi.py:504
3920+#: ../GDebi/GDebiGtk.py:556
3921 msgid "File not found"
3922 msgstr "لا يمكن العثور على الملف"
3923
3924-#: ../GDebi/GDebi.py:505
3925+#: ../GDebi/GDebiGtk.py:557
3926 msgid "You tried to install a file that does not (or no longer) exist. "
3927 msgstr "أنت تحاول تثبيت ملف غير موجود. "
3928
3929-#: ../GDebi/GDebi.py:516
3930+#: ../GDebi/GDebiGtk.py:568
3931 msgid "Installing package file..."
3932 msgstr ""
3933
3934-#: ../GDebi/GDebi.py:518
3935+#: ../GDebi/GDebiGtk.py:570
3936 msgid "Removing package..."
3937 msgstr ""
3938
3939-#: ../GDebi/GDebi.py:521
3940+#: ../GDebi/GDebiGtk.py:573
3941 msgid "Install unauthenticated software?"
3942 msgstr ""
3943
3944-#: ../GDebi/GDebi.py:522
3945+#: ../GDebi/GDebiGtk.py:574
3946 msgid ""
3947 "Malicious software can damage your data and take control of your system.\n"
3948 "\n"
3949@@ -352,11 +370,11 @@
3950 "البرامج الخبيثة يمكن أن تتلف (تدمر) بيانتك و تتحكم في النظام\n"
3951 "الحزم أدناه غير مستوثقة لذا يمكن أن تكون خبيثة."
3952
3953-#: ../GDebi/GDebi.py:550
3954+#: ../GDebi/GDebiGtk.py:602
3955 msgid "You need to grant administrative rights to install software"
3956 msgstr ""
3957
3958-#: ../GDebi/GDebi.py:551
3959+#: ../GDebi/GDebiGtk.py:603
3960 msgid ""
3961 "\n"
3962 "It is a possible security risk to install packages files manually.\n"
3963@@ -366,46 +384,47 @@
3964 "تثبيت الحزم يدويا يمكن أن يشكل خطرا أمنيا.\n"
3965 "ثبت البرامج من المصادر الآمنة منها فقط.\n"
3966
3967-#: ../GDebi/GDebi.py:556
3968+#: ../GDebi/GDebiGtk.py:608
3969 msgid "You need to grant administrative rights to remove software"
3970 msgstr ""
3971
3972-#: ../GDebi/GDebi.py:557
3973+#: ../GDebi/GDebiGtk.py:609
3974 msgid "It is a possible risk to remove packages."
3975 msgstr ""
3976
3977-#: ../GDebi/GDebi.py:579 ../GDebi/GDebi.py:643
3978+#: ../GDebi/GDebiGtk.py:631 ../GDebi/GDebiGtk.py:695
3979 msgid "Failed to install package file"
3980 msgstr "فشل تثبيت حزمة الملف."
3981
3982-#: ../GDebi/GDebi.py:581
3983+#: ../GDebi/GDebiGtk.py:633
3984 msgid "Failed to remove package"
3985 msgstr ""
3986
3987-#: ../GDebi/GDebi.py:627 ../GDebi/GDebiKDE.py:342
3988+#. errMsg = "%s" % msg
3989+#: ../GDebi/GDebiGtk.py:679 ../GDebi/GDebiKDE.py:370
3990 msgid "Could not download all required files"
3991 msgstr "يتعذر تنزيل كل الملفات المطلوبة."
3992
3993-#: ../GDebi/GDebi.py:628 ../GDebi/GDebiKDE.py:343
3994+#: ../GDebi/GDebiGtk.py:680 ../GDebi/GDebiKDE.py:371
3995 msgid "Please check your internet connection or installation medium."
3996 msgstr "من فضلك تحقق من الاتصال بالانترنت, أو تحقق من تثبيت الوسائط."
3997
3998-#: ../GDebi/GDebi.py:632 ../GDebi/GDebiKDE.py:347
3999+#: ../GDebi/GDebiGtk.py:684 ../GDebi/GDebiKDE.py:376
4000 msgid "Could not install all dependencies"
4001 msgstr "يتعذر تثبيت جميع الاعتمادات."
4002
4003-#: ../GDebi/GDebi.py:633 ../GDebi/GDebiKDE.py:348
4004+#: ../GDebi/GDebiGtk.py:685 ../GDebi/GDebiKDE.py:377
4005 msgid ""
4006 "Usually this is related to an error of the software distributor. See the "
4007 "terminal window for more details."
4008 msgstr ""
4009
4010-#: ../GDebi/GDebi.py:649
4011+#: ../GDebi/GDebiGtk.py:701
4012 #, python-format
4013 msgid "Installing %s"
4014 msgstr "جاري تثبيت %s"
4015
4016-#: ../GDebi/GDebi.py:652
4017+#: ../GDebi/GDebiGtk.py:704
4018 #, python-format
4019 msgid "Removing %s"
4020 msgstr ""
4021@@ -414,176 +433,176 @@
4022 #. show the button
4023 #. self.button_deb_install_close.set_sensitive(True)
4024 #. self.button_deb_install_close.grab_default()
4025-#: ../GDebi/GDebi.py:674 ../GDebi/GDebiKDE.py:367
4026+#: ../GDebi/GDebiGtk.py:726 ../GDebi/GDebiKDE.py:396
4027 msgid "Installation finished"
4028 msgstr ""
4029
4030-#: ../GDebi/GDebi.py:676
4031+#: ../GDebi/GDebiGtk.py:728
4032 msgid "Removal finished"
4033 msgstr ""
4034
4035-#: ../GDebi/GDebi.py:679
4036+#: ../GDebi/GDebiGtk.py:731
4037 #, python-format
4038 msgid "Package '%s' was installed"
4039 msgstr "الحزمة '%s' تم تثبيتها."
4040
4041-#: ../GDebi/GDebi.py:681
4042+#: ../GDebi/GDebiGtk.py:733
4043 #, python-format
4044 msgid "Package '%s' was removed"
4045 msgstr ""
4046
4047-#: ../GDebi/GDebi.py:684 ../GDebi/GDebiKDE.py:371
4048+#: ../GDebi/GDebiGtk.py:736 ../GDebi/GDebiKDE.py:400
4049 #, python-format
4050 msgid "Failed to install package '%s'"
4051 msgstr "فشل في تثبيت الحزمة '%s'"
4052
4053-#: ../GDebi/GDebi.py:687
4054+#: ../GDebi/GDebiGtk.py:739
4055 #, python-format
4056 msgid "Failed to remove package '%s'"
4057 msgstr ""
4058
4059-#: ../GDebi/GDebi.py:691
4060+#: ../GDebi/GDebiGtk.py:743
4061 msgid "Installation complete"
4062 msgstr ""
4063
4064-#: ../GDebi/GDebi.py:693
4065+#: ../GDebi/GDebiGtk.py:745
4066 msgid "Removal complete"
4067 msgstr ""
4068
4069-#: ../GDebi/GDebi.py:701 ../GDebi/GDebiKDE.py:381
4070+#: ../GDebi/GDebiGtk.py:753 ../GDebi/GDebiKDE.py:410
4071 msgid "Failed to completely install all dependencies"
4072 msgstr ""
4073
4074-#: ../GDebi/GDebi.py:703
4075+#: ../GDebi/GDebiGtk.py:755
4076 msgid "Failed to completely remove package"
4077 msgstr ""
4078
4079-#: ../GDebi/GDebi.py:704 ../GDebi/GDebiKDE.py:382
4080+#: ../GDebi/GDebiGtk.py:756 ../GDebi/GDebiKDE.py:411
4081 msgid "To fix this run 'sudo apt-get install -f' in a terminal window."
4082 msgstr ""
4083
4084 #. ui
4085-#: ../GDebi/GDebi.py:823 ../GDebi/KDEAptDialogs.py:73
4086+#: ../GDebi/GDebiGtk.py:875 ../GDebi/KDEAptDialogs.py:70
4087 #, python-format
4088 msgid "Installing '%s'..."
4089 msgstr ""
4090
4091-#: ../GDebi/GDebi.py:826
4092+#: ../GDebi/GDebiGtk.py:878
4093 #, python-format
4094 msgid "Removing '%s'..."
4095 msgstr ""
4096
4097-#: ../GDebi/GDebi.py:930 ../GDebi/KDEAptDialogs.py:141
4098+#: ../GDebi/GDebiGtk.py:982 ../GDebi/KDEAptDialogs.py:138
4099 msgid "Installing dependencies..."
4100 msgstr ""
4101
4102-#: ../GDebi/GDebi.py:975 ../GDebi/KDEAptDialogs.py:204
4103-#: ../GDebi/KDEAptDialogs.py:217 ../GDebi/KDEAptDialogs.py:219
4104+#: ../GDebi/GDebiGtk.py:1027 ../GDebi/KDEAptDialogs.py:201
4105+#: ../GDebi/KDEAptDialogs.py:214 ../GDebi/KDEAptDialogs.py:216
4106 msgid "Downloading additional package files..."
4107 msgstr ""
4108
4109-#: ../GDebi/GDebi.py:984 ../GDebi/KDEAptDialogs.py:217
4110+#: ../GDebi/GDebiGtk.py:1036 ../GDebi/KDEAptDialogs.py:214
4111 #, python-format
4112 msgid "File %s of %s at %sB/s"
4113 msgstr ""
4114
4115-#: ../GDebi/GDebi.py:986 ../GDebi/KDEAptDialogs.py:219
4116+#: ../GDebi/GDebiGtk.py:1038 ../GDebi/KDEAptDialogs.py:216
4117 #, python-format
4118 msgid "File %s of %s"
4119 msgstr ""
4120
4121 #. print "mediaChange %s %s" % (medium, drive)
4122-#: ../GDebi/GDebi.py:993 ../GDebi/KDEAptDialogs.py:224
4123+#: ../GDebi/GDebiGtk.py:1045 ../GDebi/KDEAptDialogs.py:221
4124 #, python-format
4125 msgid "Please insert '%s' into the drive '%s'"
4126 msgstr "الرجاء ادراج '%s' في السوّاقة '%s'"
4127
4128-#: ../GDebi/GDebiCli.py:59
4129+#: ../GDebi/GDebiCli.py:57
4130 msgid "Configuration items must be specified with a =<value>\n"
4131 msgstr ""
4132
4133-#: ../GDebi/GDebiCli.py:65
4134+#: ../GDebi/GDebiCli.py:63
4135 #, python-format
4136 msgid "Couldn't set APT option %s to %s\n"
4137 msgstr ""
4138
4139-#: ../GDebi/GDebiCli.py:78
4140+#: ../GDebi/GDebiCli.py:76
4141 #, python-format
4142 msgid "Unknown package type '%s', exiting\n"
4143 msgstr ""
4144
4145+#: ../GDebi/GDebiCli.py:80
4146+msgid "Failed to open the software package\n"
4147+msgstr ""
4148+
4149 #: ../GDebi/GDebiCli.py:81
4150-msgid "Failed to open the software package\n"
4151-msgstr ""
4152-
4153-#: ../GDebi/GDebiCli.py:82
4154 msgid ""
4155 "The package might be corrupted or you are not allowed to open the file. "
4156 "Check the permissions of the file.\n"
4157 msgstr ""
4158
4159-#: ../GDebi/GDebiCli.py:88
4160+#: ../GDebi/GDebiCli.py:87
4161 msgid "This package is uninstallable\n"
4162 msgstr ""
4163
4164-#: ../GDebi/GDebiCli.py:97 ../GDebi/GDebiKDE.py:220
4165+#: ../GDebi/GDebiCli.py:96 ../GDebi/GDebiKDE.py:244
4166 msgid "No description is available"
4167 msgstr ""
4168
4169-#: ../GDebi/GDebiCli.py:103
4170+#: ../GDebi/GDebiCli.py:106
4171 msgid "The following packages are UNAUTHENTICATED: "
4172 msgstr ""
4173
4174-#: ../GDebi/GDebiCli.py:107
4175+#: ../GDebi/GDebiCli.py:110
4176 msgid "Requires the REMOVAL of the following packages: "
4177 msgstr ""
4178
4179-#: ../GDebi/GDebiCli.py:112
4180+#: ../GDebi/GDebiCli.py:115
4181 msgid "Requires the installation of the following packages: "
4182 msgstr ""
4183
4184-#: ../GDebi/GDebiCli.py:126 ../GDebi/GDebiCli.py:129
4185+#: ../GDebi/GDebiCli.py:131
4186 #, python-format
4187 msgid "Error during install: '%s'"
4188 msgstr ""
4189
4190-#: ../GDebi/GDebiKDE.py:136
4191+#: ../GDebi/GDebiKDE.py:160
4192 msgid "Included Files"
4193 msgstr ""
4194
4195-#: ../GDebi/GDebiKDE.py:138 ../GDebi/GDebiKDE.py:278
4196+#: ../GDebi/GDebiKDE.py:162 ../GDebi/GDebiKDE.py:302
4197 msgid "&Install Package"
4198 msgstr ""
4199
4200-#: ../GDebi/GDebiKDE.py:139
4201+#: ../GDebi/GDebiKDE.py:163
4202 msgid "&Download Package"
4203 msgstr ""
4204
4205-#: ../GDebi/GDebiKDE.py:164
4206+#: ../GDebi/GDebiKDE.py:188
4207 msgid "The package file does not exist"
4208 msgstr ""
4209
4210-#: ../GDebi/GDebiKDE.py:165
4211+#: ../GDebi/GDebiKDE.py:189
4212 msgid ""
4213 "A nonexistent file has been selected for installation. Please select an "
4214 "existing .deb package file."
4215 msgstr ""
4216
4217 #. self.textLabel1_3_2.setText(_("Same version is already installed"))
4218-#: ../GDebi/GDebiKDE.py:246
4219+#: ../GDebi/GDebiKDE.py:270
4220 msgid "&Reinstall Package"
4221 msgstr ""
4222
4223-#: ../GDebi/GDebiKDE.py:281
4224+#: ../GDebi/GDebiKDE.py:305
4225 msgid "Re&install Package"
4226 msgstr ""
4227
4228-#: ../GDebi/GDebiKDE.py:292
4229+#: ../GDebi/GDebiKDE.py:316
4230 #, python-format
4231 msgid "To be removed: %s"
4232 msgstr ""
4233
4234-#: ../GDebi/GDebiKDE.py:369
4235+#: ../GDebi/GDebiKDE.py:398
4236 msgid "<b>"
4237 msgstr ""
4238
4239@@ -598,90 +617,89 @@
4240 "in a terminal window."
4241 msgstr ""
4242
4243-#: ../GDebi/GDebiCommon.py:84
4244+#: ../GDebi/GDebiCommon.py:86
4245 #, python-format
4246 msgid "'%s' is not a Debian package"
4247 msgstr ""
4248
4249-#: ../GDebi/GDebiCommon.py:85
4250+#: ../GDebi/GDebiCommon.py:87
4251 #, python-format
4252 msgid ""
4253 "The MIME type of this file is '%s' and can not be installed on this system."
4254 msgstr ""
4255
4256-#: ../GDebi/GDebiCommon.py:89
4257+#: ../GDebi/GDebiCommon.py:91
4258 #, python-format
4259 msgid "Could not open '%s'"
4260 msgstr ""
4261
4262-#: ../GDebi/GDebiCommon.py:90
4263+#: ../GDebi/GDebiCommon.py:92
4264 msgid ""
4265 "The package might be corrupted or you are not allowed to open the file. "
4266 "Check the permissions of the file."
4267 msgstr ""
4268
4269-#: ../GDebi/GDebiCommon.py:109
4270+#: ../GDebi/GDebiCommon.py:111
4271 msgid "Same version is available in a software channel"
4272 msgstr ""
4273
4274-#: ../GDebi/GDebiCommon.py:110
4275+#: ../GDebi/GDebiCommon.py:112
4276 msgid "You are recommended to install the software from the channel instead."
4277 msgstr ""
4278
4279-#: ../GDebi/GDebiCommon.py:114
4280+#: ../GDebi/GDebiCommon.py:116
4281 msgid "An older version is available in a software channel"
4282 msgstr ""
4283
4284-#: ../GDebi/GDebiCommon.py:115
4285+#: ../GDebi/GDebiCommon.py:117
4286 msgid ""
4287 "Generally you are recommended to install the version from the software "
4288 "channel, since it is usually better supported."
4289 msgstr ""
4290
4291-#: ../GDebi/GDebiCommon.py:120
4292+#: ../GDebi/GDebiCommon.py:122
4293 msgid "A later version is available in a software channel"
4294 msgstr ""
4295
4296-#: ../GDebi/GDebiCommon.py:122
4297+#: ../GDebi/GDebiCommon.py:124
4298 msgid ""
4299 "You are strongly advised to install the version from the software channel, "
4300 "since it is usually better supported."
4301 msgstr ""
4302
4303-#: ../GDebi/GDebiCommon.py:164
4304+#: ../GDebi/GDebiCommon.py:166
4305 msgid "All dependencies are satisfied"
4306 msgstr ""
4307
4308 #. FIXME: use ngettext here
4309-#: ../GDebi/GDebiCommon.py:167
4310+#: ../GDebi/GDebiCommon.py:169
4311 #, python-format
4312 msgid "Requires the <b>removal</b> of %s packages\n"
4313 msgstr ""
4314
4315-#: ../GDebi/GDebiCommon.py:169
4316+#: ../GDebi/GDebiCommon.py:171
4317 #, python-format
4318 msgid "Requires the installation of %s packages"
4319 msgstr ""
4320
4321-#: ../GDebi/GDebiCommon.py:177 ../GDebi/GDebiCommon.py:195
4322+#: ../GDebi/GDebiCommon.py:179 ../GDebi/GDebiCommon.py:197
4323 msgid "Only one software management tool is allowed to run at the same time"
4324 msgstr ""
4325
4326-#: ../GDebi/GDebiCommon.py:179 ../GDebi/GDebiCommon.py:197
4327+#: ../GDebi/GDebiCommon.py:181 ../GDebi/GDebiCommon.py:199
4328 msgid ""
4329 "Please close the other application e.g. 'Update Manager', 'aptitude' or "
4330 "'Synaptic' first."
4331 msgstr ""
4332
4333 #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
4334-#: ../GDebi/KDEAptDialogs.py:226
4335+#: ../GDebi/KDEAptDialogs.py:223
4336 msgid "Media Change"
4337 msgstr ""
4338
4339 #~ msgid "gdebi"
4340 #~ msgstr "gdebi"
4341
4342-#, python-format
4343 #~ msgid "Wrong architecture '%s'"
4344 #~ msgstr "بنية خاطئة '%s'"
4345
4346
4347=== modified file 'po/ast.po'
4348--- po/ast.po 2012-10-11 19:56:20 +0000
4349+++ po/ast.po 2013-03-22 20:07:20 +0000
4350@@ -6,11 +6,12 @@
4351 msgid ""
4352 msgstr ""
4353 "Project-Id-Version: gdebi\n"
4354-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4355-"POT-Creation-Date: 2011-09-02 22:18+0200\n"
4356+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
4357+"POT-Creation-Date: 2013-02-09 14:24+0100\n"
4358 "PO-Revision-Date: 2011-11-09 20:27+0000\n"
4359 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
4360 "Language-Team: Asturian <ast@li.org>\n"
4361+"Language: ast\n"
4362 "MIME-Version: 1.0\n"
4363 "Content-Type: text/plain; charset=UTF-8\n"
4364 "Content-Transfer-Encoding: 8bit\n"
4365@@ -52,11 +53,11 @@
4366 msgid "gdebi error, file not found: %s\n"
4367 msgstr "Error gdebi, nun s'atopó el ficheru: %s\n"
4368
4369-#: ../gdebi:95 ../gdebi:105
4370+#: ../gdebi:95 ../gdebi:104
4371 msgid "Need to be root to install packages"
4372 msgstr "Necesites ser root pa instalar paquetes"
4373
4374-#: ../gdebi:107 ../GDebi/GDebiCli.py:154
4375+#: ../gdebi:106 ../GDebi/GDebiCli.py:153
4376 msgid "Do you want to install the software package? [y/N]:"
4377 msgstr "¿Quies instalar el paquete de software? [s/N]:"
4378
4379@@ -89,152 +90,152 @@
4380 "informacion del software con: 'sudo apt-get update' y 'sudo apt-get install -"
4381 "f'."
4382
4383-#: ../data/gdebi.ui.h:1
4384-msgid " "
4385-msgstr " "
4386+#: ../data/gdebi.ui.h:1 ../data/gdebi.desktop.in.h:3
4387+msgid "Install and view software packages"
4388+msgstr "Instalar y ver paquetes de software"
4389
4390 #: ../data/gdebi.ui.h:2
4391-msgid "<b><big> </big></b>"
4392-msgstr "<b><big> </big></b>"
4393-
4394-#: ../data/gdebi.ui.h:3 ../GDebi/GDebiKDE.py:141
4395-msgid "<b>Maintainer:</b>"
4396-msgstr "<b>Mantenedor:</b>"
4397-
4398-#: ../data/gdebi.ui.h:4 ../GDebi/GDebiKDE.py:142
4399-msgid "<b>Priority:</b>"
4400-msgstr "<b>Prioridá:</b>"
4401-
4402-#: ../data/gdebi.ui.h:5 ../GDebi/GDebiKDE.py:143
4403-msgid "<b>Section:</b>"
4404-msgstr "<b>Seición:</b>"
4405-
4406-#: ../data/gdebi.ui.h:6 ../GDebi/GDebiKDE.py:144
4407-msgid "<b>Size:</b>"
4408-msgstr "<b>Tamañu:</b>"
4409-
4410-#: ../data/gdebi.ui.h:7 ../GDebi/GDebiKDE.py:295
4411-msgid "<b>To install the following changes are required:</b>"
4412-msgstr "<b>Pa instalar necesítense los cambéos darréu:</b>"
4413-
4414-#: ../data/gdebi.ui.h:8 ../GDebi/GDebiKDE.py:140
4415-msgid "<b>Version:</b>"
4416-msgstr "<b>Versión:</b>"
4417-
4418-#: ../data/gdebi.ui.h:9
4419+msgid "GPL, see /usr/share/common-licenses/GPL"
4420+msgstr "GPL, llee /usr/share/common-licenses/GPL"
4421+
4422+#: ../data/gdebi.ui.h:3
4423+msgid "Terminal"
4424+msgstr "Terminal"
4425+
4426+#: ../data/gdebi.ui.h:4
4427 msgid "Automatically close after the changes have been successfully applied"
4428 msgstr "Zarrar automáticamente tres d'aplicar los cambeos con éxitu"
4429
4430-#: ../data/gdebi.ui.h:10 ../GDebi/GDebiKDE.py:134
4431-msgid "Description"
4432-msgstr "Descripción"
4433-
4434-#: ../data/gdebi.ui.h:11
4435-msgid "Description:"
4436-msgstr "Descripción:"
4437-
4438-#: ../data/gdebi.ui.h:12 ../GDebi/GDebiKDE.py:133 ../GDebi/GDebiKDE.py:135
4439-#: ../GDebi/GDebiKDE.py:296
4440+#: ../data/gdebi.ui.h:5 ../GDebi/GDebiKDE.py:157 ../GDebi/GDebiKDE.py:159
4441+#: ../GDebi/GDebiKDE.py:321
4442 msgid "Details"
4443 msgstr "Detáis"
4444
4445-#: ../data/gdebi.ui.h:13
4446-msgid "GPL, see /usr/share/common-licenses/GPL"
4447-msgstr "GPL, llee /usr/share/common-licenses/GPL"
4448-
4449-#: ../data/gdebi.ui.h:14
4450-msgid "Included files"
4451-msgstr "Ficheros incluyíos"
4452-
4453-#: ../data/gdebi.ui.h:15 ../data/gdebi.desktop.in.h:2
4454-msgid "Install and view software packages"
4455-msgstr "Instalar y ver paquetes de software"
4456-
4457-#: ../data/gdebi.ui.h:16 ../data/gdebi.desktop.in.h:3
4458+#: ../data/gdebi.ui.h:6 ../GDebi/GDebiKDE.py:320
4459+msgid "<b>To install the following changes are required:</b>"
4460+msgstr "<b>Pa instalar necesítense los cambéos darréu:</b>"
4461+
4462+#: ../data/gdebi.ui.h:7 ../data/gdebi.desktop.in.h:2
4463 msgid "Package Installer"
4464 msgstr "Instalador de paquetes"
4465
4466+#: ../data/gdebi.ui.h:8
4467+msgid "_File"
4468+msgstr "_Ficheru"
4469+
4470+#: ../data/gdebi.ui.h:9
4471+msgid "_Open…"
4472+msgstr ""
4473+
4474+#: ../data/gdebi.ui.h:10
4475+msgid "_Refresh"
4476+msgstr "Anova_r"
4477+
4478+#: ../data/gdebi.ui.h:11
4479+msgid "_Edit"
4480+msgstr ""
4481+
4482+#: ../data/gdebi.ui.h:12
4483+msgid "_Help"
4484+msgstr "_Aida"
4485+
4486 #. first, we load all the default descriptions -- pyuic doesn't use
4487 #. gettext as default (FIXME, copy code from language-selector)
4488-#: ../data/gdebi.ui.h:17 ../GDebi/GDebiKDE.py:131
4489+#: ../data/gdebi.ui.h:13 ../GDebi/GDebiKDE.py:155
4490 msgid "Package:"
4491 msgstr "Paquete:"
4492
4493-#: ../data/gdebi.ui.h:18 ../GDebi/GDebiKDE.py:132
4494+#: ../data/gdebi.ui.h:14
4495+msgid "<b><big> </big></b>"
4496+msgstr "<b><big> </big></b>"
4497+
4498+#: ../data/gdebi.ui.h:15
4499+msgid "_Details"
4500+msgstr "_Detáis"
4501+
4502+#: ../data/gdebi.ui.h:16 ../GDebi/GDebiKDE.py:156
4503 msgid "Status:"
4504 msgstr "Estáu:"
4505
4506-#: ../data/gdebi.ui.h:19
4507-msgid "Terminal"
4508-msgstr "Terminal"
4509-
4510-#: ../data/gdebi.ui.h:20
4511-msgid "_Details"
4512-msgstr "_Detáis"
4513-
4514-#: ../data/gdebi.ui.h:21
4515-msgid "_Download Package"
4516-msgstr ""
4517-
4518-#: ../data/gdebi.ui.h:22
4519-msgid "_Edit"
4520-msgstr ""
4521-
4522-#: ../data/gdebi.ui.h:23
4523-msgid "_File"
4524-msgstr "_Ficheru"
4525-
4526-#: ../data/gdebi.ui.h:24
4527-msgid "_Help"
4528-msgstr "_Aida"
4529+#: ../data/gdebi.ui.h:17
4530+msgid "Description:"
4531+msgstr "Descripción:"
4532
4533 #. img = Gtk.Image()
4534 #. img.set_from_stock(Gtk.STOCK_APPLY,Gtk.IconSize.BUTTON)
4535 #. self.button_install.set_image(img)
4536-#: ../data/gdebi.ui.h:25 ../GDebi/GDebi.py:327 ../GDebi/GDebi.py:384
4537+#: ../data/gdebi.ui.h:18 ../GDebi/GDebiGtk.py:335 ../GDebi/GDebiGtk.py:392
4538 msgid "_Install Package"
4539 msgstr "_Instalar Paquete"
4540
4541-#: ../data/gdebi.ui.h:26
4542-msgid "_Open…"
4543-msgstr ""
4544+#: ../data/gdebi.ui.h:19
4545+msgid "_Remove Package"
4546+msgstr ""
4547+
4548+#: ../data/gdebi.ui.h:20
4549+msgid "_Download Package"
4550+msgstr ""
4551+
4552+#: ../data/gdebi.ui.h:21 ../GDebi/GDebiKDE.py:158
4553+msgid "Description"
4554+msgstr "Descripción"
4555+
4556+#: ../data/gdebi.ui.h:22 ../GDebi/GDebiKDE.py:164
4557+msgid "<b>Version:</b>"
4558+msgstr "<b>Versión:</b>"
4559+
4560+#: ../data/gdebi.ui.h:23 ../GDebi/GDebiKDE.py:165
4561+msgid "<b>Maintainer:</b>"
4562+msgstr "<b>Mantenedor:</b>"
4563+
4564+#: ../data/gdebi.ui.h:24 ../GDebi/GDebiKDE.py:166
4565+msgid "<b>Priority:</b>"
4566+msgstr "<b>Prioridá:</b>"
4567+
4568+#: ../data/gdebi.ui.h:25 ../GDebi/GDebiKDE.py:167
4569+msgid "<b>Section:</b>"
4570+msgstr "<b>Seición:</b>"
4571+
4572+#: ../data/gdebi.ui.h:26 ../GDebi/GDebiKDE.py:168
4573+msgid "<b>Size:</b>"
4574+msgstr "<b>Tamañu:</b>"
4575
4576 #: ../data/gdebi.ui.h:27
4577-msgid "_Refresh"
4578-msgstr "Anova_r"
4579+msgid " "
4580+msgstr " "
4581
4582 #: ../data/gdebi.ui.h:28
4583-msgid "_Remove Package"
4584+msgid "Included files"
4585+msgstr "Ficheros incluyíos"
4586+
4587+#: ../data/gdebi.ui.h:29
4588+msgid "Lintian output"
4589 msgstr ""
4590
4591-#: ../data/gdebi.xml.in.h:1
4592-msgid "Software package"
4593-msgstr "Paquete de software"
4594-
4595 #: ../data/gdebi.desktop.in.h:1
4596 msgid "GDebi Package Installer"
4597 msgstr "Instalador de Paquetes GDebi"
4598
4599 #. Translators: it's for missing entries in the deb package,
4600 #. e.g. a missing "Maintainer" field
4601-#: ../GDebi/DebPackage.py:39
4602+#: ../GDebi/DebPackage.py:38
4603 #, python-format
4604 msgid "%s is not available"
4605 msgstr "%s nun ta disponible"
4606
4607-#: ../GDebi/GDebi.py:92
4608+#: ../GDebi/GDebiGtk.py:93
4609 msgid "Copy selected text"
4610 msgstr ""
4611
4612-#: ../GDebi/GDebi.py:103
4613+#: ../GDebi/GDebiGtk.py:104
4614 msgid "Loading..."
4615 msgstr "Cargando..."
4616
4617-#: ../GDebi/GDebi.py:175
4618+#: ../GDebi/GDebiGtk.py:179
4619 msgid "Can not download as root"
4620 msgstr "Nun se pue descargar como root"
4621
4622-#: ../GDebi/GDebi.py:176
4623+#: ../GDebi/GDebiGtk.py:180
4624 msgid ""
4625 "Remote packages can not be downloaded when running as root. Please try again "
4626 "as a normal user."
4627@@ -242,115 +243,132 @@
4628 "Los paquetes remotos nun se pueden descargar funcionando como root. Vuelve a "
4629 "tentalo como usuariu normal."
4630
4631-#: ../GDebi/GDebi.py:189
4632+#: ../GDebi/GDebiGtk.py:193
4633 msgid "Downloading package"
4634 msgstr "Descargando paquete"
4635
4636-#: ../GDebi/GDebi.py:196
4637+#: ../GDebi/GDebiGtk.py:200
4638 msgid "Download failed"
4639 msgstr "Falló la descarga"
4640
4641-#: ../GDebi/GDebi.py:197
4642+#: ../GDebi/GDebiGtk.py:201
4643 #, python-format
4644 msgid "Downloading the package failed: file '%s' '%s'"
4645 msgstr "Falló la descarga del paquete: ficheru '%s' '%s'"
4646
4647 #. set window title
4648 #. set name
4649-#: ../GDebi/GDebi.py:246 ../GDebi/GDebiKDE.py:184
4650+#: ../GDebi/GDebiGtk.py:249 ../GDebi/GDebiKDE.py:208
4651 #, python-format
4652 msgid "Package Installer - %s"
4653 msgstr "Instalador de paquetes - %s"
4654
4655-#: ../GDebi/GDebi.py:303
4656+#: ../GDebi/GDebiGtk.py:306
4657 msgid "Package control data"
4658 msgstr "Datos de control del paquete"
4659
4660-#: ../GDebi/GDebi.py:306
4661+#: ../GDebi/GDebiGtk.py:309
4662 msgid "Upstream data"
4663 msgstr "Datos d'orixe"
4664
4665-#: ../GDebi/GDebi.py:312
4666+#: ../GDebi/GDebiGtk.py:315
4667 msgid "Error reading filelist"
4668 msgstr "Fallu al lleer la llista de ficheros"
4669
4670-#: ../GDebi/GDebi.py:323
4671+#: ../GDebi/GDebiGtk.py:331
4672 msgid "Error: "
4673 msgstr "Error: "
4674
4675-#: ../GDebi/GDebi.py:338
4676+#: ../GDebi/GDebiGtk.py:346
4677 msgid "Error: no longer provides "
4678 msgstr ""
4679
4680-#: ../GDebi/GDebi.py:354
4681+#: ../GDebi/GDebiGtk.py:362
4682 msgid "Same version is already installed"
4683 msgstr "Yá ta instalada la mesma versión"
4684
4685-#: ../GDebi/GDebi.py:355
4686+#: ../GDebi/GDebiGtk.py:363
4687 msgid "_Reinstall Package"
4688 msgstr "_Reinstalar Paquete"
4689
4690-#: ../GDebi/GDebi.py:401
4691+#: ../GDebi/GDebiGtk.py:401
4692+msgid ""
4693+"No lintian available.\n"
4694+"Please install using sudo apt-get install lintian"
4695+msgstr ""
4696+
4697+#: ../GDebi/GDebiGtk.py:404
4698+msgid "Running lintian..."
4699+msgstr ""
4700+
4701+#: ../GDebi/GDebiGtk.py:421
4702+#, python-format
4703+msgid ""
4704+"\n"
4705+"Lintian finished with exit status %s"
4706+msgstr ""
4707+
4708+#: ../GDebi/GDebiGtk.py:449
4709 msgid "Selection is a directory"
4710 msgstr "La seleición ye un direutoriu"
4711
4712-#: ../GDebi/GDebi.py:406 ../GDebi/GDebi.py:411
4713+#: ../GDebi/GDebiGtk.py:454 ../GDebi/GDebiGtk.py:460
4714 #, python-format
4715 msgid "Error reading file content '%s'"
4716 msgstr "Fallu al lleer el conteníu del ficheru «%s»"
4717
4718-#: ../GDebi/GDebi.py:415
4719+#: ../GDebi/GDebiGtk.py:465
4720 msgid "File content can not be extracted"
4721 msgstr "El conteníu del ficheru nun puede estrayese"
4722
4723-#: ../GDebi/GDebi.py:426
4724+#: ../GDebi/GDebiGtk.py:476
4725 #, python-format
4726 msgid "<b>To be removed: %s</b>"
4727 msgstr "<b>Pa desaniciar: %s</b>"
4728
4729-#: ../GDebi/GDebi.py:428 ../GDebi/GDebiKDE.py:290
4730+#: ../GDebi/GDebiGtk.py:478 ../GDebi/GDebiKDE.py:314
4731 #, python-format
4732 msgid "To be installed: %s"
4733 msgstr "Pa instalar: %s"
4734
4735-#: ../GDebi/GDebi.py:443
4736+#: ../GDebi/GDebiGtk.py:493
4737 msgid "Open Software Package"
4738 msgstr "Paquete de Software Abiertu"
4739
4740-#: ../GDebi/GDebi.py:448
4741+#: ../GDebi/GDebiGtk.py:498
4742 msgid "Software packages"
4743 msgstr "Paquetes de software"
4744
4745-#: ../GDebi/GDebi.py:495
4746+#: ../GDebi/GDebiGtk.py:547
4747 msgid "Dependency problems"
4748 msgstr ""
4749
4750-#: ../GDebi/GDebi.py:496
4751+#: ../GDebi/GDebiGtk.py:548
4752 #, python-format
4753 msgid "One or more packages are required by %s, it cannot be removed."
4754 msgstr ""
4755
4756-#: ../GDebi/GDebi.py:504
4757+#: ../GDebi/GDebiGtk.py:556
4758 msgid "File not found"
4759 msgstr "Nun s'alcuentra'l ficheru"
4760
4761-#: ../GDebi/GDebi.py:505
4762+#: ../GDebi/GDebiGtk.py:557
4763 msgid "You tried to install a file that does not (or no longer) exist. "
4764 msgstr "Tentaste instalar un ficheru que nun esiste (o yá non). "
4765
4766-#: ../GDebi/GDebi.py:516
4767+#: ../GDebi/GDebiGtk.py:568
4768 msgid "Installing package file..."
4769 msgstr "Instalando ficheru de paquete..."
4770
4771-#: ../GDebi/GDebi.py:518
4772+#: ../GDebi/GDebiGtk.py:570
4773 msgid "Removing package..."
4774 msgstr ""
4775
4776-#: ../GDebi/GDebi.py:521
4777+#: ../GDebi/GDebiGtk.py:573
4778 msgid "Install unauthenticated software?"
4779 msgstr "¿Instalar software ensin autenticar?"
4780
4781-#: ../GDebi/GDebi.py:522
4782+#: ../GDebi/GDebiGtk.py:574
4783 msgid ""
4784 "Malicious software can damage your data and take control of your system.\n"
4785 "\n"
4786@@ -361,11 +379,11 @@
4787 "\n"
4788 "Los paquetes siguientes nun tán autenticaos y podríen ser maliciosos."
4789
4790-#: ../GDebi/GDebi.py:550
4791+#: ../GDebi/GDebiGtk.py:602
4792 msgid "You need to grant administrative rights to install software"
4793 msgstr "Necesites tener privilexos alministrativos pa instalar software"
4794
4795-#: ../GDebi/GDebi.py:551
4796+#: ../GDebi/GDebiGtk.py:603
4797 msgid ""
4798 "\n"
4799 "It is a possible security risk to install packages files manually.\n"
4800@@ -375,35 +393,36 @@
4801 "Instalar paquetes manualmente ye un posible riesgu pa la seguridá.\n"
4802 "Instala namái software de distribuidores de software fiables.\n"
4803
4804-#: ../GDebi/GDebi.py:556
4805+#: ../GDebi/GDebiGtk.py:608
4806 msgid "You need to grant administrative rights to remove software"
4807 msgstr ""
4808
4809-#: ../GDebi/GDebi.py:557
4810+#: ../GDebi/GDebiGtk.py:609
4811 msgid "It is a possible risk to remove packages."
4812 msgstr ""
4813
4814-#: ../GDebi/GDebi.py:579 ../GDebi/GDebi.py:643
4815+#: ../GDebi/GDebiGtk.py:631 ../GDebi/GDebiGtk.py:695
4816 msgid "Failed to install package file"
4817 msgstr "Falló la instalación del paquete"
4818
4819-#: ../GDebi/GDebi.py:581
4820+#: ../GDebi/GDebiGtk.py:633
4821 msgid "Failed to remove package"
4822 msgstr ""
4823
4824-#: ../GDebi/GDebi.py:627 ../GDebi/GDebiKDE.py:342
4825+#. errMsg = "%s" % msg
4826+#: ../GDebi/GDebiGtk.py:679 ../GDebi/GDebiKDE.py:370
4827 msgid "Could not download all required files"
4828 msgstr "Nun pueden descargase tolos ficheros necesarios"
4829
4830-#: ../GDebi/GDebi.py:628 ../GDebi/GDebiKDE.py:343
4831+#: ../GDebi/GDebiGtk.py:680 ../GDebi/GDebiKDE.py:371
4832 msgid "Please check your internet connection or installation medium."
4833 msgstr "Comprueba la conexón a internet o el mediu d'instalación."
4834
4835-#: ../GDebi/GDebi.py:632 ../GDebi/GDebiKDE.py:347
4836+#: ../GDebi/GDebiGtk.py:684 ../GDebi/GDebiKDE.py:376
4837 msgid "Could not install all dependencies"
4838 msgstr "Nun pueden instalase toles dependencies"
4839
4840-#: ../GDebi/GDebi.py:633 ../GDebi/GDebiKDE.py:348
4841+#: ../GDebi/GDebiGtk.py:685 ../GDebi/GDebiKDE.py:377
4842 msgid ""
4843 "Usually this is related to an error of the software distributor. See the "
4844 "terminal window for more details."
4845@@ -411,12 +430,12 @@
4846 "Normalmente ye darréu d'un error del distribuidor de software. Mira la "
4847 "ventana del terminal pa más detáis."
4848
4849-#: ../GDebi/GDebi.py:649
4850+#: ../GDebi/GDebiGtk.py:701
4851 #, python-format
4852 msgid "Installing %s"
4853 msgstr "Instalando %s"
4854
4855-#: ../GDebi/GDebi.py:652
4856+#: ../GDebi/GDebiGtk.py:704
4857 #, python-format
4858 msgid "Removing %s"
4859 msgstr ""
4860@@ -425,110 +444,110 @@
4861 #. show the button
4862 #. self.button_deb_install_close.set_sensitive(True)
4863 #. self.button_deb_install_close.grab_default()
4864-#: ../GDebi/GDebi.py:674 ../GDebi/GDebiKDE.py:367
4865+#: ../GDebi/GDebiGtk.py:726 ../GDebi/GDebiKDE.py:396
4866 msgid "Installation finished"
4867 msgstr "Instalación acabada"
4868
4869-#: ../GDebi/GDebi.py:676
4870+#: ../GDebi/GDebiGtk.py:728
4871 msgid "Removal finished"
4872 msgstr "Desaniciu acabáu"
4873
4874-#: ../GDebi/GDebi.py:679
4875+#: ../GDebi/GDebiGtk.py:731
4876 #, python-format
4877 msgid "Package '%s' was installed"
4878 msgstr "Instalose'l paquete '%s'"
4879
4880-#: ../GDebi/GDebi.py:681
4881+#: ../GDebi/GDebiGtk.py:733
4882 #, python-format
4883 msgid "Package '%s' was removed"
4884 msgstr ""
4885
4886-#: ../GDebi/GDebi.py:684 ../GDebi/GDebiKDE.py:371
4887+#: ../GDebi/GDebiGtk.py:736 ../GDebi/GDebiKDE.py:400
4888 #, python-format
4889 msgid "Failed to install package '%s'"
4890 msgstr "Falló la instalación del paquete '%s'"
4891
4892-#: ../GDebi/GDebi.py:687
4893+#: ../GDebi/GDebiGtk.py:739
4894 #, python-format
4895 msgid "Failed to remove package '%s'"
4896 msgstr ""
4897
4898-#: ../GDebi/GDebi.py:691
4899+#: ../GDebi/GDebiGtk.py:743
4900 msgid "Installation complete"
4901 msgstr "Instalación completa"
4902
4903-#: ../GDebi/GDebi.py:693
4904+#: ../GDebi/GDebiGtk.py:745
4905 msgid "Removal complete"
4906 msgstr ""
4907
4908-#: ../GDebi/GDebi.py:701 ../GDebi/GDebiKDE.py:381
4909+#: ../GDebi/GDebiGtk.py:753 ../GDebi/GDebiKDE.py:410
4910 msgid "Failed to completely install all dependencies"
4911 msgstr "Falló instalar dafechu toles dependencies"
4912
4913-#: ../GDebi/GDebi.py:703
4914+#: ../GDebi/GDebiGtk.py:755
4915 msgid "Failed to completely remove package"
4916 msgstr ""
4917
4918-#: ../GDebi/GDebi.py:704 ../GDebi/GDebiKDE.py:382
4919+#: ../GDebi/GDebiGtk.py:756 ../GDebi/GDebiKDE.py:411
4920 msgid "To fix this run 'sudo apt-get install -f' in a terminal window."
4921 msgstr ""
4922 "Pa iguar esto ejecuta 'sudo apt-get install -f' na ventana d'un terminal."
4923
4924 #. ui
4925-#: ../GDebi/GDebi.py:823 ../GDebi/KDEAptDialogs.py:73
4926+#: ../GDebi/GDebiGtk.py:875 ../GDebi/KDEAptDialogs.py:70
4927 #, python-format
4928 msgid "Installing '%s'..."
4929 msgstr "Instalando '%s'..."
4930
4931-#: ../GDebi/GDebi.py:826
4932+#: ../GDebi/GDebiGtk.py:878
4933 #, python-format
4934 msgid "Removing '%s'..."
4935 msgstr ""
4936
4937-#: ../GDebi/GDebi.py:930 ../GDebi/KDEAptDialogs.py:141
4938+#: ../GDebi/GDebiGtk.py:982 ../GDebi/KDEAptDialogs.py:138
4939 msgid "Installing dependencies..."
4940 msgstr "Instalando dependencies..."
4941
4942-#: ../GDebi/GDebi.py:975 ../GDebi/KDEAptDialogs.py:204
4943-#: ../GDebi/KDEAptDialogs.py:217 ../GDebi/KDEAptDialogs.py:219
4944+#: ../GDebi/GDebiGtk.py:1027 ../GDebi/KDEAptDialogs.py:201
4945+#: ../GDebi/KDEAptDialogs.py:214 ../GDebi/KDEAptDialogs.py:216
4946 msgid "Downloading additional package files..."
4947 msgstr "Descargando paquetes adicionales..."
4948
4949-#: ../GDebi/GDebi.py:984 ../GDebi/KDEAptDialogs.py:217
4950+#: ../GDebi/GDebiGtk.py:1036 ../GDebi/KDEAptDialogs.py:214
4951 #, python-format
4952 msgid "File %s of %s at %sB/s"
4953 msgstr "Ficheru %s de %s a %sB/s"
4954
4955-#: ../GDebi/GDebi.py:986 ../GDebi/KDEAptDialogs.py:219
4956+#: ../GDebi/GDebiGtk.py:1038 ../GDebi/KDEAptDialogs.py:216
4957 #, python-format
4958 msgid "File %s of %s"
4959 msgstr "Ficheru %s de %s"
4960
4961 #. print "mediaChange %s %s" % (medium, drive)
4962-#: ../GDebi/GDebi.py:993 ../GDebi/KDEAptDialogs.py:224
4963+#: ../GDebi/GDebiGtk.py:1045 ../GDebi/KDEAptDialogs.py:221
4964 #, python-format
4965 msgid "Please insert '%s' into the drive '%s'"
4966 msgstr "Por favor inxerta '%s' nel preséu '%s'"
4967
4968-#: ../GDebi/GDebiCli.py:59
4969+#: ../GDebi/GDebiCli.py:57
4970 msgid "Configuration items must be specified with a =<value>\n"
4971 msgstr "Los elementos de configuración han de conseñase con un =<valor>\n"
4972
4973-#: ../GDebi/GDebiCli.py:65
4974+#: ../GDebi/GDebiCli.py:63
4975 #, python-format
4976 msgid "Couldn't set APT option %s to %s\n"
4977 msgstr "Nun puede afitase la opcion de APT %s como %s\n"
4978
4979-#: ../GDebi/GDebiCli.py:78
4980+#: ../GDebi/GDebiCli.py:76
4981 #, python-format
4982 msgid "Unknown package type '%s', exiting\n"
4983 msgstr "Triba de paquete '%s' desconocida, saliendo\n"
4984
4985-#: ../GDebi/GDebiCli.py:81
4986+#: ../GDebi/GDebiCli.py:80
4987 msgid "Failed to open the software package\n"
4988 msgstr "Falló abrir el paquete de software\n"
4989
4990-#: ../GDebi/GDebiCli.py:82
4991+#: ../GDebi/GDebiCli.py:81
4992 msgid ""
4993 "The package might be corrupted or you are not allowed to open the file. "
4994 "Check the permissions of the file.\n"
4995@@ -536,48 +555,48 @@
4996 "Seique'l paquete tea corrompíu o nun tengas permisu p'abrir el ficheru. Mira "
4997 "los permisos del ficheru.\n"
4998
4999-#: ../GDebi/GDebiCli.py:88
5000+#: ../GDebi/GDebiCli.py:87
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to status/vote changes: