Merge lp:aptdaemon/0.2x into lp:aptdaemon

[Jose Ledesma]

I can not seem to update my old Dell Latitude D610 laptop, because the administrator password is blocking my way. I need help on taking the admin and its password away.

[Martin Pitt (pitti)]

I'm not sure what this is, but it doesn't look like a sensible merge proposal, nor a related description. I'm closing this.

Unmerged revisions

350. By Sebastian Heinlein on 2010-04-18

Fix local deb file installation by unlocking the cache before calling dpkg

349. By Sebastian Heinlein on 2010-04-16

Bug fix: do not segfault on not availabe files to calculate a diff

348. By Sebastian Heinlein on 2010-04-16

Cherry pick fix from trunk: do not allow to remove aptdameon, essential or required packages.

347. By Sebastian Heinlein on 2010-04-01

Fix error handling in the client

346. By Sebastian Heinlein on 2010-03-31

Push local changes

345. By Michael Vogt on 2010-03-31

aptdaemon/core.py: fix incorrect return of AddRepository

344. By Sebastian Heinlein on 2010-03-31

Update for 0.20 release

343. By Sebastian Heinlein on 2010-03-28

Fix a typo in the dpkg recover progress

342. By Sebastian Heinlein on 2010-03-25

Merge backported fix to the debconf forwarding

341. By Sebastian Heinlein on 2010-03-25

Cherry pick debconf test from main

=== modified file 'NEWS'
--- NEWS	2013-03-11 06:09:53 +0000
+++ NEWS	2013-06-03 17:47:29 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 VERSION 1.x - UNRELEASED
 
  * Bug Fixes:
@@ -559,6 +560,9 @@
 
 
 API CHANGES 0.20
+=======
+API CHANGES 0.20
+>>>>>>> MERGE-SOURCE
 
 You don't have to request a transaction, set it up and call the whished action
 on it aynmore. Instead you call the action, e.g. UpdateCache, on the daemon

=== modified file 'aptdaemon/__init__.py'
--- aptdaemon/__init__.py	2013-03-18 09:17:05 +0000
+++ aptdaemon/__init__.py	2013-06-03 17:47:29 +0000
@@ -17,6 +17,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+<<<<<<< TREE
 __author__ = "Sebastian Heinlein <[e-mail]>"
 __state__ = "development"
 __version__ = '1.0'
@@ -24,5 +25,10 @@
 __all__ = ("client", "console", "core", "debconf", "defer", "enums",
            "errors", "gtkwidgets", "loop", "policykit1", "progress",
            "test", "utils", "worker")
+=======
+__author__  = "Sebastian Heinlein <[e-mail]>"
+__state__   = "stable"
+__version__ = "0.20"
+>>>>>>> MERGE-SOURCE
 
 # vim:ts=4:sw=4:et

=== modified file 'aptdaemon/client.py'
--- aptdaemon/client.py	2013-03-06 07:33:59 +0000
+++ aptdaemon/client.py	2013-06-03 17:47:29 +0000
@@ -1577,6 +1577,7 @@
                 error_handler(error)
                 return
             else:
+<<<<<<< TREE
                 raise
         if async:
             def on_error(error):
@@ -1643,6 +1644,72 @@
 
 @deferable
 @convert_dbus_exception
+=======
+                trans.sync()
+            return reply(trans)
+
+        def set_terminal(trans):
+            """Setup the attachable terminal for the transaction."""
+            if self.terminal:
+                if async:
+                    trans.set_terminal(self.terminal,
+                                       reply_handler=sync,
+                                       error_handler=error_handler)
+                    return
+                else:
+                    trans.set_terminal(self.terminal)
+            return sync(trans)
+
+        def set_locale(tid):
+            """Setup the language of the transaction."""
+            trans = AptTransaction(tid, self.bus)
+            if self._locale is not None:
+                if async:
+                    trans.set_locale(self._locale,
+                                     reply_handler=set_terminal,
+                                     error_handler=error_handler)
+                    return
+                else:
+                    trans.set_locale(self._locale)
+            return set_terminal(trans)
+
+        def on_daemon_failed(error):
+            """Error callback which tries to catch a timeout of the daemon."""
+            if hasattr(error, "get_dbus_name") and \
+               error.get_dbus_name() == "org.freedesktop.DBus.Error." \
+                                        "ServiceUnknown":
+                # Catch if the daemon has timed out
+                self.apt_control = get_aptdaemon()
+                method = self.apt_control.get_dbus_method(method_name)
+                method(reply_handler=set_locale, error_handler=error_handler,
+                       *args)
+            else:
+                error_handler(error)
+
+        async = reply_handler and error_handler
+        # Request a new transaction
+        if not self.apt_control:
+            self.apt_control = get_aptdaemon()
+        method = self.apt_control.get_dbus_method(method_name)
+        if async:
+            method(reply_handler=set_locale, error_handler=on_daemon_failed,
+                   *args)
+        else:
+            try:
+                tid = method(*args)
+            except dbus.DBusException, error:
+                if error._dbus_error_name == "org.freedesktop.DBus.Error." \
+                                             "ServiceUnknown":
+                    # Catch if the daemon has timed out
+                    self.apt_control = get_aptdaemon()
+                    method = self.apt_control.get_dbus_method(method_name)
+                    tid = method(*args)
+                else:
+                    raise error
+            return set_locale(tid)
+
+
+>>>>>>> MERGE-SOURCE
 def get_transaction(tid, bus=None, reply_handler=None, error_handler=None):
     """Get an existing transaction by its identifier.
 

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2013-03-06 06:30:57 +0000
+++ aptdaemon/core.py	2013-06-03 17:47:29 +0000
@@ -1911,7 +1911,7 @@
 
     # pylint: disable-msg=C0103,C0322
     @dbus_deferred_method(APTDAEMON_DBUS_INTERFACE,
-                          in_signature="sssasss", out_signature="s",
+                          in_signature="sssasss", out_signature="",
                           sender_keyword="sender")
     def AddRepository(self, src_type, uri, dist, comps, comment, sourcesfile,
                       sender):

=== modified file 'aptdaemon/debconf.py'
--- aptdaemon/debconf.py	2013-04-02 13:03:55 +0000
+++ aptdaemon/debconf.py	2013-06-03 17:47:29 +0000
@@ -102,14 +102,22 @@
         """Start listening on the socket."""
         logging.debug("debconf.start()")
         self.socket.listen(1)
+<<<<<<< TREE
         self._listener_id = GLib.io_add_watch(
             self.socket, GLib.PRIORITY_DEFAULT_IDLE,
             GLib.IO_IN, self._accept_connection)
+=======
+        self._listener_id = gobject.io_add_watch(self.socket,
+                                         gobject.IO_IN,
+                                         self._accept_connection,
+                                         priority=gobject.PRIORITY_DEFAULT_IDLE)
+>>>>>>> MERGE-SOURCE
 
     def stop(self):
         """Stop listening on the socket."""
         logging.debug("debconf.stop()")
         self.socket.close()
+<<<<<<< TREE
         if self._listener_id is not None:
             GLib.source_remove(self._listener_id)
             self._listener_id = None
@@ -119,6 +127,10 @@
                 os.rmdir(self.temp_dir)
             except OSError:
                 pass
+=======
+        gobject.source_remove(self._listener_id)
+        self._listener_id = None
+>>>>>>> MERGE-SOURCE
 
     def _accept_connection(self, socket, condition):
         if self._active_conn:
@@ -126,15 +138,28 @@
             return True
         conn, addr = socket.accept()
         self._active_conn = conn
+<<<<<<< TREE
         mask = GLib.IO_IN | GLib.IO_ERR | GLib.IO_HUP | GLib.IO_NVAL
+=======
+        mask = gobject.IO_IN | gobject.IO_ERR | gobject.IO_HUP | gobject.IO_NVAL
+>>>>>>> MERGE-SOURCE
         self.helper = subprocess.Popen(["debconf-communicate"],
                                        stdin=subprocess.PIPE,
                                        stdout=subprocess.PIPE,
                                        env=self._get_debconf_env())
+<<<<<<< TREE
         GLib.io_add_watch(conn, GLib.PRIORITY_HIGH_IDLE,
                           mask, self._copy_conn, self.helper.stdin)
         GLib.io_add_watch(self.helper.stdout, GLib.PRIORITY_HIGH_IDLE,
                           mask, self._copy_stdout, conn)
+=======
+        gobject.io_add_watch(conn, mask,
+                             self._copy_conn, self.helper.stdin,
+                             priority=gobject.PRIORITY_HIGH_IDLE)
+        gobject.io_add_watch(self.helper.stdout, mask,
+                             self._copy_stdout, conn,
+                             priority=gobject.PRIORITY_HIGH_IDLE)
+>>>>>>> MERGE-SOURCE
         return True
 
     def _copy_stdout(self, source, condition, conn):
@@ -147,8 +172,13 @@
                 log.debug("From debconf: %s", debconf_data)
                 conn.send(debconf_data)
                 return True
+<<<<<<< TREE
         except (socket.error, IOError) as error:
             log.debug(error)
+=======
+        except (socket.error, IOError), error:
+            log.debug(error)
+>>>>>>> MERGE-SOURCE
         # error, stop listening
         log.debug("Stop reading from stdout")
         self.helper.stdout.close()
@@ -167,6 +197,7 @@
                 stdin.write(socket_data)
                 stdin.flush()
                 return True
+<<<<<<< TREE
         except (socket.error, IOError) as error:
             log.debug(error)
         # error, stop listening
@@ -174,6 +205,14 @@
         self.helper.stdin.close()
         return False
 
+=======
+        except (socket.error, IOError), error:
+            log.debug(error)
+        # error, stop listening
+        log.debug("Stop reading from conn")
+        self.helper.stdin.close()
+        return False
+>>>>>>> MERGE-SOURCE
 
 def _test():
     """Run the DebconfProxy from the command line for testing purposes.

=== modified file 'aptdaemon/gtkwidgets.py'
--- aptdaemon/gtkwidgets.py	2013-03-18 09:17:05 +0000
+++ aptdaemon/gtkwidgets.py	2013-06-03 17:47:29 +0000
@@ -1042,11 +1042,20 @@
     def show_diff(self, from_path, to_path):
         """Show the difference between two files."""
         #FIXME: Use gio
-        try:
-            from_lines = open(from_path).readlines()
-            to_lines = open(to_path).readlines()
-        except IOError:
-            return
+<<<<<<< TREE
+        try:
+            from_lines = open(from_path).readlines()
+            to_lines = open(to_path).readlines()
+        except IOError:
+            return
+=======
+        # Do not fail on not available files (LP:563504)
+        try:
+            from_lines = open(from_path).readlines()
+            to_lines = open(to_path).readlines()
+        except IOError:
+            return
+>>>>>>> MERGE-SOURCE
         iter = self.buffer.get_start_iter()
         for line in difflib.unified_diff(from_lines, to_lines, lineterm=""):
             if line.startswith("@@"):

=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2012-12-29 19:27:25 +0000
+++ aptdaemon/worker.py	2013-06-03 17:47:29 +0000
@@ -735,6 +735,7 @@
         deb = self._check_deb_file(trans, path, force)
         # Check for required changes and apply them before
         (install, remove, unauth) = deb.required_changes
+<<<<<<< TREE
         self._call_plugins("modify_cache_after")
         if simulate:
             return deb
@@ -751,6 +752,40 @@
                                         trans.output)
 
     def _mark_packages_for_removal(self, packages, resolver, purge=False):
+=======
+        if len(install) > 0 or len(remove) > 0:
+            dpkg_range = (64, 99)
+            self._commit_changes(fetch_range=(5, 33),
+                                 install_range=(34, 63))
+        self._unlock_cache()
+        # Install the dpkg file
+        if deb.install(DaemonDpkgInstallProgress(self.trans,
+                                                 begin=64, end=95)):
+            raise TransactionFailed(ERROR_UNKNOWN, deb._failure_string)
+
+    def remove_packages(self, package_names):
+        """Remove packages.
+
+        Keyword argument:
+        package_names -- list of package name which should be installed
+        """
+        log.info("Removing packages: '%s'", package_names)
+        ac = self._cache.actiongroup()
+        resolver = apt.cache.ProblemResolver(self._cache)
+        self._mark_packages_for_removal(package_names, resolver)
+        self._resolve_depends(resolver)
+        ac.release()
+        self._commit_changes(fetch_range=(10, 10), install_range=(10, 90))
+        #FIXME: should we use a persistant cache? make a check?
+        #self._open_cache(prange=(90,99))
+        #for p in pkgs:
+        #    if self._cache.has_key(p) and self._cache[p].isInstalled:
+        #        self.ErrorCode(ERROR_UNKNOWN, "%s is still installed" % p)
+        #        self.Finished(EXIT_FAILED)
+        #        return
+
+    def _mark_packages_for_removal(self, package_names, resolver, purge=False):
+>>>>>>> MERGE-SOURCE
         """Mark packages for installation."""
         for pkg_name, pkg_ver, pkg_rel in [self._split_package_id(pkg)
                                            for pkg in packages]:
@@ -1103,6 +1138,7 @@
         install_range -- tuple containing the start and end point of the
                          install progress
         """
+<<<<<<< TREE
         changes = self._cache.get_changes()
         if not changes:
             return
@@ -1121,12 +1157,29 @@
             raise TransactionFailed(ERROR_PACKAGE_UNAUTHENTICATED,
                                     " ".join(sorted(trans.unauthenticated)))
         if trans.cancelled:
+=======
+        changes = self._cache.get_changes()
+        if not changes:
+            return
+        # Do not allow to remove essential packages
+        for pkg in changes:
+            if pkg.marked_delete and (pkg.essential == True or \
+                                      pkg.installed.priority == "required" or \
+                                      pkg.name == "aptdaemon"):
+                raise TransactionFailed(ERROR_NOT_REMOVE_ESSENTIAL_PACKAGE,
+                                        "Package %s cannot be removed." % \
+                                        pkg.name)
+        self._check_obsoleted_dependencies()
+        self._check_unauthenticated()
+        if self.trans.cancelled:
+>>>>>>> MERGE-SOURCE
             raise TransactionCancelled()
         trans.cancellable = False
         fetch_progress = DaemonAcquireProgress(trans, begin=fetch_range[0],
                                                end=fetch_range[1])
         inst_progress = DaemonInstallProgress(trans, begin=install_range[0],
                                               end=install_range[1])
+<<<<<<< TREE
         with self._frozen_status():
             try:
                 self._cache.commit(fetch_progress, inst_progress)
@@ -1564,6 +1617,27 @@
         """If a reboot is required to get all changes into effect."""
         return os.path.exists(os.path.join(apt_pkg.config.find_dir("Dir"),
                                            "var/run/reboot-required"))
+=======
+        self._unlock_cache()
+        try:
+            self._cache.commit(fetch_progress, inst_progress)
+        except apt.cache.FetchFailedException, excep:
+            raise TransactionFailed(ERROR_PACKAGE_DOWNLOAD_FAILED, 
+                                    str(excep))
+        except apt.cache.FetchCancelledException:
+            raise TransactionCancelled()
+        except SystemError, excep:
+            # Run dpkg --configure -a to recover from a failed transaction
+            self.trans.status = STATUS_CLEANING_UP
+            self._unlock_cache()
+            progress = DaemonDpkgRecoverProgress(self.trans, begin=90, end=95)
+            progress.startUpdate()
+            progress.run()
+            progress.finishUpdate()
+            output = inst_progress.output + progress.output
+            raise TransactionFailed(ERROR_PACKAGE_MANAGER_FAILED,
+                                    "%s: %s" % (excep, output))
+>>>>>>> MERGE-SOURCE
 
 
 class DummyWorker(AptWorker):

=== modified file 'po/am.po'
--- po/am.po	2013-03-10 00:01:34 +0000
+++ po/am.po	2013-06-03 17:47:29 +0000
@@ -7,16 +7,26 @@
 msgstr ""
 "Project-Id-Version: aptdaemon\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-17 11:07+0000\n"
 "PO-Revision-Date: 2011-09-20 00:25+0000\n"
+=======
+"POT-Creation-Date: 2010-03-26 09:22+0000\n"
+"PO-Revision-Date: 2010-02-11 23:23+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Launchpad-Export-Date: 2013-03-09 23:28+0000\n"
 "X-Generator: Launchpad (build 16523)\n"
+=======
+"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:1
 msgid "List keys of trusted vendors"
@@ -31,37 +41,84 @@
 msgstr "የወረዱ ጥቅል ፋይሎችን ማስወገጃ"
 
 #: ../data/org.debian.apt.policy.in.h:4
+<<<<<<< TREE
 msgid "To clean downloaded package files, you need to authenticate."
 msgstr ""
+=======
+msgid ""
+"Authentication is required to query the software repositories for "
+"installable packages"
+msgstr "ማረጋገጫ ያስፈልጋል ለጥያቄው በሶፍትዌር ማስቀመጫ ለሚገጠሙት ጥቅሎች"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:5
 msgid "Change software configuration"
 msgstr ""
 
 #: ../data/org.debian.apt.policy.in.h:6
+<<<<<<< TREE
 msgid "To change software settings, you need to authenticate."
 msgstr ""
-
+=======
+msgid "Authentication is required to repair broken installations"
+msgstr ""
+
+#: ../data/org.debian.apt.policy.in.h:7
+msgid "Authentication is required to upgrade software packages"
+msgstr "ማረጋገጫ ያስፈልጋል የሶፍትዌር ጥቅሎችን ለማሻሻል"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:7
 msgid "Change software repository"
 msgstr ""
+=======
+#: ../data/org.debian.apt.policy.in.h:8
+msgid "Authentication is required to upgrade the system"
+msgstr "ማረጋገጫ ያስፈልጋል ስርአቱን ለማሻሻል"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:8
 msgid "To change software repository settings, you need to authenticate."
 msgstr "የሶፍትዌር ማጠራቀሚያ ማሰናጃን ለመቀየር ማረጋገጫ ያስፈልጋል"
-
+=======
 #: ../data/org.debian.apt.policy.in.h:9
+msgid "Cancel the task of another user"
+msgstr "መሰረዝ የሌላ ተጠቃሚን ስራዎች"
+>>>>>>> MERGE-SOURCE
+
+#: ../data/org.debian.apt.policy.in.h:10
 msgid "Install package file"
 msgstr "የጥቅል ፋይልን መግጠም"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:10
 msgid "To install this package, you need to authenticate."
 msgstr "ይህን ጥቅል ለመግጠም ማረጋገጫ ያስፈልጋል"
-
-#: ../data/org.debian.apt.policy.in.h:11
+=======
+#: ../data/org.debian.apt.policy.in.h:11
+msgid "Install packages"
+msgstr "ጥቅሎችን መግጠም"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
+#: ../data/org.debian.apt.policy.in.h:11
+=======
+#: ../data/org.debian.apt.policy.in.h:12
+msgid "Remove packages"
+msgstr "ጥቅሎችን ማስወገድ"
+
+#: ../data/org.debian.apt.policy.in.h:13
+msgid "Repair broken installations"
+msgstr ""
+
+#: ../data/org.debian.apt.policy.in.h:14
+>>>>>>> MERGE-SOURCE
 msgid "Update package information"
 msgstr "የጥቅል መረጃዎችን ማሻሻል"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:12
 msgid "To update the software catalog, you need to authenticate."
 msgstr ""
@@ -123,9 +180,13 @@
 msgstr "የተገዛ ሶፍትዌርን ለመግጠም ማረጋገጫ ያስፈልጋል"
 
 #: ../data/org.debian.apt.policy.in.h:44
+=======
+#: ../data/org.debian.apt.policy.in.h:15
+>>>>>>> MERGE-SOURCE
 msgid "Upgrade packages"
 msgstr "ጥቅሎችን ማሻሻል"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:45
 msgid "To install updated software, you need to authenticate."
 msgstr "የተሻሻሉ ሶፍትዌሮችን ለመግጠም ማረጋገጫ ያስፈልጋል"
@@ -358,21 +419,37 @@
 msgstr ""
 
 #: ../aptdaemon/core.py:2188
+=======
+#: ../data/org.debian.apt.policy.in.h:16
+msgid "Upgrade system"
+msgstr "ስርአቱን ማሻሻል"
+
+#: ../aptdaemon/core.py:1237
+>>>>>>> MERGE-SOURCE
 msgid "Do not shutdown the daemon because of inactivity"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2193
 msgid "Do not load any plugins"
 msgstr ""
 
 #: ../aptdaemon/core.py:2197
+=======
+#: ../aptdaemon/core.py:1242
+>>>>>>> MERGE-SOURCE
 msgid "Show internal processing information"
 msgstr "የውስጥ ሂደቱን መረጃ ማሳያ"
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2202
+=======
+#: ../aptdaemon/core.py:1246
+>>>>>>> MERGE-SOURCE
 msgid "Quit and replace an already running daemon"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2207
 msgid "Listen on the DBus session bus (Only required for testing"
 msgstr ""
@@ -382,29 +459,60 @@
 msgstr ""
 
 #: ../aptdaemon/core.py:2216
+=======
+#: ../aptdaemon/core.py:1250
+>>>>>>> MERGE-SOURCE
 msgid "Store profile stats in the specified file"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2221
 msgid "Do not make any changes to the system (Only of use to developers)"
 msgstr ""
 
 #: ../aptdaemon/enums.py:366
+=======
+#: ../aptdaemon/core.py:1254
+msgid "Do not make any changes to the system (Only of use to developers)"
+msgstr ""
+
+#: ../aptdaemon/enums.py:136
+>>>>>>> MERGE-SOURCE
 msgid "Installed file"
 msgstr "የተገጠመው ፋይል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:367
+=======
+#: ../aptdaemon/enums.py:137
+>>>>>>> MERGE-SOURCE
 msgid "Installed packages"
 msgstr "የተገጠሙት ጥቅሎች"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:368
 msgid "Added key from file"
 msgstr "ከፋይል የተጨመረ ቁልፍ"
-
+=======
+#: ../aptdaemon/enums.py:138
+msgid "Added key from file"
+msgstr "ከፋይል የተጨመረ ቁልፍ"
+
+#: ../aptdaemon/enums.py:139
+msgid "Updated cache"
+msgstr ""
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:369
 msgid "Updated cache"
+=======
+#: ../aptdaemon/enums.py:140
+msgid "Removed trusted key"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:370
 msgid "Search done"
 msgstr ""
@@ -414,21 +522,39 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:372
+=======
+#: ../aptdaemon/enums.py:141
+>>>>>>> MERGE-SOURCE
 msgid "Removed packages"
 msgstr "የተወገዱ ጥቅሎች"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:373
 msgid "Updated packages"
 msgstr "ጥቅሎችን ማሻሻል"
-
+=======
+#: ../aptdaemon/enums.py:142
+msgid "Updated packages"
+msgstr "ጥቅሎችን ማሻሻል"
+
+#: ../aptdaemon/enums.py:143
+msgid "Upgraded system"
+msgstr "ስርአቱን ማሻሻል"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:374
 msgid "Upgraded system"
 msgstr "ስርአቱን ማሻሻል"
 
 #: ../aptdaemon/enums.py:375
+=======
+#: ../aptdaemon/enums.py:144
+>>>>>>> MERGE-SOURCE
 msgid "Applied changes"
 msgstr "የተተገበሩ ለውጦች"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:376
 msgid "Repaired incomplete installation"
 msgstr ""
@@ -454,53 +580,109 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:397
+=======
+#: ../aptdaemon/enums.py:145
+msgid "Repaired incomplete installation"
+msgstr ""
+
+#: ../aptdaemon/enums.py:146
+msgid "Repaired broken dependencies"
+msgstr ""
+
+#: ../aptdaemon/enums.py:157
+>>>>>>> MERGE-SOURCE
 msgid "Successful"
 msgstr "ተሳክቷል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:398
+=======
+#: ../aptdaemon/enums.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Canceled"
 msgstr "የተሰረዘ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680
+=======
+#: ../aptdaemon/enums.py:159
+>>>>>>> MERGE-SOURCE
 msgid "Failed"
 msgstr "ወድቋል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:414
+=======
+#: ../aptdaemon/enums.py:169
+>>>>>>> MERGE-SOURCE
 msgid "Installing file"
 msgstr "ፋይል በመግጠም ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:415
+=======
+#: ../aptdaemon/enums.py:170
+>>>>>>> MERGE-SOURCE
 msgid "Installing packages"
 msgstr "ጥቅሎችን በመግጠም ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:416
+=======
+#: ../aptdaemon/enums.py:171
+>>>>>>> MERGE-SOURCE
 msgid "Adding key from file"
 msgstr "ከፋይል ቁልፍ በመጨመር ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:417
+=======
+#: ../aptdaemon/enums.py:172
+>>>>>>> MERGE-SOURCE
 msgid "Updating cache"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:418
+=======
+#: ../aptdaemon/enums.py:173
+>>>>>>> MERGE-SOURCE
 msgid "Removing trusted key"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:419
+=======
+#: ../aptdaemon/enums.py:174
+>>>>>>> MERGE-SOURCE
 msgid "Removing packages"
 msgstr "ጥቅሎችን በማስወገድ ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:420
+=======
+#: ../aptdaemon/enums.py:175
+>>>>>>> MERGE-SOURCE
 msgid "Updating packages"
 msgstr "ጥቅሎችን በማሻሻል ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:421
+=======
+#: ../aptdaemon/enums.py:176
+>>>>>>> MERGE-SOURCE
 msgid "Upgrading system"
 msgstr "ስርአቱን በማሻሻል ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615
+=======
+#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308
+>>>>>>> MERGE-SOURCE
 msgid "Applying changes"
 msgstr "ለውጦችን በመተግበር ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:423
 msgid "Repairing incomplete installation"
 msgstr ""
@@ -594,69 +776,173 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480
+=======
+#: ../aptdaemon/enums.py:178
+msgid "Repairing incomplete installation"
+msgstr ""
+
+#: ../aptdaemon/enums.py:179
+msgid "Repairing broken deps"
+msgstr ""
+
+#: ../aptdaemon/enums.py:190
+msgid "Installation of the package file failed"
+msgstr "የጥቅሉን ፋይል መግጠም አልተሳካም"
+
+#: ../aptdaemon/enums.py:191
+msgid "Installation of software failed"
+msgstr "ሶፍትዌሩን መግጠም አልተሳካም"
+
+#: ../aptdaemon/enums.py:192
+msgid "Adding the key to the list of trused software vendors failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:194
+msgid "Refreshing the software list failed"
+msgstr "ሶፍትዌሩን ማነቃቃት አልተሳካም"
+
+#: ../aptdaemon/enums.py:195
+msgid "Removing the vendor from the list of trusted ones failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:197
+msgid "Removing software failed"
+msgstr "ሶፍትዌሩን ማስወገድ አልተሳካም"
+
+#: ../aptdaemon/enums.py:198
+msgid "Updating software failed"
+msgstr "ሶፍትዌሩን ማሻሻል አልተሳካም"
+
+#: ../aptdaemon/enums.py:199
+msgid "Upgrading the system failed"
+msgstr "ስርአቱን ማሻሻል አልተሳካም"
+
+#: ../aptdaemon/enums.py:200
+msgid "Applying software changes failed"
+msgstr "የሶፍትዌር ለውጦቹን መተግበር አልተሳካም"
+
+#: ../aptdaemon/enums.py:201
+msgid "Repairing incomplete installation failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:202
+msgid "Repairing broken dependencies failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214
+>>>>>>> MERGE-SOURCE
 msgid "Check your Internet connection."
 msgstr "የኢንተርኔት ግንኙነቶን ይመርምሩ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:481
+=======
+#: ../aptdaemon/enums.py:215
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are using third party repositories. If so disable them, since "
 "they are a common source of problems.\n"
 "Furthermore run the following command in a Terminal: apt-get install -f"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:486
+=======
+#: ../aptdaemon/enums.py:220
+>>>>>>> MERGE-SOURCE
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "የተመረጠው ፋይል ምናልባት የጂፒጂ ቁልፍ ፋይል አይደለም ወይም የተበከለ ነው"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:488
+=======
+#: ../aptdaemon/enums.py:222
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The selected key couldn't be removed. Check that you provided a valid "
 "fingerprint."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:490
+=======
+#: ../aptdaemon/enums.py:224
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are currently running another software management tool, e.g. "
 "Synaptic or aptitude. Only one tool is allowed to make changes at a time."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:493
+=======
+#: ../aptdaemon/enums.py:228
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This is a serious problem. Try again later. If this problem appears again, "
 "please report an error to the developers."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:496
+=======
+#: ../aptdaemon/enums.py:231
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check the spelling of the package name, and that the appropriate repository "
 "is enabled."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:498
+=======
+#: ../aptdaemon/enums.py:233
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an update."
 msgstr "ማሻሻል አይስፈልጎትም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:499
+=======
+#: ../aptdaemon/enums.py:234
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an installation"
 msgstr "መግጠም አይስፈልጎትም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:501
+=======
+#: ../aptdaemon/enums.py:236
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for a removal."
 msgstr "ማስወገድ አይስፈልጎትም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:502
+=======
+#: ../aptdaemon/enums.py:237
+>>>>>>> MERGE-SOURCE
 msgid ""
 "You requested to remove a package which is an essential part of your system."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:505
+=======
+#: ../aptdaemon/enums.py:240
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The connection to the daemon was lost. Most likely the background daemon "
 "crashed."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:507
+=======
+#: ../aptdaemon/enums.py:242
+>>>>>>> MERGE-SOURCE
 msgid "The installation or removal of a software package failed."
+<<<<<<< TREE
 msgstr "የሶፍትዌር ጥቅል መግጠም ወይም ማስወገድ ወድቋል"
 
 #: ../aptdaemon/enums.py:509
@@ -671,8 +957,18 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:514
+=======
+msgstr "የሶፍትዌር ጥቅል መግጠም ወይም ማስወገድ ወድቋል"
+
+#: ../aptdaemon/enums.py:244
+msgid "This should not happen."
+msgstr "ይህ መሆን የለበትም"
+
+#: ../aptdaemon/enums.py:245
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This error could be caused by required additional software packages which "
+<<<<<<< TREE
 "are missing or not installable. Furthermore there could be a conflict "
 "between software packages which are not allowed to be installed at the same "
 "time."
@@ -732,67 +1028,150 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:563
+=======
+"are missing or not installable. Futhermore there could be a conflict between "
+"software packages which are not allowed to be installed at the same time."
+msgstr ""
+
+#: ../aptdaemon/enums.py:251
+msgid ""
+"The action would require the installation of packages from not authenticated "
+"sources."
+msgstr ""
+
+#: ../aptdaemon/enums.py:254
+msgid ""
+"The installation could have failed because of an error in the corresponding "
+"software package or it was cancelled in an unfriendly way. You have to "
+"repair this before you can install or remove any further software."
+msgstr ""
+
+#: ../aptdaemon/enums.py:269
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download package files"
 msgstr "የጥቅል ፋይሎችን ማውረድ ወድቋል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:564
+=======
+#: ../aptdaemon/enums.py:270
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download repository information"
 msgstr "የማስቀመጫ መረጃ ማውረድ ወድቋል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:565
+=======
+#: ../aptdaemon/enums.py:271
+>>>>>>> MERGE-SOURCE
 msgid "Package dependencies cannot be resolved"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:566
+=======
+#: ../aptdaemon/enums.py:272
+>>>>>>> MERGE-SOURCE
 msgid "The package system is broken"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:567
+=======
+#: ../aptdaemon/enums.py:273
+>>>>>>> MERGE-SOURCE
 msgid "Key was not installed"
 msgstr "ቁልፍ አልተገጠመም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:568
+=======
+#: ../aptdaemon/enums.py:274
+>>>>>>> MERGE-SOURCE
 msgid "Key was not removed"
 msgstr "ቅልፍ አልተወገደም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:569
+=======
+#: ../aptdaemon/enums.py:275
+>>>>>>> MERGE-SOURCE
 msgid "Failed to lock the package manager"
 msgstr "የጥቅል አስተዳዳሪውን መቆለፍ ወድቋል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:570
+=======
+#: ../aptdaemon/enums.py:276
+>>>>>>> MERGE-SOURCE
 msgid "Failed to load the package list"
 msgstr "የጥቅል ዝርዝር መጫን ወድቋል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:571
+=======
+#: ../aptdaemon/enums.py:277
+>>>>>>> MERGE-SOURCE
 msgid "Package does not exist"
 msgstr "ጥቅሉ አልተገኘም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:572
 msgid "Package is already up to date"
 msgstr ""
+=======
+#: ../aptdaemon/enums.py:278
+msgid "Package is already up-to-date"
+msgstr "ጥቅሉ ዘመናዊ ነው"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:573
+=======
+#: ../aptdaemon/enums.py:279
+>>>>>>> MERGE-SOURCE
 msgid "Package is already installed"
 msgstr "ጥቅሉ ቀደም ብሎ ተገጥሟል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:574
+=======
+#: ../aptdaemon/enums.py:280
+>>>>>>> MERGE-SOURCE
 msgid "Package isn't installed"
 msgstr "ጥቅሉ አልተገጠመም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:575
+=======
+#: ../aptdaemon/enums.py:281
+>>>>>>> MERGE-SOURCE
 msgid "Failed to remove essential system package"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:577
+=======
+#: ../aptdaemon/enums.py:283
+>>>>>>> MERGE-SOURCE
 msgid "Task cannot be monitored or controlled"
 msgstr "ስራዎቹን መመልከት ወይም መቆጣጠር አልተቻለም"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:578
+=======
+#: ../aptdaemon/enums.py:284
+>>>>>>> MERGE-SOURCE
 msgid "Package operation failed"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:579
+=======
+#: ../aptdaemon/enums.py:285
+>>>>>>> MERGE-SOURCE
 msgid "Requires installation of untrusted packages"
+<<<<<<< TREE
 msgstr "ያልታመኑ ጥቅሎችን መግጠም ያስፈልጋል"
 
 #: ../aptdaemon/enums.py:581
@@ -836,53 +1215,113 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:603
+=======
+msgstr "ያልታመኑ ጥቅሎችን መግጠም ያስፈልጋል"
+
+#: ../aptdaemon/enums.py:287
+msgid "Previous installation hasn't been completed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:288
+msgid "An unknown error occurred"
+msgstr "ያልታወቀ ስህተት ተፈጥሯል"
+
+#: ../aptdaemon/enums.py:298
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for service to start"
 msgstr "ግልጋሎቱን ለመጀመር በመጠበቅ ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:605
 msgid "Waiting"
 msgstr ""
+=======
+#: ../aptdaemon/enums.py:299
+msgid "Waiting"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:606
+=======
+#: ../aptdaemon/enums.py:300
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for required medium"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:607
+=======
+#: ../aptdaemon/enums.py:301
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for other software managers to quit"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:608
+=======
+#: ../aptdaemon/enums.py:302
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for configuration file prompt"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:610
+=======
+#: ../aptdaemon/enums.py:304
+>>>>>>> MERGE-SOURCE
 msgid "Running task"
 msgstr "ስራዎችን በማስኬድ ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:611
+=======
+#: ../aptdaemon/enums.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Downloading"
 msgstr "በማውረድ ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:612
 msgid "Querying software sources"
 msgstr ""
 
 #: ../aptdaemon/enums.py:613
+=======
+#: ../aptdaemon/enums.py:306
+>>>>>>> MERGE-SOURCE
 msgid "Cleaning up"
 msgstr "በማጽዳት ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:616
+=======
+#: ../aptdaemon/enums.py:307
+msgid "Resolving dependencies"
+msgstr ""
+
+#: ../aptdaemon/enums.py:309
+>>>>>>> MERGE-SOURCE
 msgid "Finished"
 msgstr "ጨርሷል"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:617
+=======
+#: ../aptdaemon/enums.py:310
+>>>>>>> MERGE-SOURCE
 msgid "Cancelling"
 msgstr "በመሰረዝ ላይ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:618
+=======
+#: ../aptdaemon/enums.py:311
+>>>>>>> MERGE-SOURCE
 msgid "Loading software list"
 msgstr "የሶፍትዌር ዝርዝሮችን በመጫን ላይ"
 
+<<<<<<< TREE
 #. TRANSLATORS: %s is the name of a package
 #: ../aptdaemon/enums.py:635
 #, python-format
@@ -999,6 +1438,19 @@
 msgstr ""
 
 #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318
+=======
+#: ../aptdaemon/gtkwidgets.py:290
+#, python-format
+msgid "Downloaded %sB of %sB at %sB/s"
+msgstr "ወርዷል %sB of %sB at %sB/s"
+
+#: ../aptdaemon/gtkwidgets.py:295
+#, python-format
+msgid "Downloaded %sB of %sB"
+msgstr "ወርዷል %sB of %sB"
+
+#: ../aptdaemon/gtkwidgets.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "ዝርዝሮች"
 
@@ -1021,16 +1473,25 @@
 msgstr ""
 
 #. TRANSLATORS: %s represents the name of a CD or DVD
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:770 ../aptdaemon/gtk3widgets.py:818
+=======
+#: ../aptdaemon/gtkwidgets.py:620
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "CD/DVD '%s' is required"
 msgstr "ሲዲ/ዲቪዲ '%s' ያስፈልጋል"
 
 #. TRANSLATORS: %s is the name of the CD/DVD drive
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820
+=======
+#: ../aptdaemon/gtkwidgets.py:622
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid ""
 "Please insert the above CD/DVD into the drive '%s' to install software "
+<<<<<<< TREE
 "packages from it."
 msgstr ""
 
@@ -1145,14 +1606,50 @@
 msgstr "_ማስቀመጥ"
 
 #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035
+=======
+"packages from the medium."
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:626
+msgid "C_ontinue"
+msgstr ""
+
+#. TRANSLATORS: %s is a file path
+#: ../aptdaemon/gtkwidgets.py:640
+#, python-format
+msgid ""
+"Replace your changes in '%s' with a later version of the configuration file?"
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:642
+msgid ""
+"If you don't know why the file is there already, it is usually safe to "
+"replace it."
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:651
+msgid "_Changes"
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:654
+msgid "_Keep"
+msgstr "_ማስቀመጥ"
+
+#: ../aptdaemon/gtkwidgets.py:655
+>>>>>>> MERGE-SOURCE
 msgid "_Replace"
 msgstr "_መተካት"
 
 #. TRANSLATORS: expander label in the error dialog
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:1082 ../aptdaemon/gtk3widgets.py:1132
+=======
+#: ../aptdaemon/gtkwidgets.py:743
+>>>>>>> MERGE-SOURCE
 msgid "_Details"
 msgstr "_ዝርዝሮች"
 
+<<<<<<< TREE
 #. TRANSLATORS: %s is the name of a package manager
 #: ../aptdaemon/lock.py:179
 #, python-format
@@ -1417,3 +1914,58 @@
 #, python-format
 msgid "but %s is to be installed"
 msgstr ""
+=======
+#: ../aptdaemon/progress.py:41
+#, python-format
+msgid "Installing %s"
+msgstr "በመግጠም ላይ %s"
+
+#: ../aptdaemon/progress.py:42
+#, python-format
+msgid "Configuring %s"
+msgstr "በማዋቀር ላይ %s"
+
+#: ../aptdaemon/progress.py:43
+#, python-format
+msgid "Removing %s"
+msgstr "በማስወገድ ላይ %s"
+
+#: ../aptdaemon/progress.py:44
+#, python-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#: ../aptdaemon/progress.py:45
+#, python-format
+msgid "Purging %s"
+msgstr ""
+
+#: ../aptdaemon/progress.py:46
+#, python-format
+msgid "Upgrading %s"
+msgstr "በማሻሻል ላይ %s"
+
+#: ../aptdaemon/progress.py:142
+#, python-format
+msgid "Downloading %s"
+msgstr "በማውረድ ላይ %s"
+
+#~ msgid "Waiting for other tasks"
+#~ msgstr "ሌሎች ስራዎችን በመጠበቅ ላይ"
+
+#~ msgid "System is already up-to-date"
+#~ msgstr "ስርአቱ ዘመናዊ ነው"
+
+#~ msgid "There isn't any need for a system update"
+#~ msgstr "ስርአቱን ማሻሻል አያስፈልግም"
+
+#~ msgid "System is not up-to-date"
+#~ msgstr "ስርአቱ ዘመናዊ አይደለም"
+
+#, python-format
+#~ msgid "Configuration file '%s' changed"
+#~ msgstr "ማዋቀሪያ ፋይሉ '%s' ተቀይሯል"
+
+#~ msgid "Do you want to use the new version?"
+#~ msgstr "አዲሱን እትም መጠቀም ይፈልጋሉ?"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/ar.po'
--- po/ar.po	2013-03-10 00:01:34 +0000
+++ po/ar.po	2013-06-03 17:47:29 +0000
@@ -7,17 +7,28 @@
 msgstr ""
 "Project-Id-Version: aptdaemon\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-17 11:07+0000\n"
 "PO-Revision-Date: 2013-01-29 13:50+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2010-03-26 09:22+0000\n"
+"PO-Revision-Date: 2009-12-08 09:25+0000\n"
+"Last-Translator: Khaled Hosny <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "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"
 "X-Launchpad-Export-Date: 2013-03-09 23:28+0000\n"
 "X-Generator: Launchpad (build 16523)\n"
+=======
+"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:1
 msgid "List keys of trusted vendors"
@@ -40,33 +51,76 @@
 msgstr ""
 
 #: ../data/org.debian.apt.policy.in.h:6
+<<<<<<< TREE
 msgid "To change software settings, you need to authenticate."
 msgstr "لتغيير إعدادات البرنامج، تحتاج للاستيثاق."
-
+=======
+msgid "Authentication is required to repair broken installations"
+msgstr ""
+
+#: ../data/org.debian.apt.policy.in.h:7
+msgid "Authentication is required to upgrade software packages"
+msgstr ""
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:7
 msgid "Change software repository"
+=======
+#: ../data/org.debian.apt.policy.in.h:8
+msgid "Authentication is required to upgrade the system"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:8
 msgid "To change software repository settings, you need to authenticate."
 msgstr "لتغيير إعدادات مستودعات البرمجيات، تحتاج للاستيثاق."
-
+=======
 #: ../data/org.debian.apt.policy.in.h:9
+msgid "Cancel the task of another user"
+msgstr ""
+>>>>>>> MERGE-SOURCE
+
+#: ../data/org.debian.apt.policy.in.h:10
 msgid "Install package file"
 msgstr ""
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:10
 msgid "To install this package, you need to authenticate."
 msgstr "لتثبيت هذه الحزمة، تحتاج للاستيثاق."
+=======
+#: ../data/org.debian.apt.policy.in.h:11
+msgid "Install packages"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:11
 msgid "Update package information"
 msgstr "تحديث معلومات الحزم"
+=======
+#: ../data/org.debian.apt.policy.in.h:12
+msgid "Remove packages"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:12
 msgid "To update the software catalog, you need to authenticate."
 msgstr "لتحديث  فهرس البرمجيات, تحتاج للاستيثاق."
-
+=======
+#: ../data/org.debian.apt.policy.in.h:13
+msgid "Repair broken installations"
+msgstr ""
+
+#: ../data/org.debian.apt.policy.in.h:14
+msgid "Update package information"
+msgstr ""
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:13
 msgid "Install or remove packages"
 msgstr "تثبيت أو إزالة حزم"
@@ -124,7 +178,11 @@
 msgstr "لتثبيت البرمجيات المشتراة، تحتاج للاستيثاق."
 
 #: ../data/org.debian.apt.policy.in.h:44
+=======
+#: ../data/org.debian.apt.policy.in.h:15
+>>>>>>> MERGE-SOURCE
 msgid "Upgrade packages"
+<<<<<<< TREE
 msgstr "ترقية الحزم"
 
 #: ../data/org.debian.apt.policy.in.h:45
@@ -379,21 +437,39 @@
 msgstr "في انتظار الاستيثاق"
 
 #: ../aptdaemon/core.py:2188
+=======
+msgstr ""
+
+#: ../data/org.debian.apt.policy.in.h:16
+msgid "Upgrade system"
+msgstr ""
+
+#: ../aptdaemon/core.py:1237
+>>>>>>> MERGE-SOURCE
 msgid "Do not shutdown the daemon because of inactivity"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2193
 msgid "Do not load any plugins"
 msgstr ""
 
 #: ../aptdaemon/core.py:2197
+=======
+#: ../aptdaemon/core.py:1242
+>>>>>>> MERGE-SOURCE
 msgid "Show internal processing information"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2202
+=======
+#: ../aptdaemon/core.py:1246
+>>>>>>> MERGE-SOURCE
 msgid "Quit and replace an already running daemon"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2207
 msgid "Listen on the DBus session bus (Only required for testing"
 msgstr ""
@@ -403,49 +479,89 @@
 msgstr ""
 
 #: ../aptdaemon/core.py:2216
+=======
+#: ../aptdaemon/core.py:1250
+>>>>>>> MERGE-SOURCE
 msgid "Store profile stats in the specified file"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2221
 msgid "Do not make any changes to the system (Only of use to developers)"
 msgstr ""
 
 #: ../aptdaemon/enums.py:366
+=======
+#: ../aptdaemon/core.py:1254
+msgid "Do not make any changes to the system (Only of use to developers)"
+msgstr ""
+
+#: ../aptdaemon/enums.py:136
+>>>>>>> MERGE-SOURCE
 msgid "Installed file"
 msgstr "ملف مُثبّت"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:367
+=======
+#: ../aptdaemon/enums.py:137
+>>>>>>> MERGE-SOURCE
 msgid "Installed packages"
 msgstr "حزم مُثبّتة"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:368
+=======
+#: ../aptdaemon/enums.py:138
+>>>>>>> MERGE-SOURCE
 msgid "Added key from file"
 msgstr "أضف مفتاحا من ملف"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:369
+=======
+#: ../aptdaemon/enums.py:139
+>>>>>>> MERGE-SOURCE
 msgid "Updated cache"
 msgstr "حدّث الخبيئة"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:370
 msgid "Search done"
 msgstr ""
 
 #: ../aptdaemon/enums.py:371
+=======
+#: ../aptdaemon/enums.py:140
+>>>>>>> MERGE-SOURCE
 msgid "Removed trusted key"
 msgstr "احذف مفتاحا غير موثوق"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:372
+=======
+#: ../aptdaemon/enums.py:141
+>>>>>>> MERGE-SOURCE
 msgid "Removed packages"
 msgstr "حزم محذوفة"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:373
+=======
+#: ../aptdaemon/enums.py:142
+>>>>>>> MERGE-SOURCE
 msgid "Updated packages"
 msgstr "حزم مُحدّثة"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:374
+=======
+#: ../aptdaemon/enums.py:143
+>>>>>>> MERGE-SOURCE
 msgid "Upgraded system"
 msgstr "نظام مرقّى"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:375
 msgid "Applied changes"
 msgstr ""
@@ -475,51 +591,111 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:397
+=======
+#: ../aptdaemon/enums.py:144
+msgid "Applied changes"
+msgstr ""
+
+#: ../aptdaemon/enums.py:145
+msgid "Repaired incomplete installation"
+msgstr ""
+
+#: ../aptdaemon/enums.py:146
+msgid "Repaired broken dependencies"
+msgstr ""
+
+#: ../aptdaemon/enums.py:157
+>>>>>>> MERGE-SOURCE
 msgid "Successful"
 msgstr "ناجح"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:398
+=======
+#: ../aptdaemon/enums.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Canceled"
 msgstr "ملغى"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680
+=======
+#: ../aptdaemon/enums.py:159
+>>>>>>> MERGE-SOURCE
 msgid "Failed"
 msgstr "فشل"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:414
+=======
+#: ../aptdaemon/enums.py:169
+>>>>>>> MERGE-SOURCE
 msgid "Installing file"
 msgstr "يثبّت الملف"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:415
+=======
+#: ../aptdaemon/enums.py:170
+>>>>>>> MERGE-SOURCE
 msgid "Installing packages"
 msgstr "يثبّت الحزم"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:416
+=======
+#: ../aptdaemon/enums.py:171
+>>>>>>> MERGE-SOURCE
 msgid "Adding key from file"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:417
+=======
+#: ../aptdaemon/enums.py:172
+>>>>>>> MERGE-SOURCE
 msgid "Updating cache"
 msgstr "تحديث الخبيئة"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:418
+=======
+#: ../aptdaemon/enums.py:173
+>>>>>>> MERGE-SOURCE
 msgid "Removing trusted key"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:419
+=======
+#: ../aptdaemon/enums.py:174
+>>>>>>> MERGE-SOURCE
 msgid "Removing packages"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:420
+=======
+#: ../aptdaemon/enums.py:175
+>>>>>>> MERGE-SOURCE
 msgid "Updating packages"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:421
+=======
+#: ../aptdaemon/enums.py:176
+>>>>>>> MERGE-SOURCE
 msgid "Upgrading system"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615
+=======
+#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308
+>>>>>>> MERGE-SOURCE
 msgid "Applying changes"
+<<<<<<< TREE
 msgstr "يطبّق التغييرات"
 
 #: ../aptdaemon/enums.py:423
@@ -615,10 +791,71 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480
+=======
+msgstr ""
+
+#: ../aptdaemon/enums.py:178
+msgid "Repairing incomplete installation"
+msgstr ""
+
+#: ../aptdaemon/enums.py:179
+msgid "Repairing broken deps"
+msgstr ""
+
+#: ../aptdaemon/enums.py:190
+msgid "Installation of the package file failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:191
+msgid "Installation of software failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:192
+msgid "Adding the key to the list of trused software vendors failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:194
+msgid "Refreshing the software list failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:195
+msgid "Removing the vendor from the list of trusted ones failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:197
+msgid "Removing software failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:198
+msgid "Updating software failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:199
+msgid "Upgrading the system failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:200
+msgid "Applying software changes failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:201
+msgid "Repairing incomplete installation failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:202
+msgid "Repairing broken dependencies failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214
+>>>>>>> MERGE-SOURCE
 msgid "Check your Internet connection."
 msgstr "تفقّد اتصالك بالإنترنت."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:481
+=======
+#: ../aptdaemon/enums.py:215
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are using third party repositories. If so disable them, since "
 "they are a common source of problems.\n"
@@ -628,17 +865,29 @@
 "تعتبر مصدر شائع للأخطاء.\n"
 "علاوة على ذلك قم بتنفيذ الأمر التالي في الطرفية: apt-get install -f"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:486
+=======
+#: ../aptdaemon/enums.py:220
+>>>>>>> MERGE-SOURCE
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:488
+=======
+#: ../aptdaemon/enums.py:222
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The selected key couldn't be removed. Check that you provided a valid "
 "fingerprint."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:490
+=======
+#: ../aptdaemon/enums.py:224
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are currently running another software management tool, e.g. "
 "Synaptic or aptitude. Only one tool is allowed to make changes at a time."
@@ -646,44 +895,77 @@
 "تحقق مما إذا كان هناك برنامج إدارة برمجيات آخر يعمل (مثل: Synaptic أو "
 "aptitude). يُسمح لبرنامج إدارة برمجيات واحد فقط بإجراء تغييرات في نفس الوقت."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:493
+=======
+#: ../aptdaemon/enums.py:228
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This is a serious problem. Try again later. If this problem appears again, "
 "please report an error to the developers."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:496
+=======
+#: ../aptdaemon/enums.py:231
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check the spelling of the package name, and that the appropriate repository "
 "is enabled."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:498
+=======
+#: ../aptdaemon/enums.py:233
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an update."
 msgstr "ليس هناك أي حاجة للتحديث."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:499
+=======
+#: ../aptdaemon/enums.py:234
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an installation"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:501
+=======
+#: ../aptdaemon/enums.py:236
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for a removal."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:502
+=======
+#: ../aptdaemon/enums.py:237
+>>>>>>> MERGE-SOURCE
 msgid ""
 "You requested to remove a package which is an essential part of your system."
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:505
+=======
+#: ../aptdaemon/enums.py:240
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The connection to the daemon was lost. Most likely the background daemon "
 "crashed."
 msgstr ""
 "فُقد الاتصال بالعفريت. على الأرجح فإن العفريت الذي يعمل في الخلفية قد انهار."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:507
+=======
+#: ../aptdaemon/enums.py:242
+>>>>>>> MERGE-SOURCE
 msgid "The installation or removal of a software package failed."
+<<<<<<< TREE
 msgstr "فشل التثبيت أو الإزالة لحزمة برمجية."
 
 #: ../aptdaemon/enums.py:509
@@ -700,8 +982,18 @@
 "البرمجيات، وأداء مهام أخرى ذات صلة بإدارة الحزم."
 
 #: ../aptdaemon/enums.py:514
+=======
+msgstr ""
+
+#: ../aptdaemon/enums.py:244
+msgid "This should not happen."
+msgstr ""
+
+#: ../aptdaemon/enums.py:245
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This error could be caused by required additional software packages which "
+<<<<<<< TREE
 "are missing or not installable. Furthermore there could be a conflict "
 "between software packages which are not allowed to be installed at the same "
 "time."
@@ -766,67 +1058,149 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:563
+=======
+"are missing or not installable. Futhermore there could be a conflict between "
+"software packages which are not allowed to be installed at the same time."
+msgstr ""
+
+#: ../aptdaemon/enums.py:251
+msgid ""
+"The action would require the installation of packages from not authenticated "
+"sources."
+msgstr ""
+
+#: ../aptdaemon/enums.py:254
+msgid ""
+"The installation could have failed because of an error in the corresponding "
+"software package or it was cancelled in an unfriendly way. You have to "
+"repair this before you can install or remove any further software."
+msgstr ""
+
+#: ../aptdaemon/enums.py:269
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download package files"
 msgstr "فشل في تنزيل ملفات الحزم"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:564
+=======
+#: ../aptdaemon/enums.py:270
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download repository information"
 msgstr "فشل في تنزيل معلومات المستودع"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:565
+=======
+#: ../aptdaemon/enums.py:271
+>>>>>>> MERGE-SOURCE
 msgid "Package dependencies cannot be resolved"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:566
+=======
+#: ../aptdaemon/enums.py:272
+>>>>>>> MERGE-SOURCE
 msgid "The package system is broken"
 msgstr "حزمة النظام معطوبة"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:567
+=======
+#: ../aptdaemon/enums.py:273
+>>>>>>> MERGE-SOURCE
 msgid "Key was not installed"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:568
+=======
+#: ../aptdaemon/enums.py:274
+>>>>>>> MERGE-SOURCE
 msgid "Key was not removed"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:569
+=======
+#: ../aptdaemon/enums.py:275
+>>>>>>> MERGE-SOURCE
 msgid "Failed to lock the package manager"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:570
+=======
+#: ../aptdaemon/enums.py:276
+>>>>>>> MERGE-SOURCE
 msgid "Failed to load the package list"
 msgstr "فشل في تحميل قائمة الحزم"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:571
+=======
+#: ../aptdaemon/enums.py:277
+>>>>>>> MERGE-SOURCE
 msgid "Package does not exist"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:572
 msgid "Package is already up to date"
+=======
+#: ../aptdaemon/enums.py:278
+msgid "Package is already up-to-date"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:573
+=======
+#: ../aptdaemon/enums.py:279
+>>>>>>> MERGE-SOURCE
 msgid "Package is already installed"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:574
+=======
+#: ../aptdaemon/enums.py:280
+>>>>>>> MERGE-SOURCE
 msgid "Package isn't installed"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:575
+=======
+#: ../aptdaemon/enums.py:281
+>>>>>>> MERGE-SOURCE
 msgid "Failed to remove essential system package"
 msgstr "فشل في إزالة حزم نظام أساسية"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:577
+=======
+#: ../aptdaemon/enums.py:283
+>>>>>>> MERGE-SOURCE
 msgid "Task cannot be monitored or controlled"
 msgstr "تعذّر رصد المهمة أو التحكم بها"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:578
+=======
+#: ../aptdaemon/enums.py:284
+>>>>>>> MERGE-SOURCE
 msgid "Package operation failed"
 msgstr "فشل عملية حزمة"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:579
+=======
+#: ../aptdaemon/enums.py:285
+>>>>>>> MERGE-SOURCE
 msgid "Requires installation of untrusted packages"
+<<<<<<< TREE
 msgstr "يتطلب تثبيت حزم غير موثوقة"
 
 #: ../aptdaemon/enums.py:581
@@ -870,7 +1244,21 @@
 msgstr "حدث خطأ لا يمكن التعامل معه"
 
 #: ../aptdaemon/enums.py:603
+=======
+msgstr ""
+
+#: ../aptdaemon/enums.py:287
+msgid "Previous installation hasn't been completed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:288
+msgid "An unknown error occurred"
+msgstr ""
+
+#: ../aptdaemon/enums.py:298
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for service to start"
+<<<<<<< TREE
 msgstr "في انتظار بدء الخدمة"
 
 #: ../aptdaemon/enums.py:605
@@ -878,23 +1266,49 @@
 msgstr "ينتظر"
 
 #: ../aptdaemon/enums.py:606
+=======
+msgstr ""
+
+#: ../aptdaemon/enums.py:299
+msgid "Waiting"
+msgstr ""
+
+#: ../aptdaemon/enums.py:300
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for required medium"
 msgstr "في انتظار الوسيط المطلوب"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:607
+=======
+#: ../aptdaemon/enums.py:301
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for other software managers to quit"
 msgstr "في انتظار مديرو البرمجيات الأخرى حتى تنتهي"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:608
+=======
+#: ../aptdaemon/enums.py:302
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for configuration file prompt"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:610
+=======
+#: ../aptdaemon/enums.py:304
+>>>>>>> MERGE-SOURCE
 msgid "Running task"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:611
+=======
+#: ../aptdaemon/enums.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Downloading"
+<<<<<<< TREE
 msgstr "ينزّل"
 
 #: ../aptdaemon/enums.py:612
@@ -902,19 +1316,41 @@
 msgstr "يستعلم عن مصادر البرمجيات"
 
 #: ../aptdaemon/enums.py:613
+=======
+msgstr ""
+
+#: ../aptdaemon/enums.py:306
+>>>>>>> MERGE-SOURCE
 msgid "Cleaning up"
 msgstr ""
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:616
+=======
+#: ../aptdaemon/enums.py:307
+msgid "Resolving dependencies"
+msgstr ""
+
+#: ../aptdaemon/enums.py:309
+>>>>>>> MERGE-SOURCE
 msgid "Finished"
 msgstr "انتهى"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:617
+=======
+#: ../aptdaemon/enums.py:310
+>>>>>>> MERGE-SOURCE
 msgid "Cancelling"
 msgstr "يلغي"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:618
+=======
+#: ../aptdaemon/enums.py:311
+>>>>>>> MERGE-SOURCE
 msgid "Loading software list"
+<<<<<<< TREE
 msgstr "يحمّل قائمة البرمجيات"
 
 #. TRANSLATORS: %s is the name of a package
@@ -1033,6 +1469,21 @@
 msgstr ""
 
 #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318
+=======
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:290
+#, python-format
+msgid "Downloaded %sB of %sB at %sB/s"
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:295
+#, python-format
+msgid "Downloaded %sB of %sB"
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "تفاصيل"
 
@@ -1055,16 +1506,25 @@
 msgstr ""
 
 #. TRANSLATORS: %s represents the name of a CD or DVD
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:770 ../aptdaemon/gtk3widgets.py:818
+=======
+#: ../aptdaemon/gtkwidgets.py:620
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "CD/DVD '%s' is required"
 msgstr ""
 
 #. TRANSLATORS: %s is the name of the CD/DVD drive
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820
+=======
+#: ../aptdaemon/gtkwidgets.py:622
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid ""
 "Please insert the above CD/DVD into the drive '%s' to install software "
+<<<<<<< TREE
 "packages from it."
 msgstr ""
 
@@ -1179,11 +1639,46 @@
 msgstr ""
 
 #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035
+=======
+"packages from the medium."
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:626
+msgid "C_ontinue"
+msgstr ""
+
+#. TRANSLATORS: %s is a file path
+#: ../aptdaemon/gtkwidgets.py:640
+#, python-format
+msgid ""
+"Replace your changes in '%s' with a later version of the configuration file?"
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:642
+msgid ""
+"If you don't know why the file is there already, it is usually safe to "
+"replace it."
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:651
+msgid "_Changes"
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:654
+msgid "_Keep"
+msgstr ""
+
+#: ../aptdaemon/gtkwidgets.py:655
+>>>>>>> MERGE-SOURCE
 msgid "_Replace"
 msgstr ""
 
 #. TRANSLATORS: expander label in the error dialog
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:1082 ../aptdaemon/gtk3widgets.py:1132
+=======
+#: ../aptdaemon/gtkwidgets.py:743
+>>>>>>> MERGE-SOURCE
 msgid "_Details"
 msgstr "_تفاصيل"
 

=== modified file 'po/ast.po'
--- po/ast.po	2013-03-10 00:01:34 +0000
+++ po/ast.po	2013-06-03 17:47:29 +0000
@@ -7,16 +7,27 @@
 msgstr ""
 "Project-Id-Version: aptdaemon\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-17 11:07+0000\n"
 "PO-Revision-Date: 2013-02-02 12:54+0000\n"
 "Last-Translator: ivarela <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2010-03-26 09:22+0000\n"
+"PO-Revision-Date: 2010-03-29 11:59+0000\n"
+"Last-Translator: Iñigo Varela <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Asturian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Launchpad-Export-Date: 2013-03-09 23:28+0000\n"
 "X-Generator: Launchpad (build 16523)\n"
+=======
+"X-Launchpad-Export-Date: 2010-03-31 05:36+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:1
 msgid "List keys of trusted vendors"
@@ -40,31 +51,71 @@
 msgstr "Camudar la configuración del software"
 
 #: ../data/org.debian.apt.policy.in.h:6
+<<<<<<< TREE
 msgid "To change software settings, you need to authenticate."
 msgstr "Pa camudar la configuración del software, necesites autenticate."
-
+=======
+msgid "Authentication is required to repair broken installations"
+msgstr "Requierse autenticación pa poder iguar instalaciones frañaes"
+
+#: ../data/org.debian.apt.policy.in.h:7
+msgid "Authentication is required to upgrade software packages"
+msgstr "Necesítase autentificación pa anovar paquetes de software"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:7
 msgid "Change software repository"
 msgstr "Camudar repositoriu de software"
+=======
+#: ../data/org.debian.apt.policy.in.h:8
+msgid "Authentication is required to upgrade the system"
+msgstr "Necesítase autentificación pa anovar el sistema"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:8
 msgid "To change software repository settings, you need to authenticate."
 msgstr ""
 "Pa camudar les preferencies de los repositorios de software, tienes "
 "d'autentificate."
-
+=======
 #: ../data/org.debian.apt.policy.in.h:9
+msgid "Cancel the task of another user"
+msgstr "Encaboxar la xera d'otru usuariu"
+>>>>>>> MERGE-SOURCE
+
+#: ../data/org.debian.apt.policy.in.h:10
 msgid "Install package file"
 msgstr "Instalar ficheru de paquete"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:10
 msgid "To install this package, you need to authenticate."
 msgstr "Pa instalar esti paquete, necesites autenticate"
-
-#: ../data/org.debian.apt.policy.in.h:11
+=======
+#: ../data/org.debian.apt.policy.in.h:11
+msgid "Install packages"
+msgstr "Instalar paquetes"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
+#: ../data/org.debian.apt.policy.in.h:11
+=======
+#: ../data/org.debian.apt.policy.in.h:12
+msgid "Remove packages"
+msgstr "Desinstalar paquetes"
+
+#: ../data/org.debian.apt.policy.in.h:13
+msgid "Repair broken installations"
+msgstr "Iguar instalaciones frañaes"
+
+#: ../data/org.debian.apt.policy.in.h:14
+>>>>>>> MERGE-SOURCE
 msgid "Update package information"
 msgstr "Anovar información de paquetes"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:12
 msgid "To update the software catalog, you need to authenticate."
 msgstr "Pa instalar el catálogu de software, necesites autenticate"
@@ -128,9 +179,13 @@
 msgstr "Pa instalar software mercáu, necesites identificate."
 
 #: ../data/org.debian.apt.policy.in.h:44
+=======
+#: ../data/org.debian.apt.policy.in.h:15
+>>>>>>> MERGE-SOURCE
 msgid "Upgrade packages"
 msgstr "Anovar paquetes"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:45
 msgid "To install updated software, you need to authenticate."
 msgstr "Pa instalar software anováu, necesites autenticate"
@@ -377,21 +432,37 @@
 msgstr "Esperando por autentificación"
 
 #: ../aptdaemon/core.py:2188
+=======
+#: ../data/org.debian.apt.policy.in.h:16
+msgid "Upgrade system"
+msgstr "Anovar sistema"
+
+#: ../aptdaemon/core.py:1237
+>>>>>>> MERGE-SOURCE
 msgid "Do not shutdown the daemon because of inactivity"
 msgstr "Nun parar el degorriu en casu d'inactividá"
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2193
 msgid "Do not load any plugins"
 msgstr "Nun cargar complementos"
 
 #: ../aptdaemon/core.py:2197
+=======
+#: ../aptdaemon/core.py:1242
+>>>>>>> MERGE-SOURCE
 msgid "Show internal processing information"
 msgstr "Amosar información del procesamientu internu"
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2202
+=======
+#: ../aptdaemon/core.py:1246
+>>>>>>> MERGE-SOURCE
 msgid "Quit and replace an already running daemon"
 msgstr "Salir y camudar un degorriu que yá tea executándose"
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2207
 msgid "Listen on the DBus session bus (Only required for testing"
 msgstr "Escuchar nel bus de sesión de DBus (necesariu namái pa pruebes"
@@ -401,53 +472,97 @@
 msgstr "Fai operaciones nel chroot dau"
 
 #: ../aptdaemon/core.py:2216
+=======
+#: ../aptdaemon/core.py:1250
+>>>>>>> MERGE-SOURCE
 msgid "Store profile stats in the specified file"
 msgstr "Guardar estadístiques de perfil nel ficheru especificáu"
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2221
 msgid "Do not make any changes to the system (Only of use to developers)"
 msgstr "Nun facer cambeos al sistema (Namái pa usu de desendolcadores)"
 
 #: ../aptdaemon/enums.py:366
+=======
+#: ../aptdaemon/core.py:1254
+msgid "Do not make any changes to the system (Only of use to developers)"
+msgstr "Nun facer cambeos al sistema (Namái pa usu de desendolcadores)"
+
+#: ../aptdaemon/enums.py:136
+>>>>>>> MERGE-SOURCE
 msgid "Installed file"
 msgstr "Ficheru instaláu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:367
+=======
+#: ../aptdaemon/enums.py:137
+>>>>>>> MERGE-SOURCE
 msgid "Installed packages"
 msgstr "Paquetes instalaos"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:368
+=======
+#: ../aptdaemon/enums.py:138
+>>>>>>> MERGE-SOURCE
 msgid "Added key from file"
 msgstr "Clave amestada dende ficheru"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:369
+=======
+#: ../aptdaemon/enums.py:139
+>>>>>>> MERGE-SOURCE
 msgid "Updated cache"
 msgstr "Caché anovada"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:370
 msgid "Search done"
 msgstr "Gueta fecha"
 
 #: ../aptdaemon/enums.py:371
+=======
+#: ../aptdaemon/enums.py:140
+>>>>>>> MERGE-SOURCE
 msgid "Removed trusted key"
 msgstr "Clave de confianza desaniciada"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:372
+=======
+#: ../aptdaemon/enums.py:141
+>>>>>>> MERGE-SOURCE
 msgid "Removed packages"
 msgstr "Paquetes desaniciaos"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:373
+=======
+#: ../aptdaemon/enums.py:142
+>>>>>>> MERGE-SOURCE
 msgid "Updated packages"
 msgstr "Paquetes anovaos"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:374
+=======
+#: ../aptdaemon/enums.py:143
+>>>>>>> MERGE-SOURCE
 msgid "Upgraded system"
 msgstr "Sistema anováu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:375
+=======
+#: ../aptdaemon/enums.py:144
+>>>>>>> MERGE-SOURCE
 msgid "Applied changes"
 msgstr "Cambeos aplicaos"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:376
 msgid "Repaired incomplete installation"
 msgstr "Instalación incompleta iguada"
@@ -473,53 +588,109 @@
 msgstr "Reconfiguráronse los paquetes instalaos"
 
 #: ../aptdaemon/enums.py:397
+=======
+#: ../aptdaemon/enums.py:145
+msgid "Repaired incomplete installation"
+msgstr "Instalación incompleta iguada"
+
+#: ../aptdaemon/enums.py:146
+msgid "Repaired broken dependencies"
+msgstr "Dependencies frañaes iguaes"
+
+#: ../aptdaemon/enums.py:157
+>>>>>>> MERGE-SOURCE
 msgid "Successful"
 msgstr "Completáu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:398
+=======
+#: ../aptdaemon/enums.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Canceled"
 msgstr "Encaboxáu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680
+=======
+#: ../aptdaemon/enums.py:159
+>>>>>>> MERGE-SOURCE
 msgid "Failed"
 msgstr "Falló"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:414
+=======
+#: ../aptdaemon/enums.py:169
+>>>>>>> MERGE-SOURCE
 msgid "Installing file"
 msgstr "Instalando ficheru"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:415
+=======
+#: ../aptdaemon/enums.py:170
+>>>>>>> MERGE-SOURCE
 msgid "Installing packages"
 msgstr "Instalando paquetes"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:416
+=======
+#: ../aptdaemon/enums.py:171
+>>>>>>> MERGE-SOURCE
 msgid "Adding key from file"
 msgstr "Amestando clave dende ficheru"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:417
+=======
+#: ../aptdaemon/enums.py:172
+>>>>>>> MERGE-SOURCE
 msgid "Updating cache"
 msgstr "Anovando caché"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:418
+=======
+#: ../aptdaemon/enums.py:173
+>>>>>>> MERGE-SOURCE
 msgid "Removing trusted key"
 msgstr "Desaniciando clave de confianza"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:419
+=======
+#: ../aptdaemon/enums.py:174
+>>>>>>> MERGE-SOURCE
 msgid "Removing packages"
 msgstr "Desaniciando paquetes"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:420
+=======
+#: ../aptdaemon/enums.py:175
+>>>>>>> MERGE-SOURCE
 msgid "Updating packages"
 msgstr "Anovando paquetes"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:421
+=======
+#: ../aptdaemon/enums.py:176
+>>>>>>> MERGE-SOURCE
 msgid "Upgrading system"
 msgstr "Anovando sistema"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615
+=======
+#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308
+>>>>>>> MERGE-SOURCE
 msgid "Applying changes"
 msgstr "Aplicando cambeos"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:423
 msgid "Repairing incomplete installation"
 msgstr "Iguando instalación incompleta"
@@ -614,10 +785,71 @@
 msgstr "Amestando clave de llicencia"
 
 #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480
+=======
+#: ../aptdaemon/enums.py:178
+msgid "Repairing incomplete installation"
+msgstr "Iguando instalación incompleta"
+
+#: ../aptdaemon/enums.py:179
+msgid "Repairing broken deps"
+msgstr "Iguando dependencies frañaes"
+
+#: ../aptdaemon/enums.py:190
+msgid "Installation of the package file failed"
+msgstr "Falló la instalación del ficheru de paquete"
+
+#: ../aptdaemon/enums.py:191
+msgid "Installation of software failed"
+msgstr "Falló la instalación de software"
+
+#: ../aptdaemon/enums.py:192
+msgid "Adding the key to the list of trused software vendors failed"
+msgstr ""
+"Hebo un fallu al amestar la clave a la llista de fornidores de software de "
+"confianza"
+
+#: ../aptdaemon/enums.py:194
+msgid "Refreshing the software list failed"
+msgstr "Falló l'anovamientu de la llista de software"
+
+#: ../aptdaemon/enums.py:195
+msgid "Removing the vendor from the list of trusted ones failed"
+msgstr "Hebo un fallu al desaniciar el fornidor de la llista de confianza"
+
+#: ../aptdaemon/enums.py:197
+msgid "Removing software failed"
+msgstr "Falló el desaniciu de software"
+
+#: ../aptdaemon/enums.py:198
+msgid "Updating software failed"
+msgstr "Falló l'anovamientu de software"
+
+#: ../aptdaemon/enums.py:199
+msgid "Upgrading the system failed"
+msgstr "Falló l'anovamientu del sistema"
+
+#: ../aptdaemon/enums.py:200
+msgid "Applying software changes failed"
+msgstr "Falló l'aplicación de cambeos de software"
+
+#: ../aptdaemon/enums.py:201
+msgid "Repairing incomplete installation failed"
+msgstr "Falló la igua de la instalación incompleta"
+
+#: ../aptdaemon/enums.py:202
+msgid "Repairing broken dependencies failed"
+msgstr "Falló la igua de les dependencies frañaes"
+
+#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214
+>>>>>>> MERGE-SOURCE
 msgid "Check your Internet connection."
 msgstr "Compruebe la so conexón a Internet."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:481
+=======
+#: ../aptdaemon/enums.py:215
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are using third party repositories. If so disable them, since "
 "they are a common source of problems.\n"
@@ -627,13 +859,21 @@
 "porque son fonte de problemes.\n"
 "Darréu, executa'l siguiente comandu nuna terminal: apt-get install -f"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:486
+=======
+#: ../aptdaemon/enums.py:220
+>>>>>>> MERGE-SOURCE
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "El ficheru esbilláu puede que nun seya una clave de ficheru GPG o puede que "
 "tea frañáu."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:488
+=======
+#: ../aptdaemon/enums.py:222
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The selected key couldn't be removed. Check that you provided a valid "
 "fingerprint."
@@ -641,7 +881,11 @@
 "La clave esbillada nun puede desaniciase. Comprueba que disti una buelga "
 "válida."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:490
+=======
+#: ../aptdaemon/enums.py:224
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are currently running another software management tool, e.g. "
 "Synaptic or aptitude. Only one tool is allowed to make changes at a time."
@@ -650,7 +894,11 @@
 "software, por exemplu Synaptic o aptitude. Namái puede usase una ferramienta "
 "cada vegada."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:493
+=======
+#: ../aptdaemon/enums.py:228
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This is a serious problem. Try again later. If this problem appears again, "
 "please report an error to the developers."
@@ -658,32 +906,56 @@
 "Esti ye un problema seriu. Inténtalo otra vegada más sero. Si'l problema "
 "sigui apareciendo, informa del fallu a los desendolcadores."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:496
+=======
+#: ../aptdaemon/enums.py:231
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check the spelling of the package name, and that the appropriate repository "
 "is enabled."
 msgstr ""
 "Verifica'l nome del paquete, y que'l repositoriu apropiáu ta activáu."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:498
+=======
+#: ../aptdaemon/enums.py:233
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an update."
 msgstr "Nun fai falta dengún anovamientu."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:499
+=======
+#: ../aptdaemon/enums.py:234
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an installation"
 msgstr "Nun hai necesidá d'anovar"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:501
+=======
+#: ../aptdaemon/enums.py:236
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for a removal."
 msgstr "Nun hai necesidá d'una desinstalación."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:502
+=======
+#: ../aptdaemon/enums.py:237
+>>>>>>> MERGE-SOURCE
 msgid ""
 "You requested to remove a package which is an essential part of your system."
 msgstr ""
 "Solicitasti desinstalar un paquete que ye parte esencial del sistema."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:505
+=======
+#: ../aptdaemon/enums.py:240
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The connection to the daemon was lost. Most likely the background daemon "
 "crashed."
@@ -691,10 +963,15 @@
 "Perdióse la conexón col degorriu. Dablemente'l degorriu de segundu planu "
 "dexó de furrular."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:507
+=======
+#: ../aptdaemon/enums.py:242
+>>>>>>> MERGE-SOURCE
 msgid "The installation or removal of a software package failed."
 msgstr "Falló al instalar o desinstalar un paquete de software."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:509
 msgid "The requested feature is not supported."
 msgstr "La carauterística solicitada nun ta permitida."
@@ -710,8 +987,16 @@
 "rellacionaes."
 
 #: ../aptdaemon/enums.py:514
+=======
+#: ../aptdaemon/enums.py:244
+msgid "This should not happen."
+msgstr "Esto nun tendría d'asoceder."
+
+#: ../aptdaemon/enums.py:245
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This error could be caused by required additional software packages which "
+<<<<<<< TREE
 "are missing or not installable. Furthermore there could be a conflict "
 "between software packages which are not allowed to be installed at the same "
 "time."
@@ -790,69 +1075,161 @@
 "sesión de PolicyKit"
 
 #: ../aptdaemon/enums.py:563
+=======
+"are missing or not installable. Futhermore there could be a conflict between "
+"software packages which are not allowed to be installed at the same time."
+msgstr ""
+"Dellos paquetes de software adicionales necesarios que falten o nun se "
+"pueden instalar pueden tar causando esti fallu. Amás, podría haber un "
+"conflictu entre los paquetes de software a los que nun se-yos permite "
+"instalase al tiempu."
+
+#: ../aptdaemon/enums.py:251
+msgid ""
+"The action would require the installation of packages from not authenticated "
+"sources."
+msgstr ""
+"La aición puede necesitar la instalación de paquetes de fontes ensin "
+"autenticar."
+
+#: ../aptdaemon/enums.py:254
+msgid ""
+"The installation could have failed because of an error in the corresponding "
+"software package or it was cancelled in an unfriendly way. You have to "
+"repair this before you can install or remove any further software."
+msgstr ""
+"La instalación pudo tener fallao por un fallu nos paquetes  correspondientes "
+"de software o encaboxóse d'un mou incorreutu. Tienes d'iguar esto enantes de "
+"poder instalar o desaniciar cualesquier otru software."
+
+#: ../aptdaemon/enums.py:269
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download package files"
 msgstr "Falló al descargar los ficheros de paquetes"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:564
+=======
+#: ../aptdaemon/enums.py:270
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download repository information"
 msgstr "Falló al descargar la información del repositoriu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:565
+=======
+#: ../aptdaemon/enums.py:271
+>>>>>>> MERGE-SOURCE
 msgid "Package dependencies cannot be resolved"
 msgstr "Les dependencies del paquete nun pudieron iguase"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:566
+=======
+#: ../aptdaemon/enums.py:272
+>>>>>>> MERGE-SOURCE
 msgid "The package system is broken"
 msgstr "El paquete de sistema ta frañáu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:567
+=======
+#: ../aptdaemon/enums.py:273
+>>>>>>> MERGE-SOURCE
 msgid "Key was not installed"
 msgstr "La clave nun s'instaló"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:568
+=======
+#: ../aptdaemon/enums.py:274
+>>>>>>> MERGE-SOURCE
 msgid "Key was not removed"
 msgstr "La clave nun se desanició"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:569
+=======
+#: ../aptdaemon/enums.py:275
+>>>>>>> MERGE-SOURCE
 msgid "Failed to lock the package manager"
 msgstr "Falló al bloquiar el xestor de paquetes"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:570
+=======
+#: ../aptdaemon/enums.py:276
+>>>>>>> MERGE-SOURCE
 msgid "Failed to load the package list"
 msgstr "Falló al cargar la llista de paquetes"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:571
+=======
+#: ../aptdaemon/enums.py:277
+>>>>>>> MERGE-SOURCE
 msgid "Package does not exist"
 msgstr "El paquete nun existe"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:572
 msgid "Package is already up to date"
 msgstr "El paquete yá ta anováu a la data"
+=======
+#: ../aptdaemon/enums.py:278
+msgid "Package is already up-to-date"
+msgstr "El paquete yá s'anovó"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:573
+=======
+#: ../aptdaemon/enums.py:279
+>>>>>>> MERGE-SOURCE
 msgid "Package is already installed"
 msgstr "El paquete yá ta instaláu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:574
+=======
+#: ../aptdaemon/enums.py:280
+>>>>>>> MERGE-SOURCE
 msgid "Package isn't installed"
 msgstr "El paquete nun s'instaló"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:575
+=======
+#: ../aptdaemon/enums.py:281
+>>>>>>> MERGE-SOURCE
 msgid "Failed to remove essential system package"
 msgstr "Falló al desinstalar un paquete esencial del sistema"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:577
+=======
+#: ../aptdaemon/enums.py:283
+>>>>>>> MERGE-SOURCE
 msgid "Task cannot be monitored or controlled"
 msgstr "La xera nun pudo monitorizase o controlase"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:578
+=======
+#: ../aptdaemon/enums.py:284
+>>>>>>> MERGE-SOURCE
 msgid "Package operation failed"
 msgstr "Falló la operación col paquete"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:579
+=======
+#: ../aptdaemon/enums.py:285
+>>>>>>> MERGE-SOURCE
 msgid "Requires installation of untrusted packages"
 msgstr "Requierse la instalación de paquetes non confiables"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:581
 msgid "Previous installation hasn't been completed"
 msgstr "Una instalación previa nun se completó"
@@ -894,53 +1271,111 @@
 msgstr "Hebo un fallu que nun puede remanase."
 
 #: ../aptdaemon/enums.py:603
+=======
+#: ../aptdaemon/enums.py:287
+msgid "Previous installation hasn't been completed"
+msgstr "Una instalación previa nun se completó"
+
+#: ../aptdaemon/enums.py:288
+msgid "An unknown error occurred"
+msgstr "Hebo un fallu desconocíu"
+
+#: ../aptdaemon/enums.py:298
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for service to start"
 msgstr "Esperando l'aniciu del serviciu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:605
 msgid "Waiting"
 msgstr "Aguardando"
+=======
+#: ../aptdaemon/enums.py:299
+msgid "Waiting"
+msgstr "Aguardando"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:606
+=======
+#: ../aptdaemon/enums.py:300
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for required medium"
 msgstr "Esperando'l soporte requeríu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:607
+=======
+#: ../aptdaemon/enums.py:301
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for other software managers to quit"
 msgstr "Esperando que los demás xestores de paquetes se zarren"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:608
+=======
+#: ../aptdaemon/enums.py:302
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for configuration file prompt"
 msgstr "Esperando la solicitú del ficheru de configuración"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:610
+=======
+#: ../aptdaemon/enums.py:304
+>>>>>>> MERGE-SOURCE
 msgid "Running task"
 msgstr "Executando xera"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:611
+=======
+#: ../aptdaemon/enums.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Downloading"
 msgstr "Baxando"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:612
 msgid "Querying software sources"
 msgstr "Consultando los oríxenes del software"
 
 #: ../aptdaemon/enums.py:613
+=======
+#: ../aptdaemon/enums.py:306
+>>>>>>> MERGE-SOURCE
 msgid "Cleaning up"
 msgstr "Llimpiando"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:616
+=======
+#: ../aptdaemon/enums.py:307
+msgid "Resolving dependencies"
+msgstr "Iguando dependencies"
+
+#: ../aptdaemon/enums.py:309
+>>>>>>> MERGE-SOURCE
 msgid "Finished"
 msgstr "Fináu"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:617
+=======
+#: ../aptdaemon/enums.py:310
+>>>>>>> MERGE-SOURCE
 msgid "Cancelling"
 msgstr "Encaboxando"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:618
+=======
+#: ../aptdaemon/enums.py:311
+>>>>>>> MERGE-SOURCE
 msgid "Loading software list"
 msgstr "Cargando la llista de software"
 
+<<<<<<< TREE
 #. TRANSLATORS: %s is the name of a package
 #: ../aptdaemon/enums.py:635
 #, python-format
@@ -1057,6 +1492,19 @@
 msgstr "La rede nun ta disponible"
 
 #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318
+=======
+#: ../aptdaemon/gtkwidgets.py:290
+#, python-format
+msgid "Downloaded %sB of %sB at %sB/s"
+msgstr "Descargando %sB de %sB a %sB/s"
+
+#: ../aptdaemon/gtkwidgets.py:295
+#, python-format
+msgid "Downloaded %sB of %sB"
+msgstr "Descargando %sB de %sB"
+
+#: ../aptdaemon/gtkwidgets.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "Detalles"
 
@@ -1079,16 +1527,25 @@
 msgstr "Descargáu"
 
 #. TRANSLATORS: %s represents the name of a CD or DVD
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:770 ../aptdaemon/gtk3widgets.py:818
+=======
+#: ../aptdaemon/gtkwidgets.py:620
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "CD/DVD '%s' is required"
 msgstr "Necesítase'l CD/DVD «%s»"
 
 #. TRANSLATORS: %s is the name of the CD/DVD drive
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820
+=======
+#: ../aptdaemon/gtkwidgets.py:622
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid ""
 "Please insert the above CD/DVD into the drive '%s' to install software "
+<<<<<<< TREE
 "packages from it."
 msgstr ""
 "Inxerta' CD/DVD na unidá '%s' pa instalar los paquetes de software dende él."
@@ -1207,14 +1664,55 @@
 msgstr "_Caltener"
 
 #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035
+=======
+"packages from the medium."
+msgstr ""
+"Meti'l CD/DVD anterior na unidá «%s» pa instalar paquetes de software "
+"dende'l sofitu."
+
+#: ../aptdaemon/gtkwidgets.py:626
+msgid "C_ontinue"
+msgstr "_Continuar"
+
+#. TRANSLATORS: %s is a file path
+#: ../aptdaemon/gtkwidgets.py:640
+#, python-format
+msgid ""
+"Replace your changes in '%s' with a later version of the configuration file?"
+msgstr ""
+"¿Trocar los tos cambeos en «%s» cola cabera versión del ficheru de "
+"configuración?"
+
+#: ../aptdaemon/gtkwidgets.py:642
+msgid ""
+"If you don't know why the file is there already, it is usually safe to "
+"replace it."
+msgstr ""
+"Si nun sabes por qué'l ficheru yá ta ellí, xeneralmente ye seguro trocalu."
+
+#: ../aptdaemon/gtkwidgets.py:651
+msgid "_Changes"
+msgstr "_Cambeos"
+
+#: ../aptdaemon/gtkwidgets.py:654
+msgid "_Keep"
+msgstr "_Caltener"
+
+#: ../aptdaemon/gtkwidgets.py:655
+>>>>>>> MERGE-SOURCE
 msgid "_Replace"
 msgstr "_Trocar"
 
 #. TRANSLATORS: expander label in the error dialog
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:1082 ../aptdaemon/gtk3widgets.py:1132
+=======
+#: ../aptdaemon/gtkwidgets.py:743
+>>>>>>> MERGE-SOURCE
 msgid "_Details"
 msgstr "_Detalles"
 
+<<<<<<< TREE
 #. TRANSLATORS: %s is the name of a package manager
 #: ../aptdaemon/lock.py:179
 #, python-format
@@ -1490,3 +1988,61 @@
 #~ msgstr ""
 #~ "Hebo un fallu al amestar la clave a la llista de fornidores de software de "
 #~ "confianza"
+=======
+#: ../aptdaemon/progress.py:41
+#, python-format
+msgid "Installing %s"
+msgstr "Instalando %s"
+
+#: ../aptdaemon/progress.py:42
+#, python-format
+msgid "Configuring %s"
+msgstr "Configurando %s"
+
+#: ../aptdaemon/progress.py:43
+#, python-format
+msgid "Removing %s"
+msgstr "Desaniciando %s"
+
+#: ../aptdaemon/progress.py:44
+#, python-format
+msgid "Running post-installation trigger %s"
+msgstr "Executando activador de post-instalación de %s"
+
+#: ../aptdaemon/progress.py:45
+#, python-format
+msgid "Purging %s"
+msgstr "Purgando %s"
+
+#: ../aptdaemon/progress.py:46
+#, python-format
+msgid "Upgrading %s"
+msgstr "Anovando %s"
+
+#: ../aptdaemon/progress.py:142
+#, python-format
+msgid "Downloading %s"
+msgstr "Descargando %s"
+
+#~ msgid "There isn't any need for a system update"
+#~ msgstr "Nun hai necesidá d'un anovamientu del sistema"
+
+#~ msgid "It was not possible to install the latest for all packages."
+#~ msgstr "Nun se pudo instalar lo último pa tolos paquetes."
+
+#~ msgid "Waiting for other tasks"
+#~ msgstr "Esperando a otres xeres"
+
+#~ msgid "System is already up-to-date"
+#~ msgstr "El sistema yá ta anováu"
+
+#~ msgid "System is not up-to-date"
+#~ msgstr "El sistema nun ta anováu"
+
+#, python-format
+#~ msgid "Configuration file '%s' changed"
+#~ msgstr "Cambióse'l ficheru de configuración «%s»"
+
+#~ msgid "Do you want to use the new version?"
+#~ msgstr "¿Quier usar la nueva versión?"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/be.po'
--- po/be.po	2013-03-10 00:01:34 +0000
+++ po/be.po	2013-06-03 17:47:29 +0000
@@ -7,67 +7,156 @@
 msgstr ""
 "Project-Id-Version: aptdaemon\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-17 11:07+0000\n"
 "PO-Revision-Date: 2012-04-14 16:03+0000\n"
 "Last-Translator: Mikhail_SaTuRn <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2010-03-26 09:22+0000\n"
+"PO-Revision-Date: 2010-02-24 20:29+0000\n"
+"Last-Translator: Mikola Tsekhan <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Belarusian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "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"
 "X-Launchpad-Export-Date: 2013-03-09 23:28+0000\n"
 "X-Generator: Launchpad (build 16523)\n"
+=======
+"X-Launchpad-Export-Date: 2010-03-31 05:36+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:1
+<<<<<<< TREE
 msgid "List keys of trusted vendors"
 msgstr "Спіс ключоў давераных пастаўшчыкоў"
+=======
+msgid ""
+"Authentication is required to cancel the package management taks of another "
+"user."
+msgstr ""
+"Для адмены задач кіраваньня пакетамі іншага карыстальніка патрэбна "
+"аўтарызацыя."
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:2
+<<<<<<< TREE
 msgid "To view the list of trusted keys, you need to authenticate."
 msgstr "Для прагляду спісу давераных ключоў патрабуецца аўтэнтыфікацыя."
+=======
+msgid "Authentication is required to install a local package file."
+msgstr "Для ўсталёўкі лякальнага пакета патрэбна аўтарызацыя."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:3 ../aptdaemon/console.py:612
 msgid "Remove downloaded package files"
 msgstr "Выдаліць файлы загружаных пакетаў"
+=======
+#: ../data/org.debian.apt.policy.in.h:3
+msgid "Authentication is required to install software packages"
+msgstr "Патрабуецца аўтарызацыя, каб усталяваць праграмнае забесьпячэньне"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:4
+<<<<<<< TREE
 msgid "To clean downloaded package files, you need to authenticate."
 msgstr "Вам неабходна аўтарызавацца для ачысткі файлаў загружаных пакетаў."
+=======
+msgid ""
+"Authentication is required to query the software repositories for "
+"installable packages"
+msgstr ""
+"Для запыта рэпазыторыя аб наяўнасьці ўсталёўваемых пакетаў патрабуецца "
+"аўтарызацыя."
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:5
+<<<<<<< TREE
 msgid "Change software configuration"
 msgstr "Змяніць сховішча з праграмамі"
+=======
+msgid "Authentication is required to remove software packages"
+msgstr "Патрабуецца аўтарызацыя, каб выдаліць праграмнае забесьпячэньне"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:6
+<<<<<<< TREE
 msgid "To change software settings, you need to authenticate."
 msgstr "Вам трэба аўтарызавацца для змены налад праграмнага забеспячэння."
-
+=======
+msgid "Authentication is required to repair broken installations"
+msgstr ""
+
+#: ../data/org.debian.apt.policy.in.h:7
+msgid "Authentication is required to upgrade software packages"
+msgstr "Патрабуецца аўтарызацыя, каб абнавіць праграмнае забесьпячэньне"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:7
 msgid "Change software repository"
 msgstr "Змяніць сховішча праграмнага забеспячэння"
+=======
+#: ../data/org.debian.apt.policy.in.h:8
+msgid "Authentication is required to upgrade the system"
+msgstr "Патрабуецца аўтарызацыя, каб абнавіць сыстэму"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:8
 msgid "To change software repository settings, you need to authenticate."
 msgstr "Каб змяніць налады сховішча, вы павінны аўтарызавацца."
-
+=======
 #: ../data/org.debian.apt.policy.in.h:9
+msgid "Cancel the task of another user"
+msgstr "Скасаваць заданьне іншага карыстальніка"
+>>>>>>> MERGE-SOURCE
+
+#: ../data/org.debian.apt.policy.in.h:10
 msgid "Install package file"
 msgstr "Усталёўка файла пакета"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:10
 msgid "To install this package, you need to authenticate."
 msgstr "Каб усталяваць гэты пакет, вы павінны аўтарызавацца."
+=======
+#: ../data/org.debian.apt.policy.in.h:11
+msgid "Install packages"
+msgstr "Усталяваць пакеты"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:11
 msgid "Update package information"
 msgstr "Абнаўленне інфармацыі аб пакетах"
+=======
+#: ../data/org.debian.apt.policy.in.h:12
+msgid "Remove packages"
+msgstr "Выдаліць пакеты"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:12
 msgid "To update the software catalog, you need to authenticate."
 msgstr ""
 "Для абнаўлення каталога праграмнага забеспячэння патрабуецца аўтэнтыфікацыя."
-
+=======
+#: ../data/org.debian.apt.policy.in.h:13
+msgid "Repair broken installations"
+msgstr ""
+
+#: ../data/org.debian.apt.policy.in.h:14
+msgid "Update package information"
+msgstr "Зьвесткі пра абнаўленьне"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:13
 msgid "Install or remove packages"
 msgstr "Усталяваць ці выдаліць пакеты"
@@ -127,7 +216,11 @@
 msgstr "Каб усталяваць набытыя праграмы, вы павінны аўтарызавацца."
 
 #: ../data/org.debian.apt.policy.in.h:44
+=======
+#: ../data/org.debian.apt.policy.in.h:15
+>>>>>>> MERGE-SOURCE
 msgid "Upgrade packages"
+<<<<<<< TREE
 msgstr "Абнаўленне пакетаў"
 
 #: ../data/org.debian.apt.policy.in.h:45
@@ -383,7 +476,17 @@
 msgstr "Чаканне на аўтэнтыфікацыю"
 
 #: ../aptdaemon/core.py:2188
+=======
+msgstr "Абнаўленьне пакетаў"
+
+#: ../data/org.debian.apt.policy.in.h:16
+msgid "Upgrade system"
+msgstr "Абнавіць сыстэму"
+
+#: ../aptdaemon/core.py:1237
+>>>>>>> MERGE-SOURCE
 msgid "Do not shutdown the daemon because of inactivity"
+<<<<<<< TREE
 msgstr "Не выключайце дэман з-за яго неактыўнасці"
 
 #: ../aptdaemon/core.py:2193
@@ -391,11 +494,25 @@
 msgstr "Не загружаць ніякія плагіны"
 
 #: ../aptdaemon/core.py:2197
+=======
+msgstr "Ня выключайце дэмана з-за яго неактыўнасьці"
+
+#: ../aptdaemon/core.py:1242
+>>>>>>> MERGE-SOURCE
 msgid "Show internal processing information"
+<<<<<<< TREE
 msgstr "Паказваць інфармацыю аб унутранай апрацоўцы"
+=======
+msgstr "Паказваць інфармацыю аб унутранай апрацоўке"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2202
+=======
+#: ../aptdaemon/core.py:1246
+>>>>>>> MERGE-SOURCE
 msgid "Quit and replace an already running daemon"
+<<<<<<< TREE
 msgstr "Выйсці і замяніць ужо запушчаны дэман"
 
 #: ../aptdaemon/core.py:2207
@@ -407,7 +524,13 @@
 msgstr "Праводзіць аперацыі ў дадзеным галоўным каталозе"
 
 #: ../aptdaemon/core.py:2216
+=======
+msgstr "Выйсьці і замяніць ужо запушчаны дэман"
+
+#: ../aptdaemon/core.py:1250
+>>>>>>> MERGE-SOURCE
 msgid "Store profile stats in the specified file"
+<<<<<<< TREE
 msgstr "Захоўваць статыстыку ў пазначаным файле"
 
 #: ../aptdaemon/core.py:2221
@@ -419,13 +542,39 @@
 msgstr "Усталяваны файл"
 
 #: ../aptdaemon/enums.py:367
+=======
+msgstr "Захоўваць статыстыку ў пазначаным файле"
+
+#: ../aptdaemon/core.py:1254
+msgid "Do not make any changes to the system (Only of use to developers)"
+msgstr ""
+"Не рабіце ніякіх зьменаў у сыстэме (Толькі для выкарыстаньня "
+"распрацоўшчыкамі)"
+
+#: ../aptdaemon/enums.py:136
+msgid "Installed file"
+msgstr "Усталяваны файл"
+
+#: ../aptdaemon/enums.py:137
+>>>>>>> MERGE-SOURCE
 msgid "Installed packages"
 msgstr "Усталяваныя пакеты"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:368
 msgid "Added key from file"
 msgstr "Дададзены ключ з файла"
-
+=======
+#: ../aptdaemon/enums.py:138
+msgid "Added key from file"
+msgstr "Дададзены ключ з файла"
+
+#: ../aptdaemon/enums.py:139
+msgid "Updated cache"
+msgstr "Кэш абноўлены"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:369
 msgid "Updated cache"
 msgstr "Кэш абноўлены"
@@ -439,19 +588,39 @@
 msgstr "Давяральны ключ выдалены"
 
 #: ../aptdaemon/enums.py:372
+=======
+#: ../aptdaemon/enums.py:140
+msgid "Removed trusted key"
+msgstr "Давяральны ключ выдалены"
+
+#: ../aptdaemon/enums.py:141
+>>>>>>> MERGE-SOURCE
 msgid "Removed packages"
 msgstr "Выдаленыя пакеты"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:373
+=======
+#: ../aptdaemon/enums.py:142
+>>>>>>> MERGE-SOURCE
 msgid "Updated packages"
 msgstr "Абноўленыя пакеты"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:374
 msgid "Upgraded system"
 msgstr "Абноўленая сістэма"
 
 #: ../aptdaemon/enums.py:375
+=======
+#: ../aptdaemon/enums.py:143
+msgid "Upgraded system"
+msgstr "Абноўленая сыстэма"
+
+#: ../aptdaemon/enums.py:144
+>>>>>>> MERGE-SOURCE
 msgid "Applied changes"
+<<<<<<< TREE
 msgstr "Ужытыя змены"
 
 #: ../aptdaemon/enums.py:376
@@ -479,51 +648,129 @@
 msgstr "Нова наладжаныя пакеты"
 
 #: ../aptdaemon/enums.py:397
+=======
+msgstr "Ужытыя зьмены"
+
+#: ../aptdaemon/enums.py:145
+msgid "Repaired incomplete installation"
+msgstr ""
+
+#: ../aptdaemon/enums.py:146
+msgid "Repaired broken dependencies"
+msgstr ""
+
+#: ../aptdaemon/enums.py:157
+>>>>>>> MERGE-SOURCE
 msgid "Successful"
+<<<<<<< TREE
 msgstr "Паспяхова"
+=======
+msgstr "Пасьпяхова"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:398
+=======
+#: ../aptdaemon/enums.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Canceled"
 msgstr "Адменена"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680
+=======
+#: ../aptdaemon/enums.py:159
+>>>>>>> MERGE-SOURCE
 msgid "Failed"
 msgstr "Памылка"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:414
+=======
+#: ../aptdaemon/enums.py:169
+>>>>>>> MERGE-SOURCE
 msgid "Installing file"
 msgstr "Усталёўка файла"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:415
+=======
+#: ../aptdaemon/enums.py:170
+>>>>>>> MERGE-SOURCE
 msgid "Installing packages"
 msgstr "Усталёўка пакетаў"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:416
+=======
+#: ../aptdaemon/enums.py:171
+>>>>>>> MERGE-SOURCE
 msgid "Adding key from file"
+<<<<<<< TREE
 msgstr "Даданне ключа з файла"
+=======
+msgstr "Дабаўленьне ключа з файлу"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:417
+=======
+#: ../aptdaemon/enums.py:172
+>>>>>>> MERGE-SOURCE
 msgid "Updating cache"
+<<<<<<< TREE
 msgstr "Абнаўленне кэша"
+=======
+msgstr "Абнаўленьне кэша"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:418
+=======
+#: ../aptdaemon/enums.py:173
+>>>>>>> MERGE-SOURCE
 msgid "Removing trusted key"
+<<<<<<< TREE
 msgstr "Выдаленне даверанага ключа"
+=======
+msgstr "Выдаленьне даверанага ключа"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:419
+=======
+#: ../aptdaemon/enums.py:174
+>>>>>>> MERGE-SOURCE
 msgid "Removing packages"
 msgstr "Выдаленне пакетаў"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:420
+=======
+#: ../aptdaemon/enums.py:175
+>>>>>>> MERGE-SOURCE
 msgid "Updating packages"
 msgstr "Абнаўленне пакетаў"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:421
+=======
+#: ../aptdaemon/enums.py:176
+>>>>>>> MERGE-SOURCE
 msgid "Upgrading system"
+<<<<<<< TREE
 msgstr "Абнаўленне сістэмы"
+=======
+msgstr "Абнаўленьне сыстэмы"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615
+=======
+#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308
+>>>>>>> MERGE-SOURCE
 msgid "Applying changes"
+<<<<<<< TREE
 msgstr "Ужыванне зменаў"
 
 #: ../aptdaemon/enums.py:423
@@ -619,85 +866,235 @@
 msgstr "Даданне ліцэнзійнага ключа"
 
 #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480
+=======
+msgstr "Зьдзяйсьненьне зьменаў"
+
+#: ../aptdaemon/enums.py:178
+msgid "Repairing incomplete installation"
+msgstr ""
+
+#: ../aptdaemon/enums.py:179
+msgid "Repairing broken deps"
+msgstr ""
+
+#: ../aptdaemon/enums.py:190
+msgid "Installation of the package file failed"
+msgstr "Усталёўка пакета схібіла"
+
+#: ../aptdaemon/enums.py:191
+msgid "Installation of software failed"
+msgstr "Усталёўка дастасаваньня схібіла"
+
+#: ../aptdaemon/enums.py:192
+msgid "Adding the key to the list of trused software vendors failed"
+msgstr "Дадаваньне ключа да сьпісу давераных пастаўшчыкоў праграм схібіла"
+
+#: ../aptdaemon/enums.py:194
+msgid "Refreshing the software list failed"
+msgstr "Абнаўленьне сьпіса дастасаваньняў схібіла"
+
+#: ../aptdaemon/enums.py:195
+msgid "Removing the vendor from the list of trusted ones failed"
+msgstr "Выдаленьне пастаўшчыка са сьпісу давераных схібіла"
+
+#: ../aptdaemon/enums.py:197
+msgid "Removing software failed"
+msgstr "Выдаленьне дастасаваньня схібіла"
+
+#: ../aptdaemon/enums.py:198
+msgid "Updating software failed"
+msgstr "Абнаўленьне дастасаваньня схібіла"
+
+#: ../aptdaemon/enums.py:199
+msgid "Upgrading the system failed"
+msgstr "Абнаўленьне сыстэмы схібіла"
+
+#: ../aptdaemon/enums.py:200
+msgid "Applying software changes failed"
+msgstr "Ужываньне зьменаў дастасаваньня схібіла"
+
+#: ../aptdaemon/enums.py:201
+msgid "Repairing incomplete installation failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:202
+msgid "Repairing broken dependencies failed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214
+>>>>>>> MERGE-SOURCE
 msgid "Check your Internet connection."
 msgstr "Праверце інтэрнэт-злучэнне."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:481
+=======
+#: ../aptdaemon/enums.py:215
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are using third party repositories. If so disable them, since "
 "they are a common source of problems.\n"
 "Furthermore run the following command in a Terminal: apt-get install -f"
 msgstr ""
+<<<<<<< TREE
 "Калі Вы выкарыстоўваеце іншыя крыніцы праграм, адключыце іх, паколькі яны "
 "з'яўляюцца частай\n"
 "крыніцай праблем. Пасля гэтага выканайце ў тэрмінале наступную каманду: apt-"
 "get install -f"
+=======
+"Калі Вы выкарыстоўваеце пабочныя крыніцы дастасаваньняў, адключыце іх, бо "
+"яны з'яўляюцца частай\n"
+"крыніцай праблем. Пасьля гэтага выканайце ў тэрмінале наступную каманду: apt-"
+"get install -f"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:486
+=======
+#: ../aptdaemon/enums.py:220
+>>>>>>> MERGE-SOURCE
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Выбраны файл можа быць пашкоджаны, альбо не з'яўляецца ключом PGP."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:488
+=======
+#: ../aptdaemon/enums.py:222
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The selected key couldn't be removed. Check that you provided a valid "
 "fingerprint."
 msgstr ""
+<<<<<<< TREE
 "Абраны ключ немагчыма выдаліць. Праверце, што Вы падалі дакладны лічбавы "
 "подпіс."
+=======
+"Абраны ключ ня можа быць выдалены. Праверце, калі ласка, правільнасьць "
+"прадастаўленага адбітка ключа."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:490
+=======
+#: ../aptdaemon/enums.py:224
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are currently running another software management tool, e.g. "
 "Synaptic or aptitude. Only one tool is allowed to make changes at a time."
 msgstr ""
+<<<<<<< TREE
 "Праверце, ці не запушчана іншая праграма кіравання праграмамі, напрыклад "
 "Synaptic или aptitude. Толькі адна праграма можа ўносіць змены ў адзін і той "
 "жа час."
+=======
+"Упэўніцеся, што не запушчаны іншыя сродкі кіраваньня дастасаваньнямі, такія "
+"як Synaptic або aptitude. Адначасова можа працаваць толькі адна прылада."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:493
+=======
+#: ../aptdaemon/enums.py:228
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This is a serious problem. Try again later. If this problem appears again, "
 "please report an error to the developers."
 msgstr ""
+<<<<<<< TREE
 "Гэта сур'ёзная праблема. Паспрабуйце паўтарыць пазней. Калі праблема "
 "паўстане зноў, калі ласка, адпраўце справаздачу аб памылцы распрацоўнікам."
+=======
+"Гэта сур'ёзная праблема. Паспрабуйце паўтарыць пазьней. Калі праблема "
+"ўзьнікае зноў, калі ласка, адпраўце справаздачу аб памылке распрацоўшчыкам."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:496
+=======
+#: ../aptdaemon/enums.py:231
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check the spelling of the package name, and that the appropriate repository "
 "is enabled."
 msgstr ""
+<<<<<<< TREE
 "Праверце ці правільна пазначана назва пакета і ці ўключаны адпаведны "
 "рэпазітар."
+=======
+"Праверце правільнасьць напісаньня назвы пакета і наяўнасьць яго ў адпаведным "
+"рэпазыторыі."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:498
+=======
+#: ../aptdaemon/enums.py:233
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an update."
+<<<<<<< TREE
 msgstr "Няма неабходнасці абнаўлення."
+=======
+msgstr "Няма неабходнасьці абнаўленьня."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:499
+=======
+#: ../aptdaemon/enums.py:234
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for an installation"
+<<<<<<< TREE
 msgstr "Няма неабходнасці ўсталёўкі."
+=======
+msgstr "Няма  неабходнасьці ўсталёўкі."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:501
+=======
+#: ../aptdaemon/enums.py:236
+>>>>>>> MERGE-SOURCE
 msgid "There isn't any need for a removal."
+<<<<<<< TREE
 msgstr "Няма неабходнасці выдалення."
+=======
+msgstr "Няма  неабходнасьці выдаленьня."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:502
+=======
+#: ../aptdaemon/enums.py:237
+>>>>>>> MERGE-SOURCE
 msgid ""
 "You requested to remove a package which is an essential part of your system."
 msgstr ""
+<<<<<<< TREE
 "Вы падалі запыт на выдаленне пакета, які з'яўляецца неад'емнай часткай вашай "
 "сістэмы."
+=======
+"Вы запыталі выдаленьне пакета, які з'яўляецца неад'емнай часткай вашае "
+"сыстэмы."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:505
+=======
+#: ../aptdaemon/enums.py:240
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The connection to the daemon was lost. Most likely the background daemon "
 "crashed."
 msgstr ""
 "Сувязь з дэманам страчана. Хутчэй за ўсё, яго праца нечакана скончылася."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:507
+=======
+#: ../aptdaemon/enums.py:242
+>>>>>>> MERGE-SOURCE
 msgid "The installation or removal of a software package failed."
+<<<<<<< TREE
 msgstr "Усталёўка ці выдаленне пакетаў праграм не атрымалася."
 
 #: ../aptdaemon/enums.py:509
@@ -715,8 +1112,18 @@
 "прысутнічае праграмная памылка."
 
 #: ../aptdaemon/enums.py:514
+=======
+msgstr "Усталёўка або выдаленьне пакетаў схібіла."
+
+#: ../aptdaemon/enums.py:244
+msgid "This should not happen."
+msgstr "Гэта не павінна здарацца."
+
+#: ../aptdaemon/enums.py:245
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This error could be caused by required additional software packages which "
+<<<<<<< TREE
 "are missing or not installable. Furthermore there could be a conflict "
 "between software packages which are not allowed to be installed at the same "
 "time."
@@ -794,67 +1201,185 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:563
+=======
+"are missing or not installable. Futhermore there could be a conflict between "
+"software packages which are not allowed to be installed at the same time."
+msgstr ""
+"Гэта памылка здараецца ў выпадку неабходнасьці ва ўсталёўке дадатковых "
+"пакетаў, якія не існуюць, альбо іх немагчыма ўсталяваць. Таксама, гэта можа "
+"быць канфлікт паміж пакетамі, якія ня могуць быць усталяваны адначасова."
+
+#: ../aptdaemon/enums.py:251
+msgid ""
+"The action would require the installation of packages from not authenticated "
+"sources."
+msgstr "Дзеяньне патрабуе ўсталёўкі пакетаў з недавераных крыніц."
+
+#: ../aptdaemon/enums.py:254
+msgid ""
+"The installation could have failed because of an error in the corresponding "
+"software package or it was cancelled in an unfriendly way. You have to "
+"repair this before you can install or remove any further software."
+msgstr ""
+
+#: ../aptdaemon/enums.py:269
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download package files"
 msgstr "Памылка загрузкі файлаў пакета"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:564
+=======
+#: ../aptdaemon/enums.py:270
+>>>>>>> MERGE-SOURCE
 msgid "Failed to download repository information"
+<<<<<<< TREE
 msgstr "Памылка пры загрузцы інфармацыі аб крыніцах праграмаў"
+=======
+msgstr "Памылка пры загрузке інфармацыі аб крыніцах дастасаваньняў."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:565
+=======
+#: ../aptdaemon/enums.py:271
+>>>>>>> MERGE-SOURCE
 msgid "Package dependencies cannot be resolved"
+<<<<<<< TREE
 msgstr "Залежнасці пакета ня могуць быць задаволены."
+=======
+msgstr "Залежнасьці пакета ня могуць быць задаволены."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:566
+=======
+#: ../aptdaemon/enums.py:272
+>>>>>>> MERGE-SOURCE
 msgid "The package system is broken"
+<<<<<<< TREE
 msgstr "Сістэма пакетаў пашкоджана."
+=======
+msgstr "Сыстэма пакетаў пашкоджана."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:567
+=======
+#: ../aptdaemon/enums.py:273
+>>>>>>> MERGE-SOURCE
 msgid "Key was not installed"
 msgstr "Ключ ня быў усталяваны"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:568
+=======
+#: ../aptdaemon/enums.py:274
+>>>>>>> MERGE-SOURCE
 msgid "Key was not removed"
 msgstr "Ключ быў ня выдалены"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:569
+=======
+#: ../aptdaemon/enums.py:275
+>>>>>>> MERGE-SOURCE
 msgid "Failed to lock the package manager"
+<<<<<<< TREE
 msgstr "Немагчыма заблакаваць мэнэджар пакетаў"
+=======
+msgstr "Немагчыма заблякаваць кіраўнік пакетаў."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:570
+=======
+#: ../aptdaemon/enums.py:276
+>>>>>>> MERGE-SOURCE
 msgid "Failed to load the package list"
+<<<<<<< TREE
 msgstr "Ня ўдалося загрузіць спіс пакетаў"
+=======
+msgstr "Ня ўдалося загрузіць сьпіс пакетаў"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:571
+=======
+#: ../aptdaemon/enums.py:277
+>>>>>>> MERGE-SOURCE
 msgid "Package does not exist"
 msgstr "Пакет не існуе"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:572
 msgid "Package is already up to date"
 msgstr "Пакет у актуальным стане"
+=======
+#: ../aptdaemon/enums.py:278
+msgid "Package is already up-to-date"
+msgstr "Пакет ужо абноўлены"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:573
+=======
+#: ../aptdaemon/enums.py:279
+>>>>>>> MERGE-SOURCE
 msgid "Package is already installed"
 msgstr "Пакет ужо ўсталяваны"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:574
+=======
+#: ../aptdaemon/enums.py:280
+>>>>>>> MERGE-SOURCE
 msgid "Package isn't installed"
 msgstr "Пакет не ўсталяваны"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:575
+=======
+#: ../aptdaemon/enums.py:281
+>>>>>>> MERGE-SOURCE
 msgid "Failed to remove essential system package"
+<<<<<<< TREE
 msgstr "Памылка пры выдаленні важнага сістэмнага пакета"
+=======
+msgstr "Памылка пры выдаленьні важнага сыстэмнага пакета"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:577
+=======
+#: ../aptdaemon/enums.py:283
+>>>>>>> MERGE-SOURCE
 msgid "Task cannot be monitored or controlled"
+<<<<<<< TREE
 msgstr "Заданне ня можа быць пракантралявана"
+=======
+msgstr "Заданьне ня можа быць пракантралявана"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:578
+=======
+#: ../aptdaemon/enums.py:284
+>>>>>>> MERGE-SOURCE
 msgid "Package operation failed"
+<<<<<<< TREE
 msgstr "Памылка пакетнай аперацыі"
+=======
+msgstr "Памылка пакетнай апэрацыі"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:579
+=======
+#: ../aptdaemon/enums.py:285
+>>>>>>> MERGE-SOURCE
 msgid "Requires installation of untrusted packages"
+<<<<<<< TREE
 msgstr "Патрабуецца ўсталёўка нязнойдзеных пакетаў"
 
 #: ../aptdaemon/enums.py:581
@@ -898,7 +1423,21 @@
 msgstr "Здарылася непераадольная памылка"
 
 #: ../aptdaemon/enums.py:603
+=======
+msgstr "Патрабуецца ўсталёўка ненадзейных пакетаў"
+
+#: ../aptdaemon/enums.py:287
+msgid "Previous installation hasn't been completed"
+msgstr ""
+
+#: ../aptdaemon/enums.py:288
+msgid "An unknown error occurred"
+msgstr "Узьнікла невядомая памылка"
+
+#: ../aptdaemon/enums.py:298
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for service to start"
+<<<<<<< TREE
 msgstr "Чаканне запуска службы"
 
 #: ../aptdaemon/enums.py:605
@@ -906,23 +1445,66 @@
 msgstr "Чаканне"
 
 #: ../aptdaemon/enums.py:606
+=======
+msgstr "Чаканьне запуска службы"
+
+#: ../aptdaemon/enums.py:299
+msgid "Waiting"
+msgstr ""
+
+#: ../aptdaemon/enums.py:300
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for required medium"
+<<<<<<< TREE
 msgstr "Чаканне на неабходны носьбіт інфармацыі"
+=======
+msgstr "Чаканьне патрабуемага носьбіта інфармацыі"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:607
+=======
+#: ../aptdaemon/enums.py:301
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for other software managers to quit"
+<<<<<<< TREE
 msgstr "Чаканне на сканчэнне працы іншых мэнэджараў праграмнага забеспячэння"
+=======
+msgstr ""
+"Чаканьне сканчэньня працы іншых кіраўнікоў праграмнага забесьпячэньня"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:608
+=======
+#: ../aptdaemon/enums.py:302
+>>>>>>> MERGE-SOURCE
 msgid "Waiting for configuration file prompt"
+<<<<<<< TREE
 msgstr "Чаканне на запыт канфігурацыйнага файла"
+=======
+msgstr "Чаканьне запыта канфігурацыйнага файла"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:610
+=======
+#: ../aptdaemon/enums.py:304
+>>>>>>> MERGE-SOURCE
 msgid "Running task"
+<<<<<<< TREE
 msgstr "Запуск задачы"
+=======
+msgstr "Запуск заданьня"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:611
+=======
+#: ../aptdaemon/enums.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Downloading"
+<<<<<<< TREE
 msgstr "Ідзе загрузка"
 
 #: ../aptdaemon/enums.py:612
@@ -930,19 +1512,43 @@
 msgstr "Запыт крыніц праграм"
 
 #: ../aptdaemon/enums.py:613
+=======
+msgstr "Сьцягваньне"
+
+#: ../aptdaemon/enums.py:306
+>>>>>>> MERGE-SOURCE
 msgid "Cleaning up"
+<<<<<<< TREE
 msgstr "Ачышчэнне"
 
 #: ../aptdaemon/enums.py:616
+=======
+msgstr "Ачышчэньне"
+
+#: ../aptdaemon/enums.py:307
+msgid "Resolving dependencies"
+msgstr "Вырашэньне залежнасьцей"
+
+#: ../aptdaemon/enums.py:309
+>>>>>>> MERGE-SOURCE
 msgid "Finished"
 msgstr "Скончана"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:617
+=======
+#: ../aptdaemon/enums.py:310
+>>>>>>> MERGE-SOURCE
 msgid "Cancelling"
 msgstr "Скасавана"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:618
+=======
+#: ../aptdaemon/enums.py:311
+>>>>>>> MERGE-SOURCE
 msgid "Loading software list"
+<<<<<<< TREE
 msgstr "Загрузка спіса праграмаў"
 
 #. TRANSLATORS: %s is the name of a package
@@ -1061,6 +1667,21 @@
 msgstr "Сетка недасяжная"
 
 #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318
+=======
+msgstr "Загрузка сьпіса дастасаваньняў"
+
+#: ../aptdaemon/gtkwidgets.py:290
+#, python-format
+msgid "Downloaded %sB of %sB at %sB/s"
+msgstr "Загружана %sB з %sB на хуткасьці %sB/s"
+
+#: ../aptdaemon/gtkwidgets.py:295
+#, python-format
+msgid "Downloaded %sB of %sB"
+msgstr "Загружана %sB з %sB"
+
+#: ../aptdaemon/gtkwidgets.py:305
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "Падрабязна"
 
@@ -1083,16 +1704,29 @@
 msgstr "Загружана"
 
 #. TRANSLATORS: %s represents the name of a CD or DVD
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:770 ../aptdaemon/gtk3widgets.py:818
+=======
+#: ../aptdaemon/gtkwidgets.py:620
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "CD/DVD '%s' is required"
+<<<<<<< TREE
 msgstr "Патрабуецца наяўнасць CD/DVD «%s»"
+=======
+msgstr "Патрабуецца наяўнасьць CD/DVD «%s»"
+>>>>>>> MERGE-SOURCE
 
 #. TRANSLATORS: %s is the name of the CD/DVD drive
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820
+=======
+#: ../aptdaemon/gtkwidgets.py:622
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid ""
 "Please insert the above CD/DVD into the drive '%s' to install software "
+<<<<<<< TREE
 "packages from it."
 msgstr ""
 "Устаўце паказаны вышэй CD/DVD у прывад '%s' для ўсталёўкі пакетаў з яго."
@@ -1210,12 +1844,50 @@
 msgstr "_Пакінуць"
 
 #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035
+=======
+"packages from the medium."
+msgstr "Калі ласка, устаўце ў дыскавод CD/DVD «%s» для ўсталёўкі пакетаў"
+
+#: ../aptdaemon/gtkwidgets.py:626
+msgid "C_ontinue"
+msgstr "Пра_цягнуць"
+
+#. TRANSLATORS: %s is a file path
+#: ../aptdaemon/gtkwidgets.py:640
+#, python-format
+msgid ""
+"Replace your changes in '%s' with a later version of the configuration file?"
+msgstr "Замяніць файл «%s» з унесенымі Вамі зьменамі больш позьняй вэрсыяй?"
+
+#: ../aptdaemon/gtkwidgets.py:642
+msgid ""
+"If you don't know why the file is there already, it is usually safe to "
+"replace it."
+msgstr ""
+"Калі Вы ня ведаеце, навошта быў створаны гэты файл, то хутчэй за ўсё яго "
+"можна будзе бясьпечна замяніць."
+
+#: ../aptdaemon/gtkwidgets.py:651
+msgid "_Changes"
+msgstr "_Зьмены"
+
+#: ../aptdaemon/gtkwidgets.py:654
+msgid "_Keep"
+msgstr "_Пакінуць"
+
+#: ../aptdaemon/gtkwidgets.py:655
+>>>>>>> MERGE-SOURCE
 msgid "_Replace"
 msgstr "_Замяніць"
 
 #. TRANSLATORS: expander label in the error dialog
+<<<<<<< TREE
 #: ../aptdaemon/gtkwidgets.py:1082 ../aptdaemon/gtk3widgets.py:1132
+=======
+#: ../aptdaemon/gtkwidgets.py:743
+>>>>>>> MERGE-SOURCE
 msgid "_Details"
+<<<<<<< TREE
 msgstr "_Падрабязнасці"
 
 #. TRANSLATORS: %s is the name of a package manager
@@ -1493,3 +2165,47 @@
 
 #~ msgid "Adding the key to the list of trused software vendors failed"
 #~ msgstr "Не атрымалася дадаць ключ да спіса давераных пастаўнікоў праграм"
+=======
+msgstr "_Падрабязнасьці"
+
+#: ../aptdaemon/progress.py:41
+#, python-format
+msgid "Installing %s"
+msgstr "Устаноўка %s"
+
+#: ../aptdaemon/progress.py:42
+#, python-format
+msgid "Configuring %s"
+msgstr "Канфігураваньне %s"
+
+#: ../aptdaemon/progress.py:43
+#, python-format
+msgid "Removing %s"
+msgstr "Выдаленьне %s"
+
+#: ../aptdaemon/progress.py:44
+#, python-format
+msgid "Running post-installation trigger %s"
+msgstr "Выконваецца пасьляўсталёвачны трыгер %s"
+
+#: ../aptdaemon/progress.py:45
+#, python-format
+msgid "Purging %s"
+msgstr "Ачыстка %s"
+
+#: ../aptdaemon/progress.py:46
+#, python-format
+msgid "Upgrading %s"
+msgstr "Абнаўленьне %s"
+
+#: ../aptdaemon/progress.py:142
+#, python-format
+msgid "Downloading %s"
+msgstr "Сьцягваньне %s"
+
+#~ msgid "System is already up-to-date"
+#~ msgstr "Сыстэма ўжо абноўленая"
+
+#~ msgid "System is not up-to-date"
+#~ msgstr "Сыстэма не абноўленая"
+>>>>>>> MERGE-SOURCE

=== modified file 'po/bg.po'
--- po/bg.po	2013-03-10 00:01:34 +0000
+++ po/bg.po	2013-06-03 17:47:29 +0000
@@ -7,29 +7,59 @@
 msgstr ""
 "Project-Id-Version: aptdaemon\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-17 11:07+0000\n"
 "PO-Revision-Date: 2012-09-18 11:18+0000\n"
 "Last-Translator: Dimitar Dimitrov <Unknown>\n"
+=======
+"POT-Creation-Date: 2010-03-26 09:22+0000\n"
+"PO-Revision-Date: 2010-03-29 21:21+0000\n"
+"Last-Translator: Boyan Sotirov <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Bulgarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Launchpad-Export-Date: 2013-03-09 23:28+0000\n"
 "X-Generator: Launchpad (build 16523)\n"
+=======
+"X-Launchpad-Export-Date: 2010-03-31 05:36+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:1
+<<<<<<< TREE
 msgid "List keys of trusted vendors"
 msgstr "Изброяване на ключове на доверени доставчици"
+=======
+msgid ""
+"Authentication is required to cancel the package management taks of another "
+"user."
+msgstr ""
+"Необходимо е да се идентифицирате, за да откажете управлението на пакети на "
+"друг потребител."
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:2
 msgid "To view the list of trusted keys, you need to authenticate."
 msgstr ""
+<<<<<<< TREE
 "За да видите списъка с доверени ключове, трябва да се идентифицирате."
+=======
+"За инсталирането на локален файл пакет е необходимо да се идентифицирате."
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:3 ../aptdaemon/console.py:612
 msgid "Remove downloaded package files"
 msgstr "Премахване на инсталационните пакетни файлове"
+=======
+#: ../data/org.debian.apt.policy.in.h:3
+msgid "Authentication is required to install software packages"
+msgstr "За инсталиране на пакети е необходимо идентифициране"
+>>>>>>> MERGE-SOURCE
 
 #: ../data/org.debian.apt.policy.in.h:4
 msgid "To clean downloaded package files, you need to authenticate."
@@ -42,31 +72,71 @@
 msgstr "Променяне на софтуерната конфигурация"
 
 #: ../data/org.debian.apt.policy.in.h:6
+<<<<<<< TREE
 msgid "To change software settings, you need to authenticate."
 msgstr "За да променяте софтуерните настройки, трябва да се идентифицирате."
-
+=======
+msgid "Authentication is required to repair broken installations"
+msgstr "Идентификация е необходима за поправка на повредени инсталации"
+
+#: ../data/org.debian.apt.policy.in.h:7
+msgid "Authentication is required to upgrade software packages"
+msgstr "За надграждане на софтуерни пакети е необходимо да се идентифицирате"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:7
 msgid "Change software repository"
 msgstr "Промяна на софтуерно хранилище"
+=======
+#: ../data/org.debian.apt.policy.in.h:8
+msgid "Authentication is required to upgrade the system"
+msgstr "За надграждане на системата е необходимо да се идентифициране"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:8
 msgid "To change software repository settings, you need to authenticate."
 msgstr ""
 "За да промените настройките на софтуерно хранилище, трябва да се "
 "идентифицирате."
-
+=======
 #: ../data/org.debian.apt.policy.in.h:9
+msgid "Cancel the task of another user"
+msgstr "Отказване на задачата на друг потребител"
+>>>>>>> MERGE-SOURCE
+
+#: ../data/org.debian.apt.policy.in.h:10
 msgid "Install package file"
 msgstr "Инсталиране на файл пакет"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:10
 msgid "To install this package, you need to authenticate."
 msgstr "За да инсталирате този пакет, трябва да се идентифицирате."
-
-#: ../data/org.debian.apt.policy.in.h:11
+=======
+#: ../data/org.debian.apt.policy.in.h:11
+msgid "Install packages"
+msgstr "Инсталиране на пакети"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
+#: ../data/org.debian.apt.policy.in.h:11
+=======
+#: ../data/org.debian.apt.policy.in.h:12
+msgid "Remove packages"
+msgstr "Премахване на пакети"
+
+#: ../data/org.debian.apt.policy.in.h:13
+msgid "Repair broken installations"
+msgstr "Поправка на повредени инсталации"
+
+#: ../data/org.debian.apt.policy.in.h:14
+>>>>>>> MERGE-SOURCE
 msgid "Update package information"
 msgstr "Актуализиране на информацията за пакетите"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:12
 msgid "To update the software catalog, you need to authenticate."
 msgstr "За да обновите софтуерния каталог, трябва да се идентифицирате."
@@ -131,9 +201,13 @@
 msgstr "За да инсталирате поръчан трябва да се идентифицирате."
 
 #: ../data/org.debian.apt.policy.in.h:44
+=======
+#: ../data/org.debian.apt.policy.in.h:15
+>>>>>>> MERGE-SOURCE
 msgid "Upgrade packages"
 msgstr "Пакети за надграждане"
 
+<<<<<<< TREE
 #: ../data/org.debian.apt.policy.in.h:45
 msgid "To install updated software, you need to authenticate."
 msgstr "За да инсталирате обновен софтуер, трябва да се идентифицирате."
@@ -384,19 +458,39 @@
 msgstr "Изчакване за идентификация"
 
 #: ../aptdaemon/core.py:2188
+=======
+#: ../data/org.debian.apt.policy.in.h:16
+msgid "Upgrade system"
+msgstr "Надграждане на системата"
+
+#: ../aptdaemon/core.py:1237
+>>>>>>> MERGE-SOURCE
 msgid "Do not shutdown the daemon because of inactivity"
+<<<<<<< TREE
 msgstr "Не спирайте демона заради неактивност"
 
 #: ../aptdaemon/core.py:2193
 msgid "Do not load any plugins"
 msgstr ""
+=======
+msgstr "Не спирайте демона заради неактивност"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2197
+=======
+#: ../aptdaemon/core.py:1242
+>>>>>>> MERGE-SOURCE
 msgid "Show internal processing information"
 msgstr "Показване на вътрешна информация за обработка"
 
+<<<<<<< TREE
 #: ../aptdaemon/core.py:2202
+=======
+#: ../aptdaemon/core.py:1246
+>>>>>>> MERGE-SOURCE
 msgid "Quit and replace an already running daemon"
+<<<<<<< TREE
 msgstr "Спиране и заменяне на вече работещ демон"
 
 #: ../aptdaemon/core.py:2207
@@ -408,7 +502,13 @@
 msgstr "Изпълни операции във зададената chroot"
 
 #: ../aptdaemon/core.py:2216
+=======
+msgstr "Спиране и заменяне на вече работещ демон"
+
+#: ../aptdaemon/core.py:1250
+>>>>>>> MERGE-SOURCE
 msgid "Store profile stats in the specified file"
+<<<<<<< TREE
 msgstr "Запазване на статистики за профила в упоменатия файл"
 
 #: ../aptdaemon/core.py:2221
@@ -416,21 +516,43 @@
 msgstr "Без промени по системата (От полза само за разработчици)"
 
 #: ../aptdaemon/enums.py:366
+=======
+msgstr "Запазване на статистики за профила в упоменатия файл"
+
+#: ../aptdaemon/core.py:1254
+msgid "Do not make any changes to the system (Only of use to developers)"
+msgstr "Без промени по системата (От полза само за разработчици)"
+
+#: ../aptdaemon/enums.py:136
+>>>>>>> MERGE-SOURCE
 msgid "Installed file"
 msgstr "Инсталиран файл"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:367
+=======
+#: ../aptdaemon/enums.py:137
+>>>>>>> MERGE-SOURCE
 msgid "Installed packages"
 msgstr "Инсталирани пакети"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:368
 msgid "Added key from file"
 msgstr "Добавен ключ от файл"
 
 #: ../aptdaemon/enums.py:369
+=======
+#: ../aptdaemon/enums.py:138
+msgid "Added key from file"
+msgstr "Добавен ключ от файл"
+
+#: ../aptdaemon/enums.py:139
+>>>>>>> MERGE-SOURCE
 msgid "Updated cache"
 msgstr "Актуализиран кеш"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:370
 msgid "Search done"
 msgstr "Търсенето приключи"
@@ -440,21 +562,41 @@
 msgstr "Премахнат доверен ключ"
 
 #: ../aptdaemon/enums.py:372
+=======
+#: ../aptdaemon/enums.py:140
+msgid "Removed trusted key"
+msgstr "Премахнат доверен ключ"
+
+#: ../aptdaemon/enums.py:141
+>>>>>>> MERGE-SOURCE
 msgid "Removed packages"
 msgstr "Премахнати пакети"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:373
+=======
+#: ../aptdaemon/enums.py:142
+>>>>>>> MERGE-SOURCE
 msgid "Updated packages"
 msgstr "Обновени пакети"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:374
+=======
+#: ../aptdaemon/enums.py:143
+>>>>>>> MERGE-SOURCE
 msgid "Upgraded system"
 msgstr "Надградена система"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:375
+=======
+#: ../aptdaemon/enums.py:144
+>>>>>>> MERGE-SOURCE
 msgid "Applied changes"
 msgstr "Приложени промени"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:376
 msgid "Repaired incomplete installation"
 msgstr "Поправена непълна инсталация"
@@ -480,53 +622,109 @@
 msgstr "Пренастроени инсталирани пакети"
 
 #: ../aptdaemon/enums.py:397
+=======
+#: ../aptdaemon/enums.py:145
+msgid "Repaired incomplete installation"
+msgstr "Поправена непълна инсталация"
+
+#: ../aptdaemon/enums.py:146
+msgid "Repaired broken dependencies"
+msgstr "Поправени повредени зависимости"
+
+#: ../aptdaemon/enums.py:157
+>>>>>>> MERGE-SOURCE
 msgid "Successful"
 msgstr "Успешно"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:398
+=======
+#: ../aptdaemon/enums.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Canceled"
 msgstr "Отменено"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680
+=======
+#: ../aptdaemon/enums.py:159
+>>>>>>> MERGE-SOURCE
 msgid "Failed"
 msgstr "Неуспешно"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:414
+=======
+#: ../aptdaemon/enums.py:169
+>>>>>>> MERGE-SOURCE
 msgid "Installing file"
 msgstr "Инсталиране на файл"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:415
+=======
+#: ../aptdaemon/enums.py:170
+>>>>>>> MERGE-SOURCE
 msgid "Installing packages"
 msgstr "Инсталиране на пакети"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:416
+=======
+#: ../aptdaemon/enums.py:171
+>>>>>>> MERGE-SOURCE
 msgid "Adding key from file"
 msgstr "Добавяне на ключ от файл"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:417
+=======
+#: ../aptdaemon/enums.py:172
+>>>>>>> MERGE-SOURCE
 msgid "Updating cache"
 msgstr "Актуализиране на кеша"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:418
+=======
+#: ../aptdaemon/enums.py:173
+>>>>>>> MERGE-SOURCE
 msgid "Removing trusted key"
 msgstr "Премахване на доверен ключ"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:419
+=======
+#: ../aptdaemon/enums.py:174
+>>>>>>> MERGE-SOURCE
 msgid "Removing packages"
 msgstr "Премахване на пакети"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:420
+=======
+#: ../aptdaemon/enums.py:175
+>>>>>>> MERGE-SOURCE
 msgid "Updating packages"
 msgstr "Актуализиране на пакети"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:421
+=======
+#: ../aptdaemon/enums.py:176
+>>>>>>> MERGE-SOURCE
 msgid "Upgrading system"
 msgstr "Надграждане на системата"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615
+=======
+#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308
+>>>>>>> MERGE-SOURCE
 msgid "Applying changes"
 msgstr "Прилагане на промените"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:423
 msgid "Repairing incomplete installation"
 msgstr "Поправяне на непълна инсталация"
@@ -622,10 +820,72 @@
 msgstr ""
 
 #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480
+=======
+#: ../aptdaemon/enums.py:178
+msgid "Repairing incomplete installation"
+msgstr "Поправяне на непълна инсталация"
+
+#: ../aptdaemon/enums.py:179
+msgid "Repairing broken deps"
+msgstr "Поправяне на повредени зависимости"
+
+#: ../aptdaemon/enums.py:190
+msgid "Installation of the package file failed"
+msgstr "Инсталирането на пакета неуспешно"
+
+#: ../aptdaemon/enums.py:191
+msgid "Installation of software failed"
+msgstr "Инсталирането на софтуера неуспешно"
+
+#: ../aptdaemon/enums.py:192
+msgid "Adding the key to the list of trused software vendors failed"
+msgstr ""
+"Добавянето на ключа към списъка с доверени софтуерни доставчици неуспешно"
+
+#: ../aptdaemon/enums.py:194
+msgid "Refreshing the software list failed"
+msgstr "Опресняването на софтуерния списък неуспешно"
+
+#: ../aptdaemon/enums.py:195
+msgid "Removing the vendor from the list of trusted ones failed"
+msgstr ""
+"Премахването на софтуерния доставчик от списъка със софтуерни доставчици "
+"неуспешно"
+
+#: ../aptdaemon/enums.py:197
+msgid "Removing software failed"
+msgstr "Премахването на софтуера неуспешно"
+
+#: ../aptdaemon/enums.py:198
+msgid "Updating software failed"
+msgstr "Обновяването на софтуер неуспешно"
+
+#: ../aptdaemon/enums.py:199
+msgid "Upgrading the system failed"
+msgstr "Надграждането на системата неуспешно"
+
+#: ../aptdaemon/enums.py:200
+msgid "Applying software changes failed"
+msgstr "Прилагането на софтуерните промени неуспешно"
+
+#: ../aptdaemon/enums.py:201
+msgid "Repairing incomplete installation failed"
+msgstr "Поправянето на непълна инсталация неуспешно"
+
+#: ../aptdaemon/enums.py:202
+msgid "Repairing broken dependencies failed"
+msgstr "Поправянето на повредени зависимости неуспешно"
+
+#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214
+>>>>>>> MERGE-SOURCE
 msgid "Check your Internet connection."
 msgstr "Проверете Интернет връзката."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:481
+=======
+#: ../aptdaemon/enums.py:215
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Check if you are using third party repositories. If so disable them, since "
 "they are a common source of problems.\n"
@@ -635,28 +895,55 @@
 "така,  деактивирайте ги, защото те често са източник на проблеми.\n"
 "Допълнително изпълнете следната команда в Терминал: apt-get install -f"
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:486
+=======
+#: ../aptdaemon/enums.py:220
+>>>>>>> MERGE-SOURCE
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Избраният файл може да не е GPG файл ключ или може да е повреден."
 
+<<<<<<< TREE
 #: ../aptdaemon/enums.py:488
+=======
+#: ../aptdaemon/enums.py:222
+>>>>>>> MERGE-SOURCE
 msgid ""
 "The selected key couldn't be removed. Check that you provided a valid "
 "fingerprint."
 msgstr ""
+<<<<<<< TREE
 "Избраният ключ не може да бъде премахнат. Проверете дали сте посочили "