From 279bcc44b05310c01a8f895380e7693fce3cd249 Mon Sep 17 00:00:00 2001 From: guinux Date: Wed, 17 Apr 2013 14:41:10 +0200 Subject: [PATCH] big gui backend rewrite - now you can add and remove packages at the same time --- gui/manager.glade | 2 +- pamac-daemon.py | 5 +- pamac.pot | 125 +++--- pamac/main.py | 993 ++++++++++++++++++++++--------------------- pamac/transaction.py | 15 +- po/ca.po | 128 +++--- po/da.po | 128 +++--- po/de.po | 128 +++--- po/el.po | 128 +++--- po/es.po | 128 +++--- po/fr.po | 128 +++--- po/it.po | 128 +++--- po/nb.po | 128 +++--- po/pl.po | 128 +++--- po/pt_BR.po | 128 +++--- po/ro.po | 128 +++--- po/tr.po | 128 +++--- setup.py | 2 +- 18 files changed, 1427 insertions(+), 1251 deletions(-) diff --git a/gui/manager.glade b/gui/manager.glade index bd160a3..af5f5d2 100644 --- a/gui/manager.glade +++ b/gui/manager.glade @@ -690,7 +690,7 @@ - 2 + 2 3 diff --git a/pamac-daemon.py b/pamac-daemon.py index b663b40..40f54b1 100755 --- a/pamac-daemon.py +++ b/pamac-daemon.py @@ -254,7 +254,7 @@ class PamacDBusService(dbus.service.Object): for db in self.handle.get_syncdbs(): try: self.t = self.handle.init_transaction() - db.update(force=False) + db.update(force = False) except pyalpm.error as e: self.error += ' --> '+str(e)+'\n' break @@ -367,8 +367,7 @@ class PamacDBusService(dbus.service.Object): #self.error += ' --> '+str(e)+'\n' except: pass - finally: - self.CheckUpdates() + #finally: #if self.error: #self.EmitTransactionError(self.error) self.task.terminate() diff --git a/pamac.pot b/pamac.pot index 3f78a34..84b1a3d 100644 --- a/pamac.pot +++ b/pamac.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "" @@ -68,11 +68,11 @@ msgstr "" msgid "Downloading {size}" msgstr "" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "" @@ -105,173 +105,182 @@ msgstr "" msgid "Quit" msgstr "" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "" - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "" + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" msgstr "" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" msgstr "" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" msgstr "" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "" @@ -305,7 +314,7 @@ msgstr "" msgid "Search" msgstr "" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "" @@ -313,27 +322,27 @@ msgstr "" msgid "Repos" msgstr "" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "" diff --git a/pamac/main.py b/pamac/main.py index 4cae84f..69fb95b 100644 --- a/pamac/main.py +++ b/pamac/main.py @@ -1,7 +1,7 @@ #! /usr/bin/python3 # -*- coding:utf-8 -*- -from gi.repository import Gtk +from gi.repository import Gtk, Gdk from gi.repository.GdkPixbuf import Pixbuf import pyalpm import dbus @@ -102,10 +102,8 @@ to_remove_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/packa locked_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-blocked.png') search_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-search.png') -pkg_name_list = [] +pkg_name_list = set() current_filter = (None, None) -transaction_type = None -transaction_dict = {} mode = None states = [_('Installed'), _('Uninstalled'), _('Orphans'), _('To install'), _('To remove')] for state in states: @@ -130,15 +128,12 @@ def get_repos(): def set_list_dict_search(*patterns): global pkg_name_list - pkg_name_list = [] + pkg_name_list.clear() for db in transaction.handle.get_syncdbs(): for pkg in db.search(*patterns): - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) + pkg_name_list.add(pkg.name) for pkg in transaction.handle.get_localdb().search(*patterns): - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) - pkg_name_list = sorted(pkg_name_list) + pkg_name_list.add(pkg.name) if pkg_name_list: joined = '' for term in patterns: @@ -153,134 +148,117 @@ def set_list_dict_search(*patterns): def set_list_dict_group(group): global pkg_name_list - pkg_name_list = [] + pkg_name_list.clear() for db in transaction.handle.get_syncdbs(): grp = db.read_grp(group) if grp is not None: name, pkg_list = grp for pkg in pkg_list: - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) + pkg_name_list.add(pkg.name) db = transaction.handle.get_localdb() grp = db.read_grp(group) if grp is not None: name, pkg_list = grp for pkg in pkg_list: - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) - pkg_name_list = sorted(pkg_name_list) + pkg_name_list.add(pkg.name) def set_list_dict_installed(): global pkg_name_list - pkg_name_list = [] - for pkg in transaction.localpkgs.values(): - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) + pkg_name_list.clear() + pkg_name_list = set(transaction.localpkgs.keys()) def set_list_dict_uninstalled(): global pkg_name_list - pkg_name_list = [] - for pkg in transaction.syncpkgs.values(): - if not pkg.name in transaction.localpkgs.keys(): - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) - pkg_name_list = sorted(pkg_name_list) + pkg_name_list.clear() + pkg_name_list = set(transaction.syncpkgs.keys()).difference(set(transaction.localpkgs.keys())) def set_list_dict_local(): global pkg_name_list - pkg_name_list = [] - for pkg in transaction.localpkgs.values(): - if not pkg.name in transaction.syncpkgs.keys(): - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) + pkg_name_list.clear() + pkg_name_list = set(transaction.localpkgs.keys()).difference(set(transaction.syncpkgs.keys())) def set_list_dict_orphans(): global pkg_name_list - pkg_name_list = [] + pkg_name_list.clear() for pkg in transaction.localpkgs.values(): if pkg.reason == 1: - if not pkg.compute_requiredby(): - pkg_name_list.append(pkg.name) + required = set(pkg.compute_requiredby()) + required &= set(transaction.localpkgs.keys()) + if not required: + pkg_name_list.add(pkg.name) def set_list_dict_to_install(): global pkg_name_list - pkg_name_list = [] - if transaction_type == "install": - for pkg in transaction_dict.values(): - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) - pkg_name_list = sorted(pkg_name_list) + pkg_name_list.clear() + pkg_name_list = transaction.to_add.copy() def set_list_dict_to_remove(): global pkg_name_list - pkg_name_list = [] - if transaction_type == "remove": - for pkg in transaction_dict.values(): - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) - pkg_name_list = sorted(pkg_name_list) + pkg_name_list.clear() + pkg_name_list = transaction.to_remove.copy() def set_list_dict_repos(repo): global pkg_name_list - pkg_name_list = [] + pkg_name_list.clear() for db in transaction.handle.get_syncdbs(): if db.name == repo: for pkg in db.pkgcache: - if not pkg.name in pkg_name_list: - pkg_name_list.append(pkg.name) + pkg_name_list.add(pkg.name) def refresh_packages_list(): - packages_list.clear() - if not pkg_name_list: - packages_list.append([_('No package found'), False, False, False, search_icon, '', 0]) - else: - for name in pkg_name_list: - if name in config.holdpkg: - packages_list.append([name, True, False, True, locked_icon, '', 0]) - elif transaction_type is "install": - if transaction.localpkgs.__contains__(name): - packages_list.append([name, True, False, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize]) - elif name in transaction_dict.keys(): + if current_filter[0]: + ManagerWindow.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH)) + while Gtk.events_pending(): + Gtk.main_iteration() + packages_list.clear() + if not pkg_name_list: + packages_list.append([_('No package found'), False, False, False, search_icon, '', 0]) + else: + #installed = set(transaction.localpkgs.keys()) - transaction.to_remove + #uninstalled = (set(transaction.syncpkgs.keys()) - installed) - transaction.to_add + #to_lock = installed & set(config.holdpkg) + name_list = sorted(pkg_name_list) + for name in name_list: + if name in config.holdpkg: + packages_list.append([name, True, False, True, locked_icon, '', 0]) + elif name in transaction.to_add: packages_list.append([name, False, True, True, to_install_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize]) + elif name in transaction.to_remove: + packages_list.append([name, True, True, False, to_remove_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize]) + elif name in transaction.localpkgs.keys(): + packages_list.append([name, True, True, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize]) + #elif name in uninstalled: else: packages_list.append([name, False, True, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize]) - elif transaction_type is "remove": - if not transaction.localpkgs.__contains__(name): - packages_list.append([name, False, False, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize]) - elif name in transaction_dict.keys(): - packages_list.append([name, True, True, False, to_remove_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize]) - else: - packages_list.append([name, True, True, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize]) - elif transaction.localpkgs.__contains__(name): - packages_list.append([name, True, True, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize]) - else: - packages_list.append([name, False, True, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize]) + ManagerWindow.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW)) def set_packages_list(): if current_filter[0] == 'search': set_list_dict_search(*current_filter[1]) - if current_filter[0] == 'group': + elif current_filter[0] == 'group': set_list_dict_group(current_filter[1]) - if current_filter[0] == 'installed': + elif current_filter[0] == 'installed': set_list_dict_installed() - if current_filter[0] == 'uninstalled': + elif current_filter[0] == 'uninstalled': set_list_dict_uninstalled() - if current_filter[0] == 'orphans': + elif current_filter[0] == 'orphans': set_list_dict_orphans() - if current_filter[0] == 'local': + elif current_filter[0] == 'local': set_list_dict_local() - if current_filter[0] == 'to_install': + elif current_filter[0] == 'to_install': set_list_dict_to_install() - if current_filter[0] == 'to_remove': + elif current_filter[0] == 'to_remove': set_list_dict_to_remove() - if current_filter[0] == 'repo': + elif current_filter[0] == 'repo': set_list_dict_repos(current_filter[1]) - refresh_packages_list() + if current_filter[0]: + refresh_packages_list() def set_infos_list(pkg): name_label.set_markup('{} {}'.format(pkg.name, pkg.version)) - # fix & in desc + # fix &,-,>,< in desc desc = pkg.desc.replace('&', '&') + desc = desc.replace('<->', '/') desc_label.set_markup(desc) # fix & in url url = pkg.url.replace('&', '&') @@ -315,7 +293,7 @@ def set_details_list(pkg, style): if style == 'local': details_list.append([_('Installed Size')+':', common.format_size(pkg.isize)]) details_list.append([_('Packager')+':', pkg.packager]) - details_list.append([('Architecture')+':', pkg.arch]) + details_list.append([_('Architecture')+':', pkg.arch]) #details_list.append([_('Build Date')+':', strftime("%a %d %b %Y %X %Z", localtime(pkg.builddate))]) if style == 'local': details_list.append([_('Install Date')+':', strftime("%a %d %b %Y %X %Z", localtime(pkg.installdate))]) @@ -345,44 +323,38 @@ def set_files_list(pkg): def set_transaction_sum(): transaction_sum.clear() sum_top_label.set_markup(_('Transaction Summary')) - if transaction.to_remove: - transaction.to_remove = sorted(transaction.to_remove) - transaction_sum.append([_('To remove')+':', transaction.to_remove[0]]) - i = 1 - while i < len(transaction.to_remove): - transaction_sum.append([' ', transaction.to_remove[i]]) - i += 1 - sum_bottom_label.set_markup('') + if mode == 'manager': + if transaction.to_update: + to_update = sorted(transaction.to_update) + transaction_sum.append([_('To update')+':', to_update[0]]) + i = 1 + while i < len(to_update): + transaction_sum.append([' ', to_update[i]]) + i += 1 if transaction.to_add: - transaction.to_add = sorted(transaction.to_add) + transaction.to_add -= transaction.to_update + to_add = sorted(transaction.to_add) + if to_add: + transaction_sum.append([_('To install')+':', to_add[0]]) + i = 1 + while i < len(to_add): + transaction_sum.append([' ', to_add[i]]) + i += 1 + if transaction.to_add or transaction.to_update: dsize = 0 - for name in transaction.to_add: + for name in transaction.to_add | transaction.to_update: dsize += transaction.syncpkgs[name].download_size sum_bottom_label.set_markup(_('Total download size: ')+common.format_size(dsize)) - installed = [] - for pkg_object in config.pacman_conf.initialize_alpm().get_localdb().pkgcache: - installed.append(pkg_object.name) - transaction.to_update = sorted(set(installed).intersection(transaction.to_add)) - to_remove_from_add = sorted(set(transaction.to_update).intersection(transaction.to_add)) - for name in to_remove_from_add: - transaction.to_add.remove(name) - if transaction.to_add: - transaction_sum.append([_('To install')+':', transaction.to_add[0]]) - i = 1 - while i < len(transaction.to_add): - transaction_sum.append([' ', transaction.to_add[i]]) - i += 1 - if mode == 'manager': - if transaction.to_update: - transaction_sum.append([_('To update')+':', transaction.to_update[0]]) - i = 1 - while i < len(transaction.to_update): - transaction_sum.append([' ', transaction.to_update[i]]) - i += 1 + if transaction.to_remove: + to_remove = sorted(transaction.to_remove) + transaction_sum.append([_('To remove')+':', to_remove[0]]) + i = 1 + while i < len(to_remove): + transaction_sum.append([' ', to_remove[i]]) + i += 1 + sum_bottom_label.set_markup('') def handle_error(error): - global transaction_type - global transaction_dict ProgressWindow.hide() #while Gtk.events_pending(): # Gtk.main_iteration() @@ -393,28 +365,21 @@ def handle_error(error): response = ErrorDialog.run() if response: ErrorDialog.hide() - transaction.t_lock = False try: transaction.Release() except: pass if mode == 'manager': - transaction.to_add = [] - transaction.to_remove = [] - transaction_dict.clear() transaction.get_handle() transaction.update_db() - if (transaction_type == "install") or (transaction_type == "remove"): - transaction_type = None - set_packages_list() - else: - transaction_type = None + transaction.to_add.clear() + transaction.to_remove.clear() + transaction.to_update.clear() + set_packages_list() if mode == 'updater': have_updates() def handle_reply(reply): - global transaction_type - global transaction_dict ProgressWindow.hide() #while Gtk.events_pending(): # Gtk.main_iteration() @@ -423,21 +388,17 @@ def handle_reply(reply): response = InfoDialog.run() if response: InfoDialog.hide() - transaction.t_lock = False try: transaction.Release() except: pass - transaction.to_add = [] - transaction.to_remove = [] - transaction_dict.clear() transaction.get_handle() transaction.update_db() - if (transaction_type == "install") or (transaction_type == "remove"): - transaction_type = None + if mode == 'manager': + transaction.to_add.clear() + transaction.to_remove.clear() + transaction.to_update.clear() set_packages_list() - else: - transaction_type = None if have_updates(): if mode == 'manager': do_sysupgrade() @@ -447,16 +408,14 @@ bus.add_signal_receiver(handle_error, dbus_interface = "org.manjaro.pamac", sign def do_refresh(): """Sync databases like pacman -Sy""" - if transaction.t_lock is False: - transaction.t_lock = True - progress_label.set_text(_('Refreshing')+'...') - action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/refresh-cache.png') - progress_bar.set_text('') - progress_bar.set_fraction(0) - ProgressWindow.show_all() - while Gtk.events_pending(): - Gtk.main_iteration() - transaction.Refresh() + progress_label.set_text(_('Refreshing')+'...') + action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/refresh-cache.png') + progress_bar.set_text('') + progress_bar.set_fraction(0) + ProgressWindow.show_all() + while Gtk.events_pending(): + Gtk.main_iteration() + transaction.Refresh() def have_updates(): do_syncfirst, updates = transaction.get_updates() @@ -481,82 +440,94 @@ def have_updates(): return True def do_sysupgrade(): - global transaction_type """Upgrade a system like pacman -Su""" - if transaction.t_lock is False: - transaction_type = "update" - do_syncfirst, updates = transaction.get_updates() - if updates: - transaction.to_add = [] - transaction.to_remove = [] - if do_syncfirst: - check_conflicts('normal', updates) - for pkg in updates: - transaction.to_add.append(pkg.name) - if transaction.init_transaction(recurse = True, needed = True): - for pkgname in transaction.to_add: - transaction.Add(pkgname) - for pkgname in transaction.to_remove: - transaction.Remove(pkgname) - error = transaction.Prepare() - if error: - handle_error(error) - else: - transaction.get_to_remove() - transaction.get_to_add() - set_transaction_sum() - if mode == 'updater': - if len(transaction.to_add) + len(transaction.to_remove) != 0: - ConfDialog.show_all() - else: - finalize() - if mode == 'manager': + do_syncfirst, updates = transaction.get_updates() + if updates: + transaction.to_add.clear() + transaction.to_remove.clear() + transaction.to_update = set([pkg.name for pkg in updates]) + check_conflicts() + init = False + error = '' + if do_syncfirst: + init = transaction.init_transaction(noconflicts = True, recurse = True) + else: + init = transaction.init_transaction(noconflicts = True) + if init: + error = transaction.Sysupgrade() + if error: + handle_error(error) + if init: + if not error: + for name in transaction.to_add | transaction.to_update: + transaction.Add(name) + for name in transaction.to_remove: + transaction.Remove(name) + error = transaction.Prepare() + if error: + handle_error(error) + else: + transaction.get_to_remove() + transaction.get_to_add() + transaction.to_add -= transaction.to_update + set_transaction_sum() + if mode == 'updater': + if len(transaction.to_add) + len(transaction.to_remove) != 0: ConfDialog.show_all() - else: - check_conflicts('updating', updates) - if transaction.init_transaction(noconflicts = True): - error = transaction.Sysupgrade() - if error: - handle_error(error) - else: - for pkgname in transaction.to_add: - transaction.Add(pkgname) - for pkgname in transaction.to_remove: - transaction.Remove(pkgname) - error = transaction.Prepare() - if error: - handle_error(error) else: - transaction.get_to_remove() - transaction.get_to_add() - set_transaction_sum() - if mode == 'updater': - if len(transaction.to_add) + len(transaction.to_remove) != 0: - ConfDialog.show_all() - else: - finalize() - if mode == 'manager': - ConfDialog.show_all() + finalize() + if mode == 'manager': + ConfDialog.show_all() def finalize(): - progress_label.set_text(_('Preparing')+'...') - action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/setup.png') - progress_bar.set_text('') - progress_bar.set_fraction(0) - ProgressWindow.show_all() - while Gtk.events_pending(): - Gtk.main_iteration() - try: - transaction.Commit() - except dbus.exceptions.DBusException as e: - handle_error(str(e)) + progress_label.set_text(_('Preparing')+'...') + action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/setup.png') + progress_bar.set_text('') + progress_bar.set_fraction(0) + ProgressWindow.show_all() + while Gtk.events_pending(): + Gtk.main_iteration() + try: + transaction.Commit() + except dbus.exceptions.DBusException as e: + handle_error(str(e)) -def check_conflicts(mode, pkg_list): - depends = [pkg_list] +def check_conflicts(): + print('checking...') + ManagerWindow.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH)) + while Gtk.events_pending(): + Gtk.main_iteration() + to_check = [transaction.syncpkgs[name] for name in transaction.to_add | transaction.to_update] + already_checked = set(pkg.name for pkg in to_check) + depends = [to_check] warning = '' error = '' pkgs = transaction.handle.get_localdb().search('linux3') installed_linux = [] + # get packages to remove + check_for_removal = transaction.to_remove.copy() + to_add_to_remove = set() + hold_requirement = {} + while check_for_removal: + for name in check_for_removal: + required = transaction.localpkgs[name].compute_requiredby() + for requirement in required: + if requirement in config.holdpkg: + for hold in config.holdpkg: + if requirement == hold: + if error: + error += '\n' + error += _('The transaction cannot be performed because it needs to remove {pkgname1} which is in HoldPkg').format(pkgname1 = hold) + print(_('The transaction cannot be performed because it needs to remove {pkgname1} which is in HoldPkg').format(pkgname1 = hold)) + else: + to_add_to_remove.add(requirement) + to_add_to_remove &= set(transaction.localpkgs.keys()) + check_for_removal = to_add_to_remove.copy() + transaction.to_remove |= to_add_to_remove + to_add_to_remove.clear() + if error: + break + # get installed kernels for item in pkgs: if len(item.name) == 7: installed_linux.append(item.name) @@ -564,152 +535,8 @@ def check_conflicts(mode, pkg_list): if 'linux3' in to_install: if len(to_install) == 7: installed_linux.append(to_install) - i = 0 - while depends[i]: - depends.append([]) - for pkg in depends[i]: - if 'linux3' in pkg.name: - for _pkg in transaction.localpkgs.values(): - for depend in _pkg.depends: - if '-modules' in depend: - for __pkg in transaction.syncpkgs.values(): - if not __pkg.name in transaction.localpkgs.keys(): - for name in __pkg.provides: - for linux in installed_linux: - if linux in __pkg.name: - if common.format_pkg_name(depend) == common.format_pkg_name(name): - if not __pkg.name in transaction.to_add: - print(i,'module',__pkg) - depends[i+1].append(__pkg) - transaction.to_add.append(__pkg.name) - for depend in pkg.depends: - found_depend = pyalpm.find_satisfier(transaction.localpkgs.values(), depend) - if found_depend: - print(i,'local',found_depend) - if found_depend.name != common.format_pkg_name(depend): - if ('-modules' in depend) or ('linux' in depend): - for _pkg in transaction.syncpkgs.values(): - if not _pkg.name in transaction.localpkgs.keys(): - for name in _pkg.provides: - for linux in installed_linux: - if linux in _pkg.name: - if common.format_pkg_name(depend) == common.format_pkg_name(name): - if not _pkg.name in transaction.to_add: - depends[i+1].append(_pkg) - transaction.to_add.append(_pkg.name) - else: - found_depend = pyalpm.find_satisfier(transaction.syncpkgs.values(), depend) - if found_depend: - print(i,'sync',found_depend) - if found_depend.name != common.format_pkg_name(depend): - if ('-modules' in depend) or ('linux' in depend): - for _pkg in transaction.syncpkgs.values(): - if not _pkg.name in transaction.localpkgs.keys(): - for name in _pkg.provides: - for linux in installed_linux: - if linux in _pkg.name: - if common.format_pkg_name(depend) == common.format_pkg_name(name): - if not _pkg.name in transaction.to_add: - depends[i+1].append(_pkg) - transaction.to_add.append(_pkg.name) - else: - already_provided = False - for pkgname in transaction.to_add: - _pkg = transaction.syncpkgs[pkgname] - found_depend = pyalpm.find_satisfier([_pkg], depend) - if found_depend: - already_provided = True - if not already_provided: - to_add_to_depends = choose_provides(depend) - for _pkg in to_add_to_depends: - if not _pkg.name in transaction.to_add: - depends[i+1].append(_pkg) - transaction.to_add.append(_pkg.name) - else: - depends[i+1].append(found_depend) - if mode == 'updating': - for replace in pkg.replaces: - found_replace = pyalpm.find_satisfier(transaction.localpkgs.values(), replace) - if found_replace: - if found_replace.name != pkg.name: - if not found_replace.name in transaction.to_remove: - transaction.to_remove.append(found_replace.name) - if warning: - warning += '\n' - warning += _('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = found_replace.name, pkgname2 = pkg.name) - for conflict in pkg.conflicts: - found_conflict = pyalpm.find_satisfier(transaction.localpkgs.values(), conflict) - if found_conflict: - if found_conflict.name != pkg.name: - will_provide_conflict = pyalpm.find_satisfier([pkg], conflict) - if will_provide_conflict: - if not found_conflict.name in transaction.to_remove: - transaction.to_remove.append(found_conflict.name) - if warning: - warning += '\n' - warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name) - else: - if transaction.syncpkgs.__contains__(found_conflict.name): - new_found_conflict = pyalpm.find_satisfier([transaction.syncpkgs[found_conflict.name]], conflict) - if new_found_conflict: - required = pkg.compute_requiredby() - if required: - str_required = '' - for item in required: - if str_required: - str_required += ', ' - str_required += item - if error: - error += '\n' - error += _('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name, pkgname3 = str_required) - elif not found_conflict.name in transaction.to_remove: - transaction.to_remove.append(found_conflict.name) - if warning: - warning += '\n' - warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name) - found_conflict = pyalpm.find_satisfier(depends[0], conflict) - if found_conflict: - if not common.format_pkg_name(conflict) == pkg.name: - if not common.format_pkg_name(conflict) in transaction.to_remove: - if pkg.name in transaction.to_add and common.format_pkg_name(conflict) in transaction.to_add: - transaction.to_add.remove(common.format_pkg_name(conflict)) - transaction.to_add.remove(pkg.name) - if warning: - warning += '\n' - warning += _('{pkgname1} conflicts with {pkgname2}\nNone of them will be installed').format(pkgname1 = pkg.name, pkgname2 = common.format_pkg_name(conflict)) - i += 1 - for pkg in transaction.localpkgs.values(): - for conflict in pkg.conflicts: - found_conflict = pyalpm.find_satisfier(depends[0], conflict) - if found_conflict: - if found_conflict.name != pkg.name: - will_provide_conflict = pyalpm.find_satisfier([pkg], conflict) - if will_provide_conflict: - if not pkg.name in transaction.to_remove: - transaction.to_remove.append(pkg.name) - if warning: - warning += '\n' - warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name) - else: - if transaction.syncpkgs.__contains__(pkg.name): - new_found_conflict = pyalpm.find_satisfier([transaction.syncpkgs[pkg.name]], conflict) - if new_found_conflict: - required = pkg.compute_requiredby() - if required: - str_required = '' - for item in required: - if str_required: - str_required += ', ' - str_required += item - if error: - error += '\n' - error += _('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name, pkgname3 = str_required) - elif not pkg.name in transaction.to_remove: - transaction.to_remove.append(pkg.name) - if warning: - warning += '\n' - warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1= found_conflict.name, pkgname2 = pkg.name) - if mode == 'updating': + # check if new pkgs will replace installed ones + if transaction.to_update: for pkg in transaction.syncpkgs.values(): for replace in pkg.replaces: found_replace = pyalpm.find_satisfier(transaction.localpkgs.values(), replace) @@ -719,20 +546,269 @@ def check_conflicts(mode, pkg_list): if not pkg.name in transaction.localpkgs.keys(): if common.format_pkg_name(replace) in transaction.localpkgs.keys(): if not found_replace.name in transaction.to_remove: - transaction.to_remove.append(found_replace.name) + transaction.to_remove.add(found_replace.name) if warning: warning += '\n' warning += _('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = found_replace.name, pkgname2 = pkg.name) - if not pkg.name in transaction.to_add: - transaction.to_add.append(pkg.name) - print('check result:', 'to add:', transaction.to_add, 'to remove:', transaction.to_remove) + print(_('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = found_replace.name, pkgname2 = pkg.name)) + if not pkg.name in already_checked: + depends[0].append(pkg) + already_checked.add(pkg.name) + transaction.to_add.add(pkg.name) + # start loops to check pkgs + i = 0 + while depends[i]: + # add a empty list for new pkgs to check next loop + depends.append([]) + # start to check one pkg + for pkg in depends[i]: + # check if the current pkg is a kernel and if so, check if a module is required to install + if 'linux3' in pkg.name: + for _pkg in transaction.localpkgs.values(): + for depend in _pkg.depends: + if '-modules' in depend: + for __pkg in transaction.syncpkgs.values(): + if not __pkg.name in transaction.localpkgs.keys(): + for provide in __pkg.provides: + for linux in installed_linux: + if linux in __pkg.name: + if common.format_pkg_name(depend) == common.format_pkg_name(provide): + if not __pkg.name in transaction.to_add: + if not __pkg.name in already_checked: + depends[i+1].append(__pkg) + already_checked.add(__pkg.name) + transaction.to_add.add(__pkg.name) + # check pkg deps + for depend in pkg.depends: + # check if dep is already installed + found_depend = pyalpm.find_satisfier(transaction.localpkgs.values(), depend) + if found_depend: + # check if the dep is a kernel module to provide and if so, auto-select it + if found_depend.name != common.format_pkg_name(depend): + if ('-modules' in depend) or ('linux' in depend): + for _pkg in transaction.syncpkgs.values(): + if not _pkg.name in transaction.localpkgs.keys(): + for name in _pkg.provides: + for linux in installed_linux: + if linux in _pkg.name: + if common.format_pkg_name(depend) == common.format_pkg_name(name): + if not _pkg.name in transaction.to_add: + if not _pkg.name in already_checked: + depends[i+1].append(_pkg) + already_checked.add(_pkg.name) + transaction.to_add.add(_pkg.name) + else: + # add the dep in list to check its deps in next loop + if not found_depend.name in already_checked: + depends[i+1].append(found_depend) + already_checked.add(found_depend.name) + else: + # found the dep in uninstalled pkgs + found_depend = pyalpm.find_satisfier(transaction.syncpkgs.values(), depend) + if found_depend: + # check if the dep is a kernel module to provide and if so, auto-select it + if found_depend.name != common.format_pkg_name(depend): + if ('-modules' in depend) or ('linux' in depend): + for _pkg in transaction.syncpkgs.values(): + if not _pkg.name in transaction.localpkgs.keys(): + for name in _pkg.provides: + for linux in installed_linux: + if linux in _pkg.name: + if common.format_pkg_name(depend) == common.format_pkg_name(name): + if not _pkg.name in transaction.to_add: + if not _pkg.name in already_checked: + depends[i+1].append(_pkg) + already_checked.add(_pkg.name) + transaction.to_add.add(_pkg.name) + else: + # so the dep is a virtual dep: check if it's already provides + already_provided = False + for pkgname in transaction.to_add: + _pkg = transaction.syncpkgs[pkgname] + found_depend = pyalpm.find_satisfier([_pkg], depend) + if found_depend: + already_provided = True + # if not already provided, run ChooseDialog (via choose_provides) + if not already_provided: + to_add_to_depends = choose_provides(depend) + for _pkg in to_add_to_depends: + if not _pkg.name in transaction.to_add: + if not _pkg.name in already_checked: + depends[i+1].append(_pkg) + already_checked.add(_pkg.name) + transaction.to_add.add(_pkg.name) + else: + # so the dep is not yet installed, add it in list to check its deps in next loop + if not found_depend.name in already_checked: + depends[i+1].append(found_depend) + already_checked.add(found_depend.name) + # check if the pkg replaces installed ones + if transaction.to_update: + for replace in pkg.replaces: + found_replace = pyalpm.find_satisfier(transaction.localpkgs.values(), replace) + if found_replace: + if found_replace.name != pkg.name: + if not found_replace.name in transaction.to_remove: + transaction.to_remove.add(found_replace.name) + if warning: + warning += '\n' + warning += _('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = found_replace.name, pkgname2 = pkg.name) + print(_('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = found_replace.name, pkgname2 = pkg.name)) + # check pkg conflicts + for conflict in pkg.conflicts: + # check if the pkg conflicts with installed ones + found_conflict = pyalpm.find_satisfier(transaction.localpkgs.values(), conflict) + if found_conflict: + if found_conflict.name != pkg.name: + # if pkg provides the conflict no need to check if it can be safely removed + will_provide_conflict = pyalpm.find_satisfier([pkg], conflict) + if will_provide_conflict: + if not found_conflict.name in transaction.to_remove: + transaction.to_remove.add(found_conflict.name) + if warning: + warning += '\n' + warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name) + print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name)) + else: + # if the conflict will be updated, check the conflicts of the new one + if found_conflict.name in transaction.to_update: + new_found_conflict = pyalpm.find_satisfier([transaction.syncpkgs[found_conflict.name]], conflict) + if new_found_conflict: + # check if the conflict can be safely removed + required = set(pkg.compute_requiredby()) + required &= set(transaction.localpkgs.keys()) + if required: + str_required = '' + for item in required: + if str_required: + str_required += ', ' + str_required += item + if error: + error += '\n' + error += _('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name, pkgname3 = str_required) + print(_('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name, pkgname3 = str_required)) + elif not found_conflict.name in transaction.to_remove: + transaction.to_remove.add(found_conflict.name) + if warning: + warning += '\n' + warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name) + print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name)) + else: + # check if the conflict can be safely removed + required = set(pkg.compute_requiredby()) + required &= set(transaction.localpkgs.keys()) + if required: + str_required = '' + for item in required: + if str_required: + str_required += ', ' + str_required += item + if error: + error += '\n' + error += _('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name, pkgname3 = str_required) + print(_('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name, pkgname3 = str_required)) + elif not found_conflict.name in transaction.to_remove: + transaction.to_remove.add(found_conflict.name) + if warning: + warning += '\n' + warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name) + print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name)) + # check if the pkg conflicts with the other ones to install + found_conflict = pyalpm.find_satisfier(depends[0], conflict) + if found_conflict: + if not common.format_pkg_name(conflict) == pkg.name: + if not common.format_pkg_name(conflict) in transaction.to_remove: + if pkg.name in transaction.to_add and common.format_pkg_name(conflict) in transaction.to_add: + transaction.to_add.discard(common.format_pkg_name(conflict)) + transaction.to_add.discard(pkg.name) + if warning: + warning += '\n' + warning += _('{pkgname1} conflicts with {pkgname2}\nNone of them will be installed').format(pkgname1 = pkg.name, pkgname2 = common.format_pkg_name(conflict)) + print(_('{pkgname1} conflicts with {pkgname2}\nNone of them will be installed').format(pkgname1 = pkg.name, pkgname2 = common.format_pkg_name(conflict))) + i += 1 + # end of the loop + + # check if installed pkgs conflicts with the ones to install + to_check = [transaction.syncpkgs[name] for name in transaction.to_add | transaction.to_update] + for pkg in transaction.localpkgs.values(): + for conflict in pkg.conflicts: + found_conflict = pyalpm.find_satisfier(to_check, conflict) + if found_conflict: + if found_conflict.name != pkg.name: + # if pkg provides the conflict no need to check if it can be safely removed + will_provide_conflict = pyalpm.find_satisfier([pkg], conflict) + if will_provide_conflict: + if not pkg.name in transaction.to_remove: + transaction.to_remove.add(pkg.name) + if warning: + warning += '\n' + warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name) + print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name)) + else: + # if pkg will be updated, check the conflicts of this new one + if pkg.name in transaction.to_update: + for new_conflict in transaction.syncpkgs[pkg.name].conflicts: + if new_conflict == conflict: + # check if the conflict can be safely removed + required = set(pkg.compute_requiredby()) + required &= set(transaction.localpkgs.keys()) + if required: + str_required = '' + for item in required: + if str_required: + str_required += ', ' + str_required += item + if error: + error += '\n' + error += _('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name, pkgname3 = str_required) + print(_('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name, pkgname3 = str_required)) + elif not pkg.name in transaction.to_remove: + transaction.to_remove.add(pkg.name) + if warning: + warning += '\n' + warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1= found_conflict.name, pkgname2 = pkg.name) + print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name)) + else: + # check if the conflict can be safely removed + required = set(pkg.compute_requiredby()) + required &= set(transaction.localpkgs.keys()) + if required: + str_required = '' + for item in required: + if str_required: + str_required += ', ' + str_required += item + if error: + error += '\n' + error += _('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name, pkgname3 = str_required) + print(_('{pkgname1} conflicts with {pkgname2} but cannot be removed because it is needed by {pkgname3}').format(pkgname1 = pkg.name, pkgname2 = found_conflict.name, pkgname3 = str_required)) + elif not pkg.name in transaction.to_remove: + transaction.to_remove.add(pkg.name) + if warning: + warning += '\n' + warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1= found_conflict.name, pkgname2 = pkg.name) + print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name)) + + # remove in to_remove the packages which are needed by the names in to_add to avoid conflicts: + wont_be_removed = set() + for pkg_list in depends: + for pkg in pkg_list: + wont_be_removed.add(pkg.name) + + ManagerWindow.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW)) + print('check result:') + print(' to add:', transaction.to_add if transaction.to_add else 'None') + print(' will not be removed:', transaction.to_remove & wont_be_removed if transaction.to_remove & wont_be_removed else 'None') + transaction.to_remove -= wont_be_removed + print(' to remove:', transaction.to_remove if transaction.to_remove else 'None') + print(' to update:', transaction.to_update if transaction.to_update else 'None') if warning: WarningDialog.format_secondary_text(warning) response = WarningDialog.run() if response: WarningDialog.hide() if error: - handle_error(error) + handle_error(error) def choose_provides(name): provides = OrderedDict() @@ -768,73 +844,46 @@ class Handler: Gtk.main_quit() def on_Manager_ValidButton_clicked(self, *arg): - if not transaction_dict: - ErrorDialog.format_secondary_text(_('No package is selected')) - response = ErrorDialog.run() - if response: - ErrorDialog.hide() + transaction.to_update.clear() + if transaction.to_add | transaction.to_remove: + check_conflicts() + if transaction.to_add | transaction.to_remove: + if transaction.init_transaction(noconflicts = True): + for pkgname in transaction.to_add: + transaction.Add(pkgname) + for pkgname in transaction.to_remove: + transaction.Remove(pkgname) + error = transaction.Prepare() + if error: + handle_error(error) + else: + transaction.get_to_remove() + transaction.get_to_add() + transaction.to_update = transaction.to_add & set(transaction.localpkgs.keys()) + transaction.to_add -= transaction.to_update + set_transaction_sum() + ConfDialog.show_all() else: - if transaction.t_lock is True: - print('Transaction locked') - else: - if transaction_type is "remove": - if transaction.init_transaction(cascade = True):#, recurse = True): - for pkgname in transaction_dict.keys(): - transaction.Remove(pkgname) - error = transaction.Prepare() - if error: - handle_error(error) - else: - transaction.get_to_remove() - transaction.get_to_add() - set_transaction_sum() - ConfDialog.show_all() - if transaction_type is "install": - transaction.to_add = [] - for pkgname in transaction_dict.keys(): - transaction.to_add.append(pkgname) - transaction.to_remove = [] - check_conflicts('normal', transaction_dict.values()) - if transaction.to_add: - if transaction.init_transaction(noconflicts = True): - for pkgname in transaction.to_add: - transaction.Add(pkgname) - for pkgname in transaction.to_remove: - transaction.Remove(pkgname) - error = transaction.Prepare() - if error: - handle_error(error) - else: - transaction.get_to_remove() - transaction.get_to_add() - set_transaction_sum() - ConfDialog.show_all() - else: - WarningDialog.format_secondary_text(_('Nothing to do')) - response = WarningDialog.run() - if response: - WarningDialog.hide() - transaction.t_lock = False + WarningDialog.format_secondary_text(_('Nothing to do')) + response = WarningDialog.run() + if response: + WarningDialog.hide() + refresh_packages_list() def on_Manager_EraseButton_clicked(self, *arg): - global transaction_type - global transaction_dict - transaction_dict.clear() - if transaction_type: - transaction_type = None - refresh_packages_list() + transaction.to_add.clear() + transaction.to_remove.clear() + transaction.to_update.clear() + refresh_packages_list() def on_Manager_RefreshButton_clicked(self, *arg): do_refresh() def on_TransCancelButton_clicked(self, *arg): - global transaction_type ProgressWindow.hide() ConfDialog.hide() - transaction.t_lock = False transaction.Release() - if transaction_type == "update": - transaction_type = None + refresh_packages_list() def on_TransValidButton_clicked(self, *arg): ConfDialog.hide() @@ -852,37 +901,38 @@ class Handler: def on_list_treeview_selection_changed(self, widget): liste, line = list_selection.get_selected() - if line is not None: - if transaction.localpkgs.__contains__(packages_list[line][0]): - set_infos_list(transaction.localpkgs[packages_list[line][0]]) - set_deps_list(transaction.localpkgs[packages_list[line][0]], "local") - set_details_list(transaction.localpkgs[packages_list[line][0]], "local") - set_files_list(transaction.localpkgs[packages_list[line][0]]) - files_scrolledwindow.set_visible(True) - else: - set_infos_list(transaction.syncpkgs[packages_list[line][0]]) - set_deps_list(transaction.syncpkgs[packages_list[line][0]], "sync") - set_details_list(transaction.syncpkgs[packages_list[line][0]], "sync") - files_scrolledwindow.set_visible(False) + if line: + if packages_list[line][0] != _('No package found'): + if transaction.localpkgs.__contains__(packages_list[line][0]): + set_infos_list(transaction.localpkgs[packages_list[line][0]]) + set_deps_list(transaction.localpkgs[packages_list[line][0]], "local") + set_details_list(transaction.localpkgs[packages_list[line][0]], "local") + set_files_list(transaction.localpkgs[packages_list[line][0]]) + files_scrolledwindow.set_visible(True) + else: + set_infos_list(transaction.syncpkgs[packages_list[line][0]]) + set_deps_list(transaction.syncpkgs[packages_list[line][0]], "sync") + set_details_list(transaction.syncpkgs[packages_list[line][0]], "sync") + files_scrolledwindow.set_visible(False) def on_search_treeview_selection_changed(self, widget): global current_filter liste, line = search_selection.get_selected() - if line is not None: + if line: current_filter = ('search', search_list[line][0].split()) set_packages_list() def on_groups_treeview_selection_changed(self, widget): global current_filter liste, line = groups_selection.get_selected() - if line is not None: + if line: current_filter = ('group', groups_list[line][0]) set_packages_list() def on_state_treeview_selection_changed(self, widget): global current_filter liste, line = state_selection.get_selected() - if line is not None: + if line: if state_list[line][0] == _('Installed'): current_filter = ('installed', None) if state_list[line][0] == _('Uninstalled'): @@ -898,7 +948,7 @@ class Handler: def on_repos_treeview_selection_changed(self, widget): global current_filter liste, line = repos_selection.get_selected() - if line is not None: + if line: if repos_list[line][0] == _('local'): current_filter = ('local', None) else: @@ -906,46 +956,24 @@ class Handler: set_packages_list() def on_cellrenderertoggle1_toggled(self, widget, line): - global transaction_type - global transaction_dict - if packages_list[line][0] in transaction_dict.keys(): - if transaction_type == "remove": + if packages_list[line][1] is True: + if packages_list[line][0] in transaction.to_remove: + packages_list[line][3] =True packages_list[line][4] = installed_icon - if transaction_type == "install": - packages_list[line][4] = uninstalled_icon - transaction_dict.pop(packages_list[line][0]) - if not transaction_dict: - transaction_type = None - lin = 0 - while lin < len(packages_list): - if packages_list[lin][0] in config.holdpkg: - packages_list[lin][2] = False - else: - packages_list[lin][2] = True - lin += 1 - else: - if packages_list[line][1] is True: - transaction_type = "remove" - transaction_dict[packages_list[line][0]] = transaction.localpkgs[packages_list[line][0]] + transaction.to_remove.discard(packages_list[line][0]) + else: + packages_list[line][3] = False packages_list[line][4] = to_remove_icon - lin = 0 - while lin < len(packages_list): - if not packages_list[lin][0] in transaction_dict.keys(): - if packages_list[lin][1] is False: - packages_list[lin][2] = False - lin += 1 - if packages_list[line][1] is False: - transaction_type = "install" - transaction_dict[packages_list[line][0]] = transaction.syncpkgs[packages_list[line][0]] + transaction.to_remove.add(packages_list[line][0]) + if packages_list[line][1] is False: + if packages_list[line][0] in transaction.to_add: + packages_list[line][3] = False + packages_list[line][4] = uninstalled_icon + transaction.to_add.discard(packages_list[line][0]) + else: + packages_list[line][3] = True packages_list[line][4] = to_install_icon - lin = 0 - while lin < len(packages_list): - if not packages_list[lin][0] in transaction_dict.keys(): - if packages_list[lin][1] is True: - packages_list[lin][2] = False - lin += 1 - packages_list[line][3] = not packages_list[line][3] - packages_list[line][2] = True + transaction.to_add.add(packages_list[line][0]) def on_cellrenderertoggle2_toggled(self, widget, line): choose_list[line][0] = not choose_list[line][0] @@ -953,17 +981,24 @@ class Handler: def on_ChooseButton_clicked(self, *arg): ChooseDialog.hide() line = 0 - transaction.to_provide = [] + transaction.to_provide.clear() while line < len(choose_list): if choose_list[line][0] is True: - if not choose_list[line][1] in transaction.to_provide: - if not choose_list[line][1] in transaction.localpkgs.keys(): - transaction.to_provide.append(choose_list[line][1]) + if not choose_list[line][1] in transaction.localpkgs.keys(): + transaction.to_provide.add(choose_list[line][1]) if choose_list[line][0] is False: - if choose_list[line][1] in transaction.to_provide: - transaction.to_provide.remove(choose_list[line][1]) + transaction.to_provide.discard(choose_list[line][1]) line += 1 + def on_ProgressCancelButton_clicked(self, *arg): + print('cancelled') + if not _('Refreshing') in progress_label.get_text(): + error = transaction.Interrupt() + if error: + handle_error(error) + else: + handle_reply('') + #Updater Handlers def on_UpdaterWindow_delete_event(self, *arg): transaction.StopDaemon() @@ -981,14 +1016,6 @@ class Handler: def on_Updater_RefreshButton_clicked(self, *arg): do_refresh() - def on_ProgressCancelButton_clicked(self, *arg): - print('cancelled') - error = transaction.Interrupt() - if error: - handle_error(error) - else: - handle_reply('') - def main(_mode): if common.pid_file_exists(): ErrorDialog.format_secondary_text(_('Pamac is already running')) diff --git a/pamac/transaction.py b/pamac/transaction.py index 5da7381..d642e05 100644 --- a/pamac/transaction.py +++ b/pamac/transaction.py @@ -8,11 +8,10 @@ from dbus.mainloop.glib import DBusGMainLoop from pamac import config, common -t_lock = False -to_remove = [] -to_add = [] -to_provide = [] -to_update = [] +to_remove = set() +to_add = set() +to_update = set() +to_provide = set() handle = None syncpkgs = OrderedDict() localpkgs = OrderedDict() @@ -53,21 +52,19 @@ Release = proxy.get_dbus_method('Release','org.manjaro.pamac') StopDaemon = proxy.get_dbus_method('StopDaemon','org.manjaro.pamac') def init_transaction(**options): - global t_lock error = Init(dbus.Dictionary(options, signature='sb')) if not error: - t_lock = True return True else: return False def get_to_remove(): global to_remove - to_remove = To_Remove() + to_remove = set(To_Remove()) def get_to_add(): global to_add - to_add = To_Add() + to_add = set(To_Add()) def get_updates(): """Return a list of package objects in local db which can be updated""" diff --git a/po/ca.po b/po/ca.po index 324d2ec..32ca694 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-04-06 18:02+0100\n" "Last-Translator: Oriol Fernàndez \n" "Language-Team: Catalan\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.5.5\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Preparant" @@ -70,11 +70,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Baixada {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Actualitzant" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autenticació fallida" @@ -107,147 +107,160 @@ msgstr "Executar pamac-manager" msgid "Quit" msgstr "Sortir" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Instal·lat" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "No instal·lat" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Orfes" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "A instal·lar" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "A suprimir" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "local" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "No s'ha trobat cap paquet" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Llicències" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Depèn de" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Dependències Opcionals" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Requerit per" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Proporciona" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Reemplaça" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Conflictes amb" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Dipòsit" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Grups" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Mida comprimit" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Mida descarregat" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Mida instal·lat" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Empaquetador" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Data d'instal·lació" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Explícitament instal·lat" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Instal·lat com a dependència d'un altre paquet" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Desconegut" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Raó d'instal·lació" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Signatures" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Fitxers de còpia de seguretat" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Resum de la transacció" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Mida total de la baixada: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "A actualitzar" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Mida total de la baixada: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "El teu sistema està actualitzat" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 actualització disponible" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} actualitzacions disponibles" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} serà reemplaçat per {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} està en conflicte amb {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -255,7 +268,7 @@ msgstr "" "{pkgname1} està en conflicte amb {pkgname2} però no es pot suprimir ja que " "és requerit per {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -263,7 +276,7 @@ msgstr "" "{pkgname1} està en conflicte amb {pkgname2}\n" "Cap d'ells serà instal·lat" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -271,15 +284,11 @@ msgstr "" "{pkgname} està proveït per {number} paquets.\n" "Si us plau tria el(s) paquet(s) que vols instal·lar:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "No s'ha sel·leccionat cap paquet" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Res a fer" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac ja està executant-se" @@ -313,7 +322,7 @@ msgstr "Gestor de Paquets" msgid "Search" msgstr "Cerca" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Estat" @@ -321,30 +330,33 @@ msgstr "Estat" msgid "Repos" msgstr "Dipòsits" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Nom" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Mida" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Infos" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Dependències" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Detalls" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Fitxers" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Gestor d'Actualitzacions" + +#~ msgid "No package is selected" +#~ msgstr "No s'ha sel·leccionat cap paquet" diff --git a/po/da.po b/po/da.po index 25e8584..eb85e7d 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-03-30 15:18+0100\n" "Last-Translator: \n" "Language-Team: Danish\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Forbereder" @@ -69,11 +69,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Downloader {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Opdaterer" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autentificering mislykket" @@ -106,147 +106,160 @@ msgstr "Start pamac-manager" msgid "Quit" msgstr "Luk" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Installeret" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Afinstalleret" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Forældreløse pakker" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Installeres" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Fjernes" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "lokalt" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Ingen pakke fundet" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Licenser" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Afhænger af" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Valgfrie afhængigheder" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Kræves af" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Leverer" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Erstatter" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Konflikterer med" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Arkiv" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Grupper" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Komprimeret størrelse" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Download-størrelse" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Installeret størrelse" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Pakker" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Installations-dato" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Eksplicitte pakker" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Installeret som en afhængighed for en anden pakke" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Ukendt" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Installations-årsag" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Signaturer" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Back-up filer" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Transaktions oversigt" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Samlet download-størrelse " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Til opdatering" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Samlet download-størrelse " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Dit system er up-to-date" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 tilgængelig opdatering" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} tilgængelige opdateringer" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} bliver erstattet af {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} er i konflikt med {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -254,13 +267,13 @@ msgstr "" "{pkgname1} er i konflikt med {pkgname2}, men kan ikke fjernes, fordi den er " "krævet af {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" msgstr "" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -268,15 +281,11 @@ msgstr "" "{pkgname} bliver leveret af {number} pakker.\n" "Vælg dem, som du vil installere:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Ingen pakke er valgt" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Intet at gøre" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac kører allerede" @@ -310,7 +319,7 @@ msgstr "Pakke-manager" msgid "Search" msgstr "Søg" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Tilstand" @@ -318,27 +327,27 @@ msgstr "Tilstand" msgid "Repos" msgstr "Arkiver" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Navn" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Størrelse" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Informationer" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Afhængigheder" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Detaljer" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Filer" @@ -346,6 +355,9 @@ msgstr "Filer" msgid "Update Manager" msgstr "Opdaterings-manager" +#~ msgid "No package is selected" +#~ msgstr "Ingen pakke er valgt" + #~ msgid "" #~ "{pkgname1} conflicts {pkgname2}\n" #~ "None of them will be installed" diff --git a/po/de.po b/po/de.po index 36986a2..4ec7cba 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-04-13 14:45+0100\n" "Last-Translator: Philip Müller \n" "Language-Team: German\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.5.5\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Vorbereitung" @@ -70,11 +70,11 @@ msgstr "Überprüfe Schlüssel im Schlüsselbund" msgid "Downloading {size}" msgstr "Lade {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Aktualistation" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Authentifikation fehlgeschlagen" @@ -107,147 +107,160 @@ msgstr "Starte pamac-manager" msgid "Quit" msgstr "Beenden" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Installiert" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Nicht installiert" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Verwaist" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Wird installiert" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Wird entfernt" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "Lokal" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Keine Pakete gefunden" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Lizenzen" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Hängt ab von" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Opt. Abhängigkeiten" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Benötigt von" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Stellt bereit" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Ersetzt" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Konflikt mit" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Repositrium" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Gruppen" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Komprimierte Größe" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Datengröße" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Installierte Größe" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Packer" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Installiert am" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Ausdrücklich installiert" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Installiert als Abhängigkeit für ein anderes Paket" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Unbekannt" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Installationsgrund" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Signaturen" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Dateisicherungen" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Vorgang" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Gesamtgröße des Downloads: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Wird erneuert" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Gesamtgröße des Downloads: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Ihr System ist auf dem aktuellen Stand" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 Erneuerung verfügbar" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} Erneuerungen verfügbar" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} wird ersetzt von {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} erzeugt Konflikt mit {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -255,7 +268,7 @@ msgstr "" "{pkgname1} erzeugt einen Konflikt mit {pkgname2}, kann als Abhängigkeit von " "{pkgname3} nicht entfernt werden" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -263,7 +276,7 @@ msgstr "" "{pkgname1} erzeugt Konflikt mit {pkgname2}\n" "Es werden keine Pakete installiert" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -271,15 +284,11 @@ msgstr "" "{pkgname} wird von {number} Paket(en) bereitgestellt.\n" "Zu installierende Paket(e) aus folgender Liste auswählen:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Kein Paket wurde ausgewählt" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Es gibt nichts zu tun" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac wird bereits ausgeführt" @@ -313,7 +322,7 @@ msgstr "Paketmanager" msgid "Search" msgstr "Suche" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Status" @@ -321,30 +330,33 @@ msgstr "Status" msgid "Repos" msgstr "Repos" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Name" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Größe" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Info" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Abhängigkeiten" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Details" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Dateien" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Update Manager" + +#~ msgid "No package is selected" +#~ msgstr "Kein Paket wurde ausgewählt" diff --git a/po/el.po b/po/el.po index acf18c0..ca17b8a 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-04-08 14:35+0200\n" "Last-Translator: Angel \n" "Language-Team: Greek \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.5.5\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Προετοιμασία" @@ -70,11 +70,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Κατέβασμα {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Ανανέωση" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Η πιστοποίηση απέτυχε" @@ -107,147 +107,160 @@ msgstr "Εκτέλεση του pamac-manager" msgid "Quit" msgstr "Έξοδος" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Εγκατεστημένα" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Απεγκατεστημένα" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Ορφανά" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Προς εγκατάσταση" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Προς απεγκατάσταση" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "τοπικό" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Δεν βρέθηκε κανένα πακέτο" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Άδειες" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Εξαρτάτε από" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Προαιρετικές εξαρτήσεις" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Απαιτείτε από" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Παρέχει" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Αντικαθιστά" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Συγκρούεται με" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Αποθετήριο" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Ομάδες" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Συμπιεσμένο μέγεθος" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Μέγεθος για κατέβασμα" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Μέγεθος εγκατεστημένου" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Δημιουργός πακέτου" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Ημερομηνία εγκατάστασης" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Εγκαταστάθηκε ρητά" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Εγκαταστήθηκε ως εξάρτηση για ένα άλλο πακέτο" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Άγνωστο" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Λόγος για εγκατάσταση" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Υπογραφές" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Δημιουργία αντιγράφων ασφαλείας αρχείων" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Περίληψη ενεργειών" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Συνολικό μέγεθος προς κατέβασμα: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Προς αναβάθμιση" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Συνολικό μέγεθος προς κατέβασμα: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Το σύστημα σας είναι πλήρως ενημερωμένο" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 διαθέσιμη ενημέρωση" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} διαθέσιμες ενημερώσεις" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} θα αντικατασταθεί από {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} συγκρούεται με το {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -255,7 +268,7 @@ msgstr "" "{pkgname1} συγκρούεται με το {pkgname2} αλλά δεν μπορεί να αφαιρεθεί γιατί " "απαιτείτε από το {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -263,7 +276,7 @@ msgstr "" "{pkgname1} συγκρούεται με το {pkgname2}\n" "Δεν θα εγκατασταθεί κανένα" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -271,15 +284,11 @@ msgstr "" "{pkgname} παρέχετε από {number} πακέτα.\n" "Παρακαλώ επιλέξτε ποιο(α) θέλετε να εγκατασταθούν:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Δεν έχει επιλεγεί κανένα πακέτο" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Δεν υπάρχει τίποτε να γίνει" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Ο Pamac είναι ήδη ενεργός" @@ -313,7 +322,7 @@ msgstr "Διαχειριστής πακέτων" msgid "Search" msgstr "Αναζήτηση" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Κατάσταση" @@ -321,30 +330,33 @@ msgstr "Κατάσταση" msgid "Repos" msgstr "Αποθετήρια" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Όνομα" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Μέγεθος" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Πληροφορίες" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Εξαρτήσεις" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Λεπτομέρειες" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Αρχεία" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Διαχειριστής αναβαθμίσεων" + +#~ msgid "No package is selected" +#~ msgstr "Δεν έχει επιλεγεί κανένα πακέτο" diff --git a/po/es.po b/po/es.po index 3f37998..72b5c8e 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-04-08 09:57+0100\n" "Last-Translator: Daniel Pérez Galán \n" "Language-Team: Español\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.5.5\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Preparando" @@ -70,11 +70,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Descargando {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Actualizando" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autenticación fallida" @@ -107,147 +107,160 @@ msgstr "Ejecutar pamac-manager" msgid "Quit" msgstr "Quitar" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Instalado" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "No instalado" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Huérfanos" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "A instalar" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "A desinstalar" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "local" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "No se ha encontrado ningún paquete" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Licencias" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Depende de" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Dependencias opcionales" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Requerido por" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Proporciona" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Reemplaza" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Conflictos con" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Repositorios" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Grupos" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Tamaño comprimido" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Tamaño descargado" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Tamaño instalado" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Empaquetador" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Fecha de instalación" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Explícitamente instalado" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Instalado como dependencia de otro paquete" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Desconocido" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Razón de instalación" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Firmas" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Archivos de copia de seguridad" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Resumen de la operación" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Tamaño total de la descarga: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "A actualizar" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Tamaño total de la descarga: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Tu sistema está actualizado" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 actualización disponible" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} actualizaciones disponibles" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} será reemplazado por {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} está en coflicto con {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -255,7 +268,7 @@ msgstr "" "{pkgname1} está en conflicto con {pkgname2} pero no se puede desinstalar ya " "que es requerido por {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -263,7 +276,7 @@ msgstr "" "{pkgname1} está en conflicto con {pkgname2}\n" "Ninguno de ellos será instalado" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -271,15 +284,11 @@ msgstr "" "{pkgname} es proporcionado por {number} paquetes.\n" "Por favor elige el(los) paquete(s) que deseas instalar:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "No se ha seleccionado ningún paquete" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Nada que hacer" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac ya está siendo ejecutado" @@ -313,7 +322,7 @@ msgstr "Gestor de Paquetes" msgid "Search" msgstr "Búsqueda" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Estado" @@ -321,30 +330,33 @@ msgstr "Estado" msgid "Repos" msgstr "Repositorios" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Nombre" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Tamaño" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Infos" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Dependencias" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Detalles" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Archivos" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Gestor de Actualizaciones" + +#~ msgid "No package is selected" +#~ msgstr "No se ha seleccionado ningún paquete" diff --git a/po/fr.po b/po/fr.po index 2c3a4b7..1d1a1f1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-03-30 15:18+0100\n" "Last-Translator: \n" "Language-Team: French\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Préparation" @@ -69,11 +69,11 @@ msgstr "Vérification des clés dans le trousseau" msgid "Downloading {size}" msgstr "Téléchargement de {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Actualisation" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "L'authentification a échoué" @@ -106,147 +106,160 @@ msgstr "Exécuter pamac-manager" msgid "Quit" msgstr "Quitter" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Installé" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Non installé" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Orphelins" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "À installer" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "À désinstaller" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "locaux" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Aucun paquet trouvé" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Licences" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Dépend de" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Dépendances opt." -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Requis par" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Fournit" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Remplace" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Est conflit avec" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Dépôt" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Groupes" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Taille compressée" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Taille du téléchargement" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Taille après installation" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Paqueteur" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Installé le" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Explicitement installé" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Installé comme dépendance d'un autre paquet" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Inconnu" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Motif d'installation" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Signatures" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Fichiers sauvegardés" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Résumé de la transaction" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Taille totale du téléchargement: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "À mettre à jour" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Taille totale du téléchargement: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Votre système est à jour" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 mise à jour disponible" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} mises à jour disponibles" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} sera remplacé par {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} est en conflit avec {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -254,7 +267,7 @@ msgstr "" "{pkgname1} est en conflit avec {pkgname2} mais ne peut pas être désinstallé " "car il est requis par {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -262,7 +275,7 @@ msgstr "" "{pkgname1} est en conflit avec {pkgname2}\n" "Aucun d'entre eux ne sera installé" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -270,15 +283,11 @@ msgstr "" "{pkgname} est fourni par {number} paquets.\n" "Veuillez choisir celui ou ceux que vous voulez installer:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Aucun paquet n'est sélectionné" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Rien à faire" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac est déjà en cours d'exécution" @@ -312,7 +321,7 @@ msgstr "Gestionnaire de paquets" msgid "Search" msgstr "Rechercher" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "État" @@ -320,30 +329,33 @@ msgstr "État" msgid "Repos" msgstr "Dépôts" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Nom" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Taille" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Infos" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Dépendances" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Détails" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Fichiers" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Gestionnaire de mises à jour" + +#~ msgid "No package is selected" +#~ msgstr "Aucun paquet n'est sélectionné" diff --git a/po/it.po b/po/it.po index c5953e5..2d80fcf 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-04-07 18:06+0100\n" "Last-Translator: bernardo miguel savone \n" "Language-Team: Italian\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.5.5\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Preparazione" @@ -70,11 +70,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Scaricando {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Aggiornamento" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autenticazione non riuscita" @@ -107,147 +107,160 @@ msgstr "Esegui pamac-manager" msgid "Quit" msgstr "Esci" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Installati" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Non installati" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Orfani" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Da installare" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Da rimuovere" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "locali" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Nessun pacchetto trovato" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Licenze" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Dipende di" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Dipend. opzionali" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Richiesto da" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Fornisce" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Sostituisce" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "In conflitto con" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Repository" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Gruppi" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Dimensione compresso" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Dimensione scaricato" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Dimensione installato" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Packager" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Data installazione" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Esplicitamente installato" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Installato come dipendenza di un altro pacchetto" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Sconosciuto" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Motivo della installazione" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Firme" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "File salvati" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Riassunto della transazione" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "dimensione totale dello scaricamento: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Da aggiornare" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "dimensione totale dello scaricamento: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Il vostro sistema è aggiornato" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 aggiornamento disponibile" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} aggiornamenti disponibili" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} verrà sostituito da {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} è in conflitto con {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -255,7 +268,7 @@ msgstr "" "{pkgname1} è in conflitto con {pkgname2} ma non può essere rimosso perché " "richiesto da {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -263,7 +276,7 @@ msgstr "" "{pkgname1} è in conflitto con {pkgname2}\n" "Nessuno di essi verrà installato" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -271,15 +284,11 @@ msgstr "" "{pkgname} è fornito da {number} pacchetti.\n" "Scegliere quello (i) che si desidera installare:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Nessun pacchetto selezionato" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Niente da fare" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac è già in esecuzione" @@ -313,7 +322,7 @@ msgstr "Gestore dei pacchetti" msgid "Search" msgstr "Cerca" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Stato" @@ -321,30 +330,33 @@ msgstr "Stato" msgid "Repos" msgstr "Repos" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Nome" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Dimensione" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Info" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Dipendenze" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Dettagli" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Files" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Gestore degli aggiornamenti" + +#~ msgid "No package is selected" +#~ msgstr "Nessun pacchetto selezionato" diff --git a/po/nb.po b/po/nb.po index a8a6d51..1d9281a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-03-30 15:18+0100\n" "Last-Translator: \n" "Language-Team: Norway\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Forbereder" @@ -69,11 +69,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Laster ned {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Oppfrisker" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autentifisering feilet" @@ -106,147 +106,160 @@ msgstr "Start pamac-manager" msgid "Quit" msgstr "Avslutt" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Installert" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Avinstallert" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Foreldreløs" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Å installere" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Å fjerne" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "lokal" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Ingen pakke funnet" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Lisenser" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Avhenger av" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Valgfrie avhengigheter" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Krevd av" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Tilbyr" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Erstatter" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "I konflikt med" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Arkiv" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Grupper" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Komprimert Størrelse" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Nedlastet Størrelse" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Installert Størrelse" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Pakker" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Installasjons Dato" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Explisitt installert" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Installert som en avhengighet for en annen pakke" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Ukjent" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Grunn til Installasjon" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Signaturer" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Sikkerhetskopier filene" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Transaksjons Resyme" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Total nedlastings størrelse: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Å oppdatere" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Total nedlastings størrelse: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Systemet ditt er oppdatert" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 tilgjengelig oppdatering" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} tilgjengelige oppdateringer" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} vil bli erstattet av {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} i konflikt med {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -254,7 +267,7 @@ msgstr "" "{pkgname1} i konflikt med {pkgname2} men kan ikke bli fjernet fordi det " "trengs av {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -262,7 +275,7 @@ msgstr "" "{pkgname1} i konflikt med {pkgname2}\n" "Ingen av dem vil bli installert" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -270,15 +283,11 @@ msgstr "" "{pkgname} er tilbydd av {number} pakker.\n" "Vennligst velg de(n) du ønsker å installere:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Ingen pakke er valgt" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Ingenting å gjøre" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac kjører allerede" @@ -312,7 +321,7 @@ msgstr "Pakke Behandler" msgid "Search" msgstr "Søk" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Tilstand" @@ -320,30 +329,33 @@ msgstr "Tilstand" msgid "Repos" msgstr "Depoer" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Navn" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Størrelse" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Informasjon" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Avhengigheter" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Detaljer" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Filer" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Oppdaterings Behandler" + +#~ msgid "No package is selected" +#~ msgstr "Ingen pakke er valgt" diff --git a/po/pl.po b/po/pl.po index 9fd757e..e35b929 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-03-30 15:18+0100\n" "Last-Translator: Kuba Kaczmarzyk (poker98face) \n" "Language-Team: Poland\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Przygotowanie" @@ -69,11 +69,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Pobieranie {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Odświeżanie" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autoryzacja nie powiodła się " @@ -106,147 +106,160 @@ msgstr "Uruchom pamac-manager" msgid "Quit" msgstr "Wyjdź" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Zainstalowany" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Nie zainstalowany" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Osierocone" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Do zainstalowania" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Do usunięcia" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "lokalne" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Nie znaleziono pakietu" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Licenje" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Zależy od" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Opcjonalne zależności" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Wymagany przez" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Dostarcza" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Zamienia" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Konfliktuje z" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Repozytorium" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Grupy" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Skompresowany rozmiar" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Rozmiar pobranego" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Rozmiar zainstalowanego" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Pakowacz" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Data instalacji" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Zainstalowanych bezpośrednio" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Instalowany jako zależność innego pakietu" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Nieznany" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Motyw instalacji" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Podpis" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Backup plików" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Podsumowanie transakcji" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Całkowity rozmiar pobierania: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Do aktualizacji" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Całkowity rozmiar pobierania: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Twój system jest w pełni zaktualizowany" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 aktualizacja dostępna" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} aktualizacji dostępnych" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} zostanie zastąpiony przez {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} konfliktuje z {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -254,7 +267,7 @@ msgstr "" "{pkgname1} konfliktuje z {pkgname2} ale nie może zostać usunięty gdyż jest " "wymagany przez {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -262,7 +275,7 @@ msgstr "" "{pkgname1} konfliktuje z {pkgname2}\n" "Żaden nie zostanie zainstalowany" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -270,15 +283,11 @@ msgstr "" "{pkgname} jest dostarczany przez {number} pakietów.\n" "Wybierz które chcesz zainstalować:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Żaden pakiet nie jest wybrany" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Nic do zrobienia" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac jest już uruchomiony" @@ -312,7 +321,7 @@ msgstr "Menedżer pakietów" msgid "Search" msgstr "Wyszukaj" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Stan" @@ -320,30 +329,33 @@ msgstr "Stan" msgid "Repos" msgstr "Repozytoria" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Nazwa" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Rozmiar" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Informacje" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Zależności" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Szczegóły" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Pliki" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Menedżer aktualizacji" + +#~ msgid "No package is selected" +#~ msgstr "Żaden pakiet nie jest wybrany" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5747cf3..1b233ab 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-04-02 17:10+0100\n" "Last-Translator: Holmes , matt \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Preparando" @@ -70,11 +70,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Baixando {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Atualizando" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autenticação falhou" @@ -107,147 +107,160 @@ msgstr "Excecutar pamac-manager" msgid "Quit" msgstr "Sair" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Instalado" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Não instalado" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Orfãos" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Para instalar" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Para remover" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "local" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Pacote não encontrado" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Licenças" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Depende de" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Dependências opicionais" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Exigido pelo" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Fornece" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Substitui" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Conflita com" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Repositório" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Grupos" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Tamanho comprimido" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Tamanho baixado" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Tamanho instalado" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Empacotador" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Data de instalação" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Explicitamente instalado" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Instalado como dependência para outro pacote" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Desconhecido" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Motivo da instalação" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Assinaturas" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Cópia de segurança dos arquivos" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Resumo da transação" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Tamanho total para baixar: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Para atualizar" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Tamanho total para baixar: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "O seu sistema está atualizado" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 atualização disponível" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} atualizações disponíveis" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} será substituído por {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} está em conflito com {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -255,7 +268,7 @@ msgstr "" "{pkgname1} está em conflito com {pkgname2} mas não pode ser removido porque " "é requisitado por {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -263,7 +276,7 @@ msgstr "" "{pkgname1} está em conflito com {pkgname2}\n" "Nenhum deles será instalado" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -271,15 +284,11 @@ msgstr "" "{pkgname} é fornecido por {number} pacotes.\n" "Por favor escolha um desse (s) pacote(s) para você instalar:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Nenhum pacote selecionado" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Nada para fazer" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac ja está sendo executado" @@ -313,7 +322,7 @@ msgstr "Gerenciador de pacotes" msgid "Search" msgstr "Procurar" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Estado" @@ -321,30 +330,33 @@ msgstr "Estado" msgid "Repos" msgstr "Repositórios" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Nome" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Tamanho" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Informações" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Dependências" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Detalhes" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Arquivos" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Gerenciador de atualizações" + +#~ msgid "No package is selected" +#~ msgstr "Nenhum pacote selecionado" diff --git a/po/ro.po b/po/ro.po index de51331..2043733 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-03-30 15:18+0100\n" "Last-Translator: \n" "Language-Team: Romanian\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Se prepară" @@ -69,11 +69,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Se descarcă {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Se reîmprospătează" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Autentificarea a eșuat" @@ -106,147 +106,160 @@ msgstr "Rulează pamac-manager" msgid "Quit" msgstr "Ieși" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Instalate" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Neinstalate" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Orfani" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "De instalat" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "De dezinstalat" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "locale" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Niciun pachet găsit" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Licențe" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Depinde de" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Dependențe opționale" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "Necesar pentru" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Furnizează" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Înlocuiește" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Este în conflict cu" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Depozit" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Grupe" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Mărime comprimată" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "Mărimea descărcării" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Mărimea instalată" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Împachetator" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Instalat la" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Instalat explicit" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Instalat ca dependență a unui alt pachet" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Necunoscut" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Motivul instalării" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "Semnături" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Copii de rezervă" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "Sumarul tranzacției" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Mărimea totală a descărcării: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "De actualizat" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Mărimea totală a descărcării: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Sistemul vostru este la zi" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "O actualizare disponibilă" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} actualizări disponivile" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} va fi înlocuit de {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1} este în conflict cu {pkgname2}" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -254,7 +267,7 @@ msgstr "" "{pkgname1} este în conflict cu {pkgname2} dar nu poate fi dezinstalatpentru " "că este necesar pentru {pkgname3}" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -262,7 +275,7 @@ msgstr "" "{pkgname1} este în conflict cu {pkgname2}\n" "Niciunul nu va fi instalat" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -270,15 +283,11 @@ msgstr "" "{pkgname} este furnizate de {number} pachete.\n" "Alegeți cel/cele pe care îl/le vreți instalat(e)" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Niciun pachet selectat" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Nimic de făcut" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac rulează deja" @@ -312,7 +321,7 @@ msgstr "Gestionar de pachete" msgid "Search" msgstr "Caută" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Stare" @@ -320,30 +329,33 @@ msgstr "Stare" msgid "Repos" msgstr "Dépôts" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "Nume" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Mărime" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Informații" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Dependențe" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Detailii" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Fișiere" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Gestionar de actualizări" + +#~ msgid "No package is selected" +#~ msgstr "Niciun pachet selectat" diff --git a/po/tr.po b/po/tr.po index 54fa19a..01e486b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pamac\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-10 16:13+0200\n" +"POT-Creation-Date: 2013-04-17 14:32+0200\n" "PO-Revision-Date: 2013-03-30 15:18+0100\n" "Last-Translator: YFDogan \n" "Language-Team: Turkish\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: pamac-daemon.py:29 pamac/main.py:602 +#: pamac-daemon.py:29 pamac/main.py:483 msgid "Preparing" msgstr "Hazırlanıyor" @@ -69,11 +69,11 @@ msgstr "" msgid "Downloading {size}" msgstr "Indiriliyor {size}" -#: pamac-daemon.py:170 pamac/main.py:512 +#: pamac-daemon.py:170 pamac/main.py:411 pamac/main.py:995 msgid "Refreshing" msgstr "Yenileniyor" -#: pamac-daemon.py:289 pamac-daemon.py:397 pamac-daemon.py:405 +#: pamac-daemon.py:290 pamac-daemon.py:397 pamac-daemon.py:405 #: pamac-daemon.py:427 msgid "Authentication failed" msgstr "Doğrulama Hatası" @@ -106,147 +106,160 @@ msgstr "Pamac-Manager Çalıştırr" msgid "Quit" msgstr "Çıkış" -#: pamac/main.py:112 pamac/main.py:947 +#: pamac/main.py:108 pamac/main.py:936 msgid "Installed" msgstr "Kuruldu" -#: pamac/main.py:112 pamac/main.py:949 +#: pamac/main.py:108 pamac/main.py:938 msgid "Uninstalled" msgstr "Kurulmaya hazır" -#: pamac/main.py:112 pamac/main.py:951 +#: pamac/main.py:108 pamac/main.py:940 msgid "Orphans" msgstr "Sahipsizler" -#: pamac/main.py:112 pamac/main.py:430 pamac/main.py:953 +#: pamac/main.py:108 pamac/main.py:338 pamac/main.py:942 msgid "To install" msgstr "Kurulacak" -#: pamac/main.py:112 pamac/main.py:410 pamac/main.py:955 +#: pamac/main.py:108 pamac/main.py:350 pamac/main.py:944 msgid "To remove" msgstr "Kaldırılacak" -#: pamac/main.py:131 pamac/main.py:963 +#: pamac/main.py:127 pamac/main.py:952 msgid "local" msgstr "Yerel" -#: pamac/main.py:297 +#: pamac/main.py:215 pamac/main.py:905 msgid "No package found" msgstr "Paket Bulunamadı" -#: pamac/main.py:348 +#: pamac/main.py:266 msgid "Licenses" msgstr "Lisanslar" -#: pamac/main.py:353 +#: pamac/main.py:271 msgid "Depends On" msgstr "Bağımlı" -#: pamac/main.py:355 +#: pamac/main.py:273 msgid "Optional Deps" msgstr "Seçimli Bağımlılıklar" -#: pamac/main.py:358 +#: pamac/main.py:276 msgid "Required By" msgstr "İhtiyac Duyulan" -#: pamac/main.py:360 +#: pamac/main.py:278 msgid "Provides" msgstr "Sağladıkları" -#: pamac/main.py:362 +#: pamac/main.py:280 msgid "Replaces" msgstr "Değistirdigi Paket(ler)" -#: pamac/main.py:364 +#: pamac/main.py:282 msgid "Conflicts With" msgstr "Cakıştığı Paketler" -#: pamac/main.py:369 +#: pamac/main.py:287 msgid "Repository" msgstr "Depo" -#: pamac/main.py:371 gui/manager.glade:539 +#: pamac/main.py:289 gui/manager.glade:539 msgid "Groups" msgstr "Gruplar" -#: pamac/main.py:373 +#: pamac/main.py:291 msgid "Compressed Size" msgstr "Sıkıştırma Boyutu" -#: pamac/main.py:374 +#: pamac/main.py:292 msgid "Download Size" msgstr "İndirme Boyutu" -#: pamac/main.py:376 +#: pamac/main.py:294 msgid "Installed Size" msgstr "Kurulmuş Boyut" -#: pamac/main.py:377 +#: pamac/main.py:295 msgid "Packager" msgstr "Paketçi" -#: pamac/main.py:381 +#: pamac/main.py:296 +msgid "Architecture" +msgstr "" + +#: pamac/main.py:299 msgid "Install Date" msgstr "Kurulum Tarihi" -#: pamac/main.py:383 +#: pamac/main.py:301 msgid "Explicitly installed" msgstr "Doğrudan Yuklenmiş" -#: pamac/main.py:385 +#: pamac/main.py:303 msgid "Installed as a dependency for another package" msgstr "Başka Bir Paketin Bağımlılığı Olarak Yüklenmiş" -#: pamac/main.py:387 +#: pamac/main.py:305 msgid "Unknown" msgstr "Bilinmiyor" -#: pamac/main.py:388 +#: pamac/main.py:306 msgid "Install Reason" msgstr "Kurulum Nedeni" -#: pamac/main.py:393 +#: pamac/main.py:311 msgid "Signatures" msgstr "İmzalar" -#: pamac/main.py:397 +#: pamac/main.py:315 msgid "Backup files" msgstr "Yedek Dosyalar" -#: pamac/main.py:407 +#: pamac/main.py:325 msgid "Transaction Summary" msgstr "İşlem Özeti" -#: pamac/main.py:421 pamac/main.py:536 -msgid "Total download size: " -msgstr "Toplam İndirme Boyutu: " - -#: pamac/main.py:437 +#: pamac/main.py:329 msgid "To update" msgstr "Yükseltilecek" -#: pamac/main.py:528 pamac/main.py:1072 +#: pamac/main.py:347 pamac/main.py:435 +msgid "Total download size: " +msgstr "Toplam İndirme Boyutu: " + +#: pamac/main.py:427 pamac/main.py:1037 msgid "Your system is up-to-date" msgstr "Sisteminiz Güncel" -#: pamac/main.py:538 +#: pamac/main.py:437 msgid "1 available update" msgstr "1 Güncelleme Var" -#: pamac/main.py:540 +#: pamac/main.py:439 msgid "{number} available updates" msgstr "{number} Güncelleme Var" -#: pamac/main.py:699 pamac/main.py:785 +#: pamac/main.py:520 pamac/main.py:521 +msgid "" +"The transaction cannot be performed because it needs to remove {pkgname1} " +"which is in HoldPkg" +msgstr "" + +#: pamac/main.py:552 pamac/main.py:553 pamac/main.py:655 pamac/main.py:656 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "{pkgname1} İle Değiştirilecek {pkgname2}" -#: pamac/main.py:710 pamac/main.py:729 pamac/main.py:752 pamac/main.py:771 +#: pamac/main.py:670 pamac/main.py:671 pamac/main.py:694 pamac/main.py:695 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:745 pamac/main.py:746 +#: pamac/main.py:769 pamac/main.py:770 pamac/main.py:789 pamac/main.py:790 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "{pkgname1}, {pkgname2} İle Çakışıyor" -#: pamac/main.py:724 pamac/main.py:766 +#: pamac/main.py:688 pamac/main.py:689 pamac/main.py:708 pamac/main.py:709 +#: pamac/main.py:763 pamac/main.py:764 pamac/main.py:783 pamac/main.py:784 msgid "" "{pkgname1} conflicts with {pkgname2} but cannot be removed because it is " "needed by {pkgname3}" @@ -254,7 +267,7 @@ msgstr "" "{pkgname1} İle {pkgname2} Çakışıyor Ama {pkgname3} İçin Gerekli Olduğundan " "Kaldırılamıyor" -#: pamac/main.py:739 +#: pamac/main.py:726 pamac/main.py:727 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" @@ -262,7 +275,7 @@ msgstr "" "{pkgname1} İle {pkgname2} Çakışıyor\n" "Hiç Bir Paket Yüklenmeyecek" -#: pamac/main.py:806 +#: pamac/main.py:822 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" @@ -270,15 +283,11 @@ msgstr "" "{pkgname} Paketi İçin {number} Sağlayıcı Var.\n" "Lütfen Yüklemek İçin Seçiminizi Girin:" -#: pamac/main.py:832 -msgid "No package is selected" -msgstr "Hiç Bir Paket Seçilmedi" - -#: pamac/main.py:873 +#: pamac/main.py:867 msgid "Nothing to do" msgstr "Yapılacak Bir Şey Yok" -#: pamac/main.py:1056 +#: pamac/main.py:1021 msgid "Pamac is already running" msgstr "Pamac Zaten Çalışıyor" @@ -312,7 +321,7 @@ msgstr "Paket Yöneticisi" msgid "Search" msgstr "Ara" -#: gui/manager.glade:587 gui/manager.glade:680 +#: gui/manager.glade:587 gui/manager.glade:682 msgid "State" msgstr "Konum" @@ -320,30 +329,33 @@ msgstr "Konum" msgid "Repos" msgstr "Depolar" -#: gui/manager.glade:710 +#: gui/manager.glade:713 msgid "Name" msgstr "İsim" -#: gui/manager.glade:728 +#: gui/manager.glade:732 msgid "Size" msgstr "Boyut" -#: gui/manager.glade:829 +#: gui/manager.glade:833 msgid "Infos" msgstr "Bilgi" -#: gui/manager.glade:889 +#: gui/manager.glade:893 msgid "Deps" msgstr "Bağımlılıklar" -#: gui/manager.glade:954 +#: gui/manager.glade:958 msgid "Details" msgstr "Ayrıntılar" -#: gui/manager.glade:1002 +#: gui/manager.glade:1006 msgid "Files" msgstr "Dosyalar" #: gui/updater.glade:6 msgid "Update Manager" msgstr "Güncelleme Yöneticisi" + +#~ msgid "No package is selected" +#~ msgstr "Hiç Bir Paket Seçilmedi" diff --git a/setup.py b/setup.py index 9e6f6e2..67c08d0 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='Pamac', - version='0.6', + version='0.7', description='A gtk3 frontend for pyalpm', license='GPL', author='Guillaume Benoit',