diff --git a/.gitignore b/.gitignore
index fd90595..ad74e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
__pycache__
-.goutputstream*
test*
build
diff --git a/data/applications/pamac-tray.desktop b/data/applications/pamac-tray.desktop
new file mode 100644
index 0000000..c530f74
--- /dev/null
+++ b/data/applications/pamac-tray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Update Notifier
+Icon=update-notifier
+Exec=pamac-tray
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;System;
+NotShowIn=GNOME;XFCE;LXDE;KDE;
+StartupNotify=true
diff --git a/data/dbus/org.manjaro.pamac.conf b/data/dbus/org.manjaro.pamac.conf
new file mode 100644
index 0000000..2d727f7
--- /dev/null
+++ b/data/dbus/org.manjaro.pamac.conf
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/dbus/org.manjaro.pamac.service b/data/dbus/org.manjaro.pamac.service
new file mode 100644
index 0000000..1d8b045
--- /dev/null
+++ b/data/dbus/org.manjaro.pamac.service
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.manjaro.pamac
+Exec=/usr/bin/pamac-daemon
+User=root
+SystemdService=pamac.service
diff --git a/data/icons/16x16/status/aptdaemon-working.png b/data/icons/16x16/status/aptdaemon-working.png
new file mode 100644
index 0000000..086ff31
Binary files /dev/null and b/data/icons/16x16/status/aptdaemon-working.png differ
diff --git a/data/icons/16x16/status/package-add.png b/data/icons/16x16/status/package-add.png
new file mode 100644
index 0000000..a555b25
Binary files /dev/null and b/data/icons/16x16/status/package-add.png differ
diff --git a/data/icons/16x16/status/package-cleanup.png b/data/icons/16x16/status/package-cleanup.png
new file mode 100644
index 0000000..cb7ae09
Binary files /dev/null and b/data/icons/16x16/status/package-cleanup.png differ
diff --git a/data/icons/16x16/status/package-delete.png b/data/icons/16x16/status/package-delete.png
new file mode 100644
index 0000000..5e99438
Binary files /dev/null and b/data/icons/16x16/status/package-delete.png differ
diff --git a/data/icons/16x16/status/package-donwload.png b/data/icons/16x16/status/package-donwload.png
new file mode 100644
index 0000000..f88f63d
Binary files /dev/null and b/data/icons/16x16/status/package-donwload.png differ
diff --git a/data/icons/16x16/status/package-search.png b/data/icons/16x16/status/package-search.png
new file mode 100644
index 0000000..097daad
Binary files /dev/null and b/data/icons/16x16/status/package-search.png differ
diff --git a/data/icons/16x16/status/package-update.png b/data/icons/16x16/status/package-update.png
new file mode 100644
index 0000000..2f07dba
Binary files /dev/null and b/data/icons/16x16/status/package-update.png differ
diff --git a/data/icons/16x16/status/package-wait.png b/data/icons/16x16/status/package-wait.png
new file mode 100644
index 0000000..3489718
Binary files /dev/null and b/data/icons/16x16/status/package-wait.png differ
diff --git a/data/icons/16x16/status/refresh-cache.png b/data/icons/16x16/status/refresh-cache.png
new file mode 100644
index 0000000..6e60043
Binary files /dev/null and b/data/icons/16x16/status/refresh-cache.png differ
diff --git a/data/polkit/org.manjaro.pamac.policy b/data/polkit/org.manjaro.pamac.policy
index 781081d..e753b1d 100644
--- a/data/polkit/org.manjaro.pamac.policy
+++ b/data/polkit/org.manjaro.pamac.policy
@@ -6,46 +6,12 @@
Manjaro
http://manjaro.org/
package-x-generic
-
+
Authentication is required
no
no
auth_admin_keep
- /usr/bin/python3
- /usr/bin/pamac-manager
- true
-
-
- Authentication is required
-
- no
- no
- auth_admin_keep
-
- /usr/bin/python3
- /usr/bin/pamac-updater
- true
-
-
- Authentication is required
-
- no
- no
- auth_admin_keep
-
- /usr/bin/python3
- /usr/bin/pamac-install
- true
-
-
-
- no
- no
- yes
-
- /usr/bin/python3
- /usr/bin/pamac-refresh
diff --git a/data/systemd/pamac.service b/data/systemd/pamac.service
new file mode 100644
index 0000000..536e633
--- /dev/null
+++ b/data/systemd/pamac.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Pamac
+
+[Service]
+Type=dbus
+BusName=org.manjaro.pamac
+ExecStart=/usr/bin/pamac-daemon
diff --git a/files_to_translate b/files_to_translate
index de5ab10..384c1fa 100644
--- a/files_to_translate
+++ b/files_to_translate
@@ -1,9 +1,10 @@
+./pamac-daemon.py
./pamac-manager.py
./pamac-updater.py
./pamac-tray.py
./pamac-install.py
-./pamac/common.py
./pamac/transaction.py
+./pamac/common.py
./gui/manager.ui
./gui/updater.ui
./gui/dialogs.ui
diff --git a/gui/dialogs.ui b/gui/dialogs.ui
index ad6d03c..b9be37d 100644
--- a/gui/dialogs.ui
+++ b/gui/dialogs.ui
@@ -1,4 +1,5 @@
+
diff --git a/pamac-daemon.py b/pamac-daemon.py
new file mode 100755
index 0000000..bdfbe6c
--- /dev/null
+++ b/pamac-daemon.py
@@ -0,0 +1,689 @@
+#! /usr/bin/python3
+# -*- coding:utf-8 -*-
+
+import dbus
+import dbus.service
+from dbus.mainloop.glib import DBusGMainLoop
+from gi.repository import GObject
+import re
+
+import pyalpm
+from multiprocessing import Process
+from pamac import config, common
+
+# i18n
+import gettext
+gettext.bindtextdomain('pamac', '/usr/share/locale')
+gettext.textdomain('pamac')
+_ = gettext.gettext
+
+def pkg_in_list(pkg, pkgs_list):
+ result = False
+ if pkgs_list:
+ for _pkg in pkgs_list:
+ if (pkg.name == _pkg.name and pkg.version == _pkg.version and pkg.arch == _pkg.arch):
+ result = True
+ return result
+
+class PamacDBusService(dbus.service.Object):
+ def __init__(self):
+ bus=dbus.SystemBus()
+ bus_name = dbus.service.BusName('org.manjaro.pamac', bus)
+ dbus.service.Object.__init__(self, bus_name, '/org/manjaro/pamac')
+ self.t = None
+ self.task = None
+ self.error = ''
+ self.warning = ''
+ self.providers = []
+ self.previous_action = ''
+ self.previous_action_long = ''
+ self.previous_icon = ''
+ self.previous_target = ''
+ self.previous_percent = 0
+ self.total_size = 0
+ self.already_transferred = 0
+ self.handle = config.handle()
+
+ def get_handle(self):
+ print('daemon get handle')
+ self.handle = config.handle()
+ self.handle.dlcb = self.cb_dl
+ self.handle.totaldlcb = self.totaldlcb
+ self.handle.eventcb = self.cb_event
+ self.handle.questioncb = self.cb_question
+ self.handle.progresscb = self.cb_progress
+ self.handle.logcb = self.cb_log
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitAction(self, action):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitActionLong(self, action):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitNeedDetails(self, need):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitIcon(self, icon):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitTarget(self, target):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitPercent(self, percent):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitLogError(self, message):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitLogWarning(self, message):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitAvailableUpdates(self, updates_nb):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitDownloadStart(self, message):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitTransactionStart(self, message):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitTransactionDone(self, message):
+ pass
+
+ @dbus.service.signal('org.manjaro.pamac')
+ def EmitTransactionError(self, message):
+ pass
+
+ def cb_event(self, event, tupel):
+ action = self.previous_action
+ action_long = self.previous_action_long
+ icon = self.previous_icon
+ if event == 'ALPM_EVENT_CHECKDEPS_START':
+ action = _('Checking dependencies')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ elif event == 'ALPM_EVENT_CHECKDEPS_DONE':
+ if self.warning:
+ self.EmitLogWarning(self.warning)
+ self.warning = ''
+ elif event == 'ALPM_EVENT_FILECONFLICTS_START':
+ action = _('Checking file conflicts')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ elif event == 'ALPM_EVENT_FILECONFLICTS_DONE':
+ pass
+ elif event == 'ALPM_EVENT_RESOLVEDEPS_START':
+ action = _('Resolving dependencies')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
+ elif event == 'ALPM_EVENT_RESOLVEDEPS_DONE':
+ if self.warning:
+ self.EmitLogWarning(self.warning)
+ self.warning = ''
+ elif event == 'ALPM_EVENT_INTERCONFLICTS_START':
+ action = _('Checking inter conflicts')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ elif event == 'ALPM_EVENT_INTERCONFLICTS_DONE':
+ if self.warning:
+ self.EmitLogWarning(self.warning)
+ self.warning = ''
+ elif event == 'ALPM_EVENT_ADD_START':
+ string = _('Installing {pkgname}').format(pkgname = tupel[0].name)
+ action = string+'...'
+ action_long = '{} ({})\n'.format(string, tupel[0].version)
+ icon = '/usr/share/pamac/icons/24x24/status/package-add.png'
+ elif event == 'ALPM_EVENT_ADD_DONE':
+ formatted_event = 'Installed {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version)
+ common.write_log_file(formatted_event)
+ elif event == 'ALPM_EVENT_REMOVE_START':
+ string = _('Removing {pkgname}').format(pkgname = tupel[0].name)
+ action = string+'...'
+ action_long = '{} ({})\n'.format(string, tupel[0].version)
+ icon = '/usr/share/pamac/icons/24x24/status/package-delete.png'
+ elif event == 'ALPM_EVENT_REMOVE_DONE':
+ formatted_event = 'Removed {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version)
+ common.write_log_file(formatted_event)
+ elif event == 'ALPM_EVENT_UPGRADE_START':
+ string = _('Upgrading {pkgname}').format(pkgname = tupel[1].name)
+ action = string+'...'
+ action_long = '{} ({} -> {})\n'.format(string, tupel[1].version, tupel[0].version)
+ icon = '/usr/share/pamac/icons/24x24/status/package-update.png'
+ elif event == 'ALPM_EVENT_UPGRADE_DONE':
+ formatted_event = 'Upgraded {pkgname} ({oldversion} -> {newversion})'.format(pkgname = tupel[1].name, oldversion = tupel[1].version, newversion = tupel[0].version)
+ common.write_log_file(formatted_event)
+ elif event == 'ALPM_EVENT_DOWNGRADE_START':
+ string = _('Downgrading {pkgname}').format(pkgname = tupel[1].name)
+ action = string+'...'
+ action_long = '{} ({} -> {})'.format(string, tupel[1].version, tupel[0].version)
+ icon = '/usr/share/pamac/icons/24x24/status/package-add.png'
+ elif event == 'ALPM_EVENT_DOWNGRADE_DONE':
+ formatted_event = 'Downgraded {pkgname} ({oldversion} -> {newversion})'.format(pkgname = tupel[1].name, oldversion = tupel[1].version, newversion = tupel[0].version)
+ common.write_log_file(formatted_event)
+ elif event == 'ALPM_EVENT_REINSTALL_START':
+ string = _('Reinstalling {pkgname}').format(pkgname = tupel[0].name)
+ action = string+'...'
+ action_long = '{} ({})'.format(string, tupel[0].version)
+ icon = '/usr/share/pamac/icons/24x24/status/package-add.png'
+ elif event == 'ALPM_EVENT_REINSTALL_DONE':
+ formatted_event = 'Reinstalled {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version)
+ common.write_log_file(formatted_event)
+ elif event == 'ALPM_EVENT_INTEGRITY_START':
+ action = _('Checking integrity')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ self.already_transferred = 0
+ elif event == 'ALPM_EVENT_INTEGRITY_DONE':
+ pass
+ elif event == 'ALPM_EVENT_LOAD_START':
+ action = _('Loading packages files')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ elif event == 'ALPM_EVENT_LOAD_DONE':
+ pass
+ elif event == 'ALPM_EVENT_DELTA_INTEGRITY_START':
+ action = _('Checking delta integrity')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ elif event == 'ALPM_EVENT_DELTA_INTEGRITY_DONE':
+ pass
+ elif event == 'ALPM_EVENT_DELTA_PATCHES_START':
+ action = _('Applying deltas')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
+ elif event == 'ALPM_EVENT_DELTA_PATCHES_DONE':
+ pass
+ elif event == 'ALPM_EVENT_DELTA_PATCH_START':
+ action = _('Generating {} with {}').format(tupel[0], tupel[1])+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
+ elif event == 'ALPM_EVENT_DELTA_PATCH_DONE':
+ action = _('Generation succeeded!')
+ action_long = action+'\n'
+ elif event == 'ALPM_EVENT_DELTA_PATCH_FAILED':
+ action = _('Generation failed.')
+ action_long = action+'\n'
+ elif event == 'ALPM_EVENT_SCRIPTLET_INFO':
+ action =_('Configuring {pkgname}').format(pkgname = self.previous_target)+'...'
+ action_long = tupel[0]
+ icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
+ self.EmitNeedDetails(True)
+ elif event == 'ALPM_EVENT_RETRIEVE_START':
+ # handled by download callback
+ self.EmitDownloadStart('')
+ elif event == 'ALPM_EVENT_DISKSPACE_START':
+ action = _('Checking available disk space')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ elif event == 'ALPM_EVENT_OPTDEP_REQUIRED':
+ print('Optionnal deps exist')
+ elif event == 'ALPM_EVENT_DATABASE_MISSING':
+ #action =_('Database file for {} does not exist').format(tupel[0])+'...'
+ #action_long = action
+ pass
+ elif event == 'ALPM_EVENT_KEYRING_START':
+ action = _('Checking keyring')+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
+ elif event == 'ALPM_EVENT_KEYRING_DONE':
+ pass
+ elif event == 'ALPM_EVENT_KEY_DOWNLOAD_START':
+ action = _('Downloading required keys')+'...'
+ action_long = action+'\n'
+ elif event == 'ALPM_EVENT_KEY_DOWNLOAD_DONE':
+ pass
+ if action != self.previous_action:
+ self.previous_action = action
+ self.EmitAction(action)
+ if action_long != self.previous_action_long:
+ self.previous_action_long != action_long
+ self.EmitActionLong(action_long)
+ if icon != self.previous_icon:
+ self.previous_icon = icon
+ self.EmitIcon(icon)
+ print(event)
+
+ def cb_question(self, event, data_tupel, extra_data):
+ if event == 'ALPM_QUESTION_INSTALL_IGNOREPKG':
+ return 0 # Do not install package in IgnorePkg/IgnoreGroup
+ if event == 'ALPM_QUESTION_REPLACE_PKG':
+ self.warning += _('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = data_tupel[0].name, pkgname2 = data_tupel[1].name)+'\n'
+ return 1 # Auto-remove conflicts in case of replaces
+ if event == 'ALPM_QUESTION_CONFLICT_PKG':
+ self.warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = data_tupel[0], pkgname2 = data_tupel[1])+'\n'
+ return 1 # Auto-remove conflicts
+ if event == 'ALPM_QUESTION_CORRUPTED_PKG':
+ return 1 # Auto-remove corrupted pkgs in cache
+ if event == 'ALPM_QUESTION_REMOVE_PKGS':
+ return 1 # Do not upgrade packages which have unresolvable dependencies
+ if event == 'ALPM_QUESTION_SELECT_PROVIDER':
+ ## In this case we populate providers with different choices
+ ## the client will have to release transaction and re-init one
+ ## with the chosen package added to it
+ self.providers.append(([pkg.name for pkg in data_tupel[0]], data_tupel[1]))
+ return 0 # return the first choice, this is not important because the transaction will be released
+ if event == 'ALPM_QUESTION_IMPORT_KEY':
+ ## data_tupel = (revoked(int), length(int), pubkey_algo(string), fingerprint(string), uid(string), created_time(int))
+ if data_tupel[0] is 0: # not revoked
+ return 1 # Auto get not revoked key
+ if data_tupel[0] is 1: # revoked
+ return 0 # Do not get revoked key
+
+ def cb_log(self, level, line):
+ _logmask = pyalpm.LOG_ERROR | pyalpm.LOG_WARNING
+ if not (level & _logmask):
+ return
+ if level & pyalpm.LOG_ERROR:
+ _error = "ERROR: "+line
+ self.EmitActionLong(_error)
+ self.EmitNeedDetails(True)
+ print(line)
+ elif level & pyalpm.LOG_WARNING:
+ self.warning += line
+ _warning = "WARNING: "+line
+ self.EmitActionLong(_warning)
+ elif level & pyalpm.LOG_DEBUG:
+ line = "DEBUG: " + line
+ print(line)
+ elif level & pyalpm.LOG_FUNCTION:
+ line = "FUNC: " + line
+ print(line)
+
+ def totaldlcb(self, _total_size):
+ self.total_size = _total_size
+
+ def cb_dl(self, _target, _transferred, _total):
+ if _target.endswith('.db'):
+ action = _('Refreshing {repo}').format(repo = _target.replace('.db', ''))+'...'
+ action_long = ''
+ icon = '/usr/share/pamac/icons/24x24/status/refresh-cache.png'
+ else:
+ action = _('Downloading {pkgname}').format(pkgname = _target.replace('.pkg.tar.xz', ''))+'...'
+ action_long = action+'\n'
+ icon = '/usr/share/pamac/icons/24x24/status/package-download.png'
+ if self.total_size > 0:
+ percent = round((_transferred+self.already_transferred)/self.total_size, 2)
+ target = '{transferred}/{size}'.format(transferred = common.format_size(_transferred+self.already_transferred), size = common.format_size(self.total_size))
+ else:
+ percent = round(_transferred/_total, 2)
+ target = ''
+ if action != self.previous_action:
+ self.previous_action = action
+ self.EmitAction(action)
+ if action_long != self.previous_action_long:
+ self.previous_action_long = action_long
+ self.EmitActionLong(action_long)
+ if icon != self.previous_icon:
+ self.previous_icon = icon
+ self.EmitIcon(icon)
+ if target != self.previous_target:
+ self.previous_target = target
+ self.EmitTarget(target)
+ if percent != self.previous_percent:
+ self.previous_percent = percent
+ self.EmitPercent(percent)
+ if _transferred == 0:
+ self.EmitDownloadStart('')
+ elif _transferred == _total:
+ self.already_transferred += _total
+
+ def cb_progress(self, event, target, _percent, n, i):
+ if event in ('ALPM_PROGRESS_ADD_START', 'ALPM_PROGRESS_UPGRADE_START', 'ALPM_PROGRESS_DOWNGRADE_START', 'ALPM_PROGRESS_REINSTALL_START', 'ALPM_PROGRESS_REMOVE_START'):
+ percent = round(((i-1)/n)+(_percent/(100*n)), 2)
+ self.EmitTransactionStart('')
+ else:
+ percent = round(_percent/100, 2)
+ if target != self.previous_target:
+ self.previous_target = target.format()
+ if percent != self.previous_percent:
+ self.EmitTarget('{}/{}'.format(str(i), str(n)))
+ self.previous_percent = percent
+ self.EmitPercent(percent)
+
+ def policykit_test(self, sender, connexion, action):
+ bus = dbus.SystemBus()
+ proxy_dbus = connexion.get_object('org.freedesktop.DBus','/org/freedesktop/DBus/Bus', False)
+ dbus_info = dbus.Interface(proxy_dbus,'org.freedesktop.DBus')
+ sender_pid = dbus_info.GetConnectionUnixProcessID(sender)
+ proxy_policykit = bus.get_object('org.freedesktop.PolicyKit1','/org/freedesktop/PolicyKit1/Authority',False)
+ policykit_authority = dbus.Interface(proxy_policykit,'org.freedesktop.PolicyKit1.Authority')
+
+ Subject = ('unix-process', {'pid': dbus.UInt32(sender_pid, variant_level=1),
+ 'start-time': dbus.UInt64(0, variant_level=1)})
+ (is_authorized,is_challenge,details) = policykit_authority.CheckAuthorization(Subject, action, {'': ''}, dbus.UInt32(1), '')
+ return is_authorized
+
+ def CheckUpdates(self):
+ updates = 0
+ _ignorepkgs = []
+ for group in self.handle.ignoregrps:
+ db = self.handle.get_localdb()
+ grp = db.read_grp(group)
+ if grp:
+ name, pkg_list = grp
+ for pkg in pkg_list:
+ if not pkg.name in _ignorepkgs:
+ _ignorepkgs.append(pkg.name)
+ for name in self.handle.ignorepkgs:
+ pkg = self.handle.get_localdb().get_pkg(name)
+ if pkg:
+ if not pkg.name in _ignorepkgs:
+ _ignorepkgs.append(pkg.name)
+ if config.syncfirst:
+ for name in config.syncfirst:
+ pkg = self.handle.get_localdb().get_pkg(name)
+ if pkg:
+ candidate = pyalpm.sync_newversion(pkg, self.handle.get_syncdbs())
+ if candidate:
+ updates += 1
+ if not updates:
+ for pkg in self.handle.get_localdb().pkgcache:
+ candidate = pyalpm.sync_newversion(pkg, self.handle.get_syncdbs())
+ if candidate:
+ if not candidate.name in _ignorepkgs:
+ updates += 1
+ self.EmitAvailableUpdates(updates)
+
+ @dbus.service.method('org.manjaro.pamac', 'b', 's', async_callbacks=('success', 'nosuccess'))
+ def Refresh(self, force_update, success, nosuccess):
+ def refresh():
+ self.target = ''
+ self.percent = 0
+ error = ''
+ self.get_handle()
+ for db in self.handle.get_syncdbs():
+ try:
+ self.t = self.handle.init_transaction()
+ db.update(force = bool(force_update))
+ self.t.release()
+ except pyalpm.error as e:
+ error += str(e)
+ break
+ if error:
+ self.EmitTransactionError(error)
+ else:
+ self.CheckUpdates()
+ self.EmitTransactionDone('')
+ self.task = Process(target=refresh)
+ self.task.start()
+ success('')
+
+ @dbus.service.method('org.manjaro.pamac', 'a{sb}', 's')
+ def Init(self, options):
+ error = ''
+ try:
+ self.get_handle()
+ self.t = self.handle.init_transaction(**options)
+ print('Init:',self.t.flags)
+ except pyalpm.error as e:
+ error = str(e)
+ finally:
+ return error
+
+ @dbus.service.method('org.manjaro.pamac', '', 's')
+ def Sysupgrade(self):
+ error = ''
+ try:
+ self.t.sysupgrade(downgrade=False)
+ except pyalpm.error as e:
+ error = ' --> '+str(e)+'\n'
+ self.t.release()
+ finally:
+ return error
+
+ @dbus.service.method('org.manjaro.pamac', 's', 's')
+ def Remove(self, pkgname):
+ error = ''
+ try:
+ pkg = self.handle.get_localdb().get_pkg(pkgname)
+ if pkg is not None:
+ self.t.remove_pkg(pkg)
+ except pyalpm.error as e:
+ error = ' --> '+str(e)+'\n'
+ finally:
+ return error
+
+ @dbus.service.method('org.manjaro.pamac', 's', 's')
+ def Add(self, pkgname):
+ error = ''
+ try:
+ for repo in self.handle.get_syncdbs():
+ pkg = repo.get_pkg(pkgname)
+ if pkg:
+ self.t.add_pkg(pkg)
+ break
+ except pyalpm.error as e:
+ error += ' --> '+str(e)+'\n'
+ finally:
+ return error
+
+ @dbus.service.method('org.manjaro.pamac', 's', 's')
+ def Load(self, tarball_path):
+ error = ''
+ try:
+ pkg = self.handle.load_pkg(tarball_path)
+ if pkg:
+ self.t.add_pkg(pkg)
+ except pyalpm.error:
+ error = _('{pkgname} is not a valid path or package name').format(pkgname = tarball_path)
+ finally:
+ return error
+
+ def check_extra_modules(self):
+ localdb = self.handle.get_localdb()
+ syncdbs = self.handle.get_syncdbs()
+ to_add = set(pkg.name for pkg in self.t.to_add)
+ to_remove = set(pkg.name for pkg in self.t.to_remove)
+ to_check = [pkg for pkg in self.t.to_add]
+ already_checked = set(pkg.name for pkg in to_check)
+ depends = [to_check]
+ # get installed kernels and modules
+ pkgs = localdb.search('linux')
+ installed_kernels = set()
+ installed_modules = set()
+ for pkg in pkgs:
+ match = re.match("(linux[0-9]{2,3})(.*)", pkg.name)
+ if match:
+ installed_kernels.add(match.group(1))
+ if match.group(2):
+ installed_modules.add(match.group(2))
+ for pkg in self.t.to_add:
+ match = re.match("(linux[0-9]{2,3})(.*)", pkg.name)
+ if match:
+ installed_kernels.add(match.group(1))
+ if match.group(2):
+ installed_modules.add(match.group(2))
+ # check in to_remove if there is a kernel and if so, auto-remove the corresponding modules
+ for pkg in self.t.to_remove:
+ match = re.match("(linux[0-9]{2,3})(.*)", pkg.name)
+ if match:
+ if not match.group(2):
+ installed_kernels.discard(match.group(1))
+ for module in installed_modules:
+ pkgname = match.group(1)+module
+ if not pkgname in to_remove:
+ to_remove.add(pkgname)
+ _pkg = localdb.get_pkg(pkgname)
+ if _pkg:
+ self.t.remove_pkg(_pkg)
+ # 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
+ match = re.match("(linux[0-9]{2,3})(.*)", pkg.name)
+ if match:
+ if not match.group(2):
+ for module in installed_modules:
+ pkgname = match.group(1)+module
+ if not localdb.get_pkg(pkgname):
+ for db in syncdbs:
+ pkg = db.get_pkg(pkgname)
+ if pkg:
+ if not pkg.name in already_checked:
+ depends[i+1].append(pkg)
+ already_checked.add(pkg.name)
+ if not pkg.name in to_add | to_remove:
+ to_add.add(pkg.name)
+ self.t.add_pkg(pkg)
+ break
+ # check if the current pkg is a kernel module and if so, install it for all installed kernels
+ match = re.match("(linux[0-9]{2,3})(.*-modules)", pkg.name)
+ if match:
+ for kernel in installed_kernels:
+ pkgname = kernel+match.group(2)
+ if not localdb.get_pkg(pkgname):
+ for db in syncdbs:
+ pkg = db.get_pkg(pkgname)
+ if pkg:
+ if not pkg.name in already_checked:
+ depends[i+1].append(pkg)
+ already_checked.add(pkg.name)
+ if not pkg.name in to_add | to_remove:
+ to_add.add(pkg.name)
+ self.t.add_pkg(pkg)
+ break
+ for depend in pkg.depends:
+ found_depend = pyalpm.find_satisfier(localdb.pkgcache, depend)
+ if not found_depend:
+ for db in syncdbs:
+ found_depend = pyalpm.find_satisfier(db.pkgcache, depend)
+ if found_depend:
+ break
+ if found_depend:
+ # 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)
+ i += 1
+ # end of the loop
+
+ @dbus.service.method('org.manjaro.pamac', '', 'a(ass)')
+ def Prepare(self):
+ error = ''
+ self.providers.clear()
+ self.check_extra_modules()
+ try:
+ self.t.prepare()
+ except pyalpm.error as e:
+ error = str(e)
+ self.t.release()
+ else:
+ for pkg in self.t.to_remove:
+ if pkg.name in config.holdpkg:
+ error = _('The transaction cannot be performed because it needs to remove {pkgname1} which is a locked package').format(pkgname1 = pkg.name)
+ self.t.release()
+ break
+ finally:
+ print(self.t.to_add, self.t.to_remove)
+ if len(self.t.to_add) + len(self.t.to_remove) == 0:
+ self.t.release()
+ return [((), _('Nothing to do'))]
+ elif error:
+ return [((), error)]
+ elif self.providers:
+ return self.providers
+ else:
+ return [((), '')]
+
+ @dbus.service.method('org.manjaro.pamac', '', 'a(ss)')
+ def To_Remove(self):
+ liste = []
+ for pkg in self.t.to_remove:
+ liste.append((pkg.name, pkg.version))
+ return liste
+
+ @dbus.service.method('org.manjaro.pamac', '', 'a(ssi)')
+ def To_Add(self):
+ liste = []
+ for pkg in self.t.to_add:
+ liste.append((pkg.name, pkg.version, pkg.download_size))
+ return liste
+
+ @dbus.service.method('org.manjaro.pamac', '', 's', async_callbacks=('success', 'nosuccess'))
+ def Interrupt(self, success, nosuccess):
+ def interrupt():
+ try:
+ self.t.interrupt()
+ except:
+ pass
+ try:
+ self.t.release()
+ except:
+ pass
+ finally:
+ common.rm_lock_file()
+ self.task.terminate()
+ interrupt()
+ success('')
+
+ @dbus.service.method('org.manjaro.pamac', '', 's', sender_keyword='sender', connection_keyword='connexion', async_callbacks=('success', 'nosuccess'))
+ def Commit(self, success, nosuccess, sender=None, connexion=None):
+ def commit():
+ error = ''
+ try:
+ self.t.commit()
+ except pyalpm.error as e:
+ error = str(e)
+ #except dbus.exceptions.DBusException:
+ #pass
+ finally:
+ self.t.release()
+ self.CheckUpdates()
+ if self.warning:
+ self.EmitLogWarning(self.warning)
+ self.warning = ''
+ if error:
+ self.EmitTransactionError(error)
+ else:
+ self.EmitTransactionDone(_('Transaction successfully finished'))
+ try:
+ authorized = self.policykit_test(sender,connexion,'org.manjaro.pamac.commit')
+ except dbus.exceptions.DBusException as e:
+ self.EmitTransactionError(_('Authentication failed'))
+ success('')
+ else:
+ if authorized:
+ self.task = Process(target=commit)
+ self.task.start()
+ else :
+ self.t.release()
+ self.EmitTransactionError(_('Authentication failed'))
+ success('')
+
+ @dbus.service.method('org.manjaro.pamac', '', '')
+ def Release(self):
+ try:
+ self.t.release()
+ except:
+ pass
+
+ @dbus.service.method('org.manjaro.pamac')
+ def StopDaemon(self):
+ try:
+ self.t.release()
+ except:
+ pass
+ common.rm_pid_file()
+ mainloop.quit()
+
+GObject.threads_init()
+DBusGMainLoop(set_as_default = True)
+myservice = PamacDBusService()
+mainloop = GObject.MainLoop()
+mainloop.run()
diff --git a/pamac-install.py b/pamac-install.py
old mode 100644
new mode 100755
index 9c892e8..60983f0
--- a/pamac-install.py
+++ b/pamac-install.py
@@ -1,8 +1,9 @@
-#! /usr/bin/pkexec /usr/bin/python3
+#! /usr/bin/python3
# -*- coding:utf-8 -*-
-from gi.repository import Gtk
+from gi.repository import GObject, Gtk
from sys import argv
+import dbus
from os.path import abspath
from pamac import common, transaction
@@ -15,57 +16,95 @@ gettext.textdomain('pamac')
_ = gettext.gettext
def exiting(msg):
+ transaction.StopDaemon()
+ print(msg)
print('exiting')
loop.quit()
-def on_ProgressCloseButton_clicked(*args):
+def handle_error(error):
transaction.ProgressWindow.hide()
- transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(),transaction.progress_buffer.get_end_iter())
- common.rm_pid_file()
- Gtk.main_quit()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ if error:
+ if not 'DBus.Error.NoReply' in str(error):
+ transaction.ErrorDialog.format_secondary_text(error)
+ response = transaction.ErrorDialog.run()
+ if response:
+ transaction.ErrorDialog.hide()
+ exiting(error)
-def on_ProgressCancelButton_clicked(*args):
- trans.interrupt()
+def handle_reply(reply):
+ transaction.ProgressCloseButton.set_visible(True)
+ transaction.action_icon.set_from_icon_name('dialog-information', Gtk.IconSize.BUTTON)
+ transaction.progress_label.set_text(str(reply))
+ transaction.progress_bar.set_text('')
+ end_iter = transaction.progress_buffer.get_end_iter()
+ transaction.progress_buffer.insert(end_iter, str(reply))
-def on_TransCancelButton_clicked(self, *arg):
+def on_TransValidButton_clicked(*args):
transaction.ConfDialog.hide()
- trans.release()
- common.rm_pid_file()
- Gtk.main_quit()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ transaction.finalize()
-def on_TransValidButton_clicked(self, *arg):
+def on_TransCancelButton_clicked(*args):
transaction.ConfDialog.hide()
- trans.finalize()
- common.rm_pid_file()
- Gtk.main_quit()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ transaction.Release()
+ exiting('')
+
+def on_ProgressCloseButton_clicked(*args):
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ exiting('')
-def get_pkgs(pkgstr_list):
- get_error = ''
- for pkgstr in pkgstr_list:
- if '.pkg.tar.' in pkgstr:
- full_path = abspath(pkgstr)
- trans.to_load.append(full_path)
+def on_ProgressCancelButton_clicked(*args):
+ transaction.Interrupt()
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ exiting('')
+
+def get_pkgs(pkgs):
+ error = ''
+ for name in pkgs:
+ if '.pkg.tar.' in name:
+ full_path = abspath(name)
+ transaction.to_load.add(full_path)
+ elif transaction.get_syncpkg(name):
+ transaction.to_add.add(name)
else:
- pkg = trans.get_syncpkg(pkgstr)
- if pkg:
- trans.to_add.append(pkg)
- else:
- if get_error:
- get_error += '\n'
- get_error += _('{pkgname} is not a valid path or package name').format(pkgname = pkgstr)
- if get_error:
- trans.handle_error(get_error)
+ if error:
+ error += '\n'
+ error += _('{pkgname} is not a valid path or package name').format(pkgname = name)
+ if error:
+ handle_error(error)
return False
else:
return True
-signals = {'on_TransValidButton_clicked' : on_TransValidButton_clicked,
- 'on_TransCancelButton_clicked' : on_TransCancelButton_clicked,
- 'on_ChooseButton_clicked' : transaction.on_ChooseButton_clicked,
+def install(pkgs):
+ if get_pkgs(pkgs):
+ error = transaction.run()
+ if error:
+ handle_error(error)
+ else:
+ loop.run()
+
+signals = {'on_ChooseButton_clicked' : transaction.on_ChooseButton_clicked,
'on_progress_textview_size_allocate' : transaction.on_progress_textview_size_allocate,
'on_choose_renderertoggle_toggled' : transaction.on_choose_renderertoggle_toggled,
- 'on_ProgressCancelButton_clicked' : on_ProgressCancelButton_clicked,
- 'on_ProgressCloseButton_clicked' : on_ProgressCloseButton_clicked}
+ 'on_TransValidButton_clicked' :on_TransValidButton_clicked,
+ 'on_TransCancelButton_clicked' :on_TransCancelButton_clicked,
+ 'on_ProgressCloseButton_clicked' : on_ProgressCloseButton_clicked,
+ 'on_ProgressCancelButton_clicked' : on_ProgressCancelButton_clicked}
+
+def config_dbus_signals():
+ bus = dbus.SystemBus()
+ bus.add_signal_receiver(handle_reply, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionDone")
+ bus.add_signal_receiver(handle_error, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionError")
if common.pid_file_exists():
transaction.ErrorDialog.format_secondary_text(_('Pamac is already running'))
@@ -73,27 +112,21 @@ if common.pid_file_exists():
if response:
transaction.ErrorDialog.hide()
else:
- trans = transaction.Transaction()
- do_syncfirst, updates = trans.get_updates()
+ transaction.get_handle()
+ transaction.update_dbs()
+ transaction.get_dbus_methods()
+ do_syncfirst, updates = transaction.get_updates()
if updates:
transaction.ErrorDialog.format_secondary_text(_('Some updates are available.\nPlease update your system first'))
response = transaction.ErrorDialog.run()
if response:
transaction.ErrorDialog.hide()
+ transaction.StopDaemon()
else:
+ common.write_pid_file()
transaction.interface.connect_signals(signals)
- args_str = argv[1:]
- if get_pkgs(args_str):
- if trans.to_add or trans.to_load:
- if trans.check_extra_modules():
- if trans.init(cascade = True):
- for pkg in trans.to_add:
- trans.add(pkg)
- for path in trans.to_load:
- trans.load(path)
- if trans.prepare():
- common.write_pid_file()
- trans.set_transaction_sum(True)
- transaction.ConfDialog.show()
- Gtk.main()
-
+ transaction.config_dbus_signals()
+ config_dbus_signals()
+ loop = GObject.MainLoop()
+ pkgs_to_install = argv[1:]
+ install(pkgs_to_install)
diff --git a/pamac-manager.py b/pamac-manager.py
old mode 100644
new mode 100755
index 375824f..bf70e2f
--- a/pamac-manager.py
+++ b/pamac-manager.py
@@ -1,11 +1,12 @@
-#! /usr/bin/pkexec /usr/bin/python3
+#! /usr/bin/python3
# -*- coding:utf-8 -*-
-version = '0.8.0'
+version = '0.9'
from gi.repository import Gtk, Gdk
from gi.repository.GdkPixbuf import Pixbuf
import pyalpm
+import dbus
from time import strftime, localtime
from pamac import config, common, transaction
@@ -50,13 +51,10 @@ states_selection = interface.get_object('states_treeview_selection')
repos_list = interface.get_object('repos_list')
repos_selection = interface.get_object('repos_treeview_selection')
AboutDialog = interface.get_object('AboutDialog')
-menu_button = interface.get_object('menu_button')
-main_menu = interface.get_object('main_menu')
PackagesChooserDialog = interface.get_object('PackagesChooserDialog')
files_buffer = files_textview.get_buffer()
AboutDialog.set_version(version)
-menu_button.set_popup(main_menu)
search_dict = {}
groups_dict = {}
@@ -78,13 +76,13 @@ def state_column_display_func(column, cell, treemodel, treeiter, data):
elif treemodel[treeiter][0].name in config.holdpkg:
pixbuf = locked_icon
elif treemodel[treeiter][0].db.name == 'local':
- if transaction.pkg_in_list(treemodel[treeiter][0], trans.to_add):
+ if treemodel[treeiter][0].name in transaction.to_add:
pixbuf = to_reinstall_icon
- elif transaction.pkg_in_list(treemodel[treeiter][0], trans.to_remove):
+ elif treemodel[treeiter][0].name in transaction.to_remove:
pixbuf = to_remove_icon
else:
pixbuf = installed_icon
- elif transaction.pkg_in_list(treemodel[treeiter][0], trans.to_add):
+ elif treemodel[treeiter][0].name in transaction.to_add:
pixbuf = to_install_icon
else:
pixbuf = uninstalled_icon
@@ -137,22 +135,16 @@ def size_column_sort_func(treemodel, treeiter1, treeiter2, data):
num2 = treemodel[treeiter2][0].isize
return num1 - num2
-state_column.set_cell_data_func(state_rendererpixbuf, state_column_display_func)
-name_column.set_cell_data_func(name_renderertext, name_column_display_func)
-version_column.set_cell_data_func(version_renderertext, version_column_display_func)
-size_column.set_cell_data_func(size_renderertext, size_column_display_func)
-
def update_lists():
- for db in trans.handle.get_syncdbs():
+ for db in transaction.syncdbs:
+ repos_list.append([db.name])
for name, pkgs in db.grpcache:
groups_list.append([name])
+ repos_list.append([_('local')])
groups_list.set_sort_column_id(0, Gtk.SortType.ASCENDING)
states = [_('Installed'), _('Uninstalled'), _('Orphans'), _('To install'), _('To remove')]
for state in states:
states_list.append([state])
- for db in trans.syncdbs:
- repos_list.append([db.name])
- repos_list.append([_('local')])
def get_group_list(group):
global groups_dict
@@ -160,8 +152,8 @@ def get_group_list(group):
return groups_dict[group]
else:
groups_dict[group] = Gtk.ListStore(object)
- dbs_list = [trans.localdb]
- dbs_list.extend(trans.syncdbs.copy())
+ dbs_list = [transaction.localdb]
+ dbs_list.extend(transaction.syncdbs.copy())
pkgs = pyalpm.find_grp_pkgs(dbs_list, group)
for pkg in pkgs:
groups_dict[group].append([pkg])
@@ -171,12 +163,12 @@ def get_state_list(state):
global states_dict
if state == _('To install'):
liststore = Gtk.ListStore(object)
- for pkg in trans.to_add:
+ for pkg in transaction.to_add:
liststore.append([pkg])
return liststore
elif state == _('To remove'):
liststore = Gtk.ListStore(object)
- for pkg in trans.to_remove:
+ for pkg in transaction.to_remove:
liststore.append([pkg])
return liststore
elif state in states_dict.keys():
@@ -184,7 +176,7 @@ def get_state_list(state):
else:
states_dict[state] = Gtk.ListStore(object)
if state == _('Installed'):
- for pkg in trans.localdb.pkgcache:
+ for pkg in transaction.localdb.pkgcache:
states_dict[state].append([pkg])
elif state == _('Uninstalled'):
for pkg in get_uninstalled_pkgs():
@@ -194,7 +186,6 @@ def get_state_list(state):
states_dict[state].append([pkg])
return states_dict[state]
-
def get_repo_list(repo):
global repos_dict
if repo in repos_dict.keys():
@@ -202,14 +193,14 @@ def get_repo_list(repo):
else:
repos_dict[repo] = Gtk.ListStore(object)
if repo == _('local'):
- for pkg in trans.localdb.pkgcache:
- if not trans.get_syncpkg(pkg.name):
+ for pkg in transaction.localdb.pkgcache:
+ if not transaction.get_syncpkg(pkg.name):
repos_dict[repo].append([pkg])
else:
- for db in trans.syncdbs:
+ for db in transaction.syncdbs:
if db.name ==repo:
for pkg in db.pkgcache:
- local_pkg = trans.get_localpkg(pkg.name)
+ local_pkg = transaction.get_localpkg(pkg.name)
if local_pkg:
repos_dict[repo].append([local_pkg])
else:
@@ -223,11 +214,11 @@ def search_pkgs(search_string):
else:
search_dict[search_string] = Gtk.ListStore(object)
names_list = []
- for pkg in trans.localdb.search(*search_string.split()):
+ for pkg in transaction.localdb.search(*search_string.split()):
if not pkg.name in names_list:
names_list.append(pkg.name)
search_dict[search_string].append([pkg])
- for db in trans.syncdbs:
+ for db in transaction.syncdbs:
for pkg in db.search(*search_string.split()):
if not pkg.name in names_list:
names_list.append(pkg.name)
@@ -242,25 +233,25 @@ def search_pkgs(search_string):
def get_uninstalled_pkgs():
pkgs_list = []
names_list = []
- for repo in trans.syncdbs:
+ for repo in transaction.syncdbs:
for pkg in repo.pkgcache:
if not pkg.name in names_list:
names_list.append(pkg.name)
- if not trans.get_localpkg(pkg.name):
+ if not transaction.get_localpkg(pkg.name):
pkgs_list.append(pkg)
return pkgs_list
def get_orphan_pkgs():
pkgs_list = []
- for pkg in trans.localdb.pkgcache:
+ for pkg in transaction.localdb.pkgcache:
if pkg.reason == pyalpm.PKG_REASON_DEPEND:
if not pkg.compute_requiredby():
pkgs_list.append(pkg)
return pkgs_list
def refresh_packages_list(liststore):
- #~ packages_list_treeview.freeze_child_notify()
- #~ packages_list_treeview.set_model(None)
+ packages_list_treeview.freeze_child_notify()
+ packages_list_treeview.set_model(None)
liststore.set_sort_func(0, name_column_sort_func, None)
liststore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
packages_list_treeview.set_model(liststore)
@@ -268,7 +259,7 @@ def refresh_packages_list(liststore):
name_column.set_sort_indicator(True)
version_column.set_sort_indicator(False)
size_column.set_sort_indicator(False)
- #~ packages_list_treeview.thaw_child_notify()
+ packages_list_treeview.thaw_child_notify()
ManagerWindow.get_window().set_cursor(None)
def set_infos_list(pkg):
@@ -277,11 +268,9 @@ def set_infos_list(pkg):
desc = pkg.desc.replace('&', '&')
desc = desc.replace('<->', '/')
desc_label.set_markup(desc)
- ## don't make url clickable (http://forum.manjaro.org/index.php?topic=7263.0)
- link_label.set_markup(pkg.url)
# fix & in url
- #url = pkg.url.replace('&', '&')
- #link_label.set_markup('{_url}'.format(_url = url))
+ url = pkg.url.replace('&', '&')
+ link_label.set_markup('{_url}'.format(_url = url))
licenses_label.set_markup(_('Licenses')+': {}'.format(' '.join(pkg.licenses)))
def set_deps_list(pkg, style):
@@ -291,7 +280,7 @@ def set_deps_list(pkg, style):
if pkg.optdepends:
optdeps = []
for optdep in pkg.optdepends:
- if trans.get_localpkg(optdep.split(':')[0]):
+ if transaction.get_localpkg(optdep.split(':')[0]):
optdeps.append(optdep+' ['+_('Installed')+']')
else:
optdeps.append(optdep)
@@ -346,18 +335,50 @@ def set_files_list(pkg):
end_iter = files_buffer.get_end_iter()
files_buffer.insert(end_iter, '/'+file[0]+'\n')
-def on_ManagerWindow_delete_event(*args):
- Gtk.main_quit()
- common.rm_pid_file()
-
-def on_TransValidButton_clicked(*args):
+def handle_error(error):
+ ManagerWindow.get_window().set_cursor(None)
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ if error:
+ if not 'DBus.Error.NoReply' in str(error):
+ print(error)
+ transaction.ErrorDialog.format_secondary_text(str(error))
+ response = transaction.ErrorDialog.run()
+ if response:
+ transaction.ErrorDialog.hide()
+ transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(),transaction.progress_buffer.get_end_iter())
+ transaction.get_handle()
+ transaction.update_dbs()
+ transaction.to_add.clear()
+ transaction.to_remove.clear()
+ transaction.to_load.clear()
+
+def handle_reply(reply):
+ if reply:
+ transaction.ProgressCloseButton.set_visible(True)
+ transaction.action_icon.set_from_icon_name('dialog-information', Gtk.IconSize.BUTTON)
+ transaction.progress_label.set_text(str(reply))
+ transaction.progress_bar.set_text('')
+ end_iter = transaction.progress_buffer.get_end_iter()
+ transaction.progress_buffer.insert(end_iter, str(reply))
+ else:
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ error = transaction.sysupgrade(True)
+ ManagerWindow.get_window().set_cursor(None)
+ if error:
+ handle_error(error)
+ return
+ transaction.get_handle()
+ transaction.update_dbs()
+ transaction.to_add.clear()
+ transaction.to_remove.clear()
global search_dict
global groups_dict
global states_dict
global repos_dict
- transaction.ConfDialog.hide()
- trans.finalize()
- trans.update_dbs()
search_dict = {}
groups_dict = {}
states_dict = {}
@@ -365,69 +386,84 @@ def on_TransValidButton_clicked(*args):
if current_filter[0]:
refresh_packages_list(current_filter[0](current_filter[1]))
+def on_ManagerWindow_delete_event(*args):
+ transaction.StopDaemon()
+ common.rm_pid_file()
+ Gtk.main_quit()
+
+def on_TransValidButton_clicked(*args):
+ transaction.ConfDialog.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ transaction.finalize()
+
def on_TransCancelButton_clicked(*args):
- transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(), transaction.progress_buffer.get_end_iter())
+ transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(),transaction.progress_buffer.get_end_iter())
transaction.ConfDialog.hide()
- trans.release()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ transaction.Release()
if current_filter[0]:
refresh_packages_list(current_filter[0](current_filter[1]))
def on_ProgressCloseButton_clicked(*args):
transaction.ProgressWindow.hide()
- transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(), transaction.progress_buffer.get_end_iter())
- trans.do_sysupgrade(True)
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(),transaction.progress_buffer.get_end_iter())
+ ManagerWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
+ error = transaction.sysupgrade(True)
+ ManagerWindow.get_window().set_cursor(None)
+ if error:
+ handle_error(error)
def on_ProgressCancelButton_clicked(*args):
- trans.interrupt()
+ transaction.Interrupt()
+ ManagerWindow.get_window().set_cursor(None)
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
def on_search_entry_icon_press(*args):
on_search_entry_activate(None)
def on_search_entry_activate(widget):
global current_filter
+ ManagerWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
+ while Gtk.events_pending():
+ Gtk.main_iteration()
current_filter = (search_pkgs, search_entry.get_text())
refresh_packages_list(search_pkgs(search_entry.get_text()))
def mark_to_install(widget, pkg):
- trans.to_add.append(pkg)
+ transaction.to_add.add(pkg.name)
def mark_to_reinstall(widget, pkg):
- trans.to_add.append(pkg)
+ transaction.to_add.add(pkg.name)
def mark_to_remove(widget, pkg):
- trans.to_remove.append(pkg)
+ transaction.to_remove.add(pkg.name)
def mark_to_unselect(widget, pkg):
- if pkg.db.name == 'local':
- if trans.pkg_in_list(pkg, trans.to_add):
- transaction.remove_pkg_from_list(pkg, trans.to_add)
- elif transaction.pkg_in_list(pkg, trans.to_remove):
- transaction.remove_pkg_from_list(pkg, trans.to_remove)
- else:
- if transaction.pkg_in_list(pkg, trans.to_add):
- transaction.remove_pkg_from_list(pkg, trans.to_add)
+ transaction.to_remove.discard(pkg.name)
+ transaction.to_add.discard(pkg.name)
def select_optdeps(widget, pkg, optdeps):
- transaction.choose_only_one = False
transaction.choose_label.set_markup(_('{pkgname} has {number} uninstalled optional deps.\nPlease choose the one(s) you want to install:').format(pkgname = pkg.name, number = str(len(optdeps))))
transaction.choose_list.clear()
- transaction.choose_renderertoggle.set_radio(False)
for long_string in optdeps:
transaction.choose_list.append([False, long_string])
transaction.ChooseDialog.run()
- for long_string in trans.to_provide:
- trans.to_add.append(trans.get_syncpkg(long_string.split(':')[0]))
def install_with_optdeps(widget, pkg, optdeps):
select_optdeps(widget, pkg, optdeps)
- trans.to_add.append(pkg)
+ transaction.to_add.add(pkg.name)
def on_list_treeview_button_press_event(treeview, event):
global right_click_menu
liststore = packages_list_treeview.get_model()
# Check if right mouse button was clicked
if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3:
- ManagerWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
while Gtk.events_pending():
Gtk.main_iteration()
treepath, viewcolumn, x, y = treeview.get_path_at_pos(int(event.x), int(event.y))
@@ -435,7 +471,7 @@ def on_list_treeview_button_press_event(treeview, event):
if treeiter:
if liststore[treeiter][0] != _('No package found') and not liststore[treeiter][0].name in config.holdpkg:
right_click_menu = Gtk.Menu()
- if transaction.pkg_in_list(liststore[treeiter][0], trans.to_remove) or transaction.pkg_in_list(liststore[treeiter][0], trans.to_add):
+ if liststore[treeiter][0].name in transaction.to_add | transaction.to_remove:
item = Gtk.ImageMenuItem(_('Unselect'))
item.set_image(Gtk.Image.new_from_stock('gtk-undo', Gtk.IconSize.MENU))
item.set_always_show_image(True)
@@ -447,17 +483,18 @@ def on_list_treeview_button_press_event(treeview, event):
item.set_always_show_image(True)
item.connect('activate', mark_to_remove, liststore[treeiter][0])
right_click_menu.append(item)
- item = Gtk.ImageMenuItem(_('Reinstall'))
- item.set_image(Gtk.Image.new_from_pixbuf(to_reinstall_icon))
- item.set_always_show_image(True)
- item.connect('activate', mark_to_reinstall, liststore[treeiter][0])
- right_click_menu.append(item)
+ if transaction.get_syncpkg(liststore[treeiter][0].name):
+ item = Gtk.ImageMenuItem(_('Reinstall'))
+ item.set_image(Gtk.Image.new_from_pixbuf(to_reinstall_icon))
+ item.set_always_show_image(True)
+ item.connect('activate', mark_to_reinstall, liststore[treeiter][0])
+ right_click_menu.append(item)
optdeps_strings = liststore[treeiter][0].optdepends
if optdeps_strings:
available_optdeps = []
for optdep_string in optdeps_strings:
optdep = optdep_string.split(':')[0]
- if not trans.get_localpkg(optdep):
+ if not transaction.get_localpkg(optdep):
available_optdeps.append(optdep_string)
if available_optdeps:
item = Gtk.ImageMenuItem(_('Install optional deps'))
@@ -476,7 +513,7 @@ def on_list_treeview_button_press_event(treeview, event):
available_optdeps = []
for optdep_string in optdeps_strings:
optdep = optdep_string.split(':')[0]
- if not trans.get_localpkg(optdep):
+ if not transaction.get_localpkg(optdep):
available_optdeps.append(optdep_string)
if available_optdeps:
item = Gtk.ImageMenuItem(_('Install with optional deps'))
@@ -486,7 +523,6 @@ def on_list_treeview_button_press_event(treeview, event):
right_click_menu.append(item)
treeview.grab_focus()
treeview.set_cursor(treepath, viewcolumn, 0)
- ManagerWindow.get_window().set_cursor(None)
right_click_menu.show_all()
right_click_menu.popup(None, None, None, None, event.button, event.time)
return True
@@ -559,17 +595,17 @@ def on_list_treeview_row_activated(treeview, treeiter, column):
if not liststore[treeiter][0] == _('No package found'):
if not liststore[treeiter][0].name in config.holdpkg:
if liststore[treeiter][0].db.name == 'local':
- if transaction.pkg_in_list(liststore[treeiter][0], trans.to_add):
- transaction.remove_pkg_from_list(liststore[treeiter][0], trans.to_add)
- elif transaction.pkg_in_list(liststore[treeiter][0], trans.to_remove):
- transaction.remove_pkg_from_list(liststore[treeiter][0], trans.to_remove)
+ if liststore[treeiter][0].name in transaction.to_add:
+ transaction.to_add.discard(liststore[treeiter][0].name)
+ elif liststore[treeiter][0].name in transaction.to_remove:
+ transaction.to_remove.discard(liststore[treeiter][0].name)
else:
- trans.to_remove.append(liststore[treeiter][0])
+ transaction.to_remove.add(liststore[treeiter][0].name)
else:
- if transaction.pkg_in_list(liststore[treeiter][0], trans.to_add):
- transaction.remove_pkg_from_list(liststore[treeiter][0], trans.to_add)
+ if liststore[treeiter][0].name in transaction.to_add:
+ transaction.to_add.discard(liststore[treeiter][0].name)
else:
- trans.to_add.append(liststore[treeiter][0])
+ transaction.to_add.add(liststore[treeiter][0].name)
while Gtk.events_pending():
Gtk.main_iteration()
@@ -583,6 +619,8 @@ def on_notebook1_switch_page(notebook, page, page_num):
on_search_treeview_selection_changed(None)
elif search_entry.get_text():
on_search_entry_activate(None)
+ else:
+ ManagerWindow.get_window().set_cursor(None)
elif page_num == 1:
on_groups_treeview_selection_changed(None)
elif page_num == 2:
@@ -591,53 +629,58 @@ def on_notebook1_switch_page(notebook, page, page_num):
on_repos_treeview_selection_changed(None)
def on_manager_valid_button_clicked(*args):
- trans.run()
+ ManagerWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
+ error = transaction.run()
+ ManagerWindow.get_window().set_cursor(None)
+ if error:
+ handle_error(error)
def on_manager_cancel_button_clicked(*args):
- trans.to_add.clear()
- trans.to_remove.clear()
+ transaction.to_add.clear()
+ transaction.to_remove.clear()
if current_filter[0]:
refresh_packages_list(current_filter[0](current_filter[1]))
def on_refresh_item_activate(*args):
- global search_dict
- global groups_dict
- global states_dict
- global repos_dict
- trans.refresh(False)
- transaction.ProgressWindow.hide()
- search_dict = {}
- groups_dict = {}
- states_dict = {}
- repos_dict = {}
- if current_filter[0]:
- refresh_packages_list(current_filter[0](current_filter[1]))
- trans.do_sysupgrade(True)
+ ManagerWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
+ transaction.refresh(False)
+
def on_local_item_activate(*args):
response = PackagesChooserDialog.run()
if response:
PackagesChooserDialog.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
def on_about_item_activate(*args):
response = AboutDialog.run()
if response:
AboutDialog.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
def on_package_open_button_clicked(*args):
packages_paths = PackagesChooserDialog.get_filenames()
- print(packages_paths)
if packages_paths:
PackagesChooserDialog.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
for path in packages_paths:
- trans.to_load.append(path)
- trans.run()
+ transaction.to_load.add(path)
+ ManagerWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
+ error = transaction.run()
+ ManagerWindow.get_window().set_cursor(None)
+ if error:
+ handle_error(error)
def on_PackagesChooserDialog_file_activated(*args):
on_package_open_button_clicked(*args)
def on_package_cancel_button_clicked(*args):
PackagesChooserDialog.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
def on_state_column_clicked(column):
liststore = packages_list_treeview.get_model()
@@ -702,6 +745,11 @@ signals = {'on_ManagerWindow_delete_event' : on_ManagerWindow_delete_event,
'on_version_column_clicked' : on_version_column_clicked,
'on_size_column_clicked' : on_size_column_clicked}
+def config_dbus_signals():
+ bus = dbus.SystemBus()
+ bus.add_signal_receiver(handle_reply, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionDone")
+ bus.add_signal_receiver(handle_error, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionError")
+
if common.pid_file_exists():
transaction.ErrorDialog.format_secondary_text(_('Pamac is already running'))
response = transaction.ErrorDialog.run()
@@ -710,13 +758,19 @@ if common.pid_file_exists():
else:
common.write_pid_file()
interface.connect_signals(signals)
+ transaction.get_dbus_methods()
+ transaction.config_dbus_signals()
+ config_dbus_signals()
+ state_column.set_cell_data_func(state_rendererpixbuf, state_column_display_func)
+ name_column.set_cell_data_func(name_renderertext, name_column_display_func)
+ version_column.set_cell_data_func(version_renderertext, version_column_display_func)
+ size_column.set_cell_data_func(size_renderertext, size_column_display_func)
+ transaction.get_handle()
+ transaction.update_dbs()
+ update_lists()
ManagerWindow.show_all()
- trans = transaction.Transaction()
ManagerWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
+ transaction.refresh(False)
while Gtk.events_pending():
Gtk.main_iteration()
- trans.refresh(False)
- update_lists()
- trans.do_sysupgrade(True)
- ManagerWindow.get_window().set_cursor(None)
Gtk.main()
diff --git a/pamac-refresh.py b/pamac-refresh.py
old mode 100644
new mode 100755
index 1b62306..c6a2703
--- a/pamac-refresh.py
+++ b/pamac-refresh.py
@@ -1,26 +1,31 @@
-#! /usr/bin/pkexec /usr/bin/python3
+#! /usr/bin/python3
# -*- coding:utf-8 -*-
-from time import sleep
-from pamac import common, config
+from gi.repository import GObject
+from pamac import common, transaction
+import dbus
+
+def reply(reply):
+ transaction.StopDaemon()
+ print('check updates done')
+ loop.quit()
+
+def error(error):
+ transaction.StopDaemon()
+ print('check updates failed')
+ loop.quit()
+
+loop = GObject.MainLoop()
if not common.pid_file_exists():
- common.write_pid_file()
- print('refreshing')
- handle = config.handle()
- for db in handle.get_syncdbs():
- try:
- t = handle.init_transaction()
- db.update(force = False)
- t.release()
- except:
- try:
- t.release()
- except:
- pass
- print('refreshing {} failed'.format(db.name))
- break
- else:
- print('refreshing {} succeeded'.format(db.name))
- sleep(1)
- common.rm_pid_file()
+ print('checking updates')
+ bus = dbus.SystemBus()
+ bus.add_signal_receiver(reply, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionDone")
+ bus.add_signal_receiver(error, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionError")
+ transaction.get_dbus_methods()
+ try:
+ transaction.Refresh(False)
+ except:
+ pass
+ else:
+ loop.run()
diff --git a/pamac-tray.py b/pamac-tray.py
old mode 100644
new mode 100755
index 2f8dd7d..675be93
--- a/pamac-tray.py
+++ b/pamac-tray.py
@@ -2,12 +2,10 @@
# -*- coding:utf-8 -*-
from gi.repository import Gtk, GObject
-from subprocess import call
-from time import sleep
-import threading
+from subprocess import Popen
+import dbus
from pamac import common, transaction
-
-GObject.threads_init()
+from time import sleep
# i18n
import gettext
@@ -46,14 +44,12 @@ class Tray:
self.statusIcon.connect('activate', self.activate_cb)
def execute_update(self, widget, event, data = None):
- call(['/usr/bin/pamac-updater'])
+ Popen(['/usr/bin/pamac-updater'])
def execute_manager(self, widget, event, data = None):
- call(['/usr/bin/pamac-manager'])
+ Popen(['/usr/bin/pamac-manager'])
def quit_tray(self, widget, data = None):
- t1.shutdown()
- t2.shutdown()
Gtk.main_quit()
def popup_menu_cb(self, widget, button, time, data = None):
@@ -64,68 +60,17 @@ class Tray:
def activate_cb(self, widget, data = None):
if icon == update_icon:
- call(['/usr/bin/pamac-updater'])
+ Popen(['/usr/bin/pamac-updater'])
def update_icon(self, icon, info):
- GObject.idle_add(self.statusIcon.set_from_file, icon)
- GObject.idle_add(self.statusIcon.set_tooltip_markup, info)
+ self.statusIcon.set_from_file(icon)
+ self.statusIcon.set_tooltip_markup(info)
def set_visible(self, boolean):
self.statusIcon.set_visible(boolean)
-class PeriodicRefresh(threading.Thread):
- """Thread that executes a task every N seconds"""
- def __init__(self):
- threading.Thread.__init__(self)
- self._finished = threading.Event()
- self._interval = 3600*3
-
- def setInterval(self, interval):
- """Set the number of seconds we sleep between executing our task"""
- self._interval = interval
-
- def shutdown(self):
- """Stop this thread"""
- self._finished.set()
-
- def run(self):
- while True:
- if self._finished.isSet():
- return
- call(['/usr/bin/pamac-refresh'])
- self._finished.wait(self._interval)
-
-class PeriodicCheck(threading.Thread):
- """Thread that executes a task every N seconds"""
- def __init__(self):
- threading.Thread.__init__(self)
- self._finished = threading.Event()
- self._interval = 1
- self.trans = transaction.Transaction()
-
- def setInterval(self, interval):
- """Set the number of seconds we sleep between executing our task"""
- self._interval = interval
-
- def shutdown(self):
- """Stop this thread"""
- self._finished.set()
-
- def run(self):
- pid_file = True
- while True:
- if self._finished.isSet():
- return
- elif common.pid_file_exists():
- if not pid_file:
- pid_file = True
- self._finished.wait(self._interval)
- elif pid_file:
- self.trans.update_dbs()
- set_icon(len(self.trans.get_updates()[1]))
- pid_file = False
- else:
- self._finished.wait(self._interval)
+def refresh():
+ Popen(['/usr/bin/pamac-refresh'])
def set_icon(updates):
global icon
@@ -137,7 +82,7 @@ def set_icon(updates):
else:
info = update_info.format(number = updates)
if not common.pid_file_exists():
- call(['notify-send', '-i', '/usr/share/pamac/icons/32x32/apps/pamac-updater.png', '-u', 'normal', _('Update Manager'), info])
+ Popen(['notify-send', '-i', '/usr/share/pamac/icons/32x32/apps/pamac-updater.png', '-u', 'normal', _('Update Manager'), info])
else:
icon = noupdate_icon
info = noupdate_info
@@ -145,9 +90,9 @@ def set_icon(updates):
tray.update_icon(icon, info)
return False
+bus = dbus.SystemBus()
+bus.add_signal_receiver(set_icon, dbus_interface = "org.manjaro.pamac", signal_name = "EmitAvailableUpdates")
tray = Tray()
-t1 = PeriodicRefresh()
-t1.start()
-t2 = PeriodicCheck()
-t2.start()
+refresh()
+GObject.timeout_add(3*3600*1000, refresh)
Gtk.main()
diff --git a/pamac-updater.py b/pamac-updater.py
index 331bef4..7aa3004 100644
--- a/pamac-updater.py
+++ b/pamac-updater.py
@@ -1,8 +1,9 @@
-#! /usr/bin/pkexec /usr/bin/python3
+#! /usr/bin/python3
# -*- coding:utf-8 -*-
from gi.repository import Gtk, Gdk
import pyalpm
+import dbus
from pamac import config, common, transaction
@@ -21,18 +22,22 @@ UpdaterWindow = interface.get_object("UpdaterWindow")
update_listore = interface.get_object('update_list')
update_top_label = interface.get_object('update_top_label')
update_bottom_label = interface.get_object('update_bottom_label')
+UpdaterApplyButton = interface.get_object('UpdaterApplyButton')
update_top_label.set_markup(_('Your system is up-to-date'))
update_bottom_label.set_markup('')
+UpdaterApplyButton.set_sensitive(False)
def have_updates():
- do_syncfirst, updates = trans.get_updates()
+ do_syncfirst, updates = transaction.get_updates()
update_listore.clear()
update_top_label.set_justify(Gtk.Justification.CENTER)
if not updates:
update_bottom_label.set_markup('')
update_top_label.set_markup(_('Your system is up-to-date'))
+ UpdaterApplyButton.set_sensitive(False)
else:
+ UpdaterApplyButton.set_sensitive(True)
dsize = 0
for pkg in updates:
pkgname = pkg.name+' '+pkg.version
@@ -47,40 +52,91 @@ def have_updates():
else:
update_top_label.set_markup(_('{number} available updates').format(number = len(updates)))
-def on_TransValidButton_clicked(*arg):
+def handle_error(error):
+ UpdaterWindow.get_window().set_cursor(None)
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ if error:
+ if not 'DBus.Error.NoReply' in str(error):
+ print(error)
+ transaction.ErrorDialog.format_secondary_text(error)
+ response = transaction.ErrorDialog.run()
+ if response:
+ transaction.ErrorDialog.hide()
+ transaction.get_handle()
+ transaction.update_dbs()
+
+def handle_reply(reply):
+ if reply:
+ transaction.ProgressCloseButton.set_visible(True)
+ transaction.action_icon.set_from_icon_name('dialog-information', Gtk.IconSize.BUTTON)
+ transaction.progress_label.set_text(str(reply))
+ transaction.progress_bar.set_text('')
+ end_iter = transaction.progress_buffer.get_end_iter()
+ transaction.progress_buffer.insert(end_iter, str(reply))
+ transaction.get_handle()
+ transaction.update_dbs()
+ else:
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ UpdaterWindow.get_window().set_cursor(None)
+ transaction.get_handle()
+ transaction.update_dbs()
+ have_updates()
+
+def on_UpdaterWindow_delete_event(*args):
+ transaction.StopDaemon()
+ common.rm_pid_file()
+ Gtk.main_quit()
+
+def on_TransValidButton_clicked(*args):
+ UpdaterWindow.get_window().set_cursor(None)
transaction.ConfDialog.hide()
- trans.finalize()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ transaction.finalize()
-def on_TransCancelButton_clicked(*arg):
+def on_TransCancelButton_clicked(*args):
+ UpdaterWindow.get_window().set_cursor(None)
transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(),transaction.progress_buffer.get_end_iter())
transaction.ConfDialog.hide()
- trans.release()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ transaction.Release()
-def on_ProgressCloseButton_clicked(*arg):
+def on_ProgressCloseButton_clicked(*args):
+ UpdaterWindow.get_window().set_cursor(None)
transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
transaction.progress_buffer.delete(transaction.progress_buffer.get_start_iter(),transaction.progress_buffer.get_end_iter())
have_updates()
def on_ProgressCancelButton_clicked(*args):
- trans.interrupt()
-
-def on_UpdaterWindow_delete_event(*arg):
- Gtk.main_quit()
- common.rm_pid_file()
+ transaction.Interrupt()
+ UpdaterWindow.get_window().set_cursor(None)
+ transaction.ProgressWindow.hide()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
-def on_Updater_ApplyButton_clicked(*arg):
+def on_Updater_ApplyButton_clicked(*args):
UpdaterWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
while Gtk.events_pending():
Gtk.main_iteration()
- trans.do_sysupgrade(False)
- UpdaterWindow.get_window().set_cursor(None)
+ transaction.sysupgrade(False)
-def on_Updater_RefreshButton_clicked(*arg):
+def on_Updater_RefreshButton_clicked(*args):
while Gtk.events_pending():
Gtk.main_iteration()
UpdaterWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
- trans.refresh(False)
- UpdaterWindow.get_window().set_cursor(None)
+ transaction.refresh(False)
+
+def on_Updater_CloseButton_clicked(*args):
+ transaction.StopDaemon()
+ common.rm_pid_file()
+ Gtk.main_quit()
signals = {'on_ChooseButton_clicked' : transaction.on_ChooseButton_clicked,
'on_progress_textview_size_allocate' : transaction.on_progress_textview_size_allocate,
@@ -91,7 +147,13 @@ signals = {'on_ChooseButton_clicked' : transaction.on_ChooseButton_clicked,
'on_ProgressCancelButton_clicked' : on_ProgressCancelButton_clicked,
'on_UpdaterWindow_delete_event' : on_UpdaterWindow_delete_event,
'on_Updater_ApplyButton_clicked' : on_Updater_ApplyButton_clicked,
- 'on_Updater_RefreshButton_clicked' : on_Updater_RefreshButton_clicked}
+ 'on_Updater_RefreshButton_clicked' : on_Updater_RefreshButton_clicked,
+ 'on_Updater_CloseButton_clicked' : on_Updater_CloseButton_clicked}
+
+def config_dbus_signals():
+ bus = dbus.SystemBus()
+ bus.add_signal_receiver(handle_reply, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionDone")
+ bus.add_signal_receiver(handle_error, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionError")
if common.pid_file_exists():
transaction.ErrorDialog.format_secondary_text(_('Pamac is already running'))
@@ -101,12 +163,12 @@ if common.pid_file_exists():
else:
common.write_pid_file()
interface.connect_signals(signals)
+ transaction.get_dbus_methods()
+ transaction.config_dbus_signals()
+ config_dbus_signals()
UpdaterWindow.show_all()
- trans = transaction.Transaction()
UpdaterWindow.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
while Gtk.events_pending():
Gtk.main_iteration()
- trans.refresh(False)
- have_updates()
- UpdaterWindow.get_window().set_cursor(None)
+ transaction.refresh(False)
Gtk.main()
diff --git a/pamac.pot b/pamac.pot
index 0dc46d3..6e55e2c 100644
--- a/pamac.pot
+++ b/pamac.pot
@@ -20,444 +20,442 @@ msgstr ""
msgid "Authentication is required"
msgstr ""
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
-msgid "No package found"
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
msgstr ""
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
-msgid "Installed"
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
msgstr ""
-#: pamac-manager.py:149 pamac-manager.py:188
-msgid "Uninstalled"
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
msgstr ""
-#: pamac-manager.py:149 pamac-manager.py:191
-msgid "Orphans"
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
msgstr ""
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
-msgid "To install"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
msgstr ""
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
-msgid "To remove"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
msgstr ""
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
msgstr ""
-#: pamac-manager.py:282
-msgid "Licenses"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
msgstr ""
-#: pamac-manager.py:287
-msgid "Depends On"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
msgstr ""
-#: pamac-manager.py:295
-msgid "Optional Deps"
+#: pamac-daemon.py:187
+msgid "Checking integrity"
msgstr ""
-#: pamac-manager.py:298
-msgid "Required By"
+#: pamac-daemon.py:194
+msgid "Loading packages files"
msgstr ""
-#: pamac-manager.py:300
-msgid "Provides"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
msgstr ""
-#: pamac-manager.py:302
-msgid "Replaces"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
msgstr ""
-#: pamac-manager.py:304
-msgid "Conflicts With"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
msgstr ""
-#: pamac-manager.py:309
-msgid "Repository"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
msgstr ""
-#: pamac-manager.py:311 gui/manager.ui:237
-msgid "Groups"
+#: pamac-daemon.py:219
+msgid "Generation failed."
msgstr ""
-#: pamac-manager.py:313
-msgid "Compressed Size"
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
msgstr ""
-#: pamac-manager.py:314
-msgid "Download Size"
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
msgstr ""
-#: pamac-manager.py:316
-msgid "Installed Size"
+#: pamac-daemon.py:240
+msgid "Checking keyring"
msgstr ""
-#: pamac-manager.py:317
-msgid "Packager"
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
msgstr ""
-#: pamac-manager.py:318
-msgid "Architecture"
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
msgstr ""
-#: pamac-manager.py:321
-msgid "Install Date"
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
msgstr ""
-#: pamac-manager.py:323
-msgid "Explicitly installed"
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
msgstr ""
-#: pamac-manager.py:325
-msgid "Installed as a dependency for another package"
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
msgstr ""
-#: pamac-manager.py:327
-msgid "Unknown"
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
msgstr ""
-#: pamac-manager.py:328
-msgid "Install Reason"
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
msgstr ""
-#: pamac-manager.py:333
-msgid "Signatures"
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
msgstr ""
-#: pamac-manager.py:337
-msgid "Backup files"
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
msgstr ""
-#: pamac-manager.py:408
-#, python-brace-format
-msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
msgstr ""
-#: pamac-manager.py:435
-msgid "Unselect"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
msgstr ""
-#: pamac-manager.py:441
-msgid "Remove"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
msgstr ""
-#: pamac-manager.py:446
-msgid "Reinstall"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
msgstr ""
-#: pamac-manager.py:459
-msgid "Install optional deps"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
msgstr ""
-#: pamac-manager.py:465
-msgid "Install"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
msgstr ""
-#: pamac-manager.py:478
-msgid "Install with optional deps"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
msgstr ""
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
-msgid "Pamac is already running"
+#: pamac-manager.py:274
+msgid "Licenses"
msgstr ""
-#: pamac-updater.py:25 pamac-updater.py:34
-msgid "Your system is up-to-date"
+#: pamac-manager.py:279
+msgid "Depends On"
msgstr ""
-#: pamac-updater.py:44 pamac/transaction.py:655
-msgid "Total download size: "
+#: pamac-manager.py:287
+msgid "Optional Deps"
msgstr ""
-#: pamac-updater.py:46
-msgid "1 available update"
+#: pamac-manager.py:290
+msgid "Required By"
msgstr ""
-#: pamac-updater.py:48
-#, python-brace-format
-msgid "{number} available updates"
+#: pamac-manager.py:292
+msgid "Provides"
msgstr ""
-#: pamac-tray.py:19
-#, python-brace-format
-msgid "{number} available updates"
+#: pamac-manager.py:294
+msgid "Replaces"
msgstr ""
-#: pamac-tray.py:20
-msgid "1 available update"
+#: pamac-manager.py:296
+msgid "Conflicts With"
msgstr ""
-#: pamac-tray.py:22
-msgid "Your system is up-to-date"
+#: pamac-manager.py:301
+msgid "Repository"
msgstr ""
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
-msgid "Update Manager"
+#: pamac-manager.py:303 gui/manager.ui:340
+msgid "Groups"
msgstr ""
-#: pamac-tray.py:36 gui/manager.ui:41
-msgid "Package Manager"
+#: pamac-manager.py:305
+msgid "Compressed Size"
msgstr ""
-#: pamac-tray.py:40
-msgid "Quit"
+#: pamac-manager.py:306
+msgid "Download Size"
msgstr ""
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
+#: pamac-manager.py:308
+msgid "Installed Size"
msgstr ""
-#: pamac-install.py:79
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
+#: pamac-manager.py:309
+msgid "Packager"
msgstr ""
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
+#: pamac-manager.py:310
+msgid "Architecture"
msgstr ""
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
+#: pamac-manager.py:313
+msgid "Install Date"
msgstr ""
-#: pamac/transaction.py:50
-#, python-brace-format
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
+#: pamac-manager.py:315
+msgid "Explicitly installed"
msgstr ""
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
+#: pamac-manager.py:317
+msgid "Installed as a dependency for another package"
msgstr ""
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
+#: pamac-manager.py:319
+msgid "Unknown"
msgstr ""
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
+#: pamac-manager.py:320
+msgid "Install Reason"
msgstr ""
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
+#: pamac-manager.py:325
+msgid "Signatures"
msgstr ""
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
+#: pamac-manager.py:329
+msgid "Backup files"
msgstr ""
-#: pamac/transaction.py:211
+#: pamac-manager.py:451
#, python-brace-format
-msgid "Removing {pkgname}"
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
+#: pamac-manager.py:474
+msgid "Unselect"
msgstr ""
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
+#: pamac-manager.py:480
+msgid "Remove"
msgstr ""
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
+#: pamac-manager.py:486
+msgid "Reinstall"
msgstr ""
-#: pamac/transaction.py:247
-msgid "Checking integrity"
+#: pamac-manager.py:499
+msgid "Install optional deps"
msgstr ""
-#: pamac/transaction.py:254
-msgid "Loading packages files"
+#: pamac-manager.py:505
+msgid "Install"
msgstr ""
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
+#: pamac-manager.py:518
+msgid "Install with optional deps"
msgstr ""
-#: pamac/transaction.py:266
-msgid "Applying deltas"
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
msgstr ""
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
+#: pamac-updater.py:27 pamac-updater.py:37
+msgid "Your system is up-to-date"
msgstr ""
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
msgstr ""
-#: pamac/transaction.py:279
-msgid "Generation failed."
+#: pamac-updater.py:51
+msgid "1 available update"
msgstr ""
-#: pamac/transaction.py:282
+#: pamac-updater.py:53
#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr ""
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
+msgid "{number} available updates"
msgstr ""
-#: pamac/transaction.py:301
-msgid "Checking keyring"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
msgstr ""
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
+#: pamac-tray.py:18
+msgid "1 available update"
msgstr ""
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
msgstr ""
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
msgstr ""
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
msgstr ""
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
+#: pamac-tray.py:38
+msgid "Quit"
msgstr ""
-#: pamac/transaction.py:443
-msgid "Refreshing"
+#: pamac-install.py:119
+msgid ""
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
-#: pamac/transaction.py:581
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
+#: pamac/transaction.py:198
+msgid "Refreshing"
msgstr ""
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
+#: pamac/transaction.py:229
+msgid "Nothing to do"
msgstr ""
-#: pamac/transaction.py:632
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr ""
+
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr ""
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr ""
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr ""
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr ""
-#: pamac/transaction.py:754
-msgid "Preparing"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
msgstr ""
-#: pamac/transaction.py:782
-msgid "Nothing to do"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
msgstr ""
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr ""
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr ""
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr ""
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr ""
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr ""
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr ""
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr ""
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr ""
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr ""
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr ""
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr ""
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr ""
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr ""
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr ""
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr ""
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr ""
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr ""
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr ""
diff --git a/pamac/common.py b/pamac/common.py
index 807feff..30681cf 100644
--- a/pamac/common.py
+++ b/pamac/common.py
@@ -24,10 +24,13 @@ def format_pkg_name(name):
name = name[0:index]
return name
-from os.path import isfile
+from os.path import isfile, join
from os import getpid, remove
+from pamac import config
+
pid_file = '/tmp/pamac.pid'
+lock_file = join(config.pacman_conf.options['DBPath'], 'db.lck')
def pid_file_exists():
return isfile(pid_file)
@@ -40,6 +43,10 @@ def rm_pid_file():
if isfile(pid_file):
remove(pid_file)
+def rm_lock_file():
+ if isfile(lock_file):
+ remove(lock_file)
+
import time
def write_log_file(string):
diff --git a/pamac/transaction.py b/pamac/transaction.py
index 5c8473f..bceac57 100644
--- a/pamac/transaction.py
+++ b/pamac/transaction.py
@@ -2,10 +2,20 @@
# -*- coding:utf-8 -*-
import pyalpm
+import dbus
from gi.repository import Gtk
+from dbus.mainloop.glib import DBusGMainLoop
from pamac import config, common
+to_remove = set()
+to_add = set()
+to_update = set()
+to_load = set()
+handle = None
+syncdbs =None
+localdb = None
+
# i18n
import gettext
import locale
@@ -20,7 +30,7 @@ interface.set_translation_domain('pamac')
interface.add_from_file('/usr/share/pamac/gui/dialogs.ui')
ErrorDialog = interface.get_object('ErrorDialog')
WarningDialog = interface.get_object('WarningDialog')
-InfoDialog = interface.get_object('InfoDialog')
+#InfoDialog = interface.get_object('InfoDialog')
#QuestionDialog = interface.get_object('QuestionDialog')
ConfDialog = interface.get_object('ConfDialog')
transaction_sum = interface.get_object('transaction_sum')
@@ -40,856 +50,365 @@ progress_textview = interface.get_object('progress_textview')
progress_expander = interface.get_object('progress_expander')
progress_buffer = progress_textview.get_buffer()
-choose_only_one = False
+
+DBusGMainLoop(set_as_default = True)
+bus = dbus.SystemBus()
+
+def get_dbus_methods():
+ proxy = bus.get_object('org.manjaro.pamac','/org/manjaro/pamac', introspect = False)
+ global Refresh
+ global Init
+ global Sysupgrade
+ global Remove
+ global Add
+ global Load
+ global Prepare
+ global To_Remove
+ global To_Add
+ global Commit
+ global Interrupt
+ global Release
+ global StopDaemon
+ Refresh = proxy.get_dbus_method('Refresh','org.manjaro.pamac')
+ Init = proxy.get_dbus_method('Init','org.manjaro.pamac')
+ Sysupgrade = proxy.get_dbus_method('Sysupgrade','org.manjaro.pamac')
+ Remove = proxy.get_dbus_method('Remove','org.manjaro.pamac')
+ Add = proxy.get_dbus_method('Add','org.manjaro.pamac')
+ Load = proxy.get_dbus_method('Load','org.manjaro.pamac')
+ Prepare = proxy.get_dbus_method('Prepare','org.manjaro.pamac')
+ To_Remove = proxy.get_dbus_method('To_Remove','org.manjaro.pamac')
+ To_Add = proxy.get_dbus_method('To_Add','org.manjaro.pamac')
+ Commit = proxy.get_dbus_method('Commit','org.manjaro.pamac')
+ Interrupt = proxy.get_dbus_method('Interrupt','org.manjaro.pamac')
+ Release = proxy.get_dbus_method('Release','org.manjaro.pamac')
+ StopDaemon = proxy.get_dbus_method('StopDaemon','org.manjaro.pamac')
+
+def config_dbus_signals():
+ bus.add_signal_receiver(action_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitAction")
+ bus.add_signal_receiver(action_long_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitActionLong")
+ bus.add_signal_receiver(icon_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitIcon")
+ bus.add_signal_receiver(target_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTarget")
+ bus.add_signal_receiver(percent_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitPercent")
+ bus.add_signal_receiver(need_details_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitNeedDetails")
+ bus.add_signal_receiver(download_start_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitDownloadStart")
+ bus.add_signal_receiver(transaction_start_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTransactionStart")
+ bus.add_signal_receiver(log_error, dbus_interface = "org.manjaro.pamac", signal_name = "EmitLogError")
+ bus.add_signal_receiver(log_warning, dbus_interface = "org.manjaro.pamac", signal_name = "EmitLogWarning")
+
+def action_handler(action):
+ progress_label.set_text(action)
+
+def action_long_handler(action_long):
+ global progress_buffer
+ end_iter = progress_buffer.get_end_iter()
+ progress_buffer.insert(end_iter, action_long)
+
+def need_details_handler(need):
+ progress_expander.set_expanded(need)
+
+def icon_handler(icon):
+ action_icon.set_from_file(icon)
+
+def target_handler(target):
+ progress_bar.set_text(target)
+
+def percent_handler(percent):
+ if percent > 1:
+ progress_bar.pulse()
+ else:
+ progress_bar.set_fraction(percent)
+
+def transaction_start_handler(msg):
+ ProgressCancelButton.set_visible(False)
+ ProgressWindow.show()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+
+def download_start_handler(msg):
+ ProgressWindow.show()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+
+def log_error(msg):
+ ErrorDialog.format_secondary_text(msg)
+ response = ErrorDialog.run()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ if response:
+ ErrorDialog.hide()
+
+def log_warning(msg):
+ WarningDialog.format_secondary_text(msg)
+ response = WarningDialog.run()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ if response:
+ WarningDialog.hide()
def choose_provides(data):
- global choose_only_one
- choose_only_one = True
+ virtual_dep = str(data[1])
providers = data[0]
- dep_to_provide = data[1]
- choose_label.set_markup(_('{pkgname} is provided by {number} packages.\nPlease choose the one you want to install:').format(pkgname = dep_to_provide, number = str(len(providers))))
+ choose_label.set_markup(_('{pkgname} is provided by {number} packages.\nPlease choose the one(s) you want to install:').format(pkgname = virtual_dep, number = str(len(providers))))
choose_list.clear()
- choose_renderertoggle.set_radio(True)
- for pkg in providers:
- choose_list.append([False, pkg.name])
+ for name in providers:
+ choose_list.append([False, str(name)])
+ lenght = len(to_add)
ChooseDialog.run()
- index = 0
- if to_provide:
- for pkg in providers:
- if to_provide[0] == pkg.name:
- index = providers.index(pkg)
- return index
+ if len(to_add) == lenght: # no choice was done by the user
+ to_add.add(choose_list.get(choose_list.get_iter_first(), 1)[0]) # add first provider
def on_choose_renderertoggle_toggled(widget, line):
- global choose_only_one
choose_list[line][0] = not choose_list[line][0]
- if choose_only_one:
- for row in choose_list:
- if not row[1] == choose_list[line][1]:
- row[0] = False
def on_ChooseButton_clicked(*arg):
ChooseDialog.hide()
- line = 0
- to_provide.clear()
- while line < len(choose_list):
- if choose_list[line][0] is True:
- to_provide.append(choose_list[line][1])
- line += 1
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ for row in choose_list:
+ if row[0] is True:
+ to_add.add(row[1].split(':')[0]) # split done in case of optdep choice
def on_progress_textview_size_allocate(*arg):
#auto-scrolling method
adj = progress_textview.get_vadjustment()
adj.set_value(adj.get_upper() - adj.get_page_size())
-#~ def policykit_test(sender, connexion, action):
- #~ bus = dbus.SystemBus()
- #~ proxy_dbus = connexion.get_object('org.freedesktop.DBus','/org/freedesktop/DBus/Bus', False)
- #~ dbus_info = dbus.Interface(proxy_dbus,'org.freedesktop.DBus')
- #~ sender_pid = dbus_info.GetConnectionUnixProcessID(sender)
- #~ proxy_policykit = bus.get_object('org.freedesktop.PolicyKit1','/org/freedesktop/PolicyKit1/Authority',False)
- #~ policykit_authority = dbus.Interface(proxy_policykit,'org.freedesktop.PolicyKit1.Authority')
-#~
- #~ Subject = ('unix-process', {'pid': dbus.UInt32(sender_pid, variant_level=1),
- #~ 'start-time': dbus.UInt64(0, variant_level=1)})
- #~ (is_authorized,is_challenge,details) = policykit_authority.CheckAuthorization(Subject, action, {'': ''}, dbus.UInt32(1), '')
- #~ return is_authorized
-
-#~ def sort_pkgs_list(self, pkgs_list):
- #~ result = []
- #~ names_list = sorted([pkg.name for pkg in pkgs_list])
- #~ for name in names_list:
- #~ for pkg in pkgs_list:
- #~ if name == pkg.name:
- #~ result.append(pkg)
- #~ return result
-
-def remove_pkg_from_list(pkg, pkgs_list):
- if pkgs_list:
- for _pkg in pkgs_list:
- if (pkg.name == _pkg.name and pkg.version == _pkg.version and pkg.arch == _pkg.arch):
- target = _pkg
- pkgs_list.remove(_pkg)
-
-def pkg_in_list(pkg, pkgs_list):
- result = False
- if pkgs_list:
- for _pkg in pkgs_list:
- if (pkg.name == _pkg.name and pkg.version == _pkg.version and pkg.arch == _pkg.arch):
- result = True
- return result
-
-class Transaction():
- def __init__(self):
- self.t = None
- self.to_remove = []
- self.to_add = []
- self.to_load = []
- self.to_provide = []
- self.error = ''
- self.warning = ''
- self.previous_action = ''
- self.previous_action_long = ''
- self.previous_icon = ''
- self.previous_target = ''
- self.previous_percent = 0
- self.total_size = 0
- self.already_transferred = 0
- self.handle = config.handle()
- self.syncdbs = self.handle.get_syncdbs()
- self.localdb = self.handle.get_localdb()
- self.handle.dlcb = self.cb_dl
- self.handle.totaldlcb = self.totaldlcb
- self.handle.eventcb = self.cb_event
- self.handle.questioncb = self.cb_question
- self.handle.progresscb = self.cb_progress
- self.handle.logcb = self.cb_log
-
- def update_dbs(self):
- self.handle = config.handle()
- self.syncdbs = self.handle.get_syncdbs()
- self.localdb = self.handle.get_localdb()
- self.handle.dlcb = self.cb_dl
- self.handle.totaldlcb = self.totaldlcb
- self.handle.eventcb = self.cb_event
- self.handle.questioncb = self.cb_question
- self.handle.progresscb = self.cb_progress
- self.handle.logcb = self.cb_log
-
- def get_localpkg(self, name):
- return self.localdb.get_pkg(name)
-
- def get_syncpkg(self, name):
- for repo in self.syncdbs:
- pkg = repo.get_pkg(name)
- if pkg:
- return pkg
-
- def cb_event(self, event, tupel):
- global progress_buffer
- action = self.previous_action
- action_long = self.previous_action_long
- icon = self.previous_icon
- if event == 'ALPM_EVENT_CHECKDEPS_START':
- action = _('Checking dependencies')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- elif event == 'ALPM_EVENT_CHECKDEPS_DONE':
- if self.warning:
- self.handle_warning(self.warning)
- self.warning = ''
- elif event == 'ALPM_EVENT_FILECONFLICTS_START':
- action = _('Checking file conflicts')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- elif event == 'ALPM_EVENT_FILECONFLICTS_DONE':
- pass
- elif event == 'ALPM_EVENT_RESOLVEDEPS_START':
- action = _('Resolving dependencies')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
- elif event == 'ALPM_EVENT_RESOLVEDEPS_DONE':
- pass
- elif event == 'ALPM_EVENT_INTERCONFLICTS_START':
- action = _('Checking inter conflicts')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- elif event == 'ALPM_EVENT_INTERCONFLICTS_DONE':
- if self.warning:
- self.handle_warning(self.warning)
- self.warning = ''
- elif event == 'ALPM_EVENT_ADD_START':
- string = _('Installing {pkgname}').format(pkgname = tupel[0].name)
- action = string+'...'
- action_long = '{} ({})\n'.format(string, tupel[0].version)
- icon = '/usr/share/pamac/icons/24x24/status/package-add.png'
- ProgressCancelButton.set_visible(False)
- elif event == 'ALPM_EVENT_ADD_DONE':
- formatted_event = 'Installed {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version)
- common.write_log_file(formatted_event)
- elif event == 'ALPM_EVENT_REMOVE_START':
- string = _('Removing {pkgname}').format(pkgname = tupel[0].name)
- action = string+'...'
- action_long = '{} ({})\n'.format(string, tupel[0].version)
- icon = '/usr/share/pamac/icons/24x24/status/package-delete.png'
- ProgressCancelButton.set_visible(False)
- elif event == 'ALPM_EVENT_REMOVE_DONE':
- formatted_event = 'Removed {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version)
- common.write_log_file(formatted_event)
- elif event == 'ALPM_EVENT_UPGRADE_START':
- string = _('Upgrading {pkgname}').format(pkgname = tupel[1].name)
- action = string+'...'
- action_long = '{} ({} -> {})\n'.format(string, tupel[1].version, tupel[0].version)
- icon = '/usr/share/pamac/icons/24x24/status/package-update.png'
- ProgressCancelButton.set_visible(False)
- elif event == 'ALPM_EVENT_UPGRADE_DONE':
- formatted_event = 'Upgraded {pkgname} ({oldversion} -> {newversion})'.format(pkgname = tupel[1].name, oldversion = tupel[1].version, newversion = tupel[0].version)
- common.write_log_file(formatted_event)
- elif event == 'ALPM_EVENT_DOWNGRADE_START':
- string = _('Downgrading {pkgname}').format(pkgname = tupel[1].name)
- action = string+'...'
- action_long = '{} ({} -> {})'.format(string, tupel[1].version, tupel[0].version)
- icon = '/usr/share/pamac/icons/24x24/status/package-add.png'
- ProgressCancelButton.set_visible(False)
- elif event == 'ALPM_EVENT_DOWNGRADE_DONE':
- formatted_event = 'Downgraded {pkgname} ({oldversion} -> {newversion})'.format(pkgname = tupel[1].name, oldversion = tupel[1].version, newversion = tupel[0].version)
- common.write_log_file(formatted_event)
- elif event == 'ALPM_EVENT_REINSTALL_START':
- string = _('Reinstalling {pkgname}').format(pkgname = tupel[0].name)
- action = string+'...'
- action_long = '{} ({})'.format(string, tupel[0].version)
- icon = '/usr/share/pamac/icons/24x24/status/package-add.png'
- ProgressCancelButton.set_visible(False)
- elif event == 'ALPM_EVENT_REINSTALL_DONE':
- formatted_event = 'Reinstalled {pkgname} ({pkgversion})'.format(pkgname = tupel[0].name, pkgversion = tupel[0].version)
- common.write_log_file(formatted_event)
- elif event == 'ALPM_EVENT_INTEGRITY_START':
- action = _('Checking integrity')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- self.already_transferred = 0
- elif event == 'ALPM_EVENT_INTEGRITY_DONE':
- pass
- elif event == 'ALPM_EVENT_LOAD_START':
- action = _('Loading packages files')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- elif event == 'ALPM_EVENT_LOAD_DONE':
- pass
- elif event == 'ALPM_EVENT_DELTA_INTEGRITY_START':
- action = _('Checking delta integrity')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- elif event == 'ALPM_EVENT_DELTA_INTEGRITY_DONE':
- pass
- elif event == 'ALPM_EVENT_DELTA_PATCHES_START':
- action = _('Applying deltas')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
- elif event == 'ALPM_EVENT_DELTA_PATCHES_DONE':
- pass
- elif event == 'ALPM_EVENT_DELTA_PATCH_START':
- action = _('Generating {} with {}').format(tupel[0], tupel[1])+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
- elif event == 'ALPM_EVENT_DELTA_PATCH_DONE':
- action = _('Generation succeeded!')
- action_long = action+'\n'
- elif event == 'ALPM_EVENT_DELTA_PATCH_FAILED':
- action = _('Generation failed.')
- action_long = action+'\n'
- elif event == 'ALPM_EVENT_SCRIPTLET_INFO':
- action =_('Configuring {pkgname}').format(pkgname = self.previous_target)+'...'
- action_long = tupel[0]
- icon = '/usr/share/pamac/icons/24x24/status/package-setup.png'
- progress_bar.pulse()
- progress_expander.set_expanded(True)
- elif event == 'ALPM_EVENT_RETRIEVE_START':
- # handled by download callback
- ProgressCancelButton.set_visible(True)
- elif event == 'ALPM_EVENT_DISKSPACE_START':
- action = _('Checking available disk space')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- elif event == 'ALPM_EVENT_OPTDEP_REQUIRED':
- print('Optionnal deps exist')
- elif event == 'ALPM_EVENT_DATABASE_MISSING':
- #action =_('Database file for {} does not exist').format(tupel[0])+'...'
- #action_long = action
- pass
- elif event == 'ALPM_EVENT_KEYRING_START':
- action = _('Checking keyring')+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
- ProgressCancelButton.set_visible(True)
- elif event == 'ALPM_EVENT_KEYRING_DONE':
- pass
- elif event == 'ALPM_EVENT_KEY_DOWNLOAD_START':
- action = _('Downloading required keys')+'...'
- action_long = action+'\n'
- elif event == 'ALPM_EVENT_KEY_DOWNLOAD_DONE':
- pass
- if action != self.previous_action:
- self.previous_action = action
- progress_label.set_text(action)
- if action_long != self.previous_action_long:
- self.previous_action_long != action_long
- end_iter = progress_buffer.get_end_iter()
- progress_buffer.insert(end_iter, action_long)
- if icon != self.previous_icon:
- self.previous_icon = icon
- action_icon.set_from_file(icon)
- while Gtk.events_pending():
- Gtk.main_iteration()
- print(event)
-
- def cb_question(self, event, data_tupel, extra_data):
- print('question', event, data_tupel, extra_data)
- if event == 'ALPM_QUESTION_INSTALL_IGNOREPKG':
- return 0 #Do not install package in IgnorePkg/IgnoreGroup
- if event == 'ALPM_QUESTION_REPLACE_PKG':
- self.warning += _('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = data_tupel[0].name, pkgname2 = data_tupel[1].name)+'\n'
- return 1 #Auto-remove conflicts in case of replaces
- if event == 'ALPM_QUESTION_CONFLICT_PKG':
- self.warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = data_tupel[0], pkgname2 = data_tupel[1])+'\n'
- return 1 #Auto-remove conflicts
- if event == 'ALPM_QUESTION_CORRUPTED_PKG':
- return 1 #Auto-remove corrupted pkgs in cache
- if event == 'ALPM_QUESTION_REMOVE_PKGS':
- return 1 #Do not upgrade packages which have unresolvable dependencies
- if event == 'ALPM_QUESTION_SELECT_PROVIDER':
- return choose_provides(data_tupel)
- if event == 'ALPM_QUESTION_IMPORT_KEY':
- # data_tupel = (revoked(int), length(int), pubkey_algo(string), fingerprint(string), uid(string), created_time(int))
- if data_tupel[0] is 0: # not revoked
- return 1 #Auto import not revoked key
- if data_tupel[0] is 1: # revoked
- return 0 #Do not import revoked key
-
- def cb_log(self, level, line):
- global progress_buffer
- _logmask = pyalpm.LOG_ERROR | pyalpm.LOG_WARNING
- if not (level & _logmask):
- return
- if level & pyalpm.LOG_ERROR:
- #self.error += line
- _error = "ERROR: "+line
- end_iter = progress_buffer.get_end_iter()
- progress_buffer.insert(end_iter, _error)
- progress_expander.set_expanded(True)
- while Gtk.events_pending():
- Gtk.main_iteration()
- print(line)
- elif level & pyalpm.LOG_WARNING:
- self.warning += line
- _warning = "WARNING: "+line
- end_iter = progress_buffer.get_end_iter()
- progress_buffer.insert(end_iter, _warning)
+def get_handle():
+ global handle
+ handle = config.handle()
+ print('get handle')
+
+def update_dbs():
+ global handle
+ global syncdbs
+ global localdb
+ handle = config.handle()
+ syncdbs = handle.get_syncdbs()
+ localdb = handle.get_localdb()
+
+def get_localpkg(name):
+ return localdb.get_pkg(name)
+
+def get_syncpkg(name):
+ for repo in syncdbs:
+ pkg = repo.get_pkg(name)
+ if pkg:
+ return pkg
+
+def refresh(force_update):
+ 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)
+ ProgressCancelButton.set_visible(True)
+ ProgressCloseButton.set_visible(False)
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ Refresh(force_update)
+
+def init_transaction(**options):
+ return Init(dbus.Dictionary(options, signature='sb'))
+
+def run():
+ if to_add | to_remove | to_load:
+ error = ''
+ trans_flags = {'cascade' : True}
+ error += init_transaction(**trans_flags)
+ if not error:
+ for name in to_add:
+ error += Add(name)
+ for name in to_remove:
+ error += Remove(name)
+ for path in to_load:
+ error += Load(path)
+ if not error:
+ error += prepare(False, **trans_flags)
+ if error:
+ Release()
+ return(error)
+ else:
+ return (_('Nothing to do'))
+
+def prepare(show_updates, **trans_flags):
+ global to_add
+ error = ''
+ ret = Prepare()
+ if ret[0][0]: # providers are emitted
+ Release()
+ for item in ret:
+ choose_provides(item)
+ error += init_transaction(**trans_flags)
+ if not error:
+ for name in to_add:
+ error += Add(name)
+ for name in to_remove:
+ error += Remove(name)
+ for path in to_load:
+ error += Load(path)
+ if not error:
+ ret = Prepare()
+ if ret[0][1]:
+ error = str(ret[0][1])
+ elif ret[0][1]: # an error is emitted
+ error = str(ret[0][1])
+ if not error:
+ set_transaction_sum(show_updates)
+ if show_updates:
+ ConfDialog.show_all()
while Gtk.events_pending():
Gtk.main_iteration()
- elif level & pyalpm.LOG_DEBUG:
- line = "DEBUG: " + line
- print(line)
- elif level & pyalpm.LOG_FUNCTION:
- line = "FUNC: " + line
- print(line)
-
- def totaldlcb(self, _total_size):
- self.total_size = _total_size
-
- def cb_dl(self, _target, _transferred, _total):
- global progress_buffer
- if _target.endswith('.db'):
- action = _('Refreshing {repo}').format(repo = _target.rstrip('.db'))+'...'
- action_long = ''
- icon = '/usr/share/pamac/icons/24x24/status/refresh-cache.png'
else:
- action = _('Downloading {pkgname}').format(pkgname = _target.rstrip('.pkg.tar.xz'))+'...'
- action_long = action+'\n'
- icon = '/usr/share/pamac/icons/24x24/status/package-download.png'
- if self.total_size > 0:
- percent = round((_transferred+self.already_transferred)/self.total_size, 2)
- #~ target = '{transferred}/{size}'.format(transferred = common.format_size(_transferred+self.already_transferred), size = common.format_size(self.total_size))
- else:
- percent = round(_transferred/_total, 2)
- #~ percent = 2.0
- #~ target = ''
- if action != self.previous_action:
- self.previous_action = action
- progress_label.set_text(action)
- if action_long != self.previous_action_long:
- self.previous_action_long = action_long
- end_iter = progress_buffer.get_end_iter()
- progress_buffer.insert(end_iter, action_long)
- if icon != self.previous_icon:
- self.previous_icon = icon
- action_icon.set_from_file(icon)
- #~ if target != self.previous_target:
- #~ self.previous_target = target
- #~ progress_bar.set_text(target)
- #~ if percent == 2.0:
- #~ progress_bar.pulse()
- elif percent != self.previous_percent:
- self.previous_percent = percent
- if 0 <= percent <= 1:
- progress_bar.set_fraction(percent)
+ if len(transaction_sum) != 0:
+ ConfDialog.show_all()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
else:
- progress_bar.pulse()
- elif _transferred == _total:
- self.already_transferred += _total
- #~ if self.already_transferred == self.total_size:
- #~ progress_bar.set_text('')
- while Gtk.events_pending():
- Gtk.main_iteration()
-
- def cb_progress(self, event, target, _percent, n, i):
- if event in ('ALPM_PROGRESS_ADD_START', 'ALPM_PROGRESS_UPGRADE_START', 'ALPM_PROGRESS_DOWNGRADE_START', 'ALPM_PROGRESS_REINSTALL_START', 'ALPM_PROGRESS_REMOVE_START'):
- percent = round(((i-1)/n)+(_percent/(100*n)), 2)
- else:
- percent = round(_percent/100, 2)
- if target != self.previous_target:
- self.previous_target = target.format()
- if percent != self.previous_percent:
- progress_bar.set_text('{}/{}'.format(str(i), str(n)))
- self.previous_percent = percent
- if 0 <= percent <= 1:
- progress_bar.set_fraction(percent)
- else:
- progress_bar.pulse()
- while Gtk.events_pending():
- Gtk.main_iteration()
-
- def refresh(self, force_update):
- 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)
- ProgressCloseButton.set_visible(False)
- ProgressCancelButton.set_visible(True)
- ProgressWindow.show()
- while Gtk.events_pending():
- Gtk.main_iteration()
- self.error = ''
- for db in self.syncdbs:
- try:
- self.t = self.handle.init_transaction()
- db.update(force = force_update)
- self.t.release()
- except pyalpm.error as e:
- self.release()
- self.error += str(e)+'\n'
- break
- self.update_dbs()
- ProgressWindow.hide()
- if self.error:
- self.handle_error(self.error)
-
- def get_updates(self):
- do_syncfirst = False
- list_first = set()
- _ignorepkgs = set()
- if self.handle:
- for group in self.handle.ignoregrps:
- db = self.handle.get_localdb()
- grp = db.read_grp(group)
- if grp:
- name, pkg_list = grp
- for pkg in pkg_list:
- _ignorepkgs.add(pkg.name)
- for name in self.handle.ignorepkgs:
- if self.get_localpkg(name):
- _ignorepkgs.add(name)
- if config.syncfirst:
- for name in config.syncfirst:
- if self.get_localpkg(name):
- candidate = pyalpm.sync_newversion(self.get_localpkg(name), self.syncdbs)
- if candidate:
- list_first.add(candidate)
- if list_first:
- do_syncfirst = True
- return do_syncfirst, list_first
- result = set()
- for pkg in self.localdb.pkgcache:
- candidate = pyalpm.sync_newversion(pkg, self.syncdbs)
- if candidate:
- if not candidate.name in _ignorepkgs:
- result.add(candidate)
- return do_syncfirst, result
-
- def init(self, **options):
- self.error = ''
- try:
- self.t = self.handle.init_transaction(**options)
- except pyalpm.error as e:
- self.error += str(e)+'\n'
- finally:
- if self.error:
- self.handle_error(self.error)
- return False
- else:
- return True
-
- def sysupgrade(self, force_downgrade):
- try:
- self.t.sysupgrade(downgrade = force_downgrade)
- except pyalpm.error as e:
- self.error += str(e)+'\n'
- self.t.release()
- finally:
- if self.error:
- self.handle_error(self.error)
- return False
- else:
- return True
-
- def remove(self, pkg):
- try:
- self.t.remove_pkg(pkg)
- except pyalpm.error as e:
- self.error += str(e)+'\n'
- self.t.release()
- finally:
- if self.error:
- self.handle_error(self.error)
- return False
- else:
- return True
-
- def add(self, pkg):
- try:
- self.t.add_pkg(pkg)
- except pyalpm.error as e:
- # skip duplicate target error
- if not 'pm_errno 25' in str(e):
- self.error += str(e)+'\n'
- self.t.release()
- finally:
- if self.error:
- self.handle_error(self.error)
- return False
- else:
- return True
-
- def load(self, tarball_path):
- try:
- pkg = self.handle.load_pkg(tarball_path)
+ finalize()
+ return(error)
+
+def finalize():
+ global progress_buffer
+ progress_label.set_text(_('Preparing')+'...')
+ action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/package-setup.png')
+ progress_bar.set_text('')
+ progress_bar.set_fraction(0)
+ progress_buffer.delete(progress_buffer.get_start_iter(), progress_buffer.get_end_iter())
+ ProgressCancelButton.set_visible(True)
+ ProgressCloseButton.set_visible(False)
+ #~ try:
+ Commit()
+ #~ except dbus.exceptions.DBusException as e:
+ #~ handle_error(str(e))
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+
+def get_updates():
+ do_syncfirst = False
+ list_first = []
+ _ignorepkgs = set()
+ if handle:
+ for group in handle.ignoregrps:
+ db = localdb
+ grp = db.read_grp(group)
+ if grp:
+ name, pkg_list = grp
+ for pkg in pkg_list:
+ _ignorepkgs.add(pkg.name)
+ for name in handle.ignorepkgs:
+ if get_localpkg(name):
+ _ignorepkgs.add(name)
+ if config.syncfirst:
+ for name in config.syncfirst:
+ pkg = get_localpkg(name)
if pkg:
- self.t.add_pkg(pkg)
- else:
- self.error += _('{pkgname} is not a valid path or package name').format(pkgname = tarball_path)
- except pyalpm.error as e:
- # skip duplicate target error
- if not 'pm_errno 25' in str(e):
- self.error += str(e)+'\n'
- self.t.release()
- finally:
- if self.error:
- self.handle_error(self.error)
- return False
- else:
- return True
-
- def check_extra_modules(self):
- to_check = []
- if self.to_add:
- for pkg in self.to_add:
- to_check.append(pkg)
- if self.to_load:
- for path in self.to_load:
- try:
- pkg = self.handle.load_pkg(path)
- if pkg:
- to_check.append(pkg)
- except:
- self.handle_error(_('{pkgname} is not a valid path or package name').format(pkgname = path))
- return False
- already_checked = set(pkg.name for pkg in to_check)
- depends = [to_check]
- # get installed kernels
- pkgs = self.localdb.search('linux3')
- installed_linux = []
- for pkg in pkgs:
- if len(pkg.name) == 7 or len(pkg.name) == 8:
- installed_linux.append(pkg.name)
- for pkg in self.to_add:
- if 'linux3' in pkg.name:
- if len(pkg.name) == 7 or len(pkg.name) == 8:
- installed_linux.append(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 self.localdb.pkgcache:
- for depend in _pkg.depends:
- if '-modules' in depend:
- for db in self.syncdbs:
- for __pkg in db.pkgcache:
- if not self.get_localpkg(__pkg.name):
- 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_in_list(__pkg, self.to_add):
- if not __pkg.name in already_checked:
- depends[i+1].append(__pkg)
- already_checked.add(__pkg.name)
- self.to_add.append(__pkg)
- # check pkg deps
- for depend in pkg.depends:
- # check if dep is already installed
- found_depend = pyalpm.find_satisfier(self.localdb.pkgcache, 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 db in self.syncdbs:
- for _pkg in db.pkgcache:
- if not self.get_localpkg(_pkg.name):
- 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_in_list(_pkg, self.to_add):
- if not _pkg.name in already_checked:
- depends[i+1].append(_pkg)
- already_checked.add(_pkg.name)
- self.to_add.append(_pkg)
- 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
- for db in self.syncdbs:
- found_depend = pyalpm.find_satisfier(db.pkgcache, depend)
- if found_depend:
- if found_depend.name != common.format_pkg_name(depend):
- # check if the dep is a kernel module to provide and if so, auto-select it
- if ('-modules' in depend) or ('linux' in depend):
- for db in self.syncdbs:
- for _pkg in db.pkgcache:
- if not self.get_localpkg(_pkg.name):
- 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_in_list(_pkg, self.to_add):
- if not _pkg.name in already_checked:
- depends[i+1].append(_pkg)
- already_checked.add(_pkg.name)
- self.to_add.append(_pkg)
- 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)
- break
- i += 1
- # end of the loop
- return True
-
- def prepare(self):
- try:
- self.t.prepare()
- except pyalpm.error as e:
- self.error += str(e)+'\n'
- self.t.release()
- else:
- for pkg in self.t.to_remove:
- if pkg.name in config.holdpkg:
- self.error += _('The transaction cannot be performed because it needs to remove {pkgname1} which is a locked package').format(pkgname1 = pkg.name)
- self.t.release()
- break
- finally:
- if self.error:
- self.handle_error(self.error)
- return False
- else:
- return True
-
- def commit(self):
- try:
- self.t.commit()
- except pyalpm.error as e:
- self.error += str(e)+'\n'
- else:
- global progress_buffer
- ProgressCloseButton.set_visible(True)
- action_icon.set_from_icon_name('dialog-information', Gtk.IconSize.BUTTON)
- progress_label.set_text(_('Transaction successfully finished'))
- progress_bar.set_text('')
- end_iter = progress_buffer.get_end_iter()
- progress_buffer.insert(end_iter, _('Transaction successfully finished'))
- finally:
- self.release()
- if self.warning:
- self.handle_warning(self.warning)
- self.warning = ''
- if self.error:
- self.handle_error(self.error)
-
- def interrupt(self):
- try:
- self.t.interrupt()
- except:
- pass
- try:
- self.t.release()
- except:
- pass
- # Fix me, pyalpm don't stop so we inform and force quit to really interrupt the transaction
- InfoDialog.format_secondary_text(_('The transaction was interrupted.\nNow Pamac will quit.'))
- response = InfoDialog.run()
- if response:
- InfoDialog.hide()
- common.rm_pid_file()
- print('interrupted')
- exit(0)
-
- def set_transaction_sum(self, show_updates):
- transaction_sum.clear()
- sum_top_label.set_markup(_('Transaction Summary'))
- _to_remove = self.t.to_remove
- _to_install = []
- _to_reinstall = []
- _to_downgrade = []
- _to_update = []
- dsize = 0
- for pkg in self.t.to_add:
- dsize += pkg.download_size
- installed = self.get_localpkg(pkg.name)
- if not installed:
- _to_install.append(pkg)
- else:
- comp = pyalpm.vercmp(pkg.version, installed.version)
- if comp == 0:
- _to_reinstall.append(pkg)
- elif comp == -1:
- _to_downgrade.append(pkg)
- elif comp == 1:
- _to_update.append(pkg)
- if dsize == 0:
- sum_bottom_label.set_markup('')
+ candidate = pyalpm.sync_newversion(pkg, syncdbs)
+ if candidate:
+ list_first.append(candidate)
+ if list_first:
+ do_syncfirst = True
+ return do_syncfirst, list_first
+ result = []
+ for pkg in localdb.pkgcache:
+ candidate = pyalpm.sync_newversion(pkg, syncdbs)
+ if candidate:
+ if not candidate.name in _ignorepkgs:
+ result.append(candidate)
+ return do_syncfirst, result
+
+def get_transaction_sum():
+ transaction_dict = {'to_remove': [], 'to_install': [], 'to_update': [], 'to_reinstall': [], 'to_downgrade': []}
+ to_remove = sorted(To_Remove())
+ for name, version in to_remove:
+ transaction_dict['to_remove'].append(name+' '+version)
+ others = sorted(To_Add())
+ for name, version, dsize in others:
+ pkg = get_localpkg(name)
+ if pkg:
+ comp = pyalpm.vercmp(version, pkg.version)
+ if comp == 1:
+ transaction_dict['to_update'].append((name+' '+version, dsize))
+ elif comp == 0:
+ transaction_dict['to_reinstall'].append((name+' '+version, dsize))
+ elif comp == -1:
+ transaction_dict['to_downgrade'].append((name+' '+version, dsize))
else:
- sum_bottom_label.set_markup(_('Total download size: ')+common.format_size(dsize))
- i = 0
- while i < len(_to_remove):
- pkg = _to_remove[i]
- if i == 0:
- transaction_sum.append([_('To remove')+':', pkg.name+' '+pkg.version])
- else:
- transaction_sum.append(['', pkg.name+' '+pkg.version])
+ transaction_dict['to_install'].append((name+' '+version, dsize))
+ #~ if transaction_dict['to_install']:
+ #~ print('To install:', [name for name, size in transaction_dict['to_install']])
+ #~ if transaction_dict['to_reinstall']:
+ #~ print('To reinstall:', [name for name, size in transaction_dict['to_reinstall']])
+ #~ if transaction_dict['to_downgrade']:
+ #~ print('To downgrade:', [name for name, size in transaction_dict['to_downgrade']])
+ #~ if transaction_dict['to_remove']:
+ #~ print('To remove:', [name for name in transaction_dict['to_remove']])
+ #~ if transaction_dict['to_update']:
+ #~ print('To update:', [name for name, size in transaction_dict['to_update']])
+ return transaction_dict
+
+def set_transaction_sum(show_updates):
+ transaction_sum.clear()
+ transaction_dict = get_transaction_sum()
+ sum_top_label.set_markup(_('Transaction Summary'))
+ if transaction_dict['to_install']:
+ transaction_sum.append([_('To install')+':', transaction_dict['to_install'][0][0]])
+ i = 1
+ while i < len(transaction_dict['to_install']):
+ transaction_sum.append([' ', transaction_dict['to_install'][i][0]])
i += 1
- i = 0
- while i < len(_to_install):
- pkg = _to_install[i]
- if i == 0:
- transaction_sum.append([_('To install')+':', pkg.name+' '+pkg.version])
- else:
- transaction_sum.append(['', pkg.name+' '+pkg.version])
+ if transaction_dict['to_reinstall']:
+ transaction_sum.append([_('To reinstall')+':', transaction_dict['to_reinstall'][0][0]])
+ i = 1
+ while i < len(transaction_dict['to_reinstall']):
+ transaction_sum.append([' ', transaction_dict['to_reinstall'][i][0]])
i += 1
- i = 0
- while i < len(_to_reinstall):
- pkg = _to_reinstall[i]
- if i == 0:
- transaction_sum.append([_('To reinstall')+':', pkg.name+' '+pkg.version])
- else:
- transaction_sum.append(['', pkg.name+' '+pkg.version])
+ if transaction_dict['to_downgrade']:
+ transaction_sum.append([_('To downgrade')+':', transaction_dict['to_downgrade'][0][0]])
+ i = 1
+ while i < len(transaction_dict['to_downgrade']):
+ transaction_sum.append([' ', transaction_dict['to_downgrade'][i][0]])
i += 1
- i = 0
- while i < len(_to_downgrade):
- pkg = _to_downgrade[i]
- if i == 0:
- transaction_sum.append([_('To downgrade')+':', pkg.name+' '+pkg.version])
- else:
- transaction_sum.append(['', pkg.name+' '+pkg.version])
+ if transaction_dict['to_remove']:
+ transaction_sum.append([_('To remove')+':', transaction_dict['to_remove'][0]])
+ i = 1
+ while i < len(transaction_dict['to_remove']):
+ transaction_sum.append([' ', transaction_dict['to_remove'][i]])
i += 1
- if show_updates:
- i = 0
- while i < len(_to_update):
- pkg = _to_update[i]
- if i == 0:
- transaction_sum.append([_('To update')+':', pkg.name+' '+pkg.version])
- else:
- transaction_sum.append(['', pkg.name+' '+pkg.version])
+ if show_updates:
+ if transaction_dict['to_update']:
+ transaction_sum.append([_('To update')+':', transaction_dict['to_update'][0][0]])
+ i = 1
+ while i < len(transaction_dict['to_update']):
+ transaction_sum.append([' ', transaction_dict['to_update'][i][0]])
i += 1
-
- def handle_error(self, error):
- ProgressWindow.hide()
- print(error)
- ErrorDialog.format_secondary_text(error)
- response = ErrorDialog.run()
- if response:
- ErrorDialog.hide()
-
- def handle_warning(self, warning):
- WarningDialog.format_secondary_text(warning)
- response = WarningDialog.run()
- if response:
- WarningDialog.hide()
-
- def do_sysupgrade(self, show_updates):
- do_syncfirst, to_update = self.get_updates()
- if to_update:
- self.to_add.clear()
- self.to_remove.clear()
- self.error = ''
- if do_syncfirst:
- if self.init(recurse = True):
- for pkg in to_update:
- self.add(pkg)
- if self.prepare():
- self.set_transaction_sum(show_updates)
- if show_updates:
- ConfDialog.show_all()
- while Gtk.events_pending():
- Gtk.main_iteration()
- else:
- if len(transaction_sum) != 0:
- ConfDialog.show_all()
- while Gtk.events_pending():
- Gtk.main_iteration()
- else:
- self.finalize()
- else:
- if self.init():
- if self.sysupgrade(False):
- if self.prepare():
- self.set_transaction_sum(show_updates)
- if show_updates:
- ConfDialog.show_all()
- while Gtk.events_pending():
- Gtk.main_iteration()
- else:
- if len(transaction_sum) != 0:
- ConfDialog.show_all()
- while Gtk.events_pending():
- Gtk.main_iteration()
- else:
- self.finalize()
-
- def finalize(self):
- global progress_buffer
- progress_label.set_text(_('Preparing')+'...')
- action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/package-setup.png')
- progress_bar.set_text('')
- progress_bar.set_fraction(0)
- progress_buffer.delete(progress_buffer.get_start_iter(), progress_buffer.get_end_iter())
- ProgressCloseButton.set_visible(False)
- ProgressWindow.show()
- while Gtk.events_pending():
- Gtk.main_iteration()
- self.commit()
- self.to_add.clear()
- self.to_remove.clear()
-
- def run(self):
- if self.to_add or self.to_load:
- if self.check_extra_modules():
- if self.to_add or self.to_remove or self.to_load:
- if self.init(cascade = True):
- for pkg in self.to_add:
- self.add(pkg)
- for pkg in self.to_remove:
- self.remove(pkg)
- for path in self.to_load:
- self.load(path)
- if self.prepare():
- self.set_transaction_sum(True)
- ConfDialog.show()
- while Gtk.events_pending():
- Gtk.main_iteration()
- else:
- self.handle_warning(_('Nothing to do'))
-
- def release(self):
- try:
- self.t.release()
- except:
- pass
+ dsize = 0
+ for nameversion, size in transaction_dict['to_install'] + transaction_dict['to_update'] + transaction_dict['to_reinstall'] + transaction_dict['to_downgrade']:
+ dsize += size
+ if dsize == 0:
+ sum_bottom_label.set_markup('')
+ else:
+ sum_bottom_label.set_markup(_('Total download size: ')+common.format_size(dsize))
+
+def sysupgrade(show_updates):
+ global to_update
+ global to_add
+ global to_remove
+ do_syncfirst, updates = get_updates()
+ if updates:
+ to_update = set([pkg.name for pkg in updates])
+ to_add.clear()
+ to_remove.clear()
+ error = ''
+ if do_syncfirst:
+ error += init_transaction()
+ if not error:
+ for name in to_add:
+ error += Add(name)
+ else:
+ error += init_transaction()
+ if not error:
+ error += Sysupgrade()
+ if not error:
+ error += prepare(show_updates)
+ if error:
+ Release()
+ return error
diff --git a/po/ar.po b/po/ar.po
index c5bc6bf..1a2fe32 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Karim Oulad Chalha , 2013
msgid ""
@@ -11,324 +11,382 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-24 21:42+0000\n"
"Last-Translator: Karim Oulad Chalha \n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/manjaro-pamac/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/ar/)\n"
+"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "صلاحيات مطلوبة"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "تحضير"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "تفقد الإعتماديات"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "تفقد الملفات المتعاكسة"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "تحليل الإعتماديات"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "تفقد الانعكاسات الداخلية"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "تثبيت"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "حذف"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "ترقية"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "تحميل"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "إعادة التثبيت"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "تفقد قابلية الإندماج"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "تحميل الحزم"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "إعداد"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "تفقد المفاتيح في حلقة المفاتيح"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "تحميل {size}"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "إنعاش"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "سيتم إستبدال {pkgname1} بـ {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "تعاكس {pkgname1} مع {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} ليس مسار و إسم ملف صالح"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr "لا يمكن إتمام العملية لأنة يجب حذف الحزمة المغلقة {pkgname1}"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "تم إنهاء العملية بنجاح"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "فشل الإستوثاق"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} تحديثات متوفرة"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "تحدبث واحد متوفر"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "نظامك محدث"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "لم يتم العثور على أي حزم"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "مدير التحديثات"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "محلي"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "لا يوجد شيء للقيام به"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "مثبت"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac قيد التشغيل حاليا"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "تم إلغاء التثبيت"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "بعض التحديثات متوفرة.\nالمرجوا تحديث نظامك اولا"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "أيتام"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "محلي"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "للتثبيت"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "لم يتم العثور على أي حزم"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "للحذف"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "الرخص"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "يعتمد على"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "مثبت"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "إعتماديات إختيارية"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "مطلوب من طرف"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "المزود"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "إستبدال"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "التعارض مع"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "مستودع"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "مجموعات"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "الحجم المضغوط"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "الحجم المحمل"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "الحجم المثبت"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "محزم"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "المعمار"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "تاريخ التثبيت"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "مثبتة بوضوح"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "تثبيت كإعتمادية لحزمة أخرى"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "مجهول"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "سبب التثبيت"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "تواقيع"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "ملفات النسخ الإحتياطية"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "موجز العمليات"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} لها {number} اعتماديات اختيارية غير مثبتة.⏎\n"
+"الرجاء تحديد واحدة (أو اكثر) من التي ترغب بتثبيتها:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "للتثبيت"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "إلغاء التحديد"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "لإعادة التثبيت"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "حذف"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "للتثبيت النسخة الأقدم"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "إعادة التثبيت"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "للحذف"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "تثبيت الاعتماديات الإختيارية"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "للتحديث"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "تثبيت"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "حجم الإجمالي للتحميل: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "تثبيت مع الإعتماديات الإختيارية"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac قيد التشغيل حاليا"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "تظامك محدث"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "حجم الإجمالي للتحميل: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "تحدبث واحد متوفر"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} تحديثات متوفرة"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "لا يمكن إتمام العملية لأنة يجب حذف الحزمة المغلقة {pkgname1}"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} تحديثات متوفرة"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "سيتم إستبدال {pkgname1} بـ {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "تحدبث واحد متوفر"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "تعاكس {pkgname1} مع {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "نظامك محدث"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "تعاكس {pkgname1} مع {pkgname2}\nلن يتم تثبيت أي واحد منهما"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "مدير التحديثات"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "مدير الحزم"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} iمزودة من طرف {number} حزم.\nالموجوا إختيار واحدة لتثبيت:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"بعض التحديثات متوفرة.\n"
+"المرجوا تحديث نظامك اولا"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} لها {number} اعتماديات اختيارية غير مثبتة.⏎\nالرجاء تحديد واحدة (أو اكثر) من التي ترغب بتثبيتها:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "إلغاء التحديد"
+msgstr ""
+"{pkgname} iمزودة من طرف {number} حزم.\n"
+"الموجوا إختيار واحدة لتثبيت:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "حذف"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "إنعاش"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "إعادة التثبيت"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "لا يوجد شيء للقيام به"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "تثبيت الاعتماديات الإختيارية"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "تحضير"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "تثبيت"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "موجز العمليات"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "تثبيت مع الإعتماديات الإختيارية"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "لإعادة التثبيت"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "تم إلغاء التثبيت"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "للتثبيت النسخة الأقدم"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "أيتام"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "للتحديث"
#: pamac/common.py:13
#, python-format
@@ -340,58 +398,105 @@ msgstr "%.1f كب"
msgid "%.2f MiB"
msgstr "%.2f مب"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "حدد"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "خلاصة"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "مدير الحزم"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "بحث"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "حالة"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "مستودع"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "إسم"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "إصدار"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "حجم"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "معلومات"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "إعتماديات"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "تفاصيل"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "ملفات"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "حدد"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "خلاصة"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "تقدم"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "تثبيت"
+
+#~ msgid "Removing"
+#~ msgstr "حذف"
+
+#~ msgid "Upgrading"
+#~ msgstr "ترقية"
+
+#~ msgid "Downgrading"
+#~ msgstr "تحميل"
+
+#~ msgid "Reinstalling"
+#~ msgstr "إعادة التثبيت"
+
+#~ msgid "Configuring"
+#~ msgstr "إعداد"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "تفقد المفاتيح في حلقة المفاتيح"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "تحميل {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "تعاكس {pkgname1} مع {pkgname2}\n"
+#~ "لن يتم تثبيت أي واحد منهما"
diff --git a/po/bg.po b/po/bg.po
index 40fe0c1..68adf6e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# loot270 , 2013
msgid ""
@@ -11,332 +11,381 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-06-02 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/manjaro-pamac/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/bg_BG/)\n"
+"Language: bg_BG\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Необходимо е удостоверяване"
-#: pamac-daemon.py:29 pamac/main.py:505
-msgid "Preparing"
-msgstr "Подготвяне"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Проверка на зависимостите"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Проверка за конфликти"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Разрешаване на зависимости"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Проверка за вътрешни конфликти"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Инсталиране"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Премахване"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Обновяване"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Сваляне"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Преинсталиране"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Проверка за цялостност"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Зареждане на пакетни файлове"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Конфигуриране"
-
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Проверка на ключовете"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Сваляне {size}"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:439 pamac/main.py:1099
-msgid "Refreshing"
-msgstr "Обновяване"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:533
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} невалиден път или име на пакет"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:438
-msgid "Transaction successfully finished"
-msgstr "Успешно завършена транзакция"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
-#: pamac-daemon.py:442 pamac-daemon.py:450
-msgid "Authentication failed"
-msgstr "Неуспешно удостоверяване"
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
-#: pamac-tray.py:20
-msgid "{number} available updates"
-msgstr "{number} достъпни обновявания"
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
-#: pamac-tray.py:21
-msgid "1 available update"
-msgstr "1 достъпно обновяване"
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-tray.py:23
-msgid "Your system is up-to-date"
-msgstr "Вашата система е актуална"
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
-#: pamac-tray.py:31
-msgid "Install/Check for updates"
-msgstr "Инсталиране/проверка за обновяване "
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} ще бъде заменен от {pkgname2}"
-#: pamac-tray.py:34
-msgid "Run pamac-manager"
-msgstr "Пускане на pamac-manager"
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} конфликт с {pkgname2}"
-#: pamac-tray.py:37
-msgid "Quit"
-msgstr "Изход"
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:897
-msgid "Nothing to do"
-msgstr "Нищо за правене"
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
-#: pamac-install.py:87 pamac/main.py:1150
-msgid "Pamac is already running"
-msgstr "Pamac вече работи"
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} невалиден път или име на пакет"
-#: pamac-install.py:97
+#: pamac-daemon.py:601
+#, python-brace-format
msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Достъпни актуализации.\nМоля, първо обновете системата"
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Транзакцията не може да се извърши, защото трябва да се премахне {pkgname1}, "
+"който е заключен "
-#: pamac/main.py:89 pamac/main.py:1052
-msgid "local"
-msgstr "локален"
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Успешно завършена транзакция"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr "Неуспешно удостоверяване"
-#: pamac/main.py:180 pamac/main.py:954 pamac/main.py:1003
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Няма открит пакет"
-#: pamac/main.py:231
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "локален"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Инсталиран"
+
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Деинсталиран"
+
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Излишни"
+
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "За инсталиране"
+
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "За премахване"
+
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Лицензи"
-#: pamac/main.py:236
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Зависи от"
-#: pamac/main.py:241 pamac/main.py:1035 pamac/main.py:1224
-msgid "Installed"
-msgstr "Инсталиран"
-
-#: pamac/main.py:244
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Допълнителна зависимост"
-#: pamac/main.py:247
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Изискван от"
-#: pamac/main.py:249
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Осигуряван"
-#: pamac/main.py:251
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Замяна"
-#: pamac/main.py:253
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Конфликт със"
-#: pamac/main.py:258
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Хранилище"
-#: pamac/main.py:260 gui/manager.glade:538
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Групи"
-#: pamac/main.py:262
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Компресиран размер"
-#: pamac/main.py:263
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Размер за сваляне"
-#: pamac/main.py:265
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Инсталиран размер"
-#: pamac/main.py:266
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Опаковчик"
-#: pamac/main.py:267
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Архитектура"
-#: pamac/main.py:270
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Дата на инсталиране"
-#: pamac/main.py:272
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Изрично инсталиран"
-#: pamac/main.py:274
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Инсталиран като зависим от някой пакет"
-#: pamac/main.py:276
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Непознат"
-#: pamac/main.py:277
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Причина за инсталиране"
-#: pamac/main.py:282
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Подписи"
-#: pamac/main.py:286
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Архивни файлове"
-#: pamac/main.py:326
-msgid "Transaction Summary"
-msgstr "Обобщение за транзакцията"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/main.py:328 pamac/main.py:1041 pamac/main.py:1224
-msgid "To install"
-msgstr "За инсталиране"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr ""
-#: pamac/main.py:334
-msgid "To reinstall"
-msgstr "За преинсталиране"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr ""
-#: pamac/main.py:340
-msgid "To downgrade"
-msgstr "За състаряване"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr ""
-#: pamac/main.py:346 pamac/main.py:1043 pamac/main.py:1224
-msgid "To remove"
-msgstr "За премахване"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr ""
-#: pamac/main.py:353
-msgid "To update"
-msgstr "За обновяване"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr ""
-#: pamac/main.py:364 pamac/main.py:461
-msgid "Total download size: "
-msgstr "Общ свален размер: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac вече работи"
-#: pamac/main.py:454 pamac/main.py:1236
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Вашата система е актуална"
-#: pamac/main.py:463
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Общ свален размер: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 достъпно обновяване"
-#: pamac/main.py:465
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} достъпни обновявания"
-#: pamac/main.py:551 pamac/main.py:552
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Транзакцията не може да се извърши, защото трябва да се премахне {pkgname1}, който е заключен "
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} достъпни обновявания"
-#: pamac/main.py:583 pamac/main.py:584 pamac/main.py:686 pamac/main.py:687
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} ще бъде заменен от {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 достъпно обновяване"
-#: pamac/main.py:701 pamac/main.py:702 pamac/main.py:726 pamac/main.py:727
-#: pamac/main.py:747 pamac/main.py:748 pamac/main.py:778 pamac/main.py:779
-#: pamac/main.py:803 pamac/main.py:804 pamac/main.py:824 pamac/main.py:825
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} конфликт с {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Вашата система е актуална"
-#: pamac/main.py:759 pamac/main.py:760
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} конфликт с {pkgname2}\nНикой от тях няма да бъде инсталиран."
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Обновяващ Менажер"
-#: pamac/main.py:856
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} се осигурява от {number} пакета.\nМоля избере какво да се инсталира:"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Пакетен Менажер"
-#: pamac/main.py:939
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr "Изход"
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
+"Достъпни актуализации.\n"
+"Моля, първо обновете системата"
-#: pamac/main.py:957
-msgid "Unselect"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
+"{pkgname} се осигурява от {number} пакета.\n"
+"Моля избере какво да се инсталира:"
-#: pamac/main.py:961
-msgid "Remove"
-msgstr ""
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Обновяване"
-#: pamac/main.py:964
-msgid "Reinstall"
-msgstr ""
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Нищо за правене"
-#: pamac/main.py:975
-msgid "Install optional deps"
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Подготвяне"
-#: pamac/main.py:979
-msgid "Install"
-msgstr ""
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Обобщение за транзакцията"
-#: pamac/main.py:990
-msgid "Install with optional deps"
-msgstr ""
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "За преинсталиране"
-#: pamac/main.py:1037 pamac/main.py:1224
-msgid "Uninstalled"
-msgstr "Деинсталиран"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "За състаряване"
-#: pamac/main.py:1039 pamac/main.py:1224
-msgid "Orphans"
-msgstr "Излишни"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "За обновяване"
#: pamac/common.py:13
#, python-format
@@ -348,62 +397,111 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:7
-msgid "Choose"
-msgstr "Избор"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:112
-msgid "Summary"
-msgstr "Обобщение"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:256
-msgid "Progress"
-msgstr "Прогрес"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:402
-msgid "Package Manager"
-msgstr "Пакетен Менажер"
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
-#: gui/manager.glade:492
+#: gui/manager.ui:294
msgid "Search"
msgstr "Търсене"
-#: gui/manager.glade:585 gui/manager.glade:680
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Състояние"
-#: gui/manager.glade:632
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Хранилище"
-#: gui/manager.glade:711
+#: gui/manager.ui:492
msgid "Name"
msgstr "Име"
-#: gui/manager.glade:730
+#: gui/manager.ui:505
msgid "Version"
msgstr "Версия"
-#: gui/manager.glade:747
+#: gui/manager.ui:518
msgid "Size"
msgstr "Размер"
-#: gui/manager.glade:848
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Информация"
-#: gui/manager.glade:908
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Зависимост"
-#: gui/manager.glade:973
+#: gui/manager.ui:753
msgid "Details"
msgstr "Детайли"
-#: gui/manager.glade:1021
+#: gui/manager.ui:782
msgid "Files"
msgstr "Файлове"
-#: gui/updater.glade:6
-msgid "Update Manager"
-msgstr "Обновяващ Менажер"
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Избор"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Обобщение"
+
+#: gui/dialogs.ui:315
+msgid "Progress"
+msgstr "Прогрес"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Инсталиране"
+
+#~ msgid "Removing"
+#~ msgstr "Премахване"
+
+#~ msgid "Upgrading"
+#~ msgstr "Обновяване"
+
+#~ msgid "Downgrading"
+#~ msgstr "Сваляне"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Преинсталиране"
+
+#~ msgid "Configuring"
+#~ msgstr "Конфигуриране"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Проверка на ключовете"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Сваляне {size}"
+
+#~ msgid "Install/Check for updates"
+#~ msgstr "Инсталиране/проверка за обновяване "
+
+#~ msgid "Run pamac-manager"
+#~ msgstr "Пускане на pamac-manager"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} конфликт с {pkgname2}\n"
+#~ "Никой от тях няма да бъде инсталиран."
diff --git a/po/bg_BG.po b/po/bg_BG.po
index 4bd874c..32b7227 100644
--- a/po/bg_BG.po
+++ b/po/bg_BG.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# loot270 , 2013
msgid ""
@@ -11,324 +11,383 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/manjaro-pamac/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/bg_BG/)\n"
+"Language: bg_BG\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Необходимо е удостоверяване"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Подготвяне"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Проверка на зависимостите"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Проверка за конфликти"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Разрешаване на зависимости"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Проверка за вътрешни конфликти"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Инсталиране"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Премахване"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Обновяване"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Сваляне"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Преинсталиране"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Проверка за цялостност"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Зареждане на пакетни файлове"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Конфигуриране"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Проверка на ключовете"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Сваляне {size}"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Обновяване"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} ще бъде заменен от {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} конфликт с {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} невалиден път или име на пакет"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Транзакцията не може да се извърши, защото трябва да се премахне {pkgname1}, "
+"който е заключен "
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Успешно завършена транзакция"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Неуспешно удостоверяване"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} достъпни обновявания"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 достъпно обновяване"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Вашата система е актуална"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Няма открит пакет"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Диспечер за обновяване"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "локален"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Нищо за правене"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Инсталиран"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac вече работи"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Деинсталиран"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Достъпни актуализации.\nМоля, първо обновете системата"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Излишни"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "локален"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "За инсталиране"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Няма открит пакет"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "За премахване"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Лицензи"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Зависи от"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Инсталиран"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Допълнителна зависимост"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Изискван от"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Осигуряван"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Замяна"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Конфликт със"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Хранилище"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Групи"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Компресиран размер"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Размер за сваляне"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Инсталиран размер"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Опаковчик"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Архитектура"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Дата на инсталиране"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Изрично инсталиран"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Инсталиран като зависим от някой пакет"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Непознат"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Причина за инсталиране"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Подписи"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Архивни файлове"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Обобщение за транзакцията"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} има {number} неинсталирани допълнителни зависимости.\n"
+"Моля посочете коя(и) от тях искате да инсталирате:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "За инсталиране"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Размаркиране"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "За преинсталиране"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Премахване"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "За състаряване"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Преинсталиране"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "За премахване"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Инсталиране на допълнителни зависимости"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "За обновяване"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Инсталиране"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Общ размер за сваляне: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Инсталиране с допълнителни зависимости"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac вече работи"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Вашата система е актуална"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Общ размер за сваляне: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 достъпно обновяване"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} достъпни обновявания"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Транзакцията не може да се извърши, защото трябва да се премахне {pkgname1}, който е заключен "
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} достъпни обновявания"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} ще бъде заменен от {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 достъпно обновяване"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} конфликт с {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Вашата система е актуална"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} конфликт с {pkgname2}\nНикой от тях няма да бъде инсталиран."
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Диспечер за обновяване"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Диспечер на пакети"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} се осигурява от {number} пакета.\nМоля избере какво да се инсталира:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Достъпни актуализации.\n"
+"Моля, първо обновете системата"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} има {number} неинсталирани допълнителни зависимости.\nМоля посочете коя(и) от тях искате да инсталирате:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Размаркиране"
+msgstr ""
+"{pkgname} се осигурява от {number} пакета.\n"
+"Моля избере какво да се инсталира:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Премахване"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Обновяване"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Преинсталиране"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Нищо за правене"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Инсталиране на допълнителни зависимости"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Подготвяне"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Инсталиране"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Обобщение за транзакцията"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Инсталиране с допълнителни зависимости"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "За преинсталиране"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Деинсталиран"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "За състаряване"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Излишни"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "За обновяване"
#: pamac/common.py:13
#, python-format
@@ -340,58 +399,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Избор"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Обобщение"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Диспечер на пакети"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Търсене"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Състояние"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Хранилище"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Име"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Версия"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Размер"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Информация"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Зависимост"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Детайли"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Файлове"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Избор"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Обобщение"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Прогрес"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Инсталиране"
+
+#~ msgid "Removing"
+#~ msgstr "Премахване"
+
+#~ msgid "Upgrading"
+#~ msgstr "Обновяване"
+
+#~ msgid "Downgrading"
+#~ msgstr "Сваляне"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Преинсталиране"
+
+#~ msgid "Configuring"
+#~ msgstr "Конфигуриране"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Проверка на ключовете"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Сваляне {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} конфликт с {pkgname2}\n"
+#~ "Никой от тях няма да бъде инсталиран."
diff --git a/po/ca.po b/po/ca.po
index 331b9e6..86d80c6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Guillaume Benoit , 2013
# oriolfa , 2013
@@ -12,455 +12,474 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-01 08:17+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/manjaro-pamac/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/ca/)\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Autenticació requerida"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Verificant dependències"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Analitzant conflictes entre fitxers"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Resolent dependències"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Verificant conflictes entre paquets"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Instal·lant {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Suprimint {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Actualitzant {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Tornant a versió anterior de {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Reinstal·lant {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Verificant integritat"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Carregant fitxers de paquets"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Verificant integritat delta"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Aplicant deltes"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Generant {} amb {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Generació correcte!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Generació incorrecte."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Configurant {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Verificant espai disponible al disc"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Verificant l'anell de claus"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Baixant les claus requerides"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr ""
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr ""
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Actualitzant {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Baixada {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} no és un camí vàlid o un nom de paquet"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"La transacció no pot efectuar-se degut a que és necessari eliminar "
+"{pkgname1} que és un paquet bloquejat"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Transacció finalitzada amb èxit"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "No s'ha trobat cap paquet"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "local"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Instal·lat"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "No instal·lat"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Orfes"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "A instal·lar"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "A suprimir"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "local"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Llicències"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Depèn de"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dependències Opcionals"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Requerit Per"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Proporciona"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Reemplaça"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Conflictes amb"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Dipòsit"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grups"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Mida comprimit"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Mida baixat"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Mida instal·lat"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Empaquetador"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arquitectura"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Data d'instal·lació"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Explícitament instal·lat"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Instal·lat com a dependència d'un altre paquet"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Desconegut"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Raó d'instal·lació"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signatures"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Fitxers de còpia de seguretat"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} té {number} dependències opcionals no instal·lades.⏎\nSi us plau escull la (o les) que vulguis instal·lar:"
+msgstr ""
+"{pkgname} té {number} dependències opcionals no instal·lades.⏎\n"
+"Si us plau escull la (o les) que vulguis instal·lar:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Desel·lecciona"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Esborra"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Reinstal·la"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Instal·la dependències opcionals"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Instal·la"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Instal·la amb dependències opcionals"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac ja està executant-se"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "El teu sistema està actualitzat"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Mida total de la baixada: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 actualització disponible"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} actualitzacions disponibles"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} actualitzacions disponibles"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 actualització disponible"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "El teu sistema està actualitzat"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Gestor d'Actualitzacions"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Gestor de Paquets"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Sortir"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} no és un camí vàlid o un nom de paquet"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Algunes actualitzacions estan disponibles\nSi us plau actualitza primer el teu sistema"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MiB"
+msgstr ""
+"Algunes actualitzacions estan disponibles\n"
+"Si us plau actualitza primer el teu sistema"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} està proporcionat per {number} paquets.\nSi us plau tria el paquet que vols instal·lar:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Verificant dependències"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Analitzant conflictes entre fitxers"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Resolent dependències"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Verificant conflictes entre paquets"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Instal·lant {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Suprimint {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Actualitzant {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Tornant a versió anterior de {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Reinstal·lant {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Verificant integritat"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Carregant fitxers de paquets"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Verificant integritat delta"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Aplicant deltes"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Generant {} amb {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Generació correcte!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Generació incorrecte."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Configurant {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Verificant espai disponible al disc"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Verificant l'anell de claus"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Baixant les claus requerides"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr ""
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Actualitzant {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Baixada {pkgname}"
-
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Actualitzant"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "La transacció no pot efectuar-se degut a que és necessari eliminar {pkgname1} que és un paquet bloquejat"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Transacció finalitzada amb èxit"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Res a fer"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "La transacció ha estat interrompuda.\nPamac es tancarà ara."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Preparant"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Resum de la transacció"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "A reinstal·lar"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "A tornar a versió anterior"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "A actualitzar"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Preparant"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Res a fer"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Quant a Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Una interfície gtk3 per pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Instal·la paquets locals"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Cerca"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Estat"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Dipòsits"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nom"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versió"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Mida"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Infos"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dependències"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detalls"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Fitxers"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Instal·la paquets locals"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Triar"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Resum"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Progrès"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "detalls"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} està proporcionat per {number} paquets.\n"
+#~ "Si us plau tria el paquet que vols instal·lar:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "La transacció ha estat interrompuda.\n"
+#~ "Pamac es tancarà ara."
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 4d6cfdb..e2921b6 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Scibex , 2013
# Scibex , 2013
@@ -12,324 +12,384 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-08-30 14:16+0000\n"
"Last-Translator: Scibex \n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/manjaro-pamac/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/cs_CZ/)\n"
+"Language: cs_CZ\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Je vyžadována autentizace"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Připravuji"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Kontrola závislostí"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Kontrola konfliktních souborů"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Řešení závislostí"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Kontrola interních konfliktů"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Instalace"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Odstraňování"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Aktualizace"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Downgrading"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Reinstalace"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Kontrola integrity"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Načítání balíčků"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Konfiguruji"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Kontrola klíčů v klíčence"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Stahování {size}"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Obnovení"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} bude nahrazen {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} je v konfliktu s {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} je neplatná cesta nebo název balíčku"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Transakce nemůže být provedena, protože je třeba odstranit {pkgname1} "
+"balíček, který je uzamčen"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Transakce úspěšně dokončena"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Autentizace selhala"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} dostupných aktualizací"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 dostupná aktualizace"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Váš systém je aktuální"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Žádný balíček nalezen"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Správce aktualizací"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokální"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Spolu nesouvisí"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Nainstalováno"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac je již spuštěn"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Odinstalováno"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Jsou k dispozici aktualizace.⏎\nNejprve aktualizujte váš systém"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Sirotci"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "lokální"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Pro instalaci"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Žádný balíček nalezen"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Pro odstranění"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licence"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Závisí na"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Nainstalováno"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Volitelné závislosti"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Vyžadováno"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Obsahuje"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Nahrazuje"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Konflikty s"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repozitář"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Skupiny"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Komprimovaná velikost"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Velikost ke stažení"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Instalovaná velikost"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Balíčkovač"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architektura"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Datum instalace"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "explicitně nainstalován"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Instalováno jako závislost pro další balíček"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Neznámý"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Důvod instalace"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Podpisy"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Záložní soubory"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Shrnutí transakce"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"pro {pkgname} je nutno odistalovat {number} \n"
+" volitelných závislostíProsím, vyberte balíček (y), které chcete "
+"nainstalovat:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Pro instalaci"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Zrušit výběr"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Pro přeinstalaci"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Odstranit"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Pro downgrade"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Přeinstalovat"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Pro odstranění"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Instalace volitelných závislostí"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Pro aktualizaci"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Instalace"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Celková velikost stahování: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Instalace volitelných závislostí"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac je již spuštěn"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Váš systém je aktuální"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Celková velikost stahování: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "K dispozici je 1 aktualizace"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} aktualizací je k dispozici"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Transakce nemůže být provedena, protože je třeba odstranit {pkgname1} balíček, který je uzamčen"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} dostupných aktualizací"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} bude nahrazen {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 dostupná aktualizace"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} je v konfliktu s {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Váš systém je aktuální"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} je v konfliktu s {pkgname2}\nŽádný z nich nebude nainstalován"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Správce aktualizací"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Správce balíčků"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} je k dispozici {number} \n balíčků.Prosím, vyberte balíček (y), které chcete nainstalovat:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Jsou k dispozici aktualizace.⏎\n"
+"Nejprve aktualizujte váš systém"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "pro {pkgname} je nutno odistalovat {number} \n volitelných závislostíProsím, vyberte balíček (y), které chcete nainstalovat:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Zrušit výběr"
+msgstr ""
+"{pkgname} je k dispozici {number} \n"
+" balíčků.Prosím, vyberte balíček (y), které chcete nainstalovat:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Odstranit"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Obnovení"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Přeinstalovat"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Spolu nesouvisí"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Instalace volitelných závislostí"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Připravuji"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Instalace"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Shrnutí transakce"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Instalace volitelných závislostí"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Pro přeinstalaci"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Odinstalováno"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Pro downgrade"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Sirotci"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Pro aktualizaci"
#: pamac/common.py:13
#, python-format
@@ -341,58 +401,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f KiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Vybrat"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Shrnutí"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Správce balíčků"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Vyhledat"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Stav"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Zdroj"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Název"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Verze"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Velikost"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Info"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Závisí"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detaily"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Soubory"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Vybrat"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Shrnutí"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Postup"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Instalace"
+
+#~ msgid "Removing"
+#~ msgstr "Odstraňování"
+
+#~ msgid "Upgrading"
+#~ msgstr "Aktualizace"
+
+#~ msgid "Downgrading"
+#~ msgstr "Downgrading"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Reinstalace"
+
+#~ msgid "Configuring"
+#~ msgstr "Konfiguruji"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Kontrola klíčů v klíčence"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Stahování {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} je v konfliktu s {pkgname2}\n"
+#~ "Žádný z nich nebude nainstalován"
diff --git a/po/da.po b/po/da.po
index a31ed52..f4f0591 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# McAnde , 2013
# Guillaume Benoit , 2013
@@ -12,324 +12,381 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/manjaro-pamac/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/da/)\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Autentifikation er krævet"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Forbereder"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Tjekker afhængigheder"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Tjekker fil-konflikter"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Løser afhængigheder"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Tjekker interne konflikter"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Installerer"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Fjerner"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Opgraderer"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Nedgraderer"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Geninstallerer"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Verificerer pakkernes integritet"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Indlæser pakke-filer"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Konfigurerer"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Tjekker nøgler i nøglering"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Downloader {size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Opdaterer"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} bliver erstattet af {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} er i konflikt med {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, fuzzy, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pgkname} er ikke en gyldig sti eller pakke-navn"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, fuzzy, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Transaktionen kan ikke udføres, da fjernelse af {pgkname1} kræves, hvilket "
+"er en låst pakke"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Transaktion fuldført succesfuldt"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Autentificering mislykket"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} tilgængelige opdateringer"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 tilgængelig opdatering"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Dit system er opdateret"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Ingen pakke fundet"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Opdaterings-manager"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokalt"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Intet at gøre"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Installeret"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac kører allerede"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Afinstalleret"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Opdateringer er tilgængelige\\n\nOpdatér venligst systemet først"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Forældreløse pakker"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "lokalt"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Installeres"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Ingen pakke fundet"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Fjernes"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licenser"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Afhænger af"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Installeret"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Valgfrie afhængigheder"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Kræves af"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Leverer"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Erstatter"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Konflikterer med"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Arkiv"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupper"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Komprimeret størrelse"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Download-størrelse"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Installeret størrelse"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Pakker"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arkitektur"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installations-dato"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Eksplicitte pakker"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Installeret som en afhængighed for en anden pakke"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Ukendt"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Installations-årsag"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signaturer"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Back-up filer"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Transaktions oversigt"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Installeres"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr ""
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Geninstalleres"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr ""
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Nedgraderes"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr ""
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Fjernes"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr ""
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Til opdatering"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr ""
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Samlet download-størrelse "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac kører allerede"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Dit system er up-to-date"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Samlet download-størrelse "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 tilgængelig opdatering"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} tilgængelige opdateringer"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Transaktionen kan ikke udføres, da fjernelse af {pgkname1} kræves, hvilket er en låst pakke"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} tilgængelige opdateringer"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} bliver erstattet af {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 tilgængelig opdatering"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} er i konflikt med {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Dit system er opdateret"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} konflikterer med {pgkname2}\nIngen af dem vil blive installeret."
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Opdaterings-manager"
-#: pamac/main.py:874
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} bliver leveret af {number} pakker.\nVælg dem, som du vil installere:"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Pakke-manager"
-#: pamac/main.py:957
-msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+#: pamac-tray.py:38
+msgid "Quit"
msgstr ""
-#: pamac/main.py:976
-msgid "Unselect"
+#: pamac-install.py:119
+msgid ""
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
+"Opdateringer er tilgængelige\\n\n"
+"Opdatér venligst systemet først"
-#: pamac/main.py:982
-msgid "Remove"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
+"{pkgname} bliver leveret af {number} pakker.\n"
+"Vælg dem, som du vil installere:"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr ""
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Opdaterer"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr ""
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Intet at gøre"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Forbereder"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr ""
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Transaktions oversigt"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Afinstalleret"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Geninstalleres"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Forældreløse pakker"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Nedgraderes"
+
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Til opdatering"
#: pamac/common.py:13
#, python-format
@@ -341,58 +398,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Vælg"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Oversigt"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Pakke-manager"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Søg"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Tilstand"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Arkiver"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Navn"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Version"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Størrelse"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informationer"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Afhængigheder"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detaljer"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Filer"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Vælg"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Oversigt"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Fremskridt"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Installerer"
+
+#~ msgid "Removing"
+#~ msgstr "Fjerner"
+
+#~ msgid "Upgrading"
+#~ msgstr "Opgraderer"
+
+#~ msgid "Downgrading"
+#~ msgstr "Nedgraderer"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Geninstallerer"
+
+#~ msgid "Configuring"
+#~ msgstr "Konfigurerer"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Tjekker nøgler i nøglering"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Downloader {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} konflikterer med {pgkname2}\n"
+#~ "Ingen af dem vil blive installeret."
diff --git a/po/de.po b/po/de.po
index af56b5d..ed16f4b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Guillaume Benoit , 2013
# manjarolinux , 2013
@@ -14,324 +14,384 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: German (http://www.transifex.com/projects/p/manjaro-pamac/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/de/)\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Authentifizierung wird benötigt"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Vorbereitung"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Abhängigkeiten werden überprüft"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Dateikonflikte werden überprüft"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Abhängigkeiten werden aufgelöst"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Interne Konflikte werden überprüft"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Installation"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Deinstallation"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Systemaktualisierung"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Zurückstufen"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Neuinstallation"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Integrität wird überprüft"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Paketdateien werden geladen"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Konfiguration"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Schlüssel im Schlüsselbund werden überprüft"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "{size} werden heruntergeladen"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Aktualisierung"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} wird ersetzt von {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} steht in Konflikt mit {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} ist kein zulässiger Pfad oder Paketname"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Der Vorgang kann nicht durchgeführt werden, da das gesperrte Paket "
+"{pkgname1} entfernt werden müsste."
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Vorgang erfolgreich abgeschlossen"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Authentifikation fehlgeschlagen"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} Aktualisierungen verfügbar"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 Aktualisierung verfügbar"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Ihr System ist auf dem neusten Stand"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Keine Pakete gefunden"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Update-Manager"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "Lokal"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Es gibt nichts zu tun"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Installiert"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac wird bereits ausgeführt"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Deinstalliert"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Aktualisierungen verfügbar.⏎\nBitte aktualisieren Sie zuerst Ihr System."
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Verwaist"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "Lokal"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Wird installiert"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Keine Pakete gefunden"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Wird entfernt"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Lizenzen"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Hängt ab von"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Installiert"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Optionale Abhängigkeiten"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Benötigt von"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Stellt bereit"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Ersetzt"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Konflikt mit"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Paketquelle"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Gruppen"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Komprimierte Größe"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Datengröße"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Installierte Größe"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Packer"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architektur"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installiert am"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Ausdrücklich installiert"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Installiert als Abhängigkeit für ein anderes Paket"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Unbekannt"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Installationsgrund"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signaturen"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Dateisicherungen"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Zusammenfassung des Vorgangs"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} verfügt über {number} noch nicht installierte optionale "
+"Abhängigkeiten.⏎\n"
+"Bitte wählen Sie die Gewünschten aus:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Wird installiert"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Abwählen"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Wird neu installiert"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Entfernen"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Wird zurückgestuft"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Neu installieren"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Wird entfernt"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Optionale Abhängigkeiten installieren"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Wird aktualisiert"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Installieren"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Gesamtgröße des Downloads: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Installiere mit optionale Abhängigkeiten"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac wird bereits ausgeführt"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Ihr System ist auf dem neusten Stand"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Gesamtgröße des Downloads: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 Aktualisierung verfügbar"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} Aktualisierungen verfügbar"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Der Vorgang kann nicht durchgeführt werden, da das gesperrte Paket {pkgname1} entfernt werden müsste."
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} Aktualisierungen verfügbar"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} wird ersetzt von {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 Aktualisierung verfügbar"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} steht in Konflikt mit {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Ihr System ist auf dem neusten Stand"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} steht in Konflikt mit {pkgname2}\nDiese Pakete werden nicht installiert"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Update-Manager"
+
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Paketmanager"
-#: pamac/main.py:874
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} wird von {number} Paket(en) bereitgestellt.\nZu installierende Paket(e) aus folgender Liste auswählen:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Aktualisierungen verfügbar.⏎\n"
+"Bitte aktualisieren Sie zuerst Ihr System."
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} verfügt über {number} noch nicht installierte optionale Abhängigkeiten.⏎\nBitte wählen Sie die Gewünschten aus:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Abwählen"
+msgstr ""
+"{pkgname} wird von {number} Paket(en) bereitgestellt.\n"
+"Zu installierende Paket(e) aus folgender Liste auswählen:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Entfernen"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Aktualisierung"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Neu installieren"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Es gibt nichts zu tun"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Optionale Abhängigkeiten installieren"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Vorbereitung"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Installieren"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Zusammenfassung des Vorgangs"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Installiere mit optionale Abhängigkeiten"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Wird neu installiert"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Deinstalliert"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Wird zurückgestuft"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Verwaist"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Wird aktualisiert"
#: pamac/common.py:13
#, python-format
@@ -343,58 +403,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Auswahl"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Paketmanager"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Suche"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Status"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Paketquellen"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Name"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Version"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Größe"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Info"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Abhängigkeiten"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Details"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Dateien"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Auswahl"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Fortschritt"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Installation"
+
+#~ msgid "Removing"
+#~ msgstr "Deinstallation"
+
+#~ msgid "Upgrading"
+#~ msgstr "Systemaktualisierung"
+
+#~ msgid "Downgrading"
+#~ msgstr "Zurückstufen"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Neuinstallation"
+
+#~ msgid "Configuring"
+#~ msgstr "Konfiguration"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Schlüssel im Schlüsselbund werden überprüft"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "{size} werden heruntergeladen"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} steht in Konflikt mit {pkgname2}\n"
+#~ "Diese Pakete werden nicht installiert"
diff --git a/po/el.po b/po/el.po
index b797aa5..26fb8c8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# angel_solomos , 2013
# Guillaume Benoit , 2013
@@ -12,455 +12,474 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-01 08:17+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/manjaro-pamac/language/el/)\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/el/)\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Απαιτείται πιστοποίηση"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Έλεγχος εξαρτήσεων"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Έλεγχος για διενέξεις αρχείων"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Επίλυση εξαρτήσεων"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Έλεγχος για εσωτερικές διενέξεις"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Εγκατάσταση {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Αφαίρεση {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Αναβάθμιση {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Υποβάθμιση {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Επανεγκατάσταση {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Έλεγχος ακεραιότητας"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Φόρτωση αρχείων πακέτων"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Έλεγχος ακεραιότητας delta"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Εφαρμογή deltas"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Δημιουργία {} με {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Η δημιουργία ολοκληρώθηκε επιτυχώς!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Η δημιουργία απέτυχε."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Ρύθμιση {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Έλεγχος ελεύθερου χώρου στον δίσκο"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Έλεγχος keyring"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Μεταφόρτωση των απαιτούμενων κλειδιών"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr ""
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr ""
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Ανανέωση {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Μεταφόρτωση {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} δεν είναι έγκυρη διαδρομή ή έγκυρο όνομα πακέτου"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Η διενέργεια δεν μπορεί να εφαρμοστεί γιατί χρειάζετε να απεγκαταστήσει το "
+"{pkgname1} που είναι ένα κλειδωμένο πακέτο"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Οι ενέργειες ολοκληρώθηκαν επιτυχώς"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Δεν βρέθηκε κανένα πακέτο"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "τοπικό"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Εγκατεστημένα"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Απεγκατεστημένα"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Ορφανά"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "Προς εγκατάσταση"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "Προς αφαίρεση"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "τοπικό"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Άδειες"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Εξαρτάτε από"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Προαιρετικές εξαρτήσεις"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Απαιτείτε από"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Παρέχει"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Αντικαθιστά"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Διένεξη με"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Αποθετήριο"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Ομάδες"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Συμπιεσμένο μέγεθος"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Μέγεθος για μεταφόρτωση"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Μέγεθος εγκατεστημένου"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Δημιουργός πακέτου"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Αρχιτεκτονική"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Ημερομηνία εγκατάστασης"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Εγκαταστάθηκε ρητά"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Εγκαταστήθηκε ως εξάρτηση για ένα άλλο πακέτο"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Άγνωστο"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Λόγος για εγκατάσταση"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Υπογραφές"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Δημιουργία αντιγράφων ασφαλείας αρχείων"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} έχει {number} μη εγκατεστημένες προαιρετικές εξαρτήσεις:.⏎\nΠαρακαλώ επιλέξτε αυτή(ές) που θέλετε να εγκαταστήσετε:"
+msgstr ""
+"{pkgname} έχει {number} μη εγκατεστημένες προαιρετικές εξαρτήσεις:.⏎\n"
+"Παρακαλώ επιλέξτε αυτή(ές) που θέλετε να εγκαταστήσετε:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Μη επιλεγμένο"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Απεγκατάσταση"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Επανεγκατάσταση"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Εγκατάσταση προαιρετικών εξαρτήσειων"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Εγκατάσταση"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Εγκατάσταση μαζί με προαιρετικές εξαρτήσεις:"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Ο Pamac είναι ήδη ενεργός"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Το σύστημα σας είναι πλήρως ενημερωμένο"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Συνολικό μέγεθος μεταφόρτωσης: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 διαθέσιμη ενημέρωση"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} διαθέσιμες ενημερώσεις"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} διαθέσιμες αναβαθμίσεις"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 διαθέσιμη αναβάθμιση"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Το σύστημα σας είναι πλήρως ενημερωμένο"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Διαχειριστής αναβαθμίσεων"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Διαχειριστής πακέτων"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Έξοδος"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} δεν είναι έγκυρη διαδρομή ή έγκυρο όνομα πακέτου"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Κάποιες αναβαθμίσεις είναι διαθέσιμες.⏎\nΠαρακαλώ αναβαθμίστε πρώτα το σύστημα σας"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MiB"
+msgstr ""
+"Κάποιες αναβαθμίσεις είναι διαθέσιμες.⏎\n"
+"Παρακαλώ αναβαθμίστε πρώτα το σύστημα σας"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} παρέχετε από {number} πακέτα.⏎\nΠαρακαλώ επιλέξτε ποιο(α) θέλετε να εγκατασταθούν:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Έλεγχος εξαρτήσεων"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Έλεγχος για διενέξεις αρχείων"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Επίλυση εξαρτήσεων"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Έλεγχος για εσωτερικές διενέξεις"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Εγκατάσταση {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Αφαίρεση {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Αναβάθμιση {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Υποβάθμιση {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Επανεγκατάσταση {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Έλεγχος ακεραιότητας"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Φόρτωση αρχείων πακέτων"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Έλεγχος ακεραιότητας delta"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Εφαρμογή deltas"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Δημιουργία {} με {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Η δημιουργία ολοκληρώθηκε επιτυχώς!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Η δημιουργία απέτυχε."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Ρύθμιση {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Έλεγχος ελεύθερου χώρου στον δίσκο"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Έλεγχος keyring"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Μεταφόρτωση των απαιτούμενων κλειδιών"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr ""
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Ανανέωση {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Μεταφόρτωση {pkgname}"
-
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Ανανέωση"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Η διενέργεια δεν μπορεί να εφαρμοστεί γιατί χρειάζετε να απεγκαταστήσει το {pkgname1} που είναι ένα κλειδωμένο πακέτο"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Οι ενέργειες ολοκληρώθηκαν επιτυχώς"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Δεν υπάρχει τίποτε να γίνει"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "Η διεργασία διακόπηκε.⏎\nΟ Pamac θα τερματιστεί"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Προετοιμασία"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Περίληψη ενεργειών"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "Προς επανεγκατάσταση"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "Προς υποβάθμισ"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "Προς αναβάθμιση"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Προετοιμασία"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Δεν υπάρχει τίποτε να γίνει"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Σχετικά με τον Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Ένα gtk3 εμπρόσθιο τμήμα για το pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Εγκατάσταση τοπικών πακέτων"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Αναζήτηση"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Κατάσταση"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Αποθετήρια"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Όνομα"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Έκδοση"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Μέγεθος"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Πληροφορίες"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Εξαρτήσεις"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Λεπτομέρειες"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Αρχεία"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Εγκατάσταση τοπικών πακέτων"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Επιλέξτε"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Περίληψη"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Πρόοδος"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "Λεπτομέρειες"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} παρέχετε από {number} πακέτα.⏎\n"
+#~ "Παρακαλώ επιλέξτε ποιο(α) θέλετε να εγκατασταθούν:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "Η διεργασία διακόπηκε.⏎\n"
+#~ "Ο Pamac θα τερματιστεί"
diff --git a/po/eo.po b/po/eo.po
index b579dd4..e315985 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# anderflash , 2013
msgid ""
@@ -11,324 +11,383 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-08-11 05:15+0000\n"
"Last-Translator: anderflash \n"
-"Language-Team: Esperanto (http://www.transifex.com/projects/p/manjaro-pamac/language/eo/)\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/eo/)\n"
+"Language: eo\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Autentikeco estas bezonata"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Preparanta"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Kontrolanta Dependecojn"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Kontrolanta dosierajn konfliktojn"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Solvanta Dependecojn"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Kontrolanta interkonfliktojn"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Instalanta"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Foriganta"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Ĝisdatiganta"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Revenanta"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Reinstalanta"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Kontrolanta integrecon"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Ŝarĝanta pakaĵajn dosierojn"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Agordanta"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Kontrolanta ŝlosilo en ŝlosilringo"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Elŝutanta {size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Refreŝiganta"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} estos anstataŭigota de {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} konfliktas kun {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} ne estas valida vojo aŭ pakaĵa nomo"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"La transakcio ne povas esti plenumita ĉar ĝi bezonas forigi {pkgname1} kiu "
+"estas ŝlosita pakaĵo"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Finita sukcese transakcio"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Malsukcesa autentikeco."
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} disponeblaj ĝisdatigoj"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 disponebla ĝisdatigo"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Via sistemo estas ĝisdatigata"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Neniu pakaĵo trovita"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Ĝisdatigo Administranto"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "loka"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Nenio por fari"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Instalita"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac jam estas ekzekutanta."
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Neinstalita"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Kelkaj ĝisdatigoj estas disponeblaj.\nBonvolu ĝisdatigi vian sistemon unue"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Orfoj"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "loka"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Instali"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Neniu pakaĵo trovita"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Forigi"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Permesiloj"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Dependas De"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Instalita"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Laŭvolaj Dependecoj"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Postulata De"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Provizas"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Anstataŭigas"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Konfliktas Kun"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Deponejo"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupoj"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Grando Kunpremata"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Elŝuto Grando"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Instalo Grando"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Pakaĵkreanto"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arkitekturo"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Instalo Dato"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Eksplicite instalita"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Instalita kiel dependeco por alia pakaĵo"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Nekonata"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Instalo Kialo"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Subskriboj"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Kopisekurecaj Dosieroj"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Resumo de Transakcio"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} havas {number} neinstalitaj opciaj dependecojn.\n"
+"Bonvolu elekti tiuj, kiujn vi volas instali:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Instali"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Malelekti"
-#: pamac/main.py:332
-msgid "To reinstall"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Forigi"
+
+#: pamac-manager.py:486
+msgid "Reinstall"
msgstr "Reinstali"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Reveni"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Instali laŭvolajn dependecojn"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Forigi"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Instali"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Ĝisdatigi"
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Instali kun laŭvolaj dependecoj"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Tuta grando de elŝuto: "
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac jam estas ekzekutanta."
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Via sistemo estas ĝisdatigita"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Tuta grando de elŝuto: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 disponebla ĝisdatigo"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} disponeblaj ĝisdatigoj"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "La transakcio ne povas esti plenumita ĉar ĝi bezonas forigi {pkgname1} kiu estas ŝlosita pakaĵo"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} disponeblaj ĝisdatigoj"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} estos anstataŭigota de {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 disponebla ĝisdatigo"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} konfliktas kun {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Via sistemo estas ĝisdatigata"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} konfliktas kun {pkgname2}\nNenio el ili estas instalota"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Ĝisdatigo Administranto"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Pakaĵo Administranto"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} estas provizata de {number} pakaĵoj.\nBonvolu eleki tiuj, kiujn vi volas instali:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Kelkaj ĝisdatigoj estas disponeblaj.\n"
+"Bonvolu ĝisdatigi vian sistemon unue"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} havas {number} neinstalitaj opciaj dependecojn.\nBonvolu elekti tiuj, kiujn vi volas instali:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Malelekti"
+msgstr ""
+"{pkgname} estas provizata de {number} pakaĵoj.\n"
+"Bonvolu eleki tiuj, kiujn vi volas instali:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Forigi"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Refreŝiganta"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Reinstali"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Nenio por fari"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Instali laŭvolajn dependecojn"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Preparanta"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Instali"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Resumo de Transakcio"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Instali kun laŭvolaj dependecoj"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Reinstali"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Neinstalita"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Reveni"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Orfoj"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Ĝisdatigi"
#: pamac/common.py:13
#, python-format
@@ -340,58 +399,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Elektu"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Resumo"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Pakaĵo Administranto"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Ŝerĉi"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Stato"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Deponejoj"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nomo"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versio"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Grando"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informoj"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dependecoj"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detaloj"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Dosieroj"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Elektu"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Resumo"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Progreso"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Instalanta"
+
+#~ msgid "Removing"
+#~ msgstr "Foriganta"
+
+#~ msgid "Upgrading"
+#~ msgstr "Ĝisdatiganta"
+
+#~ msgid "Downgrading"
+#~ msgstr "Revenanta"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Reinstalanta"
+
+#~ msgid "Configuring"
+#~ msgstr "Agordanta"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Kontrolanta ŝlosilo en ŝlosilringo"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Elŝutanta {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} konfliktas kun {pkgname2}\n"
+#~ "Nenio el ili estas instalota"
diff --git a/po/es.po b/po/es.po
index 842d7f4..f41caf0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# danpergal84 , 2013
# guinux , 2013
@@ -12,455 +12,474 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-04 08:08+0000\n"
"Last-Translator: guinux \n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/manjaro-pamac/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/es/)\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Se necesita autenticación"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Comprobando dependencias"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Verificando conflictos entre paquetes"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Resolviendo dependencias"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Analizando conflictos entre archivos"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Instalando {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Desinstalando {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Actualizando {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Cambiando a versión anterior {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Reinstalando {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Verificando la integridad de los paquetes"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Cargando archivos de paquetes"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Verificando la integridad delta"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Aplicando deltas"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Generando {} con {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Generación de paquete satisfactoria"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Generación de paquete fallida"
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Configurando {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Comprobando espacio disponible en el disco"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Verificando claves en la base de datos"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Descargando las claves requeridas"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} será reemplazado por {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} está en coflicto con {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Actualizando {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Descargando {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} no es un nombre de paquete o una ruta válida"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"La operación no puede realizarse porque se necesita eliminar {pkgname1} y es "
+"un paquete bloqueado"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Operación finalizada con éxito"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "No se ha encontrado ningún paquete"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "local"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Paquetes instalados"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Paquetes no instalados"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Paquetes huérfanos"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "Paquetes a instalar"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "Paquetes a desinstalar"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "local"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licencias"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Depende de"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dependencias opcionales"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Requerido por"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Proporciona"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Reemplaza"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Conflictos con"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repositorio"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupos"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Tamaño comprimido"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Tamaño descargado"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Tamaño instalado"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Empaquetador"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arquitectura"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Fecha de instalación"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Explícitamente instalado"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Instalado como dependencia de otro paquete"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Desconocido"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Razón de instalación"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Firmas"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Archivos de copia de seguridad"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} tiene {number} dependencias opcionales no instaladas\nPor favor, elige cuál(es) quieres instalar:"
+msgstr ""
+"{pkgname} tiene {number} dependencias opcionales no instaladas\n"
+"Por favor, elige cuál(es) quieres instalar:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Deseleccionar"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Eliminar"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Reinstalar"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Instalar dependencias opcionales"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Instalar"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Instalar con dependencias opcionales"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac ya está siendo ejecutado"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Tu sistema está actualizado"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Tamaño total de la descarga: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 actualización disponible"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} actualizaciones disponibles"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} actualizaciones disponibles"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 actualización disponible"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Tu sistema está actualizado"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Gestor de Actualizaciones"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Gestor de Paquetes"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Quitar"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} no es un nombre de paquete o una ruta válida"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Hay disponibles algunas actualizaciones.⏎\nPor favor, actualiza tu sistema primero"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MiB"
+msgstr ""
+"Hay disponibles algunas actualizaciones.⏎\n"
+"Por favor, actualiza tu sistema primero"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} es proporcionado por {number} paquete/s.\nPor favor elige el/los paquete/s que deseas instalar:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Comprobando dependencias"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Verificando conflictos entre paquetes"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Resolviendo dependencias"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Analizando conflictos entre archivos"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Instalando {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Desinstalando {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Actualizando {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Cambiando a versión anterior {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Reinstalando {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Verificando la integridad de los paquetes"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Cargando archivos de paquetes"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Verificando la integridad delta"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Aplicando deltas"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Generando {} con {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Generación de paquete satisfactoria"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Generación de paquete fallida"
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Configurando {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Comprobando espacio disponible en el disco"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Verificando claves en la base de datos"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Descargando las claves requeridas"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} será reemplazado por {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} está en coflicto con {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Actualizando {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Descargando {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Actualizando"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "La operación no puede realizarse porque se necesita eliminar {pkgname1} y es un paquete bloqueado"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Operación finalizada con éxito"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Nada que hacer"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "La operación fue interrumpida.\nPamac se cerrará"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Preparando"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Resumen de la operación"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "Paquetes a reinstalar"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "Paquetes que volverán a una versión anterior"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "Paquetes a actualizar"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Preparando"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Nada que hacer"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Sobre Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Una interfaz gtk3 para pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Instalar paquetes locales"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Búsqueda"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Estado"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repositorios"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nombre"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versión"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Tamaño"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Información"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dependencias"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detalles"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Archivos"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Instalar paquetes locales"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Elegir"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Resumen"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Progreso"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "Detalles"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} es proporcionado por {number} paquete/s.\n"
+#~ "Por favor elige el/los paquete/s que deseas instalar:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "La operación fue interrumpida.\n"
+#~ "Pamac se cerrará"
diff --git a/po/fa_IR.po b/po/fa_IR.po
index e4fabd4..bb36077 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Vampir3 , 2013
msgid ""
@@ -11,324 +11,381 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/manjaro-pamac/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/manjaro-"
+"pamac/language/fa_IR/)\n"
+"Language: fa_IR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fa_IR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr ""
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "آمادهسازی"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "چککردن پیشنیازها"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "چککردن ناسازگاری فایلها"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "حل وابستگیها"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "چککردن ناسزگاریهای وارد شده"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "نصب"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "حذف"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "بهروزرسانی"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "به عقب برگرداندن"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "نصب دوباره"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "چککردن یکپارچگی"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "بارگذاری فایلهای بستهها"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "پیکربندی"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "چککردن کلیدها در کیرینگ"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "دریافت {size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "تازهکردن"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} جایگزین میشود با {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} ناسازگاری دارد با {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} مسیر درست یا نام بستهی معتبری نیست"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"به دلیل احتیاج به حذف شدن {pkgname1} که بستهای قفل شده است، تراکنش را "
+"نمیتوان انجام داد"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "تراکنش با موفقیت به پایان رسید"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "تائید هویت شکست خورد"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} بهروزرسانی در دسترس"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "یک بهروزرسانی در دسترس"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "سیستم شما به روز است"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "هیچ بستهای پیدا نشد"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "مدیر بهروزرسانی"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "محلی"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "کاری برای انجام دادن وجود ندارد"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "نصد شده"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "پاماک در حال حاظر در حال اجرا است"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "حذف شده"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "تعدادی بهروزرسانی موجود است.\nلطفا ابتدا سیستم خود را بهروزرسانی کنید"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "بی منبع"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "محلی"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "برای نصب"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "هیچ بستهای پیدا نشد"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "برای حذف"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "لایسنس"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "وابسته به"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "نصد شده"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "وابستگیهای اختیاری"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "مورد نیاز"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "ارائه شده"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "جایگزینها"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "ناسازگار با"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "مخزن"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "گروهها"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "حجم فشرده"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "حجم دریافت"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "حجم نصب"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "بسته بندی کننده"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "معماری"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "تاریخ نصب"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "آشکارانه نصب شده"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "نصب به عنوان یک وابستگی برای بستهای دیگر"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "نامشخص"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "دلیل نصب"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "امضا"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "فایلهای پشتیبان"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "خلاصه تراکنش"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "برای نصب"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr ""
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "برای نصب دوباره"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr ""
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "برای به گذشته برگرداندن"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr ""
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "برای حذف"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr ""
-#: pamac/main.py:351
-msgid "To update"
-msgstr "برای بهروزرسانی"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr ""
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "مجموع حجم دریافت: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "پاماک در حال حاظر در حال اجرا است"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "سیستم شما به روز است"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "مجموع حجم دریافت: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "یک بهروزرسانی موجود است"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number}بهروزرسانی موجود است"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "به دلیل احتیاج به حذف شدن {pkgname1} که بستهای قفل شده است، تراکنش را نمیتوان انجام داد"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} بهروزرسانی در دسترس"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} جایگزین میشود با {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "یک بهروزرسانی در دسترس"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} ناسازگاری دارد با {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "سیستم شما به روز است"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} ناسازگاری دارد با {pkgname2\nهیچ کدام نصب نخواهد شد"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "مدیر بهروزرسانی"
-#: pamac/main.py:874
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} ارائه میشود با {number} بسته\n.لطفا آن(هایی) را که میخواهید نصب شود انتخاب کنید"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "مدیر بسته"
-#: pamac/main.py:957
-msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+#: pamac-tray.py:38
+msgid "Quit"
msgstr ""
-#: pamac/main.py:976
-msgid "Unselect"
+#: pamac-install.py:119
+msgid ""
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
+"تعدادی بهروزرسانی موجود است.\n"
+"لطفا ابتدا سیستم خود را بهروزرسانی کنید"
-#: pamac/main.py:982
-msgid "Remove"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
+"{pkgname} ارائه میشود با {number} بسته\n"
+".لطفا آن(هایی) را که میخواهید نصب شود انتخاب کنید"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr ""
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "تازهکردن"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr ""
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "کاری برای انجام دادن وجود ندارد"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "آمادهسازی"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr ""
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "خلاصه تراکنش"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "حذف شده"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "برای نصب دوباره"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "بی منبع"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "برای به گذشته برگرداندن"
+
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "برای بهروزرسانی"
#: pamac/common.py:13
#, python-format
@@ -340,58 +397,105 @@ msgstr "%.1f کیبیبایت"
msgid "%.2f MiB"
msgstr "%.2f میبیبایت"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "انتخاب"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "خلاصه"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "مدیر بسته"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "جستجو"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "حالت"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "مخازن"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "نام"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "نسخه"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "حجم"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "اطلاعات"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "وابستگیها"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "توضیحات"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "فایلها"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "انتخاب"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "خلاصه"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "پیشرفت"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "نصب"
+
+#~ msgid "Removing"
+#~ msgstr "حذف"
+
+#~ msgid "Upgrading"
+#~ msgstr "بهروزرسانی"
+
+#~ msgid "Downgrading"
+#~ msgstr "به عقب برگرداندن"
+
+#~ msgid "Reinstalling"
+#~ msgstr "نصب دوباره"
+
+#~ msgid "Configuring"
+#~ msgstr "پیکربندی"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "چککردن کلیدها در کیرینگ"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "دریافت {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} ناسازگاری دارد با {pkgname2\n"
+#~ "هیچ کدام نصب نخواهد شد"
diff --git a/po/fi.po b/po/fi.po
index bfa6812..7f2c759 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Luki , 2013
# SamiPerkele , 2013
@@ -12,324 +12,383 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-08-21 00:19+0000\n"
"Last-Translator: SamiPerkele \n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/manjaro-pamac/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/fi/)\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Todennus vaaditaan"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Valmistellaan"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Selvitetään riippuvuuksia"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Tarkastetaan tiedostoristiriitoja"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Selvitetään riippuvuuksia"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Tarkastetaan sisäisiä ristiriitoja"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Asennetaan"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Poistetaan"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Päivitetään"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Varhennetaan"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Asennetaan uudelleen"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Tarkastetaan eheyttä"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Ladataan paketin tiedostoja"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Konfiguroidaan"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Tarkastetaan avainrenkaan avaimia"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Ladataan {size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Virkistetään"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} korvataan paketilla {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} on ristiriidassa paketin {pkgname2} kanssa"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} ei ole kunnollinen tiedostopolku tai paketin nimi"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Toimenpidettä ei voida suorittaa koska lukittu paketti {pkgname1} täytyisi "
+"poistaa"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Toimenpide suoritettu onnistuneesti"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Todentaminen epäonnistui"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} päivitystä saatavilla"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 päivitys saatavilla"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Järjestelmäsi on ajan tasalla"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Paketteja ei löytynyt"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Päivitystenhallinta"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "paikalliset"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Ei mitään tehtävää"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Asennettuna"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac on jo käynnissä"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Ei asennettuna"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Joitakin päivityksiä on saatavilla.⏎\nPäivitä järjestelmäsi ensin"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Orvot"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "paikalliset"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Asennettavat"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Paketteja ei löytynyt"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Poistettavat"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Lisenssit"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Riippuu paketeista"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Asennettuna"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Valinnaiset riippuvuudet"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Riippuvuutena paketeille"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Tarjoaa"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Korvaa"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Ristiriidat"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Pakettivarasto"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Ryhmät"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Pakattu koko"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Latauksen koko"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Koko asennettuna"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Pakkaaja"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arkkitehtuuri"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Asennuspäivämäärä"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Käyttäjän asentama"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Asennettu riippuvuutena toiselle paketille"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Tuntematon"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Asennuksen syy"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Allekirjoitukset"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Varmuuskopiot"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Toimenpiteiden yhteenveto"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"Paketilla {pkgname} on {number} asentamatonta valinnaista riippuvuutta.⏎\n"
+"Valitse ne, jotka haluat asentaa:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Asennettavat"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Poista valinta"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Uudelleenasennettavat"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Poista"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Varhennettavat"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Asenna uudelleen"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Poistettavat"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Asenna valinnaisia riippuvuuksia"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Päivitettävät"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Asenna"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Latauksen koko yhteensä: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Asenna valinnaisten riippuvuuksien kanssa"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac on jo käynnissä"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Järjestelmäsi on ajan tasalla"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Latauksen koko yhteensä: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 päivitys saatavilla"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} päivitystä saatavilla"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Toimenpidettä ei voida suorittaa koska lukittu paketti {pkgname1} täytyisi poistaa"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} päivitystä saatavilla"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} korvataan paketilla {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 päivitys saatavilla"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} on ristiriidassa paketin {pkgname2} kanssa"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Järjestelmäsi on ajan tasalla"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} on ristiriidassa paketin {pkgname2} kanssa⏎\nYhtäkään pakettia ei asenneta"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Päivitystenhallinta"
+
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Paketinhallinta"
-#: pamac/main.py:874
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{number} pakettia tarjoaa paketin {pkgname}.⏎\nValitse asennettava(t) paketit:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Joitakin päivityksiä on saatavilla.⏎\n"
+"Päivitä järjestelmäsi ensin"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "Paketilla {pkgname} on {number} asentamatonta valinnaista riippuvuutta.⏎\nValitse ne, jotka haluat asentaa:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Poista valinta"
+msgstr ""
+"{number} pakettia tarjoaa paketin {pkgname}.⏎\n"
+"Valitse asennettava(t) paketit:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Poista"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Virkistetään"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Asenna uudelleen"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Ei mitään tehtävää"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Asenna valinnaisia riippuvuuksia"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Valmistellaan"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Asenna"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Toimenpiteiden yhteenveto"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Asenna valinnaisten riippuvuuksien kanssa"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Uudelleenasennettavat"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Ei asennettuna"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Varhennettavat"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Orvot"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Päivitettävät"
#: pamac/common.py:13
#, python-format
@@ -341,58 +400,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Valitse"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Yhteenveto"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Paketinhallinta"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Etsi"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Tila"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Lähteet"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nimi"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versio"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Koko"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Tiedot"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Riippuvuudet"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Yksityiskohdat"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Tiedostot"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Valitse"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Edistyminen"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Asennetaan"
+
+#~ msgid "Removing"
+#~ msgstr "Poistetaan"
+
+#~ msgid "Upgrading"
+#~ msgstr "Päivitetään"
+
+#~ msgid "Downgrading"
+#~ msgstr "Varhennetaan"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Asennetaan uudelleen"
+
+#~ msgid "Configuring"
+#~ msgstr "Konfiguroidaan"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Tarkastetaan avainrenkaan avaimia"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Ladataan {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} on ristiriidassa paketin {pkgname2} kanssa⏎\n"
+#~ "Yhtäkään pakettia ei asenneta"
diff --git a/po/fr.po b/po/fr.po
index f8be535..675cae2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# guinux , 2013
msgid ""
@@ -11,455 +11,474 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-04 08:02+0000\n"
"Last-Translator: guinux \n"
-"Language-Team: French (http://www.transifex.com/projects/p/manjaro-pamac/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/fr/)\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Authentification nécessaire"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Vérification des dépendances"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Analyse des conflits entre fichiers"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Résolution des dépendances"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Recherche des conflits entre paquets"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Installation de {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Désinstallation de {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Mise à jour de {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Retour à une version antérieure de {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Réinstallation de {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Vérification de l'intégrité des paquets"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Chargement des fichiers des paquets"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Vérification de l'intégrité des deltas"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Application des deltas"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Génération de {} avec {} "
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Génération réussi!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Génération échoué."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Configuration de {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Vérification de l'espace disque disponible"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Vérification du trousseau"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Téléchargement des clés nécessaires"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} sera replacé par {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} est en conflit avec {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Actualisation de {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Téléchargement de {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} n'est pas un fichier ou un nom de paquet valide"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"La transaction ne peut pas être réalisée car elle nécessite de désinstaller "
+"{pkgname1} qui est un paquet bloqué"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Transaction terminée avec succès"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Aucun paquet trouvé"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "locaux"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Installé"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Non installé"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Orphelins"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "À installer"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "À désinstaller"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "locaux"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licences"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Dépend de"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dépendances opt."
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Requis par"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Fournit"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Remplace"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Est en conflit avec"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Dépôt"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Groupes"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Taille compressée"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Taille du téléchargement"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Taille après installation"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Paqueteur"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architecture"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installé le"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Explicitement installé"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Installé comme dépendance d'un autre paquet"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Inconnu"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Motif d'installation"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signatures"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Fichiers sauvegardés"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} a {number} dépendances optionelles non installées.⏎\nVeuillez choisir celui ou ceux que vous voulez installer:"
+msgstr ""
+"{pkgname} a {number} dépendances optionelles non installées.⏎\n"
+"Veuillez choisir celui ou ceux que vous voulez installer:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Déselectionner"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Désintaller"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Réinstaller"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Installer les dépendances optionnelles"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Installer"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Installer avec les dépendances optionnelles"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac est déjà en cours d'exécution"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Votre système est à jour"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Taille totale du téléchargement: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 mise à jour disponible"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} mises à jour disponibles"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} mises à jour disponibles"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 mise à jour disponible"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Votre système est à jour"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Gestionnaire de mises à jour"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Gestionnaire de paquets"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Quitter"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} n'est pas un fichier ou un nom de paquet valide"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Des mises à jour sont disponibles.\nMettez d'abord votre système à jour"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f Ko"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f Mo"
+msgstr ""
+"Des mises à jour sont disponibles.\n"
+"Mettez d'abord votre système à jour"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} est fourni par {number} paquets.\nVeuillez choisir celui que vous voulez installer:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Vérification des dépendances"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Analyse des conflits entre fichiers"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Résolution des dépendances"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Recherche des conflits entre paquets"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Installation de {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Désinstallation de {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Mise à jour de {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Retour à une version antérieure de {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Réinstallation de {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Vérification de l'intégrité des paquets"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Chargement des fichiers des paquets"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Vérification de l'intégrité des deltas"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Application des deltas"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Génération de {} avec {} "
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Génération réussi!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Génération échoué."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Configuration de {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Vérification de l'espace disque disponible"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Vérification du trousseau"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Téléchargement des clés nécessaires"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} sera replacé par {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} est en conflit avec {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Actualisation de {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Téléchargement de {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Actualisation"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "La transaction ne peut pas être réalisée car elle nécessite de désinstaller {pkgname1} qui est un paquet bloqué"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Transaction terminée avec succès"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Rien à faire"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "La transaction a été interrompu.\nPamac va se fermer."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Préparation"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Résumé de la transaction"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "A réinstaller"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "Retour à une version antérieure"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "À mettre à jour"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Préparation"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f Ko"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Rien à faire"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f Mo"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "A propos de Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Une interface gtk3 à pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Installer des paquets locaux"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Rechercher"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "État"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Dépôts"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nom"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Version"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Taille"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Infos"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dépendances"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Détails"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Fichiers"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Installer des paquets locaux"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Choisir"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Résumé"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Progression"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "détails"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} est fourni par {number} paquets.\n"
+#~ "Veuillez choisir celui que vous voulez installer:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "La transaction a été interrompu.\n"
+#~ "Pamac va se fermer."
diff --git a/po/fr_FR.po b/po/fr_FR.po
index f82f2c8..b198f5e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# guinux , 2013
# texaveryfun , 2013
@@ -12,324 +12,383 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: French (France) (http://www.transifex.com/projects/p/manjaro-pamac/language/fr_FR/)\n"
+"Language-Team: French (France) (http://www.transifex.com/projects/p/manjaro-"
+"pamac/language/fr_FR/)\n"
+"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr_FR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Authentification nécessaire"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Préparation"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Vérification des dépendances"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Analyse des conflits entre fichiers"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Résolution des dépendances"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Recherche des conflits entre paquets"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Installation"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Désinstallation"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Mise à jour"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Retour à une version antérieure"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Réinstallation"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Vérification de l'intégrité des paquets"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Chargement des fichiers des paquets"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Configuration"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Vérification des clés dans le trousseau"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Téléchargement de {size}"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Actualisation"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} sera remplacé par {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} est en conflit avec {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} n'est pas un fichier ou un nom de paquet valide"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"La transaction ne peut pas être réalisée car elle nécessite de désinstaller "
+"{pkgname1} qui est un paquet bloqué"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Transaction terminée avec succès"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "L'authentification a échoué"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} mises à jour disponibles"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 mise à jour disponible"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Votre système est à jour"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Aucun paquet trouvé"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Gestionnaire de mises à jour"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "locaux"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Rien à faire"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Installé"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac est déjà en cours d'exécution"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Non installé"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Des mises à jour sont disponibles.\nMettez d'abord votre système à jour"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Orphelins"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "locaux"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "À installer"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Aucun paquet trouvé"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "À désinstaller"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licences"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Dépend de"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Installé"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dépendances opt."
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Requis par"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Fournit"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Remplace"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Est en conflit avec"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Dépôt"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Groupes"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Taille compressée"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Taille du téléchargement"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Taille après installation"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Paqueteur"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architecture"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installé le"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Explicitement installé"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Installé comme dépendance d'un autre paquet"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Inconnu"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Motif d'installation"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signatures"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Fichiers sauvegardés"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Résumé de la transaction"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} a {number} dépendances optionnelles non installées.⏎\n"
+"Veuillez choisir celle(s) que vous voulez installer :"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "À installer"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Non sélectionné"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "A réinstaller"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Supprimer"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Retour à une version antérieure"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Réinstaller"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "À désinstaller"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Installer dépendance(s) optionelle(s)"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "À mettre à jour"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Installer"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Taille totale du téléchargement: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Installer avec dépendance(s) optionnelle(s)"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac est déjà en cours d'exécution"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Votre système est à jour"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Taille totale du téléchargement: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 mise à jour disponible"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} mises à jour disponibles"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "La transaction ne peut pas être réalisée car elle nécessite de désinstaller {pkgname1} qui est un paquet bloqué"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} mises à jour disponibles"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} sera remplacé par {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 mise à jour disponible"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} est en conflit avec {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Votre système est à jour"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} est en conflit avec {pkgname2}\nAucun d'entre eux ne sera installé"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Gestionnaire de mises à jour"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Gestionnaire de paquets"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} est fourni par {number} paquets.\nVeuillez choisir celui ou ceux que vous voulez installer:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Des mises à jour sont disponibles.\n"
+"Mettez d'abord votre système à jour"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} a {number} dépendances optionnelles non installées.⏎\nVeuillez choisir celle(s) que vous voulez installer :"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Non sélectionné"
+msgstr ""
+"{pkgname} est fourni par {number} paquets.\n"
+"Veuillez choisir celui ou ceux que vous voulez installer:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Supprimer"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Actualisation"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Réinstaller"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Rien à faire"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Installer dépendance(s) optionelle(s)"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Préparation"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Installer"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Résumé de la transaction"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Installer avec dépendance(s) optionnelle(s)"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "A réinstaller"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Non installé"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Retour à une version antérieure"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Orphelins"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "À mettre à jour"
#: pamac/common.py:13
#, python-format
@@ -341,58 +400,105 @@ msgstr "%.1f Ko"
msgid "%.2f MiB"
msgstr "%.2f Mo"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Choisir"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Résumé"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Gestionnaire de paquets"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Rechercher"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "État"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Dépôts"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nom"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Version"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Taille"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Infos"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dépendances"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Détails"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Fichiers"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Choisir"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Résumé"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Progression"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Installation"
+
+#~ msgid "Removing"
+#~ msgstr "Désinstallation"
+
+#~ msgid "Upgrading"
+#~ msgstr "Mise à jour"
+
+#~ msgid "Downgrading"
+#~ msgstr "Retour à une version antérieure"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Réinstallation"
+
+#~ msgid "Configuring"
+#~ msgstr "Configuration"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Vérification des clés dans le trousseau"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Téléchargement de {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} est en conflit avec {pkgname2}\n"
+#~ "Aucun d'entre eux ne sera installé"
diff --git a/po/he.po b/po/he.po
index 4a74fa0..7fde1b3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# GenghisKhan , 2013
msgid ""
@@ -11,455 +11,467 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-01 08:17+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/manjaro-pamac/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/he/)\n"
+"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "אימות נדרש"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "כעת בוחן תלויות"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "כעת בוחן התנגשויות קובץ"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "כעת פותר תלויות"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "כעת בוחן התנגשויות פנימיות"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "כעת מתקין את {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "כעת מסיר את {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "כעת משדרג את {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "כעת מנמיך את {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "כעת מתקין מחדש את {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "כעת בוחן שלמות"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "כעת טוען קבצי חבילות"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "כעת בוחן שלמות דלתא"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "כעת מחיל דלתא"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "כעת מחולל {} בעזרת {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "הפקה צלחה!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "הפקה כשלה."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "כעת מגדיר את {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "כעת בוחן נפח כונן זמין"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "כעת בוחן מחזיק מפתחות"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "כעת מוריד מפתחות נדרשות"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} תוחלף על ידי {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} מתנגשת עם {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "כעת מרענן את {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "כעת מוריד את {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} אינה נתיב תקף או שם חבילה"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"אין אפשרות לבצע את הטרנזקציה מכיוון שזו צריכה להסיר את {pkgname1} שהיא חבילה "
+"נעולה"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "טרנזקציה הסתיימה בהצלחה"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "לא נמצאה חבילה"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "מקומית"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "מותקנות"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "לא מותקנות"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "יתומות"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "להתקנה"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "להסרה"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "מקומית"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "רשיונות"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "תלויה על"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "תלויות רשות"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "מחויבת על ידי"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "מספקת"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "מחליפה"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "מתנגשת עם"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "מאגר"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "קבוצה"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "גודל מכווץ"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "גודל הורדה"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "גודל מותקן"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "אורז"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "ארכיטקטורה"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "תאריך התקנה"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr ""
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "מותקנת כתלות עבור חבילה אחרת"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "לא ידוע"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "סיבת התקנה"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "חתימות"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "קבצי גיבוי"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "לחבילה {pkgname} יש {number} תלויות רשות לא מותקנות.\nאנא בחר את אלה שברצונך להתקין:"
+msgstr ""
+"לחבילה {pkgname} יש {number} תלויות רשות לא מותקנות.\n"
+"אנא בחר את אלה שברצונך להתקין:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "בטל בחירה"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "הסר"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "התקן שוב"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "התקן תלויות רשות"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "התקן"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "התקן עם תלויות רשות"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac כבר מורץ כעת"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "המערכת שלך מעודכנת"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "סך גודל הורדה: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "עדכון 1 זמין"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} עדכונים זמינים"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} עדכונים זמינים"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "עדכון 1 זמין"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "המערכת שלך מעודכנת"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "מנהל עדכונים"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "מנהל חבילה"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "יציאה"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} אינה נתיב תקף או שם חבילה"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "עדכונים מסוימים זמינים כעת.\nאנא עדכן תחילה את מערכתך"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f קי״ב"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f מי״ב"
+msgstr ""
+"עדכונים מסוימים זמינים כעת.\n"
+"אנא עדכן תחילה את מערכתך"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} הינה מסופקת על ידי {number} חבילות.\nאנא בחר את זו אשר ברצונך להתקין:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "כעת בוחן תלויות"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "כעת בוחן התנגשויות קובץ"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "כעת פותר תלויות"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "כעת בוחן התנגשויות פנימיות"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "כעת מתקין את {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "כעת מסיר את {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "כעת משדרג את {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "כעת מנמיך את {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "כעת מתקין מחדש את {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "כעת בוחן שלמות"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "כעת טוען קבצי חבילות"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "כעת בוחן שלמות דלתא"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "כעת מחיל דלתא"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "כעת מחולל {} בעזרת {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "הפקה צלחה!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "הפקה כשלה."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "כעת מגדיר את {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "כעת בוחן נפח כונן זמין"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "כעת בוחן מחזיק מפתחות"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "כעת מוריד מפתחות נדרשות"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} תוחלף על ידי {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} מתנגשת עם {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "כעת מרענן את {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "כעת מוריד את {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "כעת מרענן"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "אין אפשרות לבצע את הטרנזקציה מכיוון שזו צריכה להסיר את {pkgname1} שהיא חבילה נעולה"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "טרנזקציה הסתיימה בהצלחה"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "אין מה לעשות"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "כעת מתכונן"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "סיכום טרנזקציה"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "להתקנה חוזרת"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "להנמכה"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "לשדרוג"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "כעת מתכונן"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f קי״ב"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "אין מה לעשות"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f מי״ב"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "אודות Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "זכויות יוצרים © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "מגשר חזיתי gtk3 עבור pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "התקן חבילות מקומיות"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "חיפוש"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "מצב"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "מאגרים"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "שם"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "גרסא"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "גודל"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "מידע"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "תלויות"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "פרטים"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "קבצים"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "התקן חבילות מקומיות"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "בחר"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "סיכום"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "התקדמות"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "פרטים"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} הינה מסופקת על ידי {number} חבילות.\n"
+#~ "אנא בחר את זו אשר ברצונך להתקין:"
diff --git a/po/id.po b/po/id.po
index f1fcde1..c10c521 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Mohamad Hasan Al Banna, 2013
# operamaniac , 2013
@@ -12,324 +12,383 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/manjaro-pamac/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/id/)\n"
+"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Membutuhkan Otentifikasi"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Menyiapkan"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Memeriksa ketergantungan"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Memeriksa konflik berkas"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Memecahkan dependensi"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Memeriksa konflik internal"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Memasang"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Menghapus"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Meningkatkan"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Menurunkan"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Memasang ulang"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Memeriksa integritas"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Pemuatan berkas paket"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Mengkonfigurasi"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Memeriksa keys di keyring"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Mengunduh {size}"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Menyegarkan"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} Akan digantikan dengan {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} Konflik dengan {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} bukan jalur yang tepat atau nama paket"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Transaksi tidak bisa dilaksanakan karena membutuhkan untuk menghapus "
+"{pkgname1} dimana merupakan paket yang terkunci"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Transaksi sukses terselesaikan"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Otentifikasi gagal"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} pemutakhiran tersedia"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 pemutakhiran tersedia"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Sistem anda sudah dimutakhirkan"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Tidak ada paket yang ditemukan"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Manajer Pemutakhiran"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "Lokal"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Tidak ada yang harus dilakukan"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Terpasang"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac sudah berjalan"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Dihapus"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Beberapa pemutakhiran tersedia.\nHarap mutakhirkan sistem terlebih dahulu"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Yatim"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "Lokal"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Untuk diPasang"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Tidak ada paket yang ditemukan"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Untuk diHapus"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Lisensi"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Bergantung Pada"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Terpasang"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dependensi Opsional"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Dibutuhkan Oleh"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Menyediakan"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Gantikan"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Konflik Dengan"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Gudang"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grup"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Ukuran Termampatkan"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Ukuran Unduhan"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Ukuran yang terpasang"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Pemaket"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arsitektur"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Waktu Pasang"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Terpasang secara jelas"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Terpasang sebagai dependensi untuk paket yang lain"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Tidak diketahui"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Alasan Pasang"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Tanda Tangan"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Berkas Cadangan"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Ringkasan Transaksi"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} mempunya {number} dependensi opsional yang tidak terpasang.\n"
+"Harap pilih satu atau lebih yang ingin kamu pasang:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Untuk diPasang"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Tidak diPilih"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Untuk diPasang ulang"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Hapus"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Untuk diTurunkan"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Memasang ulang"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Untuk diHapus"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Pasang dependensi opsional"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Untuk dimutakhirkan"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Pasang"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Total ukuran unduhan: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Pasang dengan dependensi opsional"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac sudah berjalan"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Sistem anda sudah paling baru"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Total ukuran unduhan: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "Tersedia 1 Pemutakhiran"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} pemutakhiran tersedia"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Transaksi tidak bisa dilaksanakan karena membutuhkan untuk menghapus {pkgname1} dimana merupakan paket yang terkunci"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} pemutakhiran tersedia"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} Akan digantikan dengan {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 pemutakhiran tersedia"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} Konflik dengan {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Sistem anda sudah dimutakhirkan"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} konflik dengan {pkgname2}\nTidak ada dari paket tersebut yang akan diPasang"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Manajer Pemutakhiran"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Manajer Paket"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} adalah disediakan oleh {number} paket.\nHarap pilih satu yang ingin kamu pasang:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Beberapa pemutakhiran tersedia.\n"
+"Harap mutakhirkan sistem terlebih dahulu"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} mempunya {number} dependensi opsional yang tidak terpasang.\nHarap pilih satu atau lebih yang ingin kamu pasang:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Tidak diPilih"
+msgstr ""
+"{pkgname} adalah disediakan oleh {number} paket.\n"
+"Harap pilih satu yang ingin kamu pasang:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Hapus"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Menyegarkan"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Memasang ulang"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Tidak ada yang harus dilakukan"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Pasang dependensi opsional"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Menyiapkan"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Pasang"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Ringkasan Transaksi"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Pasang dengan dependensi opsional"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Untuk diPasang ulang"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Dihapus"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Untuk diTurunkan"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Yatim"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Untuk dimutakhirkan"
#: pamac/common.py:13
#, python-format
@@ -341,58 +400,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Pilih"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Ringkasan"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Manajer Paket"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Cari"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Keadaan"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Gudang"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nama"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versi"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Ukuran"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Info"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dependensi"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detail"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Berkas"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Pilih"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Ringkasan"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Kemajuan"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Memasang"
+
+#~ msgid "Removing"
+#~ msgstr "Menghapus"
+
+#~ msgid "Upgrading"
+#~ msgstr "Meningkatkan"
+
+#~ msgid "Downgrading"
+#~ msgstr "Menurunkan"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Memasang ulang"
+
+#~ msgid "Configuring"
+#~ msgstr "Mengkonfigurasi"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Memeriksa keys di keyring"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Mengunduh {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} konflik dengan {pkgname2}\n"
+#~ "Tidak ada dari paket tersebut yang akan diPasang"
diff --git a/po/it.po b/po/it.po
index 6c7d0c7..fb4e53a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Bernardo Miguel Savone , 2013
# Guillaume Benoit , 2013
@@ -12,455 +12,474 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-01 08:17+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/manjaro-pamac/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/it/)\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "È richiesta l'autenticazione"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Controllo dipendenze"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Controllo conflitti tra file"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Risoluzione delle dipendenze"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Controllo conflitti tra i pacchetti"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Installo {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Rimuovo {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Aggiornamento {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Retrocessione {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Reinstallo {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Verifico l'integrità dei pacchetti"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Caricamento dei file dei pacchetti"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Controllo dell'integrità dei delta"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Applicando deltas"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Generazione {} con {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Generazione riuscita!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Generazione fallita!"
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Configurazione di {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Controllo spazio disponibile su disco"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Controllo portachiavi"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Scaricamento delle chiavi necessarie"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr ""
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr ""
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Aggiornamento {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Scaricamento di {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} non è un percorso valido o il nome di un pacchetto"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"L'operazione non può essere eseguita perché bisogna rimuovere {pkgname1} che "
+"è un pacchetto bloccato"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Transazione completata con successo"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Nessun pacchetto trovato"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "locali"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Installati"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Non installati"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Orfani"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "Da installare"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "Da rimuovere"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "locali"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licenze"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Dipende di"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dipend. opzionali"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Richiesto da"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Fornisce"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Sostituisce"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "In conflitto con"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repository"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Gruppi"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Dimensione compresso"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Dimensione scaricato"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Dimensione installato"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Packager"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architettura"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Data installazione"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Esplicitamente installato"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Installato come dipendenza di un altro pacchetto"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Sconosciuto"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Motivo della installazione"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Firme"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "File salvati"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} ha {number} dipendenze opzionali non installate.\nSi prega di scegliere quello(i) da installare:"
+msgstr ""
+"{pkgname} ha {number} dipendenze opzionali non installate.\n"
+"Si prega di scegliere quello(i) da installare:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Deseleziona"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Rimuovi"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Reinstalla"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Installa dipendenze opzionali"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Installa"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Installa con dipendenze opzionali"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac è già in esecuzione"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Il vostro sistema è aggiornato"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "dimensione totale dello scaricamento: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 aggiornamento disponibile"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} aggiornamenti disponibili"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} aggiornamenti disponibili"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 aggiornamento disponibile"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Il vostro sistema è aggiornato"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Gestore degli aggiornamenti"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Gestore dei pacchetti"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Esci"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} non è un percorso valido o il nome di un pacchetto"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Ci sono aggiornamenti disponibili.\nSi prega di aggiornare il sistema prima"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MiB"
+msgstr ""
+"Ci sono aggiornamenti disponibili.\n"
+"Si prega di aggiornare il sistema prima"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} è fornita da {number} pacchetti.\nSi prega di scegliere quello che si vuole installare:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Controllo dipendenze"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Controllo conflitti tra file"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Risoluzione delle dipendenze"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Controllo conflitti tra i pacchetti"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Installo {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Rimuovo {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Aggiornamento {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Retrocessione {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Reinstallo {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Verifico l'integrità dei pacchetti"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Caricamento dei file dei pacchetti"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Controllo dell'integrità dei delta"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Applicando deltas"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Generazione {} con {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Generazione riuscita!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Generazione fallita!"
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Configurazione di {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Controllo spazio disponibile su disco"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Controllo portachiavi"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Scaricamento delle chiavi necessarie"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr ""
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Aggiornamento {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Scaricamento di {pkgname}"
-
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Aggiornamento"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "L'operazione non può essere eseguita perché bisogna rimuovere {pkgname1} che è un pacchetto bloccato"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Transazione completata con successo"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Niente da fare"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "L'operazione è stata interrotta.\nOra Pamac si chiuderà."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Preparazione"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Riassunto della transazione"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "Da reinstallare"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "Da retrocedere"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "Da aggiornare"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Preparazione"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Niente da fare"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Info su Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Un frontend in gtk3 per pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Installa pacchetti locali"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Cerca"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Stato"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repos"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nome"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versione"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Dimensione"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Info"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dipendenze"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Dettagli"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Files"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Installa pacchetti locali"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Scegli"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Riassunto"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Avanzamento"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "dettagli"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} è fornita da {number} pacchetti.\n"
+#~ "Si prega di scegliere quello che si vuole installare:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "L'operazione è stata interrotta.\n"
+#~ "Ora Pamac si chiuderà."
diff --git a/po/ja.po b/po/ja.po
index a1d0180..c16faa4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# rago1975, 2013
msgid ""
@@ -11,324 +11,383 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-08-03 15:15+0000\n"
"Last-Translator: rago1975\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/manjaro-pamac/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/ja/)\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "認証が必要です"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "準備中"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "依存関係を解決中"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "競合するファイルを確認中"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "依存関係を解決中"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "内部競合を確認中"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "インストール中"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "プログラムの削除中"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "アップグレード中"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "ダウングレーディング"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "再インストール中"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "ファイルの整合性を確認中"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "パッケージファイルのロード中"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "設定中"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "キーリングのキーを確認中"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "ダウンロード中{size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "更新中"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1}は{pkgname2}に置換されます"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} は {pkgname2}と競合します"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} はパッケージの名前またはパスが適切ではありません"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"ロックされたパッケージ {pkgname1} を削除する必要があるため、処理は完了しませ"
+"んでした。"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "処理が正常に終了しました。"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "認証失敗"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number}種類の利用可能なアップデート"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 つの利用可能なアップデート"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "システムは最新です"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "パッケージが見つかりません"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "アップデートマネージャー"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "ローカル"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "何もすることがありません"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "インストール済み"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "pamacは既に起動しています"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "アンインストール済み"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "アップデートが利用可能です。⏎\nまず、システムをアップデートしてください"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Orphans"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "ローカル"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "インストール"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "パッケージが見つかりません"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "削除"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "ライセンス"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "依存する"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "インストール済み"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "オプショナルな依存"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "必要としています"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "提供"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "置換"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "競合しています"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "リポジトリ"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "グループ"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "圧縮したパッケージのサイズ"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "ダウンロードしたパッケージのサイズ"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "インストールしたパッケージのサイズ"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "パッケージャー"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "アーキテクチャー"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "インストール時刻"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "明示的にインストールされた"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "他のパッケージに依存するプログラムとしてインストールされました"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "不明"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "インストールReason"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "署名"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "バックアップファイル"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "処理概要"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname}には オプショナルに依存するパッケージが{number}種類あります。.⏎\n"
+"インストールしたいプログラムを選択してください"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "インストール"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "未選択"
-#: pamac/main.py:332
-msgid "To reinstall"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "削除"
+
+#: pamac-manager.py:486
+msgid "Reinstall"
msgstr "再インストール"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "ダウングレード"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "オプショナルに依存するパッケージをインストール"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "削除"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "インストール"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "アップデート"
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "オプショナルに依存するパッケージを含めてインストール"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "全ダウンロード サイズ: "
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "pamacは既に起動しています"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "システムは最新です。"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "全ダウンロード サイズ: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 つの利用可能なアップデート"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number}種類の利用可能なアップデート"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "ロックされたパッケージ {pkgname1} を削除する必要があるため、処理は完了しませんでした。"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number}種類の利用可能なアップデート"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1}は{pkgname2}に置換されます"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 つの利用可能なアップデート"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} は {pkgname2}と競合します"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "システムは最新です"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} は{pkgname2}と競合します⏎\n インストールされませんでした"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "アップデートマネージャー"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "パッケージマネージャー"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname}は{number}種類のパッケージが提供されています。⏎\n インストールしたいものを選んでください"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"アップデートが利用可能です。⏎\n"
+"まず、システムをアップデートしてください"
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname}には オプショナルに依存するパッケージが{number}種類あります。.⏎\nインストールしたいプログラムを選択してください"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "未選択"
+msgstr ""
+"{pkgname}は{number}種類のパッケージが提供されています。⏎\n"
+" インストールしたいものを選んでください"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "削除"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "更新中"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "再インストール"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "何もすることがありません"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "オプショナルに依存するパッケージをインストール"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "準備中"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "インストール"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "処理概要"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "オプショナルに依存するパッケージを含めてインストール"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "再インストール"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "アンインストール済み"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "ダウングレード"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Orphans"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "アップデート"
#: pamac/common.py:13
#, python-format
@@ -340,58 +399,105 @@ msgstr "%.1f キロバイト"
msgid "%.2f MiB"
msgstr "%.2f メガバイト"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr " 選択"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "要約"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "パッケージマネージャー"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "検索"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "状態"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "リポジトリ"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "名前"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "バージョン"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "サイズ"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "情報"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "依存"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "詳細"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "ファイル"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr " 選択"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "要約"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "経過"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "インストール中"
+
+#~ msgid "Removing"
+#~ msgstr "プログラムの削除中"
+
+#~ msgid "Upgrading"
+#~ msgstr "アップグレード中"
+
+#~ msgid "Downgrading"
+#~ msgstr "ダウングレーディング"
+
+#~ msgid "Reinstalling"
+#~ msgstr "再インストール中"
+
+#~ msgid "Configuring"
+#~ msgstr "設定中"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "キーリングのキーを確認中"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "ダウンロード中{size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} は{pkgname2}と競合します⏎\n"
+#~ " インストールされませんでした"
diff --git a/po/nb.po b/po/nb.po
index 427fe72..2291c88 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Guillaume Benoit , 2013
# tflovik , 2013
@@ -12,324 +12,381 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manjaro-pamac/language/nb/)\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manjaro-"
+"pamac/language/nb/)\n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Autentifisering er krevd"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Forbereder"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Sjekker avhengigheter"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Sjekker fil konflikter"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Ordner avhengigheter"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Sjekker inter konflikter"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Installerer"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Fjerner"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Oppgraderer"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Nedgraderer"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Reinstallerer"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Sjekker integritet"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Laster pakke filer"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Konfigurerer"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Sjekker nøkler i nøkkelring"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Laster ned {size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Oppfrisker"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} vil bli erstattet av {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} i konflikt med {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} er ikke en gyldig sti eller pakke navn"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Transaksjonen kan ikke bli utført fordi den trenger å fjerne\n"
+" {pkgname1} som er en låst pakke"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Transaksjonen avsluttet vellykket"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Autentifisering feilet"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} tilgjengelige oppdateringer"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 tilgjengelig oppdatering"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Systemet ditt er oppdatert"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Ingen pakke funnet"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Oppdaterings Behandler"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokal"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Ingenting å gjøre"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Installert"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac kjører allerede"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Avinstallert"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Noen oppdateringer er tilgjengelige.⏎\nVennligst oppdater systemet ditt først"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Foreldreløs"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "lokal"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Å installere"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Ingen pakke funnet"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Å fjerne"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Lisenser"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Avhenger av"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Installert"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Valgfrie avhengigheter"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Krevd av"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Tilbyr"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Erstatter"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "I konflikt med"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Arkiv"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupper"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Komprimert Størrelse"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Nedlastet Størrelse"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Installert Størrelse"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Pakker"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arkitektur"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installasjons Dato"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Explisitt installert"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Installert som en avhengighet for en annen pakke"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Ukjent"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Grunn til Installasjon"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signaturer"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Sikkerhetskopier filene"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Transaksjons Resyme"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Å installere"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr ""
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Å reinstallere"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr ""
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Å nedgradere"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr ""
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Å fjerne"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr ""
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Å oppdatere"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr ""
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Total nedlastings størrelse: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac kjører allerede"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Systemet ditt er oppdatert"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Total nedlastings størrelse: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 tilgjengelig oppdatering"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} tilgjengelige oppdateringer"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Transaksjonen kan ikke bli utført fordi den trenger å fjerne\n {pkgname1} som er en låst pakke"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} tilgjengelige oppdateringer"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} vil bli erstattet av {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 tilgjengelig oppdatering"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} i konflikt med {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Systemet ditt er oppdatert"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} i konflikt med {pkgname2}⏎\nIngen av dem vil bli installert"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Oppdaterings Behandler"
-#: pamac/main.py:874
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} er tilbydd av {number} pakker.⏎\nVennligst velg de(n) du ønsker å installere:"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Pakke Behandler"
-#: pamac/main.py:957
-msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+#: pamac-tray.py:38
+msgid "Quit"
msgstr ""
-#: pamac/main.py:976
-msgid "Unselect"
+#: pamac-install.py:119
+msgid ""
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
+"Noen oppdateringer er tilgjengelige.⏎\n"
+"Vennligst oppdater systemet ditt først"
-#: pamac/main.py:982
-msgid "Remove"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
+"{pkgname} er tilbydd av {number} pakker.⏎\n"
+"Vennligst velg de(n) du ønsker å installere:"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr ""
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Oppfrisker"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr ""
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Ingenting å gjøre"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Forbereder"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr ""
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Transaksjons Resyme"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Avinstallert"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Å reinstallere"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Foreldreløs"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Å nedgradere"
+
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Å oppdatere"
#: pamac/common.py:13
#, python-format
@@ -341,58 +398,105 @@ msgstr "%.1f Kb"
msgid "%.2f MiB"
msgstr "%.2f Mb"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Velg"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Resyme"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Pakke Behandler"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Søk"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Tilstand"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Depoer"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Navn"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versjon"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Størrelse"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informasjon"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Avhengigheter"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detaljer"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Filer"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Velg"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Resyme"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Framdrift"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Installerer"
+
+#~ msgid "Removing"
+#~ msgstr "Fjerner"
+
+#~ msgid "Upgrading"
+#~ msgstr "Oppgraderer"
+
+#~ msgid "Downgrading"
+#~ msgstr "Nedgraderer"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Reinstallerer"
+
+#~ msgid "Configuring"
+#~ msgstr "Konfigurerer"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Sjekker nøkler i nøkkelring"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Laster ned {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} i konflikt med {pkgname2}⏎\n"
+#~ "Ingen av dem vil bli installert"
diff --git a/po/nl.po b/po/nl.po
index a9b7993..96a92b9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# BootZ , 2013
msgid ""
@@ -11,332 +11,383 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-06-02 22:10+0000\n"
"Last-Translator: BootZ \n"
-"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/manjaro-pamac/language/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/nl_NL/)\n"
+"Language: nl_NL\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nl_NL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Authenticatie is vereist"
-#: pamac-daemon.py:29 pamac/main.py:505
-msgid "Preparing"
-msgstr "Voorbereiding"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Controleren afhankelijkheden"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Controle bestandsconflicten"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Afhankelijkheden oplossen"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Controle op interne conflicten"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Installeren"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Verwijderen"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Bijwerken"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Downgraden"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Herinstalleren"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Controle op integriteit"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Pakket bestanden laden"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Configureren"
-
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Controle sleutels in sleutelring"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Downloaden {size}"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:439 pamac/main.py:1099
-msgid "Refreshing"
-msgstr "Verversen"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:533
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} is geen geldig pad of pakket naam"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:438
-msgid "Transaction successfully finished"
-msgstr "Transactie succesvol afgerond"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
-#: pamac-daemon.py:442 pamac-daemon.py:450
-msgid "Authentication failed"
-msgstr "Authenticatie mislukt"
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
-#: pamac-tray.py:20
-msgid "{number} available updates"
-msgstr "{number} beschikbare updates"
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
-#: pamac-tray.py:21
-msgid "1 available update"
-msgstr "1 beschikbare update"
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-tray.py:23
-msgid "Your system is up-to-date"
-msgstr "Uw systeem is up-to-date, Cool!"
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
-#: pamac-tray.py:31
-msgid "Install/Check for updates"
-msgstr "Installeren/Controle op updates"
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} zal vervangen worden door {pkgname2}"
-#: pamac-tray.py:34
-msgid "Run pamac-manager"
-msgstr "Start pamac-manager"
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} conflicteert met {pkgname2}"
-#: pamac-tray.py:37
-msgid "Quit"
-msgstr "Stoppen"
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:897
-msgid "Nothing to do"
-msgstr "Niets te doen"
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
-#: pamac-install.py:87 pamac/main.py:1150
-msgid "Pamac is already running"
-msgstr "Pamac is reeds gestart"
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} is geen geldig pad of pakket naam"
-#: pamac-install.py:97
+#: pamac-daemon.py:601
+#, python-brace-format
msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Er zijn updates beschikbaar.\nWerk uw systeem s.v.p. eerst bij"
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"De transactie kan niet worden uitgevoerd omdat {pkgname1} moet worden "
+"verwijderd maar dit is een 'locked' pakket"
-#: pamac/main.py:89 pamac/main.py:1052
-msgid "local"
-msgstr "lokaal"
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Transactie succesvol afgerond"
-#: pamac/main.py:180 pamac/main.py:954 pamac/main.py:1003
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr "Authenticatie mislukt"
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Geen pakket gevonden"
-#: pamac/main.py:231
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokaal"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Geïnstalleerd"
+
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Verwijderd"
+
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Wezen"
+
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Te installeren"
+
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Te verwijderen"
+
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licenties"
-#: pamac/main.py:236
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Is afhankelijk van"
-#: pamac/main.py:241 pamac/main.py:1035 pamac/main.py:1224
-msgid "Installed"
-msgstr "Geïnstalleerd"
-
-#: pamac/main.py:244
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Optionele afhankelijkheden"
-#: pamac/main.py:247
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Vereist door"
-#: pamac/main.py:249
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Biedt"
-#: pamac/main.py:251
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Vervangt"
-#: pamac/main.py:253
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Conflicteert met"
-#: pamac/main.py:258
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repository"
-#: pamac/main.py:260 gui/manager.glade:538
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Groepen"
-#: pamac/main.py:262
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Gecomprimeerde grootte"
-#: pamac/main.py:263
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Download grootte"
-#: pamac/main.py:265
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Geïnstalleerde grootte"
-#: pamac/main.py:266
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Packager"
-#: pamac/main.py:267
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architectuur"
-#: pamac/main.py:270
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installatie Datum"
-#: pamac/main.py:272
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Expliciet geïnstalleerd"
-#: pamac/main.py:274
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Geïnstalleerd als een afhankelijkheid van een ander pakket"
-#: pamac/main.py:276
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Onbekend"
-#: pamac/main.py:277
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Installatie reden"
-#: pamac/main.py:282
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Handtekeningen"
-#: pamac/main.py:286
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Back-up bestanden"
-#: pamac/main.py:326
-msgid "Transaction Summary"
-msgstr "Transactie Overzicht"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} heeft {number} niet geïnstalleerde optionele afhankelijkheden.\n"
+"Kies degene(n) die u wilt installeren:"
-#: pamac/main.py:328 pamac/main.py:1041 pamac/main.py:1224
-msgid "To install"
-msgstr "Te installeren"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "De-selecteren"
-#: pamac/main.py:334
-msgid "To reinstall"
-msgstr "Opnieuw te installeren"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Verwijderen"
-#: pamac/main.py:340
-msgid "To downgrade"
-msgstr "Te downgraden"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Herinstalleren"
-#: pamac/main.py:346 pamac/main.py:1043 pamac/main.py:1224
-msgid "To remove"
-msgstr "Te verwijderen"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Installeer optionele afhankelijkheden"
-#: pamac/main.py:353
-msgid "To update"
-msgstr "Te updaten"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Installeer"
-#: pamac/main.py:364 pamac/main.py:461
-msgid "Total download size: "
-msgstr "Totale download grootte: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Installeer met optionele afhankelijkheden"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac is reeds gestart"
-#: pamac/main.py:454 pamac/main.py:1236
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Uw systeem is up-to-date, Cool!"
-#: pamac/main.py:463
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Totale download grootte: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 beschikbare update"
-#: pamac/main.py:465
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} beschikbare updates"
-#: pamac/main.py:551 pamac/main.py:552
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "De transactie kan niet worden uitgevoerd omdat {pkgname1} moet worden verwijderd maar dit is een 'locked' pakket"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} beschikbare updates"
-#: pamac/main.py:583 pamac/main.py:584 pamac/main.py:686 pamac/main.py:687
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} zal vervangen worden door {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 beschikbare update"
-#: pamac/main.py:701 pamac/main.py:702 pamac/main.py:726 pamac/main.py:727
-#: pamac/main.py:747 pamac/main.py:748 pamac/main.py:778 pamac/main.py:779
-#: pamac/main.py:803 pamac/main.py:804 pamac/main.py:824 pamac/main.py:825
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} conflicteert met {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Uw systeem is up-to-date, Cool!"
-#: pamac/main.py:759 pamac/main.py:760
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} conflicteert met {pkgname2}\nGeen pakket wordt geïnstalleerd"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Update Manager"
+
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Pakket Manager"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr "Stoppen"
-#: pamac/main.py:856
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} wordt aangeboden in {number} pakketten.\nKies het/de te installeren pakket(ten):"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr ""
+"Er zijn updates beschikbaar.\n"
+"Werk uw systeem s.v.p. eerst bij"
-#: pamac/main.py:939
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} heeft {number} niet geïnstalleerde optionele afhankelijkheden.\nKies degene(n) die u wilt installeren:"
-
-#: pamac/main.py:957
-msgid "Unselect"
-msgstr "De-selecteren"
+msgstr ""
+"{pkgname} wordt aangeboden in {number} pakketten.\n"
+"Kies het/de te installeren pakket(ten):"
-#: pamac/main.py:961
-msgid "Remove"
-msgstr "Verwijderen"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Verversen"
-#: pamac/main.py:964
-msgid "Reinstall"
-msgstr "Herinstalleren"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Niets te doen"
-#: pamac/main.py:975
-msgid "Install optional deps"
-msgstr "Installeer optionele afhankelijkheden"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Voorbereiding"
-#: pamac/main.py:979
-msgid "Install"
-msgstr "Installeer"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Transactie Overzicht"
-#: pamac/main.py:990
-msgid "Install with optional deps"
-msgstr "Installeer met optionele afhankelijkheden"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Opnieuw te installeren"
-#: pamac/main.py:1037 pamac/main.py:1224
-msgid "Uninstalled"
-msgstr "Verwijderd"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Te downgraden"
-#: pamac/main.py:1039 pamac/main.py:1224
-msgid "Orphans"
-msgstr "Wezen"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Te updaten"
#: pamac/common.py:13
#, python-format
@@ -348,62 +399,111 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:7
-msgid "Choose"
-msgstr "Kies"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:112
-msgid "Summary"
-msgstr "Overzicht"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:256
-msgid "Progress"
-msgstr "Voortgang"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:402
-msgid "Package Manager"
-msgstr "Pakket Manager"
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
-#: gui/manager.glade:492
+#: gui/manager.ui:294
msgid "Search"
msgstr "Zoek"
-#: gui/manager.glade:585 gui/manager.glade:680
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Status"
-#: gui/manager.glade:632
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repos"
-#: gui/manager.glade:711
+#: gui/manager.ui:492
msgid "Name"
msgstr "Naam"
-#: gui/manager.glade:730
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versie"
-#: gui/manager.glade:747
+#: gui/manager.ui:518
msgid "Size"
msgstr "Grootte"
-#: gui/manager.glade:848
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Info"
-#: gui/manager.glade:908
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Afhankelijkheden"
-#: gui/manager.glade:973
+#: gui/manager.ui:753
msgid "Details"
msgstr "Details"
-#: gui/manager.glade:1021
+#: gui/manager.ui:782
msgid "Files"
msgstr "Bestanden"
-#: gui/updater.glade:6
-msgid "Update Manager"
-msgstr "Update Manager"
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Kies"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Overzicht"
+
+#: gui/dialogs.ui:315
+msgid "Progress"
+msgstr "Voortgang"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Installeren"
+
+#~ msgid "Removing"
+#~ msgstr "Verwijderen"
+
+#~ msgid "Upgrading"
+#~ msgstr "Bijwerken"
+
+#~ msgid "Downgrading"
+#~ msgstr "Downgraden"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Herinstalleren"
+
+#~ msgid "Configuring"
+#~ msgstr "Configureren"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Controle sleutels in sleutelring"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Downloaden {size}"
+
+#~ msgid "Install/Check for updates"
+#~ msgstr "Installeren/Controle op updates"
+
+#~ msgid "Run pamac-manager"
+#~ msgstr "Start pamac-manager"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} conflicteert met {pkgname2}\n"
+#~ "Geen pakket wordt geïnstalleerd"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c05bb5b..41a90ba 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# BootZ , 2013
# guinux , 2013
@@ -13,455 +13,474 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-04 08:05+0000\n"
"Last-Translator: guinux \n"
-"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/manjaro-pamac/language/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/nl_NL/)\n"
+"Language: nl_NL\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nl_NL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Authenticatie is vereist"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Controleren afhankelijkheden"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Controle bestandsconflicten"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Afhankelijkheden oplossen"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Controle op interne conflicten"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Installeer {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Verwijderen {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Opwaarderen {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Downgraden {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Herinstalleer {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Controle op integriteit"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Pakket bestanden laden"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Delta integriteit controleren"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Het toepassen van delta's"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Genereer {} met {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Generatie Gelukt!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Generatie gefaald."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Configureer {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Controleren beschikbare schijfruimte"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Controleren Sleutelring "
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Downloaden benodigde sleutels"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} zal vervangen worden door {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} conflicteerd met {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Ververs {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Downloaden {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} is geen geldig pad of pakket naam"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"De transactie kan niet worden uitgevoerd omdat {pkgname1} moet worden "
+"verwijderd maar dit is een 'locked' pakket"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Transactie succesvol afgerond"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Geen pakket gevonden"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokaal"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Geïnstalleerd"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Verwijderd"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Wezen"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "Te installeren"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "Te verwijderen"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "lokaal"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licenties"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Is afhankelijk van"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Optionele afhankelijkheden"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Vereist door"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Biedt"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Vervangt"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Conflicteert met"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repository"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Groepen"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Gecomprimeerde grootte"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Download grootte"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Geïnstalleerde grootte"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Packager"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architectuur"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installatie Datum"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Expliciet geïnstalleerd"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Geïnstalleerd als een afhankelijkheid van een ander pakket"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Onbekend"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Installatie reden"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Handtekeningen"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Back-up bestanden"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} heeft {number} niet geïnstalleerde optionele afhankelijkheden.\nKies degene(n) die u wilt installeren:"
+msgstr ""
+"{pkgname} heeft {number} niet geïnstalleerde optionele afhankelijkheden.\n"
+"Kies degene(n) die u wilt installeren:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "De-selecteren"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Verwijderen"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Herinstalleren"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Installeer optionele afhankelijkheden"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Installeer"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Installeer met optionele afhankelijkheden"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac is reeds gestart"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Uw systeem is up-to-date, Cool!"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Totale download grootte: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 beschikbare update"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} beschikbare updates"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} beschikbare updates"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 beschikbare update"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Uw systeem is up-to-date, Cool!"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Update Manager"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Pakket Manager"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Afsluiten"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} is geen geldig pad of pakket naam"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Er zijn updates beschikbaar.\nWerk uw systeem s.v.p. eerst bij"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MiB"
+msgstr ""
+"Er zijn updates beschikbaar.\n"
+"Werk uw systeem s.v.p. eerst bij"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} wordt geleverd door {number} pakketten.\nKies degene die je wilt installeren:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Controleren afhankelijkheden"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Controle bestandsconflicten"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Afhankelijkheden oplossen"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Controle op interne conflicten"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Installeer {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Verwijderen {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Opwaarderen {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Downgraden {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Herinstalleer {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Controle op integriteit"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Pakket bestanden laden"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Delta integriteit controleren"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Het toepassen van delta's"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Genereer {} met {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Generatie Gelukt!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Generatie gefaald."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Configureer {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Controleren beschikbare schijfruimte"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Controleren Sleutelring "
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Downloaden benodigde sleutels"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} zal vervangen worden door {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} conflicteerd met {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Ververs {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Downloaden {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Verversen"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "De transactie kan niet worden uitgevoerd omdat {pkgname1} moet worden verwijderd maar dit is een 'locked' pakket"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Transactie succesvol afgerond"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Niets te doen"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "De transactie werd onderbroken. ⏎\nNu zal Pamac stoppen."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Voorbereiding"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Transactie Overzicht"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "Opnieuw te installeren"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "Te downgraden"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "Te updaten"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Voorbereiding"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Niets te doen"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Over Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Auteursrecht © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Een gtk3 frontend voor pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Installeer lokale pakketten"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Zoek"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Status"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repos"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Naam"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versie"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Grootte"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Info"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Afhankelijkheden"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Details"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Bestanden"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Installeer lokale pakketten"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Kies"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Overzicht"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Voortgang"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "details"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} wordt geleverd door {number} pakketten.\n"
+#~ "Kies degene die je wilt installeren:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "De transactie werd onderbroken. ⏎\n"
+#~ "Nu zal Pamac stoppen."
diff --git a/po/pl.po b/po/pl.po
index 73f1444..5efbc64 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Guillaume Benoit , 2013
# poker98face , 2013
@@ -13,455 +13,475 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-02 09:57+0000\n"
"Last-Translator: Piotr Strębski \n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/manjaro-pamac/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/pl/)\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Wymagana autoryzacja"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Sprawdzanie zależności"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Sprawdzanie konfliktów plików"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Rozwiązywanie zależności"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Wyszukiwanie konfliktów między pakietami"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Instalowanie {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Usuwanie {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Aktualizowanie {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Obniżanie wersji {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Przeinstalowywanie {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Sprawdzanie spójności"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Ładowanie plików pakietów"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Sprawdzanie integralności delta"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Zastosowywanie delt"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Generowanie {} przy użyciu {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Generowanie zakończone sukcesem!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Generowanie nie powiodło się."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Konfigurowanie {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Sprawdzanie dostępnego miejsca na dysku"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Sprawdzanie zestawu kluczy"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Pobieranie wymaganych kluczy"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} zostanie zastąpiony przez {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} jest w konflikcie z {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Odświeżanie {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Pobieranie {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} nie jest poprawną ścieżką lub nazwą pakietu"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Operacja nie może zostać przeprowadzona z powodu konieczności usunięcia "
+"{pkgname1}, który jest pakietem zablokowanym."
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Operacja zakończona sukcesem"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Nie znaleziono pakietu"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokalne"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Zainstalowany"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Nie zainstalowany"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Osierocone"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "Do zainstalowania"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "Do usunięcia"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "lokalne"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licenje"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Zależy od"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Opcjonalne zależności"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Wymagany przez"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Dostarcza"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Zamienia"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Konfliktuje z"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repozytorium"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupy"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Skompresowany rozmiar"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Rozmiar pobranego"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Rozmiar zainstalowanego"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Pakowacz"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architektura"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Data instalacji"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Zainstalowany bezpośrednio"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Instalowany jako zależność innego pakietu"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Nieznany"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Motyw instalacji"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Podpis"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Backup plików"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} posiada {number} niezainstalowanych opcjonalnych zależności.\nProszę wskazać jedną (lub wiele), które chcesz zainstalować:"
+msgstr ""
+"{pkgname} posiada {number} niezainstalowanych opcjonalnych zależności.\n"
+"Proszę wskazać jedną (lub wiele), które chcesz zainstalować:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Odznacz"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Usuń"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Przeinstaluj"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Zainstaluj opcjonalne zależności"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Zainstaluj"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Zainstaluj wraz z opcjonalnymi zależnościami"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac jest już uruchomiony"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Twój system jest w pełni zaktualizowany"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Całkowity rozmiar pobierania: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 aktualizacja dostępna"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} aktualizacji dostępnych"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} dostępnych aktualizacji"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 aktualizacja dostępna"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Twój system jest w pełni zaktualizowany"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Menedżer aktualizacji"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Menedżer pakietów"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Wyjdź"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} nie jest poprawną ścieżką lub nazwą pakietu"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Dostępne są pewne uaktualnienia.\nProszę zaktualizować wpierw swój system."
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f Kb"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f Mb"
+msgstr ""
+"Dostępne są pewne uaktualnienia.\n"
+"Proszę zaktualizować wpierw swój system."
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} jest dostarczane przez {number} pakietów.\nProszę wskazać ten, który ma zostać zainstalowany:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Sprawdzanie zależności"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Sprawdzanie konfliktów plików"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Rozwiązywanie zależności"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Wyszukiwanie konfliktów między pakietami"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Instalowanie {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Usuwanie {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Aktualizowanie {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Obniżanie wersji {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Przeinstalowywanie {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Sprawdzanie spójności"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Ładowanie plików pakietów"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Sprawdzanie integralności delta"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Zastosowywanie delt"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Generowanie {} przy użyciu {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Generowanie zakończone sukcesem!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Generowanie nie powiodło się."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Konfigurowanie {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Sprawdzanie dostępnego miejsca na dysku"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Sprawdzanie zestawu kluczy"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Pobieranie wymaganych kluczy"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} zostanie zastąpiony przez {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} jest w konflikcie z {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Odświeżanie {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Pobieranie {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Odświeżanie"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Operacja nie może zostać przeprowadzona z powodu konieczności usunięcia {pkgname1}, który jest pakietem zablokowanym."
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Operacja zakończona sukcesem"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Nic do zrobienia"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "Operacja przebiegła niepomyślnie.\nPamac zakończy teraz pracę."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Przygotowanie"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Podsumowanie operacji"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "Do przeinstalowania"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "Do obniżenia wersji"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "Do aktualizacji"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Przygotowanie"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f Kb"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Nic do zrobienia"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f Mb"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "O Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Prawa autorskie © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Nakładka gtk3 dla pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Zainstaluj lokalne pakiety"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Wyszukaj"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Stan"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repozytoria"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nazwa"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Wersja"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Rozmiar"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informacje"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Zależności"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Szczegóły"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Pliki"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Zainstaluj lokalne pakiety"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Wybierz"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Podsumowanie"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Postęp"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "szczegóły"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} jest dostarczane przez {number} pakietów.\n"
+#~ "Proszę wskazać ten, który ma zostać zainstalowany:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "Operacja przebiegła niepomyślnie.\n"
+#~ "Pamac zakończy teraz pracę."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1388df7..8d82b46 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Guillaume Benoit , 2013
# holmeslinux , 2013
@@ -13,324 +13,381 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/manjaro-pamac/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/pt_BR/)\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr ""
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Preparando"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Verificando dependências"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Verificando conflito entre arquivos"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Resolvendo dependências"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Verificando conflito entre pacotes"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Instalando"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Removendo"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Atualizando"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Substituíndo por versão anterior"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Reinstalando"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Verificando a integridade dos pacotes"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Carregando arquivos de pacotes"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Configurando"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Verificando chaves no chaveiro"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Baixando {size}"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Atualizando"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} será substituído por {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} está em conflito com {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} não é um caminho ou nome de pacto válido"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"A transação não pode ser realizada porque ela precisa remover {pkgname1}, o "
+"qual é um pacote bloqueado"
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Transação finalizada com êxito"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Autenticação falhou"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} atualizações disponíveis"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 atualização disponível"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "O seu sistema está atualizado"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Pacote não encontrado"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Gerenciador de atualizações"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "local"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Nada para fazer"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Instalado"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac ja está sendo executado"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Desinstalado"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Algumas atualizações estão disponíveis.\nPor favor, atualize o seu sistema antes"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Orfãos"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "local"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Para instalar"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Pacote não encontrado"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Para remover"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licenças"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Depende de"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Instalado"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dependências opicionais"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Exigido por"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Fornece"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Substitui"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Conflita com"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repositório"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupos"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Tamanho comprimido"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Tamanho baixado"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Tamanho instalado"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Empacotador"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arquitetura"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Data de instalação"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Explicitamente instalado"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Instalado como dependência para outro pacote"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Desconhecido"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Motivo da instalação"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Assinaturas"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Cópia de segurança dos arquivos"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Resumo da transação"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Para instalar"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr ""
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Para reinstalar"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr ""
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Para substituir por versão anterior"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr ""
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Para remover"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr ""
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Para atualizar"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr ""
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Tamanho total para baixar: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac ja está sendo executado"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "O seu sistema está atualizado"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Tamanho total para baixar: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 atualização disponível"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} atualizações disponíveis"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "A transação não pode ser realizada porque ela precisa remover {pkgname1}, o qual é um pacote bloqueado"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} atualizações disponíveis"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} será substituído por {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 atualização disponível"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} está em conflito com {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "O seu sistema está atualizado"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} está em conflito com {pkgname2}\nNenhum deles será instalado"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Gerenciador de atualizações"
-#: pamac/main.py:874
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} é fornecido por {number} pacotes.\nPor favor escolha um desse (s) pacote(s) para você instalar:"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Gerenciador de pacotes"
-#: pamac/main.py:957
-msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+#: pamac-tray.py:38
+msgid "Quit"
msgstr ""
-#: pamac/main.py:976
-msgid "Unselect"
+#: pamac-install.py:119
+msgid ""
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
+"Algumas atualizações estão disponíveis.\n"
+"Por favor, atualize o seu sistema antes"
-#: pamac/main.py:982
-msgid "Remove"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
+"{pkgname} é fornecido por {number} pacotes.\n"
+"Por favor escolha um desse (s) pacote(s) para você instalar:"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr ""
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Atualizando"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr ""
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Nada para fazer"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Preparando"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr ""
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Resumo da transação"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Desinstalado"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Para reinstalar"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Orfãos"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Para substituir por versão anterior"
+
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Para atualizar"
#: pamac/common.py:13
#, python-format
@@ -342,58 +399,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Escolher"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Resumo"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Gerenciador de pacotes"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Procurar"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Estado"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repositórios"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nome"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versão"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Tamanho"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informações"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dependências"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detalhes"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Arquivos"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Escolher"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Resumo"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Progresso"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Instalando"
+
+#~ msgid "Removing"
+#~ msgstr "Removendo"
+
+#~ msgid "Upgrading"
+#~ msgstr "Atualizando"
+
+#~ msgid "Downgrading"
+#~ msgstr "Substituíndo por versão anterior"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Reinstalando"
+
+#~ msgid "Configuring"
+#~ msgstr "Configurando"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Verificando chaves no chaveiro"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Baixando {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} está em conflito com {pkgname2}\n"
+#~ "Nenhum deles será instalado"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 119dcd8..b7fe9d3 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -10,323 +10,374 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/manjaro-pamac/language/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/pt_PT/)\n"
+"Language: pt_PT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr ""
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr ""
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr ""
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr ""
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr ""
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr ""
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr ""
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr ""
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
-msgid "{pkgname} is not a valid path or package name"
+#: pamac-daemon.py:219
+msgid "Generation failed."
msgstr ""
-#: pamac-daemon.py:438
-msgid "Transaction successfully finished"
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
msgstr ""
-#: pamac-daemon.py:442 pamac-daemon.py:450
-msgid "Authentication failed"
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
msgstr ""
-#: pamac-tray.py:22
-msgid "{number} available updates"
+#: pamac-daemon.py:240
+msgid "Checking keyring"
msgstr ""
-#: pamac-tray.py:23
-msgid "1 available update"
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
msgstr ""
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
msgstr ""
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
msgstr ""
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
msgstr ""
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
msgstr ""
-#: pamac-install.py:97
+#: pamac-daemon.py:601
+#, python-brace-format
msgid ""
-"Some updates are available.\n"
-"Please update your system first"
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
msgstr ""
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
msgstr ""
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
msgstr ""
-#: pamac/main.py:229
-msgid "Licenses"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
msgstr ""
-#: pamac/main.py:234
-msgid "Depends On"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
msgstr ""
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr ""
-#: pamac/main.py:242
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr ""
+
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr ""
+
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr ""
+
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr ""
+
+#: pamac-manager.py:274
+msgid "Licenses"
+msgstr ""
+
+#: pamac-manager.py:279
+msgid "Depends On"
+msgstr ""
+
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr ""
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr ""
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr ""
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr ""
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr ""
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr ""
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr ""
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr ""
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr ""
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr ""
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr ""
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr ""
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr ""
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr ""
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr ""
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr ""
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr ""
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr ""
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr ""
-#: pamac/main.py:324
-msgid "Transaction Summary"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
+#: pamac-manager.py:474
+msgid "Unselect"
msgstr ""
-#: pamac/main.py:332
-msgid "To reinstall"
+#: pamac-manager.py:480
+msgid "Remove"
msgstr ""
-#: pamac/main.py:338
-msgid "To downgrade"
+#: pamac-manager.py:486
+msgid "Reinstall"
msgstr ""
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
+#: pamac-manager.py:499
+msgid "Install optional deps"
msgstr ""
-#: pamac/main.py:351
-msgid "To update"
+#: pamac-manager.py:505
+msgid "Install"
msgstr ""
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
msgstr ""
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr ""
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr ""
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr ""
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr ""
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
msgstr ""
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
msgstr ""
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
msgstr ""
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
msgstr ""
-#: pamac/main.py:874
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr ""
+
+#: pamac-tray.py:38
+msgid "Quit"
msgstr ""
-#: pamac/main.py:957
+#: pamac-install.py:119
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
-#: pamac/main.py:976
-msgid "Unselect"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/main.py:982
-msgid "Remove"
+#: pamac/transaction.py:198
+msgid "Refreshing"
msgstr ""
-#: pamac/main.py:987
-msgid "Reinstall"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
msgstr ""
-#: pamac/main.py:1000
-msgid "Install optional deps"
+#: pamac/transaction.py:270
+msgid "Preparing"
msgstr ""
-#: pamac/main.py:1006
-msgid "Install"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
msgstr ""
-#: pamac/main.py:1019
-msgid "Install with optional deps"
+#: pamac/transaction.py:358
+msgid "To reinstall"
msgstr ""
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
+#: pamac/transaction.py:364
+msgid "To downgrade"
msgstr ""
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
+#: pamac/transaction.py:377
+msgid "To update"
msgstr ""
#: pamac/common.py:13
@@ -339,58 +390,74 @@ msgstr ""
msgid "%.2f MiB"
msgstr ""
-#: gui/manager.glade:6
-msgid "Choose"
+#: gui/manager.ui:8
+msgid "About Pamac"
msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
+
+#: gui/manager.ui:42
+msgid "Install local packages"
msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:294
msgid "Search"
msgstr ""
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr ""
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr ""
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr ""
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr ""
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr ""
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr ""
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr ""
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr ""
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr ""
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr ""
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr ""
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr ""
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 5ea4ad4..24335ec 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Ayceman , 2013
# Guillaume Benoit , 2013
@@ -12,455 +12,475 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-01 08:17+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/manjaro-pamac/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/ro/)\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Este necesară autentificarea"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Se verifică dependențele"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Se analizează conflictele de fișiere"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Se rezolvă dependențele"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Se verifică inter-conflictele"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Se instalează {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Se elimină {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Se actualizează {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Se retrogradează {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Se reinstalează {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Se verifică integritatea"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Se încarcă fișierele pachetelor"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Se verifică delta integritatea"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Se aplică delta"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Se generează {} cu {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Generare reușită!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Generare eșuată."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Se configurează {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Se verifică spațiul pe disc disponibil"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Se verifică inelul de chei"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Se descarcă cheile necesare"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} va fi înlocuit de {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} este în conflict cu {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Se reîmprospătează {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Se descarcă {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} nu este o cale sau un nume de pachet valid"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Tranzacția nu poate fi făcută deoarece trebuie eliminat {pkgname1} care este "
+"un pachet blocat"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Tranzacția s-a terminat cu succes"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Niciun pachet găsit"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "locale"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Instalate"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Neinstalate"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Orfani"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "De instalat"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "De eliminat"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "locale"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licențe"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Depinde de"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Dependențe opționale"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Necesar pentru"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Furnizează"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Înlocuiește"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Este în conflict cu"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Depozit"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupe"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Mărime comprimată"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Mărimea descărcată"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Mărimea instalată"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Împachetator"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arhitectură"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Instalat la"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Instalat explicit"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Instalat ca dependență a unui alt pachet"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Necunoscut"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Motivul instalării"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Semnături"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Copii de rezervă"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} are {number} dependențe opționale neinstalate.\nAlegeți cel/cele pe care îl/le vreți instalat(e)"
+msgstr ""
+"{pkgname} are {number} dependențe opționale neinstalate.\n"
+"Alegeți cel/cele pe care îl/le vreți instalat(e)"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Deselectează"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Elimină"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Reinstalează"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Instalează dependențe opționale"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Instalează"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Instalează cu dependențe opționale"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac rulează deja"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Sistemul vostru este la zi"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Mărimea totală a descărcară: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "O actualizare disponibilă"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} actualizări disponibile"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} actualizări disponibile"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "O actualizare disponibilă"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Sistemul vostru este la zi"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Gestionar de actualizări"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Gestionar de pachete"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Ieșire"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} nu este o cale sau un nume de pachet valid"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Niște actualizări sunt disponibile.\nActualizați întâi sistemul"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MiB"
+msgstr ""
+"Niște actualizări sunt disponibile.\n"
+"Actualizați întâi sistemul"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} este furnizat de {number} pachete.\nAlegeți pe care-l vreți instalat:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Se verifică dependențele"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Se analizează conflictele de fișiere"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Se rezolvă dependențele"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Se verifică inter-conflictele"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Se instalează {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Se elimină {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Se actualizează {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Se retrogradează {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Se reinstalează {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Se verifică integritatea"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Se încarcă fișierele pachetelor"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Se verifică delta integritatea"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Se aplică delta"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Se generează {} cu {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Generare reușită!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Generare eșuată."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Se configurează {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Se verifică spațiul pe disc disponibil"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Se verifică inelul de chei"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Se descarcă cheile necesare"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} va fi înlocuit de {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} este în conflict cu {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Se reîmprospătează {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Se descarcă {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Se reîmprospătează"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Tranzacția nu poate fi făcută deoarece trebuie eliminat {pkgname1} care este un pachet blocat"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Tranzacția s-a terminat cu succes"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Nimic de făcut"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "Tranzacția a fost întreruptă.\nPamac va ieși."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Se prepară"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Sumarul tranzacției"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "De reinstalat"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "De retrogradat"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "De actualizat"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Se prepară"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Nimic de făcut"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Despre Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "O interfață gtk3 pentru pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Instalează pachete locale"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Caută"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Stare"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Depozite"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nume"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versiune"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Mărime"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informații"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Dependențe"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detalii"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Fișiere"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Instalează pachete locale"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Alegeți"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Sumar"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Progres"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "detalii"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} este furnizat de {number} pachete.\n"
+#~ "Alegeți pe care-l vreți instalat:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "Tranzacția a fost întreruptă.\n"
+#~ "Pamac va ieși."
diff --git a/po/ru.po b/po/ru.po
index ca85eb2..7c04151 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# macbet , 2013
# Umidjon Almasov , 2013
@@ -12,455 +12,475 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-01 08:17+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/manjaro-pamac/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/ru/)\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Требуется проверка подлинности"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Проверка зависимостей"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Проверка файлов на конфликты "
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Разрешение зависимостей"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Проверка конфликтов между"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Установка {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Удаление {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Обновление {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Понижение версии {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Переустановка {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Проверка целостности"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Загрузка файлов пакетов"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Проверка целостности delta"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Применение deltas"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Генерация {} с {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Генерация успешна!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Генерация не удалась."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Настройка {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Проверка доступного дискового пространства"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Проверка ключей"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Загрузка необходимых ключей"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} будет заменен {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} конфликтует с {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Обновление {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Загрузка {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} это недействительный путь или название пакета"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Транзакция не может быть выполнена, т.к. требуется удалить {pkgname1}, "
+"который заблокирован"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Транзакция успешно завершена"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Пакет не найден"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "местно"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Установлено"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Не установлено"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Сироты"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "К установке"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "К удалению"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "местно"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Лицензии"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Зависит от"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Дополнительные зависимости"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Требуется"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Предоставляет"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Заменяет"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Конфликтует с"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Репозиторий"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Группы"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Размер в сжатом виде"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Размер загрузки"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Размер в установленном виде"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Упаковщик"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Архитектура"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Дата установки"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Установлены явно"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Установлены как зависимости для других пакетов"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Неизвестно"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Причина установки"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Подписи"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Резервные файлы"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} имеет {number} неустановленных дополнительных\nзависимостей. Выберите нужные для установки:"
+msgstr ""
+"{pkgname} имеет {number} неустановленных дополнительных\n"
+"зависимостей. Выберите нужные для установки:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Отмена выбора"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Удаление"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Переустановка"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Установка дополнительных зависимостей"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Установка"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Установка с дополнительными зависимостями"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac уже запущен"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Система обновлена"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Общий размер загрузки: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 доступное обновление"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} доступных обновлений"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} доступных обновлений"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 доступное обновление"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Система обновлена"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Менеджер обновлений"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Менеджер пакетов"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Выход"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} это недействительный путь или название пакета"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Доступны обновления.\nСначала обновите систему"
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f КБ"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f МБ"
+msgstr ""
+"Доступны обновления.\n"
+"Сначала обновите систему"
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} представлен {number} пакетами.\nВыберите один для установки:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Проверка зависимостей"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Проверка файлов на конфликты "
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Разрешение зависимостей"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Проверка конфликтов между"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Установка {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Удаление {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Обновление {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Понижение версии {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Переустановка {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Проверка целостности"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Загрузка файлов пакетов"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Проверка целостности delta"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Применение deltas"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Генерация {} с {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Генерация успешна!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Генерация не удалась."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Настройка {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Проверка доступного дискового пространства"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Проверка ключей"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Загрузка необходимых ключей"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} будет заменен {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} конфликтует с {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Обновление {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Загрузка {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Обновление"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Транзакция не может быть выполнена, т.к. требуется удалить {pkgname1}, который заблокирован"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Транзакция успешно завершена"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Нет заданий"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "Транзакция была прервана.\nВыход изPamac."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Подготовка"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Сводка транзакции"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "К переустановке"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "К понижению версии"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "К обновлению"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Подготовка"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f КБ"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Нет заданий"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f МБ"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "О Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Авторское право © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "GTK3 фронт-энд для pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Установка локальных пакетов"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Поиск"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Состояние"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Репозитории"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Название"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Версия"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Размер"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Информация"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Зависимости"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Подробности"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Файлы"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Установка локальных пакетов"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Выбор"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Сводка"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Прогресс"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "детали"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} представлен {number} пакетами.\n"
+#~ "Выберите один для установки:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "Транзакция была прервана.\n"
+#~ "Выход изPamac."
diff --git a/po/sk.po b/po/sk.po
index d794cbc..f7ea0b3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Inoki Sakaeru, 2013
msgid ""
@@ -11,332 +11,381 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-06-02 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/manjaro-pamac/language/sk_SK/)\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/sk_SK/)\n"
+"Language: sk_SK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr ""
-#: pamac-daemon.py:29 pamac/main.py:505
-msgid "Preparing"
-msgstr "Pripravuje sa"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Overujú sa súvisiace balíčky"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Prebieha kontrola pre možné konflikty medzi súbormi"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Riešia sa závislosti"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Prebieha kontrola pre možné interné konflikty"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Inštaluje sa"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Odstraňuje sa"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Prebieha aktualizácia"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Prechod na predošlú verziu"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Preinštalovanie"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Kontroluje sa integrita"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Načítavajú sa súbory balíčkov"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Prebieha nastavenie"
-
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Overujú sa kľúče"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Sťahuje sa {size}"
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:439 pamac/main.py:1099
-msgid "Refreshing"
-msgstr "Prebieha obnova"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:533
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} nie je platná cesta alebo názov súboru"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:438
-msgid "Transaction successfully finished"
-msgstr "Transakcia bola úspešná"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
-#: pamac-daemon.py:442 pamac-daemon.py:450
-msgid "Authentication failed"
-msgstr "Autentifikácia zlyhala"
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
-#: pamac-tray.py:20
-msgid "{number} available updates"
-msgstr "{number} aktualizácií je dostupných"
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
-#: pamac-tray.py:21
-msgid "1 available update"
-msgstr "1 aktualizácia je dostupná"
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-tray.py:23
-msgid "Your system is up-to-date"
-msgstr "Váš systém je aktuálny"
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
-#: pamac-tray.py:31
-msgid "Install/Check for updates"
-msgstr "Inštalovať/Skontrolovať aktualizácie"
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} bude nahradené {pkgname2}"
-#: pamac-tray.py:34
-msgid "Run pamac-manager"
-msgstr "Spustiť správcu balíčkov Pamac"
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} je v rozpore s {pkgname2}"
-#: pamac-tray.py:37
-msgid "Quit"
-msgstr "Ukončiť"
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:897
-msgid "Nothing to do"
-msgstr "Niet čo spraviť"
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
-#: pamac-install.py:87 pamac/main.py:1150
-msgid "Pamac is already running"
-msgstr "Pamac už beží"
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} nie je platná cesta alebo názov súboru"
-#: pamac-install.py:97
+#: pamac-daemon.py:601
+#, python-brace-format
msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Niektoré aktualizácie sú dostupné.⏎\nNajprv však aktualizujte Váš systém"
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Transakcia nemohla byť uskutočnená. K jej dokončeniu je nutné odstrániť "
+"{pkgname1}. Jedná sa však o uzamknutý balíček."
-#: pamac/main.py:89 pamac/main.py:1052
-msgid "local"
-msgstr "lokálny"
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Transakcia bola úspešná"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr "Autentifikácia zlyhala"
-#: pamac/main.py:180 pamac/main.py:954 pamac/main.py:1003
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Balíček nebol nájdený"
-#: pamac/main.py:231
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokálny"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Nainštalované"
+
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Odinštalované"
+
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Siroty"
+
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Nainštalovať"
+
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Odstrániť"
+
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licencie"
-#: pamac/main.py:236
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Závisí na"
-#: pamac/main.py:241 pamac/main.py:1035 pamac/main.py:1224
-msgid "Installed"
-msgstr "Nainštalované"
-
-#: pamac/main.py:244
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Voliteľné závislosti"
-#: pamac/main.py:247
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Požadované"
-#: pamac/main.py:249
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Poskytuje"
-#: pamac/main.py:251
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Nahradí"
-#: pamac/main.py:253
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Je v konflikte s"
-#: pamac/main.py:258
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Zdroj"
-#: pamac/main.py:260 gui/manager.glade:538
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Skupiny"
-#: pamac/main.py:262
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Veľkosť po komprimácii"
-#: pamac/main.py:263
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Veľkosť sťahovaného súboru"
-#: pamac/main.py:265
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Veľkosť súboru po inštalácii"
-#: pamac/main.py:266
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Autor balíčka"
-#: pamac/main.py:267
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architektúra"
-#: pamac/main.py:270
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Dátum inštalácie"
-#: pamac/main.py:272
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Požadovaná inštalácia"
-#: pamac/main.py:274
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Balíček bol nainštalovaný ako súčasť iného balíčka"
-#: pamac/main.py:276
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Neznáme"
-#: pamac/main.py:277
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Dôvod inštalácie"
-#: pamac/main.py:282
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signatúry"
-#: pamac/main.py:286
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Súbory zálohy"
-#: pamac/main.py:326
-msgid "Transaction Summary"
-msgstr "Zhrnutie o vykonanej transakcii"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/main.py:328 pamac/main.py:1041 pamac/main.py:1224
-msgid "To install"
-msgstr "Nainštalovať"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr ""
-#: pamac/main.py:334
-msgid "To reinstall"
-msgstr "Preinštalovať"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr ""
-#: pamac/main.py:340
-msgid "To downgrade"
-msgstr "Preinštalovanie na predošlú verziu"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr ""
-#: pamac/main.py:346 pamac/main.py:1043 pamac/main.py:1224
-msgid "To remove"
-msgstr "Odstrániť"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr ""
-#: pamac/main.py:353
-msgid "To update"
-msgstr "Bude sa aktualizovať"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr ""
-#: pamac/main.py:364 pamac/main.py:461
-msgid "Total download size: "
-msgstr "Celková veľkosť sťahovaných súborov: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac už beží"
-#: pamac/main.py:454 pamac/main.py:1236
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Váš systém je aktuálny"
-#: pamac/main.py:463
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Celková veľkosť sťahovaných súborov: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 aktualizácia je dostupná"
-#: pamac/main.py:465
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} aktualizácií je dostupných"
-#: pamac/main.py:551 pamac/main.py:552
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Transakcia nemohla byť uskutočnená. K jej dokončeniu je nutné odstrániť {pkgname1}. Jedná sa však o uzamknutý balíček."
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} aktualizácií je dostupných"
-#: pamac/main.py:583 pamac/main.py:584 pamac/main.py:686 pamac/main.py:687
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} bude nahradené {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 aktualizácia je dostupná"
-#: pamac/main.py:701 pamac/main.py:702 pamac/main.py:726 pamac/main.py:727
-#: pamac/main.py:747 pamac/main.py:748 pamac/main.py:778 pamac/main.py:779
-#: pamac/main.py:803 pamac/main.py:804 pamac/main.py:824 pamac/main.py:825
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} je v rozpore s {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Váš systém je aktuálny"
-#: pamac/main.py:759 pamac/main.py:760
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} je v rozpore s {pkgname2}⏎\nŽiaden z uvedených balíčkov sa nebude inštalovať"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Správca aktualizácií"
-#: pamac/main.py:856
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} je dodávaný s {number} balíčkami.⏎\nVyberte, ktorý/é sa bude/ú inštalovať:"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Správca balíčkov"
-#: pamac/main.py:939
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr "Ukončiť"
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
+"Niektoré aktualizácie sú dostupné.⏎\n"
+"Najprv však aktualizujte Váš systém"
-#: pamac/main.py:957
-msgid "Unselect"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
+"{pkgname} je dodávaný s {number} balíčkami.⏎\n"
+"Vyberte, ktorý/é sa bude/ú inštalovať:"
-#: pamac/main.py:961
-msgid "Remove"
-msgstr ""
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Prebieha obnova"
-#: pamac/main.py:964
-msgid "Reinstall"
-msgstr ""
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Niet čo spraviť"
-#: pamac/main.py:975
-msgid "Install optional deps"
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Pripravuje sa"
-#: pamac/main.py:979
-msgid "Install"
-msgstr ""
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Zhrnutie o vykonanej transakcii"
-#: pamac/main.py:990
-msgid "Install with optional deps"
-msgstr ""
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Preinštalovať"
-#: pamac/main.py:1037 pamac/main.py:1224
-msgid "Uninstalled"
-msgstr "Odinštalované"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Preinštalovanie na predošlú verziu"
-#: pamac/main.py:1039 pamac/main.py:1224
-msgid "Orphans"
-msgstr "Siroty"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Bude sa aktualizovať"
#: pamac/common.py:13
#, python-format
@@ -348,62 +397,111 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:7
-msgid "Choose"
-msgstr "Vyberte, prosím"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:112
-msgid "Summary"
-msgstr "Zhrnutie"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:256
-msgid "Progress"
-msgstr "Priebeh"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:402
-msgid "Package Manager"
-msgstr "Správca balíčkov"
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
-#: gui/manager.glade:492
+#: gui/manager.ui:294
msgid "Search"
msgstr "Vyhľadávanie"
-#: gui/manager.glade:585 gui/manager.glade:680
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Stav"
-#: gui/manager.glade:632
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Zdroje"
-#: gui/manager.glade:711
+#: gui/manager.ui:492
msgid "Name"
msgstr "Názov"
-#: gui/manager.glade:730
+#: gui/manager.ui:505
msgid "Version"
msgstr "Verzia"
-#: gui/manager.glade:747
+#: gui/manager.ui:518
msgid "Size"
msgstr "Veľkosť"
-#: gui/manager.glade:848
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informácie"
-#: gui/manager.glade:908
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Závislosti"
-#: gui/manager.glade:973
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detaily"
-#: gui/manager.glade:1021
+#: gui/manager.ui:782
msgid "Files"
msgstr "Súbory"
-#: gui/updater.glade:6
-msgid "Update Manager"
-msgstr "Správca aktualizácií"
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Vyberte, prosím"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Zhrnutie"
+
+#: gui/dialogs.ui:315
+msgid "Progress"
+msgstr "Priebeh"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Inštaluje sa"
+
+#~ msgid "Removing"
+#~ msgstr "Odstraňuje sa"
+
+#~ msgid "Upgrading"
+#~ msgstr "Prebieha aktualizácia"
+
+#~ msgid "Downgrading"
+#~ msgstr "Prechod na predošlú verziu"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Preinštalovanie"
+
+#~ msgid "Configuring"
+#~ msgstr "Prebieha nastavenie"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Overujú sa kľúče"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Sťahuje sa {size}"
+
+#~ msgid "Install/Check for updates"
+#~ msgstr "Inštalovať/Skontrolovať aktualizácie"
+
+#~ msgid "Run pamac-manager"
+#~ msgstr "Spustiť správcu balíčkov Pamac"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} je v rozpore s {pkgname2}⏎\n"
+#~ "Žiaden z uvedených balíčkov sa nebude inštalovať"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index e823e7b..d057267 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Inoki Sakaeru, 2013
msgid ""
@@ -11,324 +11,381 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/manjaro-pamac/language/sk_SK/)\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/"
+"manjaro-pamac/language/sk_SK/)\n"
+"Language: sk_SK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr ""
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Pripravuje sa"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Overujú sa súvisiace balíčky"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Prebieha kontrola pre možné konflikty medzi súbormi"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Riešia sa závislosti"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Prebieha kontrola pre možné interné konflikty"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Inštaluje sa"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Odstraňuje sa"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Prebieha aktualizácia"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Prechod na predošlú verziu"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Preinštalovanie"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Kontroluje sa integrita"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Načítavajú sa súbory balíčkov"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Prebieha nastavenie"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Overujú sa kľúče"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Sťahuje sa {size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Prebieha obnova"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} bude nahradené {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} je v rozpore s {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} nie je platná cesta alebo názov súboru"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Transakcia nemohla byť uskutočnená. K jej dokončeniu je nutné odstrániť "
+"{pkgname1}. Jedná sa však o uzamknutý balíček."
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Transakcia bola úspešná"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Autentifikácia zlyhala"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} aktualizácií je dostupných"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 aktualizácia je dostupná"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Váš systém je aktuálny"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Balíček nebol nájdený"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Správca aktualizácií"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "lokálny"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Niet čo spraviť"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Nainštalované"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac už beží"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Odinštalované"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Niektoré aktualizácie sú dostupné.⏎\nNajprv však aktualizujte Váš systém"
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Siroty"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "lokálny"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Nainštalovať"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Balíček nebol nájdený"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Odstrániť"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Licencie"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Závisí na"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Nainštalované"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Voliteľné závislosti"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Požadované"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Poskytuje"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Nahradí"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Je v konflikte s"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Zdroj"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Skupiny"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Veľkosť po komprimácii"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Veľkosť sťahovaného súboru"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Veľkosť súboru po inštalácii"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Autor balíčka"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Architektúra"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Dátum inštalácie"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Požadovaná inštalácia"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Balíček bol nainštalovaný ako súčasť iného balíčka"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Neznáme"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Dôvod inštalácie"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signatúry"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Súbory zálohy"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "Zhrnutie o vykonanej transakcii"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Nainštalovať"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr ""
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Preinštalovať"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr ""
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Preinštalovanie na predošlú verziu"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr ""
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Odstrániť"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr ""
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Bude sa aktualizovať"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr ""
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Celková veľkosť sťahovaných súborov: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr ""
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac už beží"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Váš systém je aktuálny"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Celková veľkosť sťahovaných súborov: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 aktualizácia je dostupná"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} aktualizácií je dostupných"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Transakcia nemohla byť uskutočnená. K jej dokončeniu je nutné odstrániť {pkgname1}. Jedná sa však o uzamknutý balíček."
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} aktualizácií je dostupných"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} bude nahradené {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 aktualizácia je dostupná"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} je v rozpore s {pkgname2}"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Váš systém je aktuálny"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} je v rozpore s {pkgname2}⏎\nŽiaden z uvedených balíčkov sa nebude inštalovať"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Správca aktualizácií"
-#: pamac/main.py:874
-msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} je dodávaný s {number} balíčkami.⏎\nVyberte, ktorý/é sa bude/ú inštalovať:"
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Správca balíčkov"
-#: pamac/main.py:957
-msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
-"Please choose the one(s) you want to install:"
+#: pamac-tray.py:38
+msgid "Quit"
msgstr ""
-#: pamac/main.py:976
-msgid "Unselect"
+#: pamac-install.py:119
+msgid ""
+"Some updates are available.\n"
+"Please update your system first"
msgstr ""
+"Niektoré aktualizácie sú dostupné.⏎\n"
+"Najprv však aktualizujte Váš systém"
-#: pamac/main.py:982
-msgid "Remove"
+#: pamac/transaction.py:150
+#, python-brace-format
+msgid ""
+"{pkgname} is provided by {number} packages.\n"
+"Please choose the one(s) you want to install:"
msgstr ""
+"{pkgname} je dodávaný s {number} balíčkami.⏎\n"
+"Vyberte, ktorý/é sa bude/ú inštalovať:"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr ""
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Prebieha obnova"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr ""
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Niet čo spraviť"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr ""
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Pripravuje sa"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr ""
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "Zhrnutie o vykonanej transakcii"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Odinštalované"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Preinštalovať"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Siroty"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Preinštalovanie na predošlú verziu"
+
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Bude sa aktualizovať"
#: pamac/common.py:13
#, python-format
@@ -340,58 +397,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Vyberte, prosím"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Zhrnutie"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Správca balíčkov"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Vyhľadávanie"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Stav"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Zdroje"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "Názov"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Verzia"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Veľkosť"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Informácie"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Závislosti"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detaily"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Súbory"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Vyberte, prosím"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Zhrnutie"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Priebeh"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Inštaluje sa"
+
+#~ msgid "Removing"
+#~ msgstr "Odstraňuje sa"
+
+#~ msgid "Upgrading"
+#~ msgstr "Prebieha aktualizácia"
+
+#~ msgid "Downgrading"
+#~ msgstr "Prechod na predošlú verziu"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Preinštalovanie"
+
+#~ msgid "Configuring"
+#~ msgstr "Prebieha nastavenie"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Overujú sa kľúče"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Sťahuje sa {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} je v rozpore s {pkgname2}⏎\n"
+#~ "Žiaden z uvedených balíčkov sa nebude inštalovať"
diff --git a/po/sv.po b/po/sv.po
index f99f8c7..51863ae 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Alekzanther , 2013
# tsw , 2013
@@ -12,455 +12,474 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-02 17:22+0000\n"
"Last-Translator: Alekzanther \n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/manjaro-pamac/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/sv/)\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Autenstiering krävs"
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Kollar beronden"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Kontrollerar konflikter"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Undersöker beroenden"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "Undersöker interna konflikter"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "Installerar {pkgname}"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "Tar bort {pkgname}"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "Upgraderar {pkgname}"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr "Nedgraderar {pkgname}"
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "Ominstallerar {pkgname}"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Undersöker integritet"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Laddar paketfiler"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Undersöker skillnadsintegritet"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr "Applicerar skillnader"
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr "Genererar {} med {}"
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr "Generering lyckades!"
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr "Generering misslyckades."
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr "Konfigurerar {pkgname}"
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr "Kontrollerar tillgängligt diskutrymme"
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Undersöker nyckelringen"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Laddar ned nödvändiga nycklar"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} ersätts av {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} är i konflikt med {pkgname2}"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "Uppdaterar {repo}"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "Laddar ned {pkgname}"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} är inte ett godkänt paketnamn"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+"Överföringen kan inte utföras! Behöver ta bort {pkgname1} som är ett låst "
+"paket"
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Överföring lyckades"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Inget paket hittat"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "Lokalt"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "Installerad"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "Avinstallerad"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Föräldralösa"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "Att installera"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "Ta bort"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "Lokalt"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "LIcenser"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Beroende av"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Valfria beroenden"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr "Krävs av"
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Erbjuder"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Ersätter"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Konflikt med"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repository"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Grupp"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Komprimerad storlek"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Nedladdningsstorlek"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Installerad storlek"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Pakethanterare"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arkitektur"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Installationsdatum"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Särskillt installerad"
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Installerad som ett beroende för ett annat paket"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Okänd"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Installeringsorsak"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Signatur"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Backup filer"
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} erbjuds av {number} paket.⏎\nVar vänlig välj vilket/vilka att installera:"
+msgstr ""
+"{pkgname} erbjuds av {number} paket.⏎\n"
+"Var vänlig välj vilket/vilka att installera:"
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr "Avmarkera"
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "Ta bort"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Återinstallera"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Installera valfria beroenden"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "Installera"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Installera med valda beroenden"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac körs redan"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Ditt system är uppdaterat"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr "Total nedladdningsstorlek: "
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 tillgänglig uppdatering"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} tillgängliga uppdateringar"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} tillgängliga uppdateringar"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 tillgänglig uppdatering"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Ditt system är uppdaterat"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Uppdateringshanterare"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Pakethanterare"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Avsluta"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} är inte ett godkänt paketnamn"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
-msgstr "Uppdateringar är tillgängliga.⏎\nUppdatera ditt system först."
-
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MiB"
+msgstr ""
+"Uppdateringar är tillgängliga.⏎\n"
+"Uppdatera ditt system först."
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr "{pkgname} erbjuds av {number} paket.\nVänligen välj vilket eller vilka du vill installera:"
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Kollar beronden"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Kontrollerar konflikter"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Undersöker beroenden"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "Undersöker interna konflikter"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "Installerar {pkgname}"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "Tar bort {pkgname}"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "Upgraderar {pkgname}"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr "Nedgraderar {pkgname}"
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "Ominstallerar {pkgname}"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Undersöker integritet"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Laddar paketfiler"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Undersöker skillnadsintegritet"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr "Applicerar skillnader"
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr "Genererar {} med {}"
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr "Generering lyckades!"
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr "Generering misslyckades."
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr "Konfigurerar {pkgname}"
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
-msgstr "Kontrollerar tillgängligt diskutrymme"
-
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Undersöker nyckelringen"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Laddar ned nödvändiga nycklar"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} ersätts av {pkgname2}"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} är i konflikt med {pkgname2}"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "Uppdaterar {repo}"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "Laddar ned {pkgname}"
+"Please choose the one(s) you want to install:"
+msgstr ""
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Uppdaterar"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Överföringen kan inte utföras! Behöver ta bort {pkgname1} som är ett låst paket"
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Överföring lyckades"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Inget att göra"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "Transaktionen avbröts. \nPamac avslutas."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Förbereder"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr "Summering av överföring"
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "Att ominstallera"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr "Att nedgradera"
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "Att uppdatera"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Förbereder"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Inget att göra"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Om Pamac"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Ett Gtk3-gränssnitt för pyalpm"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Installera lokala paket"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Sök"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Status"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repos"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Namn"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Version"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Storlek"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Info"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Beror på"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Detaljer"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Filer"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Installera lokala paket"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Välj"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr "Summering"
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Status"
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "detaljer"
+
+#~ msgid ""
+#~ "{pkgname} is provided by {number} packages.\n"
+#~ "Please choose the one you want to install:"
+#~ msgstr ""
+#~ "{pkgname} erbjuds av {number} paket.\n"
+#~ "Vänligen välj vilket eller vilka du vill installera:"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "Transaktionen avbröts. \n"
+#~ "Pamac avslutas."
diff --git a/po/tr.po b/po/tr.po
index 17c756e..f46286a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Guillaume Benoit , 2013
# yfdogan , 2013
@@ -12,324 +12,379 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-07-14 08:13+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/manjaro-pamac/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/tr/)\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr "Yetki doğrulaması gerekiyor"
-#: pamac-daemon.py:29 pamac/main.py:503
-msgid "Preparing"
-msgstr "Hazırlanıyor"
-
-#: pamac-daemon.py:68
+#: pamac-daemon.py:117
msgid "Checking dependencies"
msgstr "Bağımlılıklar Denetleniyor"
-#: pamac-daemon.py:75
+#: pamac-daemon.py:125
msgid "Checking file conflicts"
msgstr "Dosya Cakışmaları Denetleniyor"
-#: pamac-daemon.py:78
+#: pamac-daemon.py:131
msgid "Resolving dependencies"
msgstr "Bağımlılıklar Çözümleniyor"
-#: pamac-daemon.py:85
+#: pamac-daemon.py:139
msgid "Checking inter conflicts"
msgstr "Cakışmalar Denetleniyor"
-#: pamac-daemon.py:88 pamac/main.py:51
-msgid "Installing"
-msgstr "Kuruluyor"
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:95 pamac/main.py:51
-msgid "Removing"
-msgstr "Kaldırılıyor"
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr ""
-#: pamac-daemon.py:102 pamac/main.py:51
-msgid "Upgrading"
-msgstr "Yükseltiliyor"
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:109 pamac/main.py:51
-msgid "Downgrading"
-msgstr "Geri Yükleme Yapılıyor"
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
-#: pamac-daemon.py:117 pamac/main.py:51
-msgid "Reinstalling"
-msgstr "Yeniden Kuruluyor"
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr ""
-#: pamac-daemon.py:125
+#: pamac-daemon.py:187
msgid "Checking integrity"
msgstr "Bütünlük Denetleniyor"
-#: pamac-daemon.py:129
+#: pamac-daemon.py:194
msgid "Loading packages files"
msgstr "Paket Dosyalari Yükleniyor"
-#: pamac-daemon.py:133 pamac/main.py:51
-msgid "Configuring"
-msgstr "Yapılandırılıyor"
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr ""
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
-#: pamac-daemon.py:140
-msgid "Checking keys in keyring"
-msgstr "Anahtarlık değerleri kontrol ediliyor"
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
-#: pamac-daemon.py:198
-msgid "Downloading {size}"
-msgstr "Indiriliyor {size}"
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
-#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126
-msgid "Refreshing"
-msgstr "Yenileniyor"
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr ""
-#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr ""
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} İle Değiştirilecek {pkgname2}"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1}, {pkgname2} İle Çakışıyor"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr ""
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
msgid "{pkgname} is not a valid path or package name"
msgstr "{pkgname} geçerli bir yol veya dosya adı değildir"
-#: pamac-daemon.py:438
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr "Bu işlem {pkgname1} kilitli paketi sebebiyle yürütülemiyor "
+
+#: pamac-daemon.py:662
msgid "Transaction successfully finished"
msgstr "Işlem Başarılı"
-#: pamac-daemon.py:442 pamac-daemon.py:450
+#: pamac-daemon.py:666 pamac-daemon.py:674
msgid "Authentication failed"
msgstr "Doğrulama Hatası"
-#: pamac-tray.py:22
-msgid "{number} available updates"
-msgstr "{number} Mevcut Güncellemeler"
-
-#: pamac-tray.py:23
-msgid "1 available update"
-msgstr "1 Güncelleme Var"
-
-#: pamac-tray.py:25
-msgid "Your system is up-to-date"
-msgstr "Sisteminiz Güncel"
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
+msgid "No package found"
+msgstr "Paket Bulunamadı"
-#: pamac-tray.py:113 gui/updater.glade:7
-msgid "Update Manager"
-msgstr "Güncelleme Yöneticisi"
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "Yerel"
-#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915
-msgid "Nothing to do"
-msgstr "Yapılacak Bir Şey Yok"
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
+msgid "Installed"
+msgstr "Kuruldu"
-#: pamac-install.py:87 pamac/main.py:1177
-msgid "Pamac is already running"
-msgstr "Pamac Zaten Çalışıyor"
+#: pamac-manager.py:145 pamac-manager.py:181
+msgid "Uninstalled"
+msgstr "Kurulmaya hazır"
-#: pamac-install.py:97
-msgid ""
-"Some updates are available.\n"
-"Please update your system first"
-msgstr "Yeni güncellemeler var. Lütfen önce sisteminizi güncelleyin."
+#: pamac-manager.py:145 pamac-manager.py:184
+msgid "Orphans"
+msgstr "Sahipsizler"
-#: pamac/main.py:88 pamac/main.py:1083
-msgid "local"
-msgstr "Yerel"
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
+msgid "To install"
+msgstr "Kurulacak"
-#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034
-msgid "No package found"
-msgstr "Paket Bulunamadı"
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
+msgid "To remove"
+msgstr "Kaldırılacak"
-#: pamac/main.py:229
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Lisanslar"
-#: pamac/main.py:234
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Bağımlı"
-#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251
-msgid "Installed"
-msgstr "Kuruldu"
-
-#: pamac/main.py:242
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Seçimli Bağımlılıklar"
-#: pamac/main.py:245
+#: pamac-manager.py:290
msgid "Required By"
msgstr "İhtiyac Duyulan"
-#: pamac/main.py:247
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Sağladıkları"
-#: pamac/main.py:249
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Değistirdigi Paket(ler)"
-#: pamac/main.py:251
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "Cakıştığı Paketler"
-#: pamac/main.py:256
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Depo"
-#: pamac/main.py:258 gui/manager.glade:384
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Gruplar"
-#: pamac/main.py:260
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Sıkıştırma Boyutu"
-#: pamac/main.py:261
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "İndirme Boyutu"
-#: pamac/main.py:263
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "Kurulmuş Boyut"
-#: pamac/main.py:264
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Paketçi"
-#: pamac/main.py:265
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Mimari"
-#: pamac/main.py:268
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "Kurulum Tarihi"
-#: pamac/main.py:270
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr "Doğrudan Yuklenmiş"
-#: pamac/main.py:272
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Başka Bir Paketin Bağımlılığı Olarak Yüklenmiş"
-#: pamac/main.py:274
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Bilinmiyor"
-#: pamac/main.py:275
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "Kurulum Nedeni"
-#: pamac/main.py:280
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "İmzalar"
-#: pamac/main.py:284
+#: pamac-manager.py:329
msgid "Backup files"
msgstr "Yedek Dosyalar"
-#: pamac/main.py:324
-msgid "Transaction Summary"
-msgstr "İşlem Özeti"
+#: pamac-manager.py:451
+#, python-brace-format
+msgid ""
+"{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:"
+msgstr ""
+"{pkgname} paketinin {number} kurulmamış seçimli bağımlılığı var.⏎\n"
+"Lütfen yüklemek istenen(ler)i seçin:"
-#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251
-msgid "To install"
-msgstr "Kurulacak"
+#: pamac-manager.py:474
+msgid "Unselect"
+msgstr "Seçimi bırak"
-#: pamac/main.py:332
-msgid "To reinstall"
-msgstr "Kurulacak"
+#: pamac-manager.py:480
+msgid "Remove"
+msgstr "Kaldır"
-#: pamac/main.py:338
-msgid "To downgrade"
-msgstr "Geri Yükleme Yapılacak"
+#: pamac-manager.py:486
+msgid "Reinstall"
+msgstr "Yeniden yükle"
-#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251
-msgid "To remove"
-msgstr "Kaldırılacak"
+#: pamac-manager.py:499
+msgid "Install optional deps"
+msgstr "Seçimli bağımlılıkları yükle"
-#: pamac/main.py:351
-msgid "To update"
-msgstr "Yükseltilecek"
+#: pamac-manager.py:505
+msgid "Install"
+msgstr "Yükle"
-#: pamac/main.py:362 pamac/main.py:459
-msgid "Total download size: "
-msgstr "Toplam İndirme Boyutu: "
+#: pamac-manager.py:518
+msgid "Install with optional deps"
+msgstr "Seçimli bağımlılıklarıyla birlikte yükle"
+
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
+msgid "Pamac is already running"
+msgstr "Pamac Zaten Çalışıyor"
-#: pamac/main.py:452 pamac/main.py:1263
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Sisteminiz Güncel"
-#: pamac/main.py:461
+#: pamac-updater.py:49 pamac/transaction.py:388
+msgid "Total download size: "
+msgstr "Toplam İndirme Boyutu: "
+
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 Güncelleme Var"
-#: pamac/main.py:463
+#: pamac-updater.py:53
+#, python-brace-format
msgid "{number} available updates"
msgstr "{number} Güncelleme Var"
-#: pamac/main.py:549 pamac/main.py:550
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr "Bu işlem {pkgname1} kilitli paketi sebebiyle yürütülemiyor "
+#: pamac-tray.py:17
+#, python-brace-format
+msgid "{number} available updates"
+msgstr "{number} Mevcut Güncellemeler"
-#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} İle Değiştirilecek {pkgname2}"
+#: pamac-tray.py:18
+msgid "1 available update"
+msgstr "1 Güncelleme Var"
-#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740
-#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792
-#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1}, {pkgname2} İle Çakışıyor"
+#: pamac-tray.py:20
+msgid "Your system is up-to-date"
+msgstr "Sisteminiz Güncel"
-#: pamac/main.py:772 pamac/main.py:773
-msgid ""
-"{pkgname1} conflicts with {pkgname2}\n"
-"None of them will be installed"
-msgstr "{pkgname1} İle {pkgname2} Çakışıyor\nHiç Bir Paket Yüklenmeyecek"
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
+msgid "Update Manager"
+msgstr "Güncelleme Yöneticisi"
-#: pamac/main.py:874
+#: pamac-tray.py:34 gui/manager.ui:144
+msgid "Package Manager"
+msgstr "Paket Yöneticisi"
+
+#: pamac-tray.py:38
+msgid "Quit"
+msgstr ""
+
+#: pamac-install.py:119
msgid ""
-"{pkgname} is provided by {number} packages.\n"
-"Please choose the one(s) you want to install:"
-msgstr "{pkgname} Paketi İçin {number} Sağlayıcı Var.\nLütfen Yüklemek İçin Seçiminizi Girin:"
+"Some updates are available.\n"
+"Please update your system first"
+msgstr "Yeni güncellemeler var. Lütfen önce sisteminizi güncelleyin."
-#: pamac/main.py:957
+#: pamac/transaction.py:150
+#, python-brace-format
msgid ""
-"{pkgname} has {number} uninstalled optional deps.\n"
+"{pkgname} is provided by {number} packages.\n"
"Please choose the one(s) you want to install:"
-msgstr "{pkgname} paketinin {number} kurulmamış seçimli bağımlılığı var.⏎\nLütfen yüklemek istenen(ler)i seçin:"
-
-#: pamac/main.py:976
-msgid "Unselect"
-msgstr "Seçimi bırak"
+msgstr ""
+"{pkgname} Paketi İçin {number} Sağlayıcı Var.\n"
+"Lütfen Yüklemek İçin Seçiminizi Girin:"
-#: pamac/main.py:982
-msgid "Remove"
-msgstr "Kaldır"
+#: pamac/transaction.py:198
+msgid "Refreshing"
+msgstr "Yenileniyor"
-#: pamac/main.py:987
-msgid "Reinstall"
-msgstr "Yeniden yükle"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Yapılacak Bir Şey Yok"
-#: pamac/main.py:1000
-msgid "Install optional deps"
-msgstr "Seçimli bağımlılıkları yükle"
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Hazırlanıyor"
-#: pamac/main.py:1006
-msgid "Install"
-msgstr "Yükle"
+#: pamac/transaction.py:350
+msgid "Transaction Summary"
+msgstr "İşlem Özeti"
-#: pamac/main.py:1019
-msgid "Install with optional deps"
-msgstr "Seçimli bağımlılıklarıyla birlikte yükle"
+#: pamac/transaction.py:358
+msgid "To reinstall"
+msgstr "Kurulacak"
-#: pamac/main.py:1068 pamac/main.py:1251
-msgid "Uninstalled"
-msgstr "Kurulmaya hazır"
+#: pamac/transaction.py:364
+msgid "To downgrade"
+msgstr "Geri Yükleme Yapılacak"
-#: pamac/main.py:1070 pamac/main.py:1251
-msgid "Orphans"
-msgstr "Sahipsizler"
+#: pamac/transaction.py:377
+msgid "To update"
+msgstr "Yükseltilecek"
#: pamac/common.py:13
#, python-format
@@ -341,58 +396,105 @@ msgstr "%.1f KiB"
msgid "%.2f MiB"
msgstr "%.2f MiB"
-#: gui/manager.glade:6
-msgid "Choose"
-msgstr "Seçin"
+#: gui/manager.ui:8
+msgid "About Pamac"
+msgstr ""
-#: gui/manager.glade:109
-msgid "Summary"
-msgstr "Özet"
+#: gui/manager.ui:11
+msgid "Copyright © 2013 Guillaume Benoit"
+msgstr ""
-#: gui/manager.glade:250
-msgid "Package Manager"
-msgstr "Paket Yöneticisi"
+#: gui/manager.ui:12
+msgid "A gtk3 frontend for pyalpm"
+msgstr ""
-#: gui/manager.glade:338
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr ""
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Ara"
-#: gui/manager.glade:431 gui/manager.glade:524
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Konum"
-#: gui/manager.glade:478
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Depolar"
-#: gui/manager.glade:540
+#: gui/manager.ui:492
msgid "Name"
msgstr "İsim"
-#: gui/manager.glade:558
+#: gui/manager.ui:505
msgid "Version"
msgstr "Sürüm"
-#: gui/manager.glade:574
+#: gui/manager.ui:518
msgid "Size"
msgstr "Boyut"
-#: gui/manager.glade:675
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Bilgi"
-#: gui/manager.glade:735
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Bağımlılıklar"
-#: gui/manager.glade:800
+#: gui/manager.ui:753
msgid "Details"
msgstr "Ayrıntılar"
-#: gui/manager.glade:848
+#: gui/manager.ui:782
msgid "Files"
msgstr "Dosyalar"
-#: gui/manager.glade:970
+#: gui/dialogs.ui:7
+msgid "Choose"
+msgstr "Seçin"
+
+#: gui/dialogs.ui:113
+msgid "Summary"
+msgstr "Özet"
+
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr "Süreç"
+
+#: gui/dialogs.ui:406
+msgid "details"
+msgstr ""
+
+#~ msgid "Installing"
+#~ msgstr "Kuruluyor"
+
+#~ msgid "Removing"
+#~ msgstr "Kaldırılıyor"
+
+#~ msgid "Upgrading"
+#~ msgstr "Yükseltiliyor"
+
+#~ msgid "Downgrading"
+#~ msgstr "Geri Yükleme Yapılıyor"
+
+#~ msgid "Reinstalling"
+#~ msgstr "Yeniden Kuruluyor"
+
+#~ msgid "Configuring"
+#~ msgstr "Yapılandırılıyor"
+
+#~ msgid "Checking keys in keyring"
+#~ msgstr "Anahtarlık değerleri kontrol ediliyor"
+
+#~ msgid "Downloading {size}"
+#~ msgstr "Indiriliyor {size}"
+
+#~ msgid ""
+#~ "{pkgname1} conflicts with {pkgname2}\n"
+#~ "None of them will be installed"
+#~ msgstr ""
+#~ "{pkgname1} İle {pkgname2} Çakışıyor\n"
+#~ "Hiç Bir Paket Yüklenmeyecek"
diff --git a/po/uz.po b/po/uz.po
index e1632ef..a17f627 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,7 +1,7 @@
# Translation of Pamac.
# Copyright (C) 2007-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the Pamac package.
-#
+#
# Translators:
# Umidjon Almasov , 2013
msgid ""
@@ -11,455 +11,461 @@ msgstr ""
"POT-Creation-Date: 2013-03-30 15:09+0100\n"
"PO-Revision-Date: 2013-10-01 08:17+0000\n"
"Last-Translator: manjarolinux \n"
-"Language-Team: Uzbek (http://www.transifex.com/projects/p/manjaro-pamac/language/uz/)\n"
+"Language-Team: Uzbek (http://www.transifex.com/projects/p/manjaro-pamac/"
+"language/uz/)\n"
+"Language: uz\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: data/polkit/org.manjaro.pamac.policy:10
msgid "Authentication is required"
msgstr ""
-#: pamac-manager.py:75 pamac-manager.py:104 pamac-manager.py:105
-#: pamac-manager.py:120 pamac-manager.py:129 pamac-manager.py:235
-#: pamac-manager.py:432 pamac-manager.py:493 pamac-manager.py:555
+#: pamac-daemon.py:117
+msgid "Checking dependencies"
+msgstr "Bog'liqliklar tekshirilmoqda"
+
+#: pamac-daemon.py:125
+msgid "Checking file conflicts"
+msgstr "Fayl to'qnashuvlari tekshirilmoqda"
+
+#: pamac-daemon.py:131
+msgid "Resolving dependencies"
+msgstr "Bog'liqliklar yechilmoqda"
+
+#: pamac-daemon.py:139
+msgid "Checking inter conflicts"
+msgstr "O'zaro to'qnashuvlar tekshirilmoqda"
+
+#: pamac-daemon.py:147
+#, python-brace-format
+msgid "Installing {pkgname}"
+msgstr "{pkgname} o'rnatilmoqda"
+
+#: pamac-daemon.py:155
+#, python-brace-format
+msgid "Removing {pkgname}"
+msgstr "{pkgname} o'chirilmoqda"
+
+#: pamac-daemon.py:163
+#, python-brace-format
+msgid "Upgrading {pkgname}"
+msgstr "{pkgname} yangilanmoqda"
+
+#: pamac-daemon.py:171
+#, python-brace-format
+msgid "Downgrading {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:179
+#, python-brace-format
+msgid "Reinstalling {pkgname}"
+msgstr "{pkgname} qayta o'rnatilmoqda"
+
+#: pamac-daemon.py:187
+msgid "Checking integrity"
+msgstr "Butunligi tekshirilmoqda"
+
+#: pamac-daemon.py:194
+msgid "Loading packages files"
+msgstr "Paketlar fayllari yuklanmoqda"
+
+#: pamac-daemon.py:200
+msgid "Checking delta integrity"
+msgstr "Delta butunligi tekshirilmoqda"
+
+#: pamac-daemon.py:206
+msgid "Applying deltas"
+msgstr ""
+
+#: pamac-daemon.py:212
+msgid "Generating {} with {}"
+msgstr ""
+
+#: pamac-daemon.py:216
+msgid "Generation succeeded!"
+msgstr ""
+
+#: pamac-daemon.py:219
+msgid "Generation failed."
+msgstr ""
+
+#: pamac-daemon.py:222
+#, python-brace-format
+msgid "Configuring {pkgname}"
+msgstr ""
+
+#: pamac-daemon.py:230
+msgid "Checking available disk space"
+msgstr ""
+
+#: pamac-daemon.py:240
+msgid "Checking keyring"
+msgstr "Kalitlar tekshirilmoqda"
+
+#: pamac-daemon.py:246
+msgid "Downloading required keys"
+msgstr "Kerakli kalitlar yuklab olinmoqda"
+
+#: pamac-daemon.py:265
+#, python-brace-format
+msgid "{pkgname1} will be replaced by {pkgname2}"
+msgstr "{pkgname1} {pkgname2} bilan almashtiriladi"
+
+#: pamac-daemon.py:268
+#, python-brace-format
+msgid "{pkgname1} conflicts with {pkgname2}"
+msgstr "{pkgname1} {pkgname2} bilan to'qnashmoqda"
+
+#: pamac-daemon.py:312
+#, python-brace-format
+msgid "Refreshing {repo}"
+msgstr "{repo} yangilanmoqda"
+
+#: pamac-daemon.py:316
+#, python-brace-format
+msgid "Downloading {pkgname}"
+msgstr "{pkgname} yuklab olinmoqda"
+
+#: pamac-daemon.py:487 pamac-install.py:81
+#, python-brace-format
+msgid "{pkgname} is not a valid path or package name"
+msgstr "{pkgname} yo'li yoki paket nomi haqiqiy emas"
+
+#: pamac-daemon.py:601
+#, python-brace-format
+msgid ""
+"The transaction cannot be performed because it needs to remove {pkgname1} "
+"which is a locked package"
+msgstr ""
+
+#: pamac-daemon.py:662
+msgid "Transaction successfully finished"
+msgstr "Tranzaksiya muvaffaqiyatli tugadi"
+
+#: pamac-daemon.py:666 pamac-daemon.py:674
+msgid "Authentication failed"
+msgstr ""
+
+#: pamac-manager.py:74 pamac-manager.py:103 pamac-manager.py:104
+#: pamac-manager.py:119 pamac-manager.py:128 pamac-manager.py:227
+#: pamac-manager.py:471 pamac-manager.py:532 pamac-manager.py:594
msgid "No package found"
msgstr "Paket topilmadi"
-#: pamac-manager.py:149 pamac-manager.py:185 pamac-manager.py:292
+#: pamac-manager.py:143 pamac-manager.py:195
+msgid "local"
+msgstr "mahalliy"
+
+#: pamac-manager.py:145 pamac-manager.py:178 pamac-manager.py:284
msgid "Installed"
msgstr "O'rnatilgan"
-#: pamac-manager.py:149 pamac-manager.py:188
+#: pamac-manager.py:145 pamac-manager.py:181
msgid "Uninstalled"
msgstr "O'chirilgan"
-#: pamac-manager.py:149 pamac-manager.py:191
+#: pamac-manager.py:145 pamac-manager.py:184
msgid "Orphans"
msgstr "Yetimlar"
-#: pamac-manager.py:149 pamac-manager.py:171 pamac/transaction.py:668
+#: pamac-manager.py:145 pamac-manager.py:164 pamac/transaction.py:352
msgid "To install"
msgstr "O'rnatish uchun"
-#: pamac-manager.py:149 pamac-manager.py:176 pamac/transaction.py:660
+#: pamac-manager.py:145 pamac-manager.py:169 pamac/transaction.py:370
msgid "To remove"
msgstr "O'chirish uchun"
-#: pamac-manager.py:154 pamac-manager.py:203
-msgid "local"
-msgstr "mahalliy"
-
-#: pamac-manager.py:282
+#: pamac-manager.py:274
msgid "Licenses"
msgstr "Litsenziyalar"
-#: pamac-manager.py:287
+#: pamac-manager.py:279
msgid "Depends On"
msgstr "Bog'langan"
-#: pamac-manager.py:295
+#: pamac-manager.py:287
msgid "Optional Deps"
msgstr "Qo'shimcha bog'liqliklar"
-#: pamac-manager.py:298
+#: pamac-manager.py:290
msgid "Required By"
msgstr ""
-#: pamac-manager.py:300
+#: pamac-manager.py:292
msgid "Provides"
msgstr "Ta'minlaydi"
-#: pamac-manager.py:302
+#: pamac-manager.py:294
msgid "Replaces"
msgstr "Almashtiradi"
-#: pamac-manager.py:304
+#: pamac-manager.py:296
msgid "Conflicts With"
msgstr "To'qnashuvda"
-#: pamac-manager.py:309
+#: pamac-manager.py:301
msgid "Repository"
msgstr "Repozitoriy"
-#: pamac-manager.py:311 gui/manager.ui:237
+#: pamac-manager.py:303 gui/manager.ui:340
msgid "Groups"
msgstr "Guruhlar"
-#: pamac-manager.py:313
+#: pamac-manager.py:305
msgid "Compressed Size"
msgstr "Siqilgan hajmi"
-#: pamac-manager.py:314
+#: pamac-manager.py:306
msgid "Download Size"
msgstr "Yuklab olinadigan hajm"
-#: pamac-manager.py:316
+#: pamac-manager.py:308
msgid "Installed Size"
msgstr "O'rnatilgan holda hajm"
-#: pamac-manager.py:317
+#: pamac-manager.py:309
msgid "Packager"
msgstr "Paket yaratuvchisi"
-#: pamac-manager.py:318
+#: pamac-manager.py:310
msgid "Architecture"
msgstr "Arxitektura"
-#: pamac-manager.py:321
+#: pamac-manager.py:313
msgid "Install Date"
msgstr "O'rnatish sanasi"
-#: pamac-manager.py:323
+#: pamac-manager.py:315
msgid "Explicitly installed"
msgstr ""
-#: pamac-manager.py:325
+#: pamac-manager.py:317
msgid "Installed as a dependency for another package"
msgstr "Boshqa paketning bogliqligi sifatida o'rnatilgan"
-#: pamac-manager.py:327
+#: pamac-manager.py:319
msgid "Unknown"
msgstr "Noma'lum"
-#: pamac-manager.py:328
+#: pamac-manager.py:320
msgid "Install Reason"
msgstr "O'rnatish sababi"
-#: pamac-manager.py:333
+#: pamac-manager.py:325
msgid "Signatures"
msgstr "Imzolar"
-#: pamac-manager.py:337
+#: pamac-manager.py:329
msgid "Backup files"
msgstr ""
-#: pamac-manager.py:408
+#: pamac-manager.py:451
#, python-brace-format
msgid ""
"{pkgname} has {number} uninstalled optional deps.\n"
"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac-manager.py:435
+#: pamac-manager.py:474
msgid "Unselect"
msgstr ""
-#: pamac-manager.py:441
+#: pamac-manager.py:480
msgid "Remove"
msgstr "O'chirish"
-#: pamac-manager.py:446
+#: pamac-manager.py:486
msgid "Reinstall"
msgstr "Qayta o'rnatish"
-#: pamac-manager.py:459
+#: pamac-manager.py:499
msgid "Install optional deps"
msgstr "Qo'shimcha bog'liqliklarni o'rnatish"
-#: pamac-manager.py:465
+#: pamac-manager.py:505
msgid "Install"
msgstr "O'rnatish"
-#: pamac-manager.py:478
+#: pamac-manager.py:518
msgid "Install with optional deps"
msgstr "Qo'shimcha bog'liqliklar bilan o'rnatish"
-#: pamac-manager.py:702 pamac-updater.py:97 pamac-install.py:71
+#: pamac-manager.py:753 pamac-updater.py:150 pamac-install.py:109
msgid "Pamac is already running"
msgstr "Pamac ishga tushirilgan"
-#: pamac-updater.py:25 pamac-updater.py:34
+#: pamac-updater.py:27 pamac-updater.py:37
msgid "Your system is up-to-date"
msgstr "Tizim yangilangan"
-#: pamac-updater.py:44 pamac/transaction.py:655
+#: pamac-updater.py:49 pamac/transaction.py:388
msgid "Total download size: "
msgstr ""
-#: pamac-updater.py:46
+#: pamac-updater.py:51
msgid "1 available update"
msgstr "1 yangilanish mavjud"
-#: pamac-updater.py:48
+#: pamac-updater.py:53
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} yangilanish mavjud"
-#: pamac-tray.py:19
+#: pamac-tray.py:17
#, python-brace-format
msgid "{number} available updates"
msgstr "{number} yangilanishlar mavjud"
-#: pamac-tray.py:20
+#: pamac-tray.py:18
msgid "1 available update"
msgstr "1 yangilanish mavjud"
-#: pamac-tray.py:22
+#: pamac-tray.py:20
msgid "Your system is up-to-date"
msgstr "Tizim yangilangan"
-#: pamac-tray.py:32 pamac-tray.py:138 gui/updater.ui:7
+#: pamac-tray.py:30 pamac-tray.py:85 gui/updater.ui:24
msgid "Update Manager"
msgstr "Yangilanish boshqaruvchisi"
-#: pamac-tray.py:36 gui/manager.ui:41
+#: pamac-tray.py:34 gui/manager.ui:144
msgid "Package Manager"
msgstr "Paket boshqaruvchisi"
-#: pamac-tray.py:40
+#: pamac-tray.py:38
msgid "Quit"
msgstr "Chiqish"
-#: pamac-install.py:55 pamac/transaction.py:559
-#, python-brace-format
-msgid "{pkgname} is not a valid path or package name"
-msgstr "{pkgname} yo'li yoki paket nomi haqiqiy emas"
-
-#: pamac-install.py:79
+#: pamac-install.py:119
msgid ""
"Some updates are available.\n"
"Please update your system first"
msgstr ""
-#: pamac/common.py:13
-#, python-format
-msgid "%.1f KiB"
-msgstr "%.1f KB"
-
-#: pamac/common.py:16
-#, python-format
-msgid "%.2f MiB"
-msgstr "%.2f MB"
-
-#: pamac/transaction.py:50
+#: pamac/transaction.py:150
#, python-brace-format
msgid ""
"{pkgname} is provided by {number} packages.\n"
-"Please choose the one you want to install:"
-msgstr ""
-
-#: pamac/transaction.py:174
-msgid "Checking dependencies"
-msgstr "Bog'liqliklar tekshirilmoqda"
-
-#: pamac/transaction.py:182
-msgid "Checking file conflicts"
-msgstr "Fayl to'qnashuvlari tekshirilmoqda"
-
-#: pamac/transaction.py:188
-msgid "Resolving dependencies"
-msgstr "Bog'liqliklar yechilmoqda"
-
-#: pamac/transaction.py:194
-msgid "Checking inter conflicts"
-msgstr "O'zaro to'qnashuvlar tekshirilmoqda"
-
-#: pamac/transaction.py:202
-#, python-brace-format
-msgid "Installing {pkgname}"
-msgstr "{pkgname} o'rnatilmoqda"
-
-#: pamac/transaction.py:211
-#, python-brace-format
-msgid "Removing {pkgname}"
-msgstr "{pkgname} o'chirilmoqda"
-
-#: pamac/transaction.py:220
-#, python-brace-format
-msgid "Upgrading {pkgname}"
-msgstr "{pkgname} yangilanmoqda"
-
-#: pamac/transaction.py:229
-#, python-brace-format
-msgid "Downgrading {pkgname}"
-msgstr ""
-
-#: pamac/transaction.py:238
-#, python-brace-format
-msgid "Reinstalling {pkgname}"
-msgstr "{pkgname} qayta o'rnatilmoqda"
-
-#: pamac/transaction.py:247
-msgid "Checking integrity"
-msgstr "Butunligi tekshirilmoqda"
-
-#: pamac/transaction.py:254
-msgid "Loading packages files"
-msgstr "Paketlar fayllari yuklanmoqda"
-
-#: pamac/transaction.py:260
-msgid "Checking delta integrity"
-msgstr "Delta butunligi tekshirilmoqda"
-
-#: pamac/transaction.py:266
-msgid "Applying deltas"
-msgstr ""
-
-#: pamac/transaction.py:272
-msgid "Generating {} with {}"
-msgstr ""
-
-#: pamac/transaction.py:276
-msgid "Generation succeeded!"
-msgstr ""
-
-#: pamac/transaction.py:279
-msgid "Generation failed."
-msgstr ""
-
-#: pamac/transaction.py:282
-#, python-brace-format
-msgid "Configuring {pkgname}"
-msgstr ""
-
-#: pamac/transaction.py:291
-msgid "Checking available disk space"
+"Please choose the one(s) you want to install:"
msgstr ""
-#: pamac/transaction.py:301
-msgid "Checking keyring"
-msgstr "Kalitlar tekshirilmoqda"
-
-#: pamac/transaction.py:308
-msgid "Downloading required keys"
-msgstr "Kerakli kalitlar yuklab olinmoqda"
-
-#: pamac/transaction.py:331
-#, python-brace-format
-msgid "{pkgname1} will be replaced by {pkgname2}"
-msgstr "{pkgname1} {pkgname2} bilan almashtiriladi"
-
-#: pamac/transaction.py:334
-#, python-brace-format
-msgid "{pkgname1} conflicts with {pkgname2}"
-msgstr "{pkgname1} {pkgname2} bilan to'qnashmoqda"
-
-#: pamac/transaction.py:383
-#, python-brace-format
-msgid "Refreshing {repo}"
-msgstr "{repo} yangilanmoqda"
-
-#: pamac/transaction.py:387
-#, python-brace-format
-msgid "Downloading {pkgname}"
-msgstr "{pkgname} yuklab olinmoqda"
-
-#: pamac/transaction.py:443
+#: pamac/transaction.py:198
msgid "Refreshing"
msgstr "Yangilanmoqda"
-#: pamac/transaction.py:581
-#, python-brace-format
-msgid ""
-"The transaction cannot be performed because it needs to remove {pkgname1} "
-"which is a locked package"
-msgstr ""
-
-#: pamac/transaction.py:600 pamac/transaction.py:603
-msgid "Transaction successfully finished"
-msgstr "Tranzaksiya muvaffaqiyatli tugadi"
+#: pamac/transaction.py:229
+msgid "Nothing to do"
+msgstr "Vazifalar yo'q"
-#: pamac/transaction.py:622
-msgid ""
-"The transaction was interrupted.\n"
-"Now Pamac will quit."
-msgstr "Tranzaksiya to'xtatilgan.\nPamac yopiladi."
+#: pamac/transaction.py:270
+msgid "Preparing"
+msgstr "Tayyorlanmoqda"
-#: pamac/transaction.py:632
+#: pamac/transaction.py:350
msgid "Transaction Summary"
msgstr ""
-#: pamac/transaction.py:676
+#: pamac/transaction.py:358
msgid "To reinstall"
msgstr "Qayta o'rnatish uchun"
-#: pamac/transaction.py:684
+#: pamac/transaction.py:364
msgid "To downgrade"
msgstr ""
-#: pamac/transaction.py:693
+#: pamac/transaction.py:377
msgid "To update"
msgstr "Yangilanish uchun"
-#: pamac/transaction.py:754
-msgid "Preparing"
-msgstr "Tayyorlanmoqda"
+#: pamac/common.py:13
+#, python-format
+msgid "%.1f KiB"
+msgstr "%.1f KB"
-#: pamac/transaction.py:782
-msgid "Nothing to do"
-msgstr "Vazifalar yo'q"
+#: pamac/common.py:16
+#, python-format
+msgid "%.2f MiB"
+msgstr "%.2f MB"
-#: gui/manager.ui:7
+#: gui/manager.ui:8
msgid "About Pamac"
msgstr "Pamac haqida"
-#: gui/manager.ui:10
+#: gui/manager.ui:11
msgid "Copyright © 2013 Guillaume Benoit"
msgstr "Copyright © 2013 Guillaume Benoit"
-#: gui/manager.ui:11
+#: gui/manager.ui:12
msgid "A gtk3 frontend for pyalpm"
msgstr "Pyalpm uchun gtk3 frontendi"
-#: gui/manager.ui:191
+#: gui/manager.ui:42
+msgid "Install local packages"
+msgstr "Mahalliy paketlarni o'rnatish"
+
+#: gui/manager.ui:294
msgid "Search"
msgstr "Qidirish"
-#: gui/manager.ui:284 gui/manager.ui:376
+#: gui/manager.ui:387 gui/manager.ui:479
msgid "State"
msgstr "Holati"
-#: gui/manager.ui:331
+#: gui/manager.ui:434
msgid "Repos"
msgstr "Repozitoriylar"
-#: gui/manager.ui:389
+#: gui/manager.ui:492
msgid "Name"
msgstr "Nomi"
-#: gui/manager.ui:402
+#: gui/manager.ui:505
msgid "Version"
msgstr "Versiya"
-#: gui/manager.ui:415
+#: gui/manager.ui:518
msgid "Size"
msgstr "Hajmi"
-#: gui/manager.ui:513
+#: gui/manager.ui:620
msgid "Infos"
msgstr "Ma'lumot"
-#: gui/manager.ui:573
+#: gui/manager.ui:684
msgid "Deps"
msgstr "Bog'liqliklar"
-#: gui/manager.ui:638
+#: gui/manager.ui:753
msgid "Details"
msgstr "Tafsilotlar"
-#: gui/manager.ui:686
+#: gui/manager.ui:782
msgid "Files"
msgstr "Fayllar"
-#: gui/manager.ui:718
-msgid "Install local packages"
-msgstr "Mahalliy paketlarni o'rnatish"
-
-#: gui/dialogs.ui:6
+#: gui/dialogs.ui:7
msgid "Choose"
msgstr "Tanlash"
-#: gui/dialogs.ui:108
+#: gui/dialogs.ui:113
msgid "Summary"
msgstr ""
-#: gui/dialogs.ui:306
+#: gui/dialogs.ui:315
msgid "Progress"
msgstr ""
-#: gui/dialogs.ui:398
+#: gui/dialogs.ui:406
msgid "details"
msgstr "tafsilotlar"
+
+#~ msgid ""
+#~ "The transaction was interrupted.\n"
+#~ "Now Pamac will quit."
+#~ msgstr ""
+#~ "Tranzaksiya to'xtatilgan.\n"
+#~ "Pamac yopiladi."
diff --git a/setup.py b/setup.py
index 5d1694d..fbde26e 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from distutils.core import setup
setup(name='Pamac',
- version='0.8',
+ version='0.9',
description='A gtk3 frontend for pyalpm',
license='GPL',
author='Guillaume Benoit',
diff --git a/start-pamac-daemon b/start-pamac-daemon
new file mode 100755
index 0000000..efe0c72
--- /dev/null
+++ b/start-pamac-daemon
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+/usr/bin/pamac-daemon &