=== 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 " __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 " +__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 \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 \n" "Language-Team: Amharic \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 \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 \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 \n" +>>>>>>> MERGE-SOURCE "Language-Team: Arabic \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 \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 \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 \n" +>>>>>>> MERGE-SOURCE "Language-Team: Asturian \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 \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 \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 \n" +>>>>>>> MERGE-SOURCE "Language-Team: Belarusian \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 \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 \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 \n" +>>>>>>> MERGE-SOURCE "Language-Team: Bulgarian \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 "Избраният ключ не може да бъде премахнат. Проверете дали сте посочили " "валиден идентификатор." +======= +"Избраният ключ не може да бъде премахнат. Проверете дали сте предоставили " +"валиден пръстов отпечатък." +>>>>>>> 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." @@ -664,33 +951,62 @@ "Това е сериозен проблем. Опитайте отново по-късно. Ако проблемът се появи " "отново, съобщете го на разработчиците." +<<<<<<< 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." 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." @@ -698,8 +1014,13 @@ "Връзката с демона беше изгубена. Най-вероятно демонът, работещ във фонов " "режим е блокирал." +<<<<<<< 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 @@ -717,8 +1038,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." @@ -791,67 +1122,158 @@ 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 @@ -895,7 +1317,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 @@ -903,45 +1339,91 @@ 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" 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 @@ -1058,6 +1540,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 от %sB с %sB/с" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Изтеглени %sB от %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Подробности" @@ -1080,16 +1575,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 "Необходим е 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 "" "Моля поставете горния CD/DVD в устройството '%s', за да инсталирате " @@ -1209,14 +1713,55 @@ 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" msgstr "_Подробности" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1489,3 +2034,52 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ 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 not up-to-date" +#~ msgstr "Системата не е актуализирана" + +#~ msgid "System is already 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/bn.po' --- po/bn.po 2013-03-10 00:01:34 +0000 +++ po/bn.po 2013-06-03 17:47:29 +0000 @@ -8,16 +8,28 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-04-04 04:03+0000\n" "Last-Translator: Robin Mehdee \n" "Language-Team: Bengali \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-11-09 14:41+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Bengali \n" +>>>>>>> MERGE-SOURCE "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" @@ -40,34 +52,77 @@ 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." +======= +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +>>>>>>> MERGE-SOURCE msgstr "" "সফটওয়্যার রিপোজিটরী সেটিংস পরিবর্তন করতে আপনাকে আপনার পরিচয় দিতে হবে।" -#: ../data/org.debian.apt.policy.in.h:9 +#: ../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 +182,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 @@ -374,7 +433,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 @@ -382,11 +451,21 @@ msgstr "কোন প্লাগইন লোড করা হবে না" #: ../aptdaemon/core.py:2197 +======= +msgstr "" + +#: ../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 @@ -398,7 +477,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 @@ -408,15 +493,43 @@ #: ../aptdaemon/enums.py:366 msgid "Installed file" msgstr "ইনস্টল করা ফাইল সমূহ" - +======= +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 +msgid "Installed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:367 msgid "Installed packages" msgstr "ইন্সটল করা প্যাকেজসমুহ" +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:368 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 "ক্যাশ আপগ্রেড করুন" @@ -428,19 +541,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "বিশ্বস্ত কী মুছে ফেলুন" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "মুছে ফেলা হয়েছে এমন প্যাকেজসমূহ" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 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:144 +msgid "Applied changes" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "পরিবর্তন সমূহ প্রয়োগ করা হয়েছে" @@ -470,50 +611,105 @@ 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 "পরিবর্তনসমূহ প্রয়োগ করা হচ্ছে" @@ -557,6 +753,7 @@ msgid "Adding the key to the list of trusted software vendors failed" msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:449 msgid "Refreshing the software list failed" msgstr "সফটওয়্যারের তালিকা রিফ্রেশ করতে ব্যর্থ" @@ -610,10 +807,69 @@ 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" @@ -623,11 +879,19 @@ "নিষ্ক্রিয় করা হয়, ইতোমধ্যে এটি সাধারণ সমস্যার উৎস।\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." @@ -635,7 +899,11 @@ "নির্বাচিত কী অপসারণ করা যায়নি। কার্যকর আঙ্গুলের ছাপ সরবরাহ করেছেন কিনা তা " "পরীক্ষা করুন।" +<<<<<<< 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." @@ -644,7 +912,11 @@ "উদাহরণ স্বরূপ সিন্যাপটিক অথবা এপটিটিউড। একটি মাত্র টুল একইসময়ে পরিবর্তন করতে " "অনুমতি দেয়।" +<<<<<<< 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." @@ -652,40 +924,69 @@ "এটি একটি কঠিন সমস্যা। পরবর্তীতে আবার চেষ্টা করুন। যদি এই সমস্যা আবার " "দৃষ্টিগোচর হয়, অনুগ্রহ করে ডেভেলপারকে ত্রুটির রিপোর্ট দিন।" +<<<<<<< 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 "" "daemon এর সংযোগ বিচ্ছিন্ন হয়েছে। খুব সম্ভবত daemon এর পটভূমি ক্র্যাশ করেছে।" +<<<<<<< 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 @@ -703,8 +1004,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." @@ -780,39 +1091,92 @@ 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" +<<<<<<< TREE msgstr "প্যাকেজ বিদ্যমান নয়" #: ../aptdaemon/enums.py:572 @@ -820,27 +1184,57 @@ msgstr "প্যাকেজ ইতোমধ্যে হালনাগাদ" #: ../aptdaemon/enums.py:573 +======= +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../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 @@ -884,7 +1278,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 @@ -892,23 +1300,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 @@ -916,19 +1350,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 @@ -1047,6 +1505,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 "বিস্তারিত তথ্য" @@ -1069,16 +1542,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 "" "অনুগ্রহ করে সফটওয়্যার প্যাকেজ ইনস্টল করতে ড্রাইভ '%s' তে উপর থেকে CD/DVD " @@ -1198,11 +1680,51 @@ msgstr "রাখা (_K)" #: ../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" +<<<<<<< TREE msgstr "প্রতিস্থাপন (_R)" +======= +msgstr "" + +>>>>>>> MERGE-SOURCE #. 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 "বিস্তারিত তথ্য (_D)" === modified file 'po/bs.po' --- po/bs.po 2013-03-10 00:01:34 +0000 +++ po/bs.po 2013-06-03 17:47:29 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE # Bosnian translation for aptdaemon # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the aptdaemon package. @@ -1489,3 +1490,563 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "" #~ "Dodavanje ključa na listu povjerljivih proizvođača softvera nije uspjelo" +======= +# Bosnian translation for aptdaemon +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the aptdaemon package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: aptdaemon\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-02-01 04:13+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Bosnian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../data/org.debian.apt.policy.in.h:1 +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:2 +msgid "Authentication is required to install a local package file." +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:4 +msgid "" +"Authentication is required to query the software repositories for " +"installable packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:5 +msgid "Authentication is required to remove software packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:6 +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 "" + +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Autentikacija je neophodna za nadogradnju sistema" + +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Poništi zadatak drugog korisnika" + +#: ../data/org.debian.apt.policy.in.h:10 +msgid "Install package file" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Instaliraj pakete" + +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Ukloni pakete" + +#: ../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 "Ažuriraj podatke o paketu" + +#: ../data/org.debian.apt.policy.in.h:15 +msgid "Upgrade packages" +msgstr "Nadogradi pakete" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Nadogradi sistem" + +#: ../aptdaemon/core.py:1237 +msgid "Do not shutdown the daemon because of inactivity" +msgstr "" + +#: ../aptdaemon/core.py:1242 +msgid "Show internal processing information" +msgstr "" + +#: ../aptdaemon/core.py:1246 +msgid "Quit and replace an already running daemon" +msgstr "" + +#: ../aptdaemon/core.py:1250 +msgid "Store profile stats in the specified file" +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 "Instalirana datoteka" + +#: ../aptdaemon/enums.py:137 +msgid "Installed packages" +msgstr "Instalirani paketi" + +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" + +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "" + +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "Uklonjeni paketi" + +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "Ažurirani paketi" + +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "" + +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "Primijenjene promjene" + +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:157 +msgid "Successful" +msgstr "Uspješno" + +#: ../aptdaemon/enums.py:158 +msgid "Canceled" +msgstr "Poništeno" + +#: ../aptdaemon/enums.py:159 +msgid "Failed" +msgstr "Neuspelo" + +#: ../aptdaemon/enums.py:169 +msgid "Installing file" +msgstr "Instaliranje datoteke" + +#: ../aptdaemon/enums.py:170 +msgid "Installing packages" +msgstr "Instaliranje paketa" + +#: ../aptdaemon/enums.py:171 +msgid "Adding key from file" +msgstr "" + +#: ../aptdaemon/enums.py:172 +msgid "Updating cache" +msgstr "" + +#: ../aptdaemon/enums.py:173 +msgid "Removing trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:174 +msgid "Removing packages" +msgstr "Uklanjanje paketa" + +#: ../aptdaemon/enums.py:175 +msgid "Updating packages" +msgstr "Ažuriranje paketa" + +#: ../aptdaemon/enums.py:176 +msgid "Upgrading system" +msgstr "Nadogradnja sistema" + +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +msgid "Applying changes" +msgstr "Primjenjivanje promjena" + +#: ../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 +msgid "Check your Internet connection." +msgstr "Provjerite vašu Internet konekciju." + +#: ../aptdaemon/enums.py:215 +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 "" + +#: ../aptdaemon/enums.py:220 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "" + +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" + +#: ../aptdaemon/enums.py:233 +msgid "There isn't any need for an update." +msgstr "Nema nikakve potrebe za ažuriranjem." + +#: ../aptdaemon/enums.py:234 +msgid "There isn't any need for an installation" +msgstr "Nema nikakve potrebe za instaliranjem." + +#: ../aptdaemon/enums.py:236 +msgid "There isn't any need for a removal." +msgstr "Nema nikakve potrebe za uklanjanje." + +#: ../aptdaemon/enums.py:237 +msgid "" +"You requested to remove a package which is an essential part of your system." +msgstr "" + +#: ../aptdaemon/enums.py:240 +msgid "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." +msgstr "" + +#: ../aptdaemon/enums.py:242 +msgid "The installation or removal of a software package failed." +msgstr "" + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Ovo se nije trebalo dogoditi." + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 +msgid "Failed to download package files" +msgstr "" + +#: ../aptdaemon/enums.py:270 +msgid "Failed to download repository information" +msgstr "" + +#: ../aptdaemon/enums.py:271 +msgid "Package dependencies cannot be resolved" +msgstr "" + +#: ../aptdaemon/enums.py:272 +msgid "The package system is broken" +msgstr "" + +#: ../aptdaemon/enums.py:273 +msgid "Key was not installed" +msgstr "" + +#: ../aptdaemon/enums.py:274 +msgid "Key was not removed" +msgstr "" + +#: ../aptdaemon/enums.py:275 +msgid "Failed to lock the package manager" +msgstr "" + +#: ../aptdaemon/enums.py:276 +msgid "Failed to load the package list" +msgstr "" + +#: ../aptdaemon/enums.py:277 +msgid "Package does not exist" +msgstr "Paket ne postoji" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Paket je već ažuriran" + +#: ../aptdaemon/enums.py:279 +msgid "Package is already installed" +msgstr "Paket je već instaliran" + +#: ../aptdaemon/enums.py:280 +msgid "Package isn't installed" +msgstr "Paket nije instaliran" + +#: ../aptdaemon/enums.py:281 +msgid "Failed to remove essential system package" +msgstr "Neuspjelo uklanjanje bitnog sistemskog paketa" + +#: ../aptdaemon/enums.py:283 +msgid "Task cannot be monitored or controlled" +msgstr "" + +#: ../aptdaemon/enums.py:284 +msgid "Package operation failed" +msgstr "" + +#: ../aptdaemon/enums.py:285 +msgid "Requires installation of untrusted packages" +msgstr "" + +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Došlo je do nepoznate greške" + +#: ../aptdaemon/enums.py:298 +msgid "Waiting for service to start" +msgstr "" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +msgid "Waiting for required medium" +msgstr "" + +#: ../aptdaemon/enums.py:301 +msgid "Waiting for other software managers to quit" +msgstr "" + +#: ../aptdaemon/enums.py:302 +msgid "Waiting for configuration file prompt" +msgstr "" + +#: ../aptdaemon/enums.py:304 +msgid "Running task" +msgstr "" + +#: ../aptdaemon/enums.py:305 +msgid "Downloading" +msgstr "Preuzimanje" + +#: ../aptdaemon/enums.py:306 +msgid "Cleaning up" +msgstr "Čišćenje" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:309 +msgid "Finished" +msgstr "Završeno" + +#: ../aptdaemon/enums.py:310 +msgid "Cancelling" +msgstr "" + +#: ../aptdaemon/enums.py:311 +msgid "Loading software list" +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 "Preuzeto %sB od %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +msgid "Details" +msgstr "Detalji" + +#. TRANSLATORS: %s represents the name of a CD or DVD +#: ../aptdaemon/gtkwidgets.py:620 +#, python-format +msgid "CD/DVD '%s' is required" +msgstr "CD/DVD '%s' je neophodan" + +#. TRANSLATORS: %s is the name of the CD/DVD drive +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"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 "_Zadrži" + +#: ../aptdaemon/gtkwidgets.py:655 +msgid "_Replace" +msgstr "_Zamijeni" + +#. TRANSLATORS: expander label in the error dialog +#: ../aptdaemon/gtkwidgets.py:743 +msgid "_Details" +msgstr "_Detalji" + +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Instaliranje %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Konfiguriranje %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Uklanjanje %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 "Nadogradnja %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Preuzimanje %s" +>>>>>>> MERGE-SOURCE === modified file 'po/ca.po' --- po/ca.po 2013-03-10 00:01:34 +0000 +++ po/ca.po 2013-06-03 17:47:29 +0000 @@ -7,70 +7,154 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-03-02 12:03+0000\n" "Last-Translator: David Planella \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-02-13 14:24+0000\n" +"Last-Translator: David Planella \n" +>>>>>>> MERGE-SOURCE "Language-Team: Catalan \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" "Language: ca\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 "Obtenció d'una llista de claus dels proveïdors de confiança" +======= +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" +"Cal autenticació per a cancel·lar les tasques de gestió de paquets d'un " +"altre usuari." +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:2 +<<<<<<< TREE msgid "To view the list of trusted keys, you need to authenticate." msgstr "Cal que us autentiqueu per obtenir la llista de claus de confiança." +======= +msgid "Authentication is required to install a local package file." +msgstr "Cal autenticació per a instal·lar un fitxer de paquet local." +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:3 ../aptdaemon/console.py:612 msgid "Remove downloaded package files" msgstr "Supressió dels fitxers de paquet baixats" +======= +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "Cal autenticació per a instal·lar paquets de programari" +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:4 msgid "To clean downloaded package files, you need to authenticate." msgstr "" +<<<<<<< TREE "Cal que us autentiqueu per poder netejar els fitxers de paquet baixats." +======= +"Cal autenticació per a consultar els dipòsits de paquets instal·lables" +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:5 +<<<<<<< TREE msgid "Change software configuration" msgstr "Canvi de la configuració del programari" +======= +msgid "Authentication is required to remove software packages" +msgstr "Cal autenticació per a suprimir paquets de programari" +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "" "Cal que us autentiqueu per poder canviar els paràmetres del programari." - +======= +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 "Cal autenticació per a actualizar paquets de programari" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Canvi de dipòsit de programari" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Cal autenticació per a actualizar el sistema" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Cal que us autentiqueu per canviar els paràmetres dels dipòsits de " "programari." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Cancel·lació de la tasca d'un altre usuari" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Instal·lació d'un fitxer de paquet" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Cal que us autentiqueu per instal·lar aquest paquet." +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Instal·lació de paquets" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:11 msgid "Update package information" msgstr "Actualització de la informació dels paquets" - +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Supressió de paquets" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Cal que us autentiqueu per actualitzar el catàleg de programari." +======= +#: ../data/org.debian.apt.policy.in.h:14 +msgid "Update package information" +msgstr "Actualització de la informació dels paquets" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:13 msgid "Install or remove packages" msgstr "Instal·lació o supressió de paquets" @@ -130,7 +214,11 @@ msgstr "Heu d'autenticar-vos per instal·lar programari que hàgiu comprat." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" +<<<<<<< TREE msgstr "Actualització dels paquets" #: ../data/org.debian.apt.policy.in.h:45 @@ -388,7 +476,17 @@ msgstr "S'està esperant l'autenticació" #: ../aptdaemon/core.py:2188 +======= +msgstr "Actualització dels paquets" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Actualització del sistema" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE msgstr "No aturis el dimoni per inactivitat" #: ../aptdaemon/core.py:2193 @@ -396,11 +494,21 @@ msgstr "No carreguis cap connector" #: ../aptdaemon/core.py:2197 +======= +msgstr "No aturis el dimoni per inactivitat" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Mostra la informació interna de processament" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Surt i reemplaça un dimoni que s'estigui executant" #: ../aptdaemon/core.py:2207 @@ -412,7 +520,13 @@ msgstr "Realitza les operacions en el chroot especificat" #: ../aptdaemon/core.py:2216 +======= +msgstr "Surt i reemplaça un dimoni que s'estigui executant" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" +<<<<<<< TREE msgstr "Desa estadístiques de perfil en el fitxer especificat" #: ../aptdaemon/core.py:2221 @@ -424,13 +538,37 @@ msgstr "Fitxer instal·lat" #: ../aptdaemon/enums.py:367 +======= +msgstr "Desa estadístiques de perfil en el fitxer especificat" + +#: ../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 "Fitxer instal·lat" + +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Paquets instal·lats" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" msgstr "S'ha afegit la clau des d'un fitxer" - +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "S'ha afegit la clau des d'un fitxer" + +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "Memòria cau actualitzada" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:369 msgid "Updated cache" msgstr "S'ha actualitzat la memòria cau" @@ -442,19 +580,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "S'ha suprimit la clau de confiança" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "S'ha suprimit la clau de confiança" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "S'han suprimit els paquets" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "S'han suprimit els paquets" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "S'han actualitzat els paquets" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 msgid "Updated packages" msgstr "S'han actualitzat els paquets" +======= +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "S'ha actualitzat el sistema" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:374 msgid "Upgraded system" msgstr "S'ha actualitzat el sistema" +======= +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "Canvis aplicats" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "S'han aplicat els canvis" @@ -484,51 +650,115 @@ msgstr "S'han tornat a configurar els paquets instal·lats" #: ../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 "Correcte" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" +<<<<<<< TREE msgstr "Cancel·lat" +======= +msgstr "S'ha cancel·lat" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Ha fallat" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "S'està instal·lant un fitxer" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "S'estan instal·lant els paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "S'està afegint la clau des del fitxer" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "S'està actualitzant la memòria cau" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "S'està suprimint la clau de confiança" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" +<<<<<<< TREE msgstr "S'estan suprimint els paquets" +======= +msgstr "S'estan eliminant els paquets" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "S'estan actualitzant els paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "S'està actualitzant el sistema" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" +<<<<<<< TREE msgstr "S'estan aplicant els canvis" #: ../aptdaemon/enums.py:423 @@ -625,10 +855,71 @@ msgstr "S'està afegint la clau de llicència" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +msgstr "S'estan aplicant els canvis" + +#: ../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 "Ha fallat la instal·lació del paquet" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Ha fallat la instal·lació del programari" + +#: ../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 "Comproveu la connexió 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" @@ -639,30 +930,57 @@ "Addicionalment, hauríeu d'executar l'ordre següent en un 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 "" "Pot ser que el fitxer que heu seleccionat no sigui un fitxer de clau GPG o " "que estigui malmès." +<<<<<<< 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 "No s'ha pogut suprimir la clau seleccionada. Comproveu que hàgiu " "proporcionat una empremta vàlida." +======= +"No s'ha pogut suprimir la clau seleccionada. Comproveu si heu proporcionat " +"una empremta digital vàlida." +>>>>>>> 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 "Comproveu si actualment esteu executant una altra eina de gestió del " "programari, com ara el Synaptic o l'aptitude. Només es permet utilitzar una " "eina a la vegada per fer canvis." +======= +"Comproveu si esteu executant una altra eina de gestió de programari, com ara " +"exemple el Synaptic o l'Aptitude. Només es permet que una eina faci canvis " +"al mateix temps." +>>>>>>> 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." @@ -670,34 +988,63 @@ "Aquest es un problema seriós. Torneu a intentar-ho més tard. Si el problema " "reapareix, informeu-ne els desenvolupadors." +<<<<<<< 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 "Comproveu l'ortografia del nom del paquet i que el dipòsit apropiat estigui " "activat." +======= +"Comproveu que hàgiu escrit correctament el nom del paquet i si teniu activat " +"el dipòsit corresponent." +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "No cal fer cap actualització." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "No cal fer cap instal·lació." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "No cal fer cap supressió." +<<<<<<< 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 "" "Heu sol·licitat la supressió d'un paquet que és una part essencial 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." @@ -705,8 +1052,13 @@ "S'ha perdut la connexió amb el dimoni. Segurament el dimoni en segon pla ha " "tingut una fallada." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." +<<<<<<< TREE msgstr "Ha fallat la instal·lació o supressió d'un paquet de programari." #: ../aptdaemon/enums.py:509 @@ -724,8 +1076,18 @@ "relacionades amb la gestió de paquets." #: ../aptdaemon/enums.py:514 +======= +msgstr "Ha fallat la instal·lació o supressió d'un paquet de programari." + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Això no hauria de passar." + +#: ../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." @@ -808,39 +1170,97 @@ "sessió del 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 "" +"Pot ser que aquest error sigui causat per paquets addicionals de programari " +"necessaris que manquen o no són instal·lables. També pot ser que hi hagi un " +"conflicte entre paquets de programari que no es puguin instal·lar al mateix " +"temps." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Aquesta acció requereix la instal·lació de paquets de fonts no autenticades." + +#: ../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 "Ha fallat la baixada de fitxers de paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Ha fallat la baixada de la informació del dipòsit" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "No es poden resoldre les dependències dels paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "El sistema de paquets està malmès" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "No s'ha instal·lat la clau" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "No s'ha suprimit la clau" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Ha fallat el blocatge del gestor de paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Ha fallat la càrrega de la llista de paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" +<<<<<<< TREE msgstr "El paquet no existeix" #: ../aptdaemon/enums.py:572 @@ -848,27 +1268,57 @@ msgstr "El paquet ja està actualitzat" #: ../aptdaemon/enums.py:573 +======= +msgstr "El paquet no existeix" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "El paquet ja està actualitzat" + +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "El paquet ja està instal·lat" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "El paquet no està instal·lat" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Ha fallat la supressió d'un paquet essencial del sistema" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "No es pot fer un seguiment o control de la tasca" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Ha fallat l'operació amb el paquet" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" +<<<<<<< TREE msgstr "Requereix la instal·lació de paquets que no són de confiança" #: ../aptdaemon/enums.py:581 @@ -912,7 +1362,21 @@ msgstr "S'ha produit un error que no es pot gestionar" #: ../aptdaemon/enums.py:603 +======= +msgstr "Requereix la instal·lació de paquets que no són de confiança" + +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "S'ha produït un error desconegut" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" +<<<<<<< TREE msgstr "S'està esperant que comenci el servei" #: ../aptdaemon/enums.py:605 @@ -920,23 +1384,49 @@ msgstr "En espera" #: ../aptdaemon/enums.py:606 +======= +msgstr "S'està esperant que comenci el servei" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "S'està esperant el suport necessari" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "S'està esperant que altres gestors de programari surtin" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "S'està esperant el diàleg del fitxer de configuració." +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "S'està executant la tasca" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" +<<<<<<< TREE msgstr "S'està baixant" #: ../aptdaemon/enums.py:612 @@ -944,19 +1434,43 @@ msgstr "S'estan consultant les fonts de programari" #: ../aptdaemon/enums.py:613 +======= +msgstr "S'està baixant" + +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" +<<<<<<< TREE msgstr "S'està netejant" #: ../aptdaemon/enums.py:616 +======= +msgstr "S'està netejant" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "S'estan resolent les dependències" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "S'ha finalitzat" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "S'està cancel·lant" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" +<<<<<<< TREE msgstr "S'està carregant la llista de programari" #. TRANSLATORS: %s is the name of a package @@ -1075,7 +1589,23 @@ msgstr "La xarxa no es troba disponible" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +msgstr "S'està carregant la llista de programari" + +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "S'han baixat %sB of %sB at %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "S'han baiixat %sB de %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" +<<<<<<< TREE msgstr "Detalls" #: ../aptdaemon/gtkwidgets.py:458 ../aptdaemon/gtk3widgets.py:463 @@ -1095,18 +1625,30 @@ #: ../aptdaemon/gtkwidgets.py:500 ../aptdaemon/gtk3widgets.py:505 msgid "Downloaded" msgstr "Baixat" +======= +msgstr "Detalls" +>>>>>>> MERGE-SOURCE #. 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 "Cal el CD o 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 "Inseriu el CD/DVD a la unitat «%s» per instal·lar-ne els paquets." @@ -1225,12 +1767,50 @@ msgstr "_Manté" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Introduïu el CD/DVD a la unitat «%s» per a instal·lar els paquets de " +"programari des del suport." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinua" + +#. 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 "_Canvis" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Manté" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Reemplaça" #. 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 "_Detalls" #. TRANSLATORS: %s is the name of a package manager @@ -1508,3 +2088,41 @@ #~ msgstr "" #~ "S'ha produït un error en afegir la clau a la llista de proveïdors de " #~ "programari de confiança" +======= +msgstr "_Detalls" + +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "S'està instal·lant %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "S'està configurant %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "S'està suprimint %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "S'està executant l'activador de postinstal·lació %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "S'està purgant %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "S'està actualitzant %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "S'està baixant %s" +>>>>>>> MERGE-SOURCE === modified file 'po/crh.po' --- po/crh.po 2013-03-10 00:01:34 +0000 +++ po/crh.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,26 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2011-05-05 10:26+0000\n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-08 09:26+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Reşat SABIQ \n" "Language-Team: Crimean Turkish; Crimean Tatar \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "Plural-Forms: nplurals=1; plural=0;\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" @@ -39,33 +49,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" +>>>>>>> MERGE-SOURCE +msgstr "" + +<<<<<<< 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" +>>>>>>> MERGE-SOURCE +msgstr "" + +#: ../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." +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:11 msgid "Update package information" +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< 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" +>>>>>>> MERGE-SOURCE +msgstr "" + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:13 msgid "Install or remove packages" msgstr "" @@ -123,9 +171,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 +410,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,49 +450,101 @@ 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 msgid "Installed file" -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 +msgid "Installed packages" +>>>>>>> MERGE-SOURCE +msgstr "" + +<<<<<<< TREE #: ../aptdaemon/enums.py:367 msgid "Installed packages" +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" +======= +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< 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 "" #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" +======= +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 msgid "Updated packages" +======= +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 msgid "Upgraded system" +======= +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "" @@ -454,53 +574,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 "Muvafaqiyetli" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Vazgeçilgen" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Muvafaqiyetsiz" +<<<<<<< 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,71 +770,175 @@ 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." msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "" @@ -671,8 +951,16 @@ msgstr "" #: ../aptdaemon/enums.py:514 +======= +#: ../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,69 +1020,151 @@ 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" msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "" @@ -836,53 +1206,110 @@ msgstr "" #: ../aptdaemon/enums.py:603 +======= +#: ../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" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< 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 +1426,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 "" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Tafsilât" @@ -1021,16 +1461,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 "" @@ -1145,11 +1594,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 "_İvaz Et" #. 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 "_Tafsilât" === modified file 'po/cs.po' --- po/cs.po 2013-03-10 00:01:34 +0000 +++ po/cs.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-09-16 06:20+0000\n" "Last-Translator: Vojtěch Trefný \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-10-24 14:23+0000\n" +"Last-Translator: FULL NAME \n" +>>>>>>> MERGE-SOURCE "Language-Team: Czech \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==1) ? 0 : (n>=2 && n<=4) ? 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: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" @@ -39,33 +50,77 @@ msgstr "Změnit nastavení softwaru" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Pro změnu nastavení softwaru je vyžadováno ověření." - +======= +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 "Změnit zdroj softwaru" +======= +#: ../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 "Pro změnu nastavení zdrojů softwaru je vyžadováno ověření." - +======= #: ../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 "Nainstalovat balík" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Pro instalaci tohoto balíku je vyžadováno ověření." +======= +#: ../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 "Aktualizovat informace o balících" +======= +#: ../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 "Pro obnovení katalogu softwaru je vyžadováno ověření." - +======= +#: ../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 "Nainstalovat nebo odstranit balíky" @@ -123,7 +178,11 @@ msgstr "Pro instalaci placeného softwaru je vyžadováno ověření." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" +<<<<<<< TREE msgstr "Aktualizovat balíky" #: ../data/org.debian.apt.policy.in.h:45 @@ -376,7 +435,17 @@ msgstr "Čeká se na ověření" #: ../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 "Neukončovat démona z důvodu neaktivity" #: ../aptdaemon/core.py:2193 @@ -384,11 +453,21 @@ msgstr "Nenačítat žádné zásuvné moduly" #: ../aptdaemon/core.py:2197 +======= +msgstr "" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Zobrazit informace o vnitřních procesech" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Ukončit a nahradit již běžícího démona" #: ../aptdaemon/core.py:2207 @@ -400,7 +479,13 @@ msgstr "Provést operace v zadaném chroot" #: ../aptdaemon/core.py:2216 +======= +msgstr "" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" +<<<<<<< TREE msgstr "Ukládat statistiky profilu do zadaného souboru" #: ../aptdaemon/core.py:2221 @@ -410,15 +495,43 @@ #: ../aptdaemon/enums.py:366 msgid "Installed file" msgstr "Soubor nainstalován" - +======= +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 +msgid "Installed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:367 msgid "Installed packages" msgstr "Balíky nainstalovány" +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" msgstr "Přidán klíč ze souboru" +======= +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:369 msgid "Updated cache" msgstr "Mezipaměť aktualizována" @@ -430,19 +543,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "Odstraněn důvěryhodný klíč" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "Balíky odstraněny" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 msgid "Updated packages" msgstr "Balíky aktualizovány" +======= +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:374 msgid "Upgraded system" msgstr "Systém povýšen" +======= +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "Změny provedeny" @@ -472,50 +613,105 @@ msgstr "Překonfigurované instalované balíky" #: ../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 "Úspěšné" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Zrušeno" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Selhalo" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Instaluje se soubor" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Instalují se balíky" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Přidává se klíč ze souboru" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Aktualizuje se mezipaměť" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Odstraňuje se důvěryhodný klíč" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Odstraňují se balíky" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Aktualizují se balíky" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Povyšuje se systém" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Provádějí se změny" @@ -559,6 +755,7 @@ msgid "Adding the key to the list of trusted software vendors failed" msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:449 msgid "Refreshing the software list failed" msgstr "Obnovování seznamu softwaru selhalo" @@ -612,10 +809,69 @@ msgstr "Přidávání licenčního klíče" #: ../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 "Zkontrolujte svoje internetové připojení" +<<<<<<< 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" @@ -625,11 +881,19 @@ "protože jsou často zdrojem problémů.\n" "Dále spusťte v terminálu následující příkaz: 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 "Vybraný soubor možná neobsahuje klíč GPG nebo může být poškozen." +<<<<<<< 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." @@ -637,7 +901,11 @@ "Vybraný klíč nelze odstranit. Zkontrolujte, zda byl otisk prstu správně " "proveden." +<<<<<<< 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." @@ -645,7 +913,11 @@ "Zkontrolujte, zda není spuštěn jiný nástroj pro správu softwaru, např. " "Synaptic nebo aptitude. Najednou smí běžet pouze jeden nástroj." +<<<<<<< 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." @@ -653,31 +925,55 @@ "Toto je závažný problém. Zkuste akci opakovat později. Pokud se problém " "vyskytne znovu, oznamte to vývojářům." +<<<<<<< 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 "" "Zkontrolujte pravopis v názvu balíku a zda je povolen příslušný zdroj." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Není nutná žádná aktualizace." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Není nutná žádná instalace." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Není nutné žádné odstraňová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 "Požadujete odstranění balíku, který je nezbytnou součástí systému." +<<<<<<< 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." @@ -685,8 +981,13 @@ "Spojení s démonem bylo ztraceno. Tento démon běžící na pozadí pravděpodobně " "spadl." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." +<<<<<<< TREE msgstr "Instalace nebo odstraňování balíku selhalo." #: ../aptdaemon/enums.py:509 @@ -704,8 +1005,18 @@ "softwaru - došlo k chybě." #: ../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." @@ -780,39 +1091,92 @@ 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 "Stahování balíků selhalo" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Stahování informací o zdroji selhalo" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Závislosti balíku nemohly být vyřešeny" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Balíčkovací systém je porušen" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Klíč nebyl nainstalován" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Klíč nebyl odstraněn" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Zamknutí správce balíků selhalo" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Nahrávání seznamu balíků selhalo" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" +<<<<<<< TREE msgstr "Balík neexistuje" #: ../aptdaemon/enums.py:572 @@ -820,27 +1184,57 @@ msgstr "Balík je aktuální." #: ../aptdaemon/enums.py:573 +======= +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Balík je nainstalován" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Balík není nainstalován" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Odstranění nezbytného systémového balíku selhalo" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Úloha nemůže být sledována nebo kontrolována" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Operace s balíkem selhala" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" +<<<<<<< TREE msgstr "Je požadována instalace neprověřených balíků" #: ../aptdaemon/enums.py:581 @@ -884,7 +1278,21 @@ msgstr "Nastala neošetřená chyba" #: ../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 "Čeká se na spuštění služby" #: ../aptdaemon/enums.py:605 @@ -892,23 +1300,49 @@ msgstr "Čeká se" #: ../aptdaemon/enums.py:606 +======= +msgstr "" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Čeká se na požadované médium" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Čeká se na ukončení jiných správců softwaru" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Čeká se na výzvu konfiguračního souboru" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Běžící úloha" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" +<<<<<<< TREE msgstr "Stahuje se" #: ../aptdaemon/enums.py:612 @@ -916,19 +1350,43 @@ msgstr "Dotazování zdrojů softwaru" #: ../aptdaemon/enums.py:613 +======= +msgstr "" + +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" +<<<<<<< TREE msgstr "Probíhá čištění" #: ../aptdaemon/enums.py:616 +======= +msgstr "" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Dokončeno" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Ruší se" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" +<<<<<<< TREE msgstr "Nahrává se seznam software" #. TRANSLATORS: %s is the name of a package @@ -1047,6 +1505,21 @@ msgstr "Síť není dostupná" #: ../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 "Podrobnosti" @@ -1069,16 +1542,25 @@ msgstr "Staženo" #. 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 "Je požadováno 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 "" "K instalaci balíků vložte prosím výše uvedené CD/DVD do mechaniky '%s'." @@ -1196,11 +1678,51 @@ msgstr "_Ponechat" #: ../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" +<<<<<<< TREE msgstr "_Nahradit" +======= +msgstr "" + +>>>>>>> MERGE-SOURCE #. 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 "Po_drobnosti" === modified file 'po/da.po' --- po/da.po 2013-03-10 00:01:34 +0000 +++ po/da.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-02-27 16:08+0000\n" "Last-Translator: Ask Hjorth Larsen \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-02-05 14:31+0000\n" +"Last-Translator: AJenbo \n" +>>>>>>> MERGE-SOURCE "Language-Team: Danish \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" @@ -39,34 +50,77 @@ msgstr "Ændr programopsætning" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Du skal godkende for at ændre programindstillinger." - +======= +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 "Skift softwarearkiv" +======= +#: ../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." +======= +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +>>>>>>> MERGE-SOURCE msgstr "" "For at ændre indstillinger for softwarearkiver, skal du først godkende." -#: ../data/org.debian.apt.policy.in.h:9 +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Installér pakkefil" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "For at installere denne pakke, skal du først godkende." +======= +#: ../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 "Opdatér pakkeinformation" - +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Fjern pakker" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "For at opdatere softwarekataloget, skal du først godkende." +======= +#: ../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 "Installér eller fjern pakker" @@ -125,7 +179,11 @@ msgstr "Du skal godkende for at kunne installere købte programmer." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" +<<<<<<< TREE msgstr "Opgradér pakker" #: ../data/org.debian.apt.policy.in.h:45 @@ -370,7 +428,17 @@ msgstr "Venter på godkendelse" #: ../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 "Luk ikke dæmonen ned på grund af inaktivitet" #: ../aptdaemon/core.py:2193 @@ -378,11 +446,21 @@ msgstr "Indlæs ingen udvidelsesmoduler" #: ../aptdaemon/core.py:2197 +======= +msgstr "" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Vis intern arbejdsinformation" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Afslut og erstat en allerede kørende dæmon" #: ../aptdaemon/core.py:2207 @@ -394,7 +472,13 @@ msgstr "Udfør handlinger i den givne chroot" #: ../aptdaemon/core.py:2216 +======= +msgstr "" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" +<<<<<<< TREE msgstr "Gem profilstatistik i den angivne fil" #: ../aptdaemon/core.py:2221 @@ -404,15 +488,43 @@ #: ../aptdaemon/enums.py:366 msgid "Installed file" msgstr "Installeret fil" - +======= +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 +msgid "Installed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:367 msgid "Installed packages" msgstr "Installerede pakker" +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" msgstr "Nøgle tilføjet fra fil" +======= +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:369 msgid "Updated cache" msgstr "Opdaterede mellemlager" @@ -424,19 +536,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "Fjernede betroet nøgle" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "Fjernede pakker" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 msgid "Updated packages" msgstr "Opdaterede pakker" +======= +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:374 msgid "Upgraded system" msgstr "Upgraderede systemet" +======= +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "Anvendte ændringer" @@ -466,51 +606,115 @@ msgstr "Omkonfigurerede installerede pakker" #: ../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" +<<<<<<< TREE msgstr "Fuldført" +======= +msgstr "Lykkedes" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" +<<<<<<< TREE msgstr "Annulleret" +======= +msgstr "Annullerede" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Mislykket" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Installerer fil" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Installerer pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Tilføjer nøgle fra fil" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Opdaterer mellemlager" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Fjerner betroet nøgle" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Fjerner pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Opdaterer pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Opgraderer systemet" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" +<<<<<<< TREE msgstr "Anvender ændringer" #: ../aptdaemon/enums.py:423 @@ -609,10 +813,71 @@ msgstr "Tilføjer licensnøgle" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +msgstr "Anvender ændringer" + +#: ../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 "Kontrollér din internetforbindelse" +<<<<<<< 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" @@ -622,12 +887,24 @@ "benyttes, da de er en almindeligt kendt kilde til problemer.\n" "Kør derudover denne kommando i en 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 "" +<<<<<<< TREE "Den valgte fil er måske ikke en GPG-nøglefil, eller den kan være beskadiget." +======= +"Den valgte fil er måske ikke en GPG-nøglefil, eller den kan være ødelagt." +>>>>>>> MERGE-SOURCE +<<<<<<< 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." @@ -635,7 +912,11 @@ "Den valgte nøgle kunne ikke fjernes. Kontroller at du har givet et korrekt " "fingeraftryk." +<<<<<<< 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." @@ -644,7 +925,11 @@ "software, f.eks. Synaptic eller aptitude. Ændringer kan kun laves af et " "værktøj ad gangen." +<<<<<<< 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." @@ -652,7 +937,11 @@ "Dette er et alvorligt problem. Prøv igen senere. Hvis problemet opstår igen, " "så rapportér det venligst til udviklerne." +<<<<<<< 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." @@ -660,25 +949,45 @@ "Kontroller stavningen af pakkenavnet, og at det korrekte pakkearkiv er " "aktiveret." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Opdatering er ikke nødvendig." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Installation er ikke nødvendig" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Fjernelse er ikke nødvendig." +<<<<<<< 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 "" "Du anmodede om at fjerne en pakke som er en essentiel del af dit system." +<<<<<<< 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." @@ -686,8 +995,13 @@ "Forbindelsen til dæmonen blev afbrudt. Det er sandsynligt at " "baggrundsdæmonen er gået ned." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." +<<<<<<< TREE msgstr "Installation eller fjernelse af en softwarepakke mislykkedes." #: ../aptdaemon/enums.py:509 @@ -705,8 +1019,18 @@ "pakkehåndteringsopgaver." #: ../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." @@ -787,39 +1111,92 @@ "sessionsagent for 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 "" + +#: ../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 "Kunne ikke hente pakkefiler" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Kunne ikke hente information om softwarearkiv" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Pakkeafhængigheder kan ikke afklares" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Pakkesystemet er beskadiget" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Nøglen blev ikke installeret" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Nøglen blev ikke fjernet" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Kunne ikke låse pakkehåndteringen" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Kunne ikke indlæse pakkelisten" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" +<<<<<<< TREE msgstr "Pakken findes ikke" #: ../aptdaemon/enums.py:572 @@ -827,27 +1204,57 @@ msgstr "Pakken er allerede fuldt opdateret" #: ../aptdaemon/enums.py:573 +======= +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Pakken er allerede installeret" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Pakken er ikke installeret" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Kunne ikke fjerne essentiel systempakke" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Opgaven kan ikke overvåges eller kontrolleres" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Pakkehandling mislykkedes" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" +<<<<<<< TREE msgstr "Kræver installation af ikke-betroede pakker" #: ../aptdaemon/enums.py:581 @@ -891,7 +1298,21 @@ msgstr "Der opstod en fejl som ikke kunne håndteres" #: ../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 "En ukendt fejl opstod" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" +<<<<<<< TREE msgstr "Venter på at tjeneste starter" #: ../aptdaemon/enums.py:605 @@ -899,23 +1320,49 @@ msgstr "Venter" #: ../aptdaemon/enums.py:606 +======= +msgstr "" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Venter på krævet medie" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Venter på at andre softwarehåndteringsprogrammer afslutter" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Venter på prompt for konfigurationsfil" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Kører opgave" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" +<<<<<<< TREE msgstr "Henter" #: ../aptdaemon/enums.py:612 @@ -923,19 +1370,47 @@ msgstr "Forespørger i softwarekilder" #: ../aptdaemon/enums.py:613 +======= +msgstr "Henter" + +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" +<<<<<<< TREE msgstr "Rydder op" #: ../aptdaemon/enums.py:616 +======= +msgstr "Rydder op" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Løser afhængigheder" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" +<<<<<<< TREE msgstr "Fuldført" +======= +msgstr "Færdig" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Annullerer" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" +<<<<<<< TREE msgstr "Henter softwareliste" #. TRANSLATORS: %s is the name of a package @@ -1054,7 +1529,23 @@ msgstr "Netværk ikke tilgængeligt" #: ../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" +<<<<<<< TREE msgstr "Detaljer" #: ../aptdaemon/gtkwidgets.py:458 ../aptdaemon/gtk3widgets.py:463 @@ -1074,18 +1565,30 @@ #: ../aptdaemon/gtkwidgets.py:500 ../aptdaemon/gtk3widgets.py:505 msgid "Downloaded" msgstr "Hentede" +======= +msgstr "Detaljer" +>>>>>>> MERGE-SOURCE #. 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 "Cd'en eller dvd'en \"%s\" skal bruges" #. 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 "" "Indsæt venligst den ovenstående cd/dvd i drevet \"%s\" for at installere " @@ -1205,12 +1708,48 @@ msgstr "_Behold" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "F_ortsæt" + +#. 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 "_Ændringer" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "E_rstat" #. 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 "_Detailer" #. TRANSLATORS: %s is the name of a package manager @@ -1486,3 +2025,41 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "" #~ "Tilføjelse af nøglen til listen af betroede softwareleverandører mislykkedes" +======= +msgstr "_Detailer" + +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Sætter %s op" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Fjerner %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 "" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Henter %s" +>>>>>>> MERGE-SOURCE === modified file 'po/de.po' --- po/de.po 2013-03-10 00:01:34 +0000 +++ po/de.po 2013-06-03 17:47:29 +0000 @@ -7,26 +7,51 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-12-30 21:13+0000\n" "Last-Translator: Hendrik Knackstedt \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-26 23:39+0000\n" +"Last-Translator: Moritz Baumann \n" +>>>>>>> MERGE-SOURCE "Language-Team: German \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 "Schlüssel vertrauenswürdiger Anbieter anzeigen" +======= +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" +"Authentifizierung ist erforderlich, um Paketverwaltungsprozesse eines " +"anderen Benutzers abzubrechen." +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:2 msgid "To view the list of trusted keys, you need to authenticate." msgstr "" +<<<<<<< TREE "Sie müssen Ihr Passwort eingeben, um die Schlüssel der vertrauenswürdigen " "Anbieter anzuzeigen." +======= +"Authentifizierung ist erforderlich, um eine lokale Paketdatei zu " +"installieren." +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:3 ../aptdaemon/console.py:612 msgid "Remove downloaded package files" @@ -43,32 +68,73 @@ msgstr "Software-Konfiguration ändern" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." +======= +msgid "Authentication is required to repair broken installations" +msgstr "" +"Authentifizierung ist erforderlich, um unterbrochene Installationen zu " +"reparieren" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +>>>>>>> MERGE-SOURCE msgstr "" "Sie müssen Ihr Passwort eingeben, um Software-Einstellungen zu ändern." +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Software-Paketquelle ändern" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Authentifizierung ist erforderlich, um das System zu aktualisieren" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Sie müssen Ihr Passwort eingeben, um Einstellungen der Software-Paketquellen " "zu ändern." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Prozess eines anderen Benutzers abbrechen" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Paketdatei installieren" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Sie müssen Ihr Passwort eingeben, um dieses Paket zu installieren." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Pakete installieren" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Pakete entfernen" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Unterbrochene Installationen reparieren" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Paketinformationen aktualisieren" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "" @@ -139,9 +205,13 @@ "Sie müssen Ihr Passwort eingeben, um erworbene Software zu installieren." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Pakete aktualisieren" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "" @@ -406,7 +476,15 @@ msgstr "Es wird auf die Legitimation gewartet" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "System aktualisieren" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE msgstr "Den Dienst nicht aufgrund von Inaktivität beenden" #: ../aptdaemon/core.py:2193 @@ -414,13 +492,23 @@ msgstr "Keine Erweiterungen laden" #: ../aptdaemon/core.py:2197 +======= +msgstr "Beenden Sie den Dienst nicht aufgrund von Inaktivität" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Interne Verarbeitungsinformationen anzeigen" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Einen bereits laufenden Dienst beenden und ersetzen" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Verbindung vom Sitzungs-D-Bus annehmen (Nur zum Testen nützlich)" @@ -430,53 +518,97 @@ msgstr "Vorgänge in der angegebenen chroot-Umgebung ausführen" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Profilstatistiken in der angegebenen Datei speichern" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Keine Änderungen am System vornehmen (Nur für Entwickler nützlich)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Bitte ändern Sie nichts am System (Nur für Entwickler gedacht)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Datei installiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Pakete installiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Schlüssel aus Datei hinzugefügt" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Zwischenspeicher aktualisiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Suche abgeschlossen" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Vertrauenswürdigen Schlüssel entfernt" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Pakete entfernt" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Pakete aktualisiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "System aktualisiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Änderungen angewendet" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Unvollständige Installation repariert" @@ -502,53 +634,109 @@ msgstr "Installierte Pakete neu konfiguriert" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Unvollständige Installation repariert" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Unerfüllte Abhängigkeiten repariert" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Erfolgreich" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Abgebrochen" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Gescheitert" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Datei wird installiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Pakete werden installiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Schlüssel aus Datei wird hinzugefügt" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Zwischenspeicher wird aktualisiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Vertrauenswürdiger Schlüssel wird entfernt" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Pakete werden entfernt" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Pakete werden aktualisiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "System wird aktualisiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Änderungen werden angewendet" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Unvollständige Installation wird repariert" @@ -646,10 +834,73 @@ msgstr "Lizenzschlüssel wird hinzugefügt" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Unterbrochene Installationen werden repariert" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Unerfüllte Abhängigkeiten werden repariert" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Die Installation der Paketdatei ist gescheitert" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Die Installation der Software ist gescheitert" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"Der Schlüssel konnte nicht zu der Liste der zuverlässigen Software-Anbieter " +"hinzugefügt werden" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Die Aktualisierung der Software-Liste ist gescheitert" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "" +"Der Anbieter konnte nicht aus der Liste der zuverlässigen Anbieter entfernt " +"werden." + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Das Entfernen der Software ist gescheitert" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Das Aktualisieren der Software ist gescheitert" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Das Aktualisieren des Systems ist gescheitert" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Das Anwenden der Software-Änderungen ist gescheitert" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Das Reparieren unvollständiger Installationen ist gescheitert" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Das Reparieren nicht erfüllter Abhängigkeiten ist gescheitert" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Überprüfen Sie Ihre Internetverbindung." +<<<<<<< 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" @@ -661,13 +912,21 @@ "Führen Sie außerdem in einem Terminal den folgenden Befehl aus: 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 "" "Die ausgewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder sie " "ist beschädigt." +<<<<<<< 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." @@ -675,7 +934,11 @@ "Der angegebene Schlüssel konnte nicht entfernt werden. Überprüfen Sie, ob " "Sie den richtigen Fingerabdruck angegeben haben." +<<<<<<< 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." @@ -684,7 +947,11 @@ "andere Software-Paketverwaltung läuft, z.B. Synaptic oder aptitude. Es kann " "immer nur eine Anwendung gleichzeitig Änderungen vornehmen." +<<<<<<< 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." @@ -692,7 +959,11 @@ "Dies ist ein schwerwiegendes Problem. Versuchen Sie es später noch einmal. " "Falls das Problem erneut auftritt, melden Sie einen Fehler an die Entwickler." +<<<<<<< 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." @@ -700,26 +971,46 @@ "Bitte überprüfen Sie die exakte Schreibweise des Paketnamens und stellen Sie " "sicher, dass die zugehörige Software-Paketquelle aktiviert ist." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Eine Aktualisierung ist unnötig." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Eine Installation ist unnötig." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Eine Deinstallation ist unnötig." +<<<<<<< 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 "" "Sie versuchen ein Paket zu entfernen, das einen essenziellen Teil Ihres " "Systems darstellt." +<<<<<<< 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." @@ -727,9 +1018,14 @@ "Die Verbindung zum Hintergrunddienst wurde unterbrochen. " "Höchstwahrscheinlich ist der Dienst abgestürzt." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "" +<<<<<<< TREE "Das Installieren oder Entfernen eines Software-Pakets ist gescheitert." #: ../aptdaemon/enums.py:509 @@ -747,8 +1043,19 @@ "Paketverwaltungsaufgaben ermöglicht." #: ../aptdaemon/enums.py:514 +======= +"Die Installation oder Deinstallation eines Software-Pakets ist " +"fehlgeschlagen." + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Dies sollte nicht passieren." + +#: ../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." @@ -834,71 +1141,163 @@ "keinen PolicyKit-Sitzungsagent bereit." #: ../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 "" +"Dieser Fehler könnte von erforderlichen weiteren Software-Paketen verursacht " +"worden sein, die fehlen oder nicht installierbar sind. Weiterhin könnte ein " +"Konflikt zwischen Paketen aufgetreten sein, die nicht zur selben Zeit " +"installiert werden dürfen." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Diese Aktion würde die Installation von Paketen aus nicht authentifizierten " +"Software-Paketquellen erfordern." + +#: ../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 "" +"Die Installation könnte aufgrund eines Fehlers im betreffenden Software-" +"Paket gescheitert sein oder weil Sie nicht ordnungsgemäß abgebrochen wurde. " +"Dieser Zustand muss behoben werden, bevor weitere Software installiert oder " +"entfernt werden kann." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Das Herunterladen der Paketdateien ist gescheitert" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "" "Das Herunterladen von Informationen zu Software-Paketquellen ist gescheitert" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Die Paketabhängigkeiten können nicht aufgelöst werden" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Das Paketsystem ist beschädigt" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Der Schlüssel wurde nicht installiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Der Schlüssel wurde nicht entfernt" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Das Sperren der Paketverwaltung ist gescheitert" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Das Laden der Paketliste ist gescheitert" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Paket existiert nicht" +<<<<<<< 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 "Paket ist bereits auf dem neuesten Stand" +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Paket ist bereits installiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Paket ist nicht installiert" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Das Entfernen eines grundlegenden Systempakets ist gescheitert" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Der Vorgang kann nicht überwacht oder gesteuert werden" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Die Paketoperation ist gescheitert" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "" "Installation von Paketen erforderlich, denen nicht vertraut werden kann" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Der letzte Installationsvorgang wurde nicht erfolgreich beendet" @@ -940,7 +1339,19 @@ msgstr "Ein unvorhergesehener Fehler ist aufgetreten" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Der letzte Installationsvorgang wurde nicht erfolgreich beendet" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Ein unbekannter Fehler ist aufgetreten" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" +<<<<<<< TREE msgstr "Auf den Start des Dienstes wird gewartet" #: ../aptdaemon/enums.py:605 @@ -948,43 +1359,93 @@ msgstr "Warten" #: ../aptdaemon/enums.py:606 +======= +msgstr "Warten auf den Start des Dienstes" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Warten" + +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Auf das benötigte Medium wird gewartet" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Auf das Beenden anderer Software-Paketverwaltungen wird gewartet" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" +<<<<<<< TREE msgstr "Auf den Auswahldialog für die Konfigurationsdatei wird gewartet" +======= +msgstr "Warten auf Auswahldialog für Konfigurationsdatei" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Vorgang läuft" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Herunterladen" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Software-Paketquellen werden abgerufen" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Aufräumen" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Abhängigkeiten werden aufgelöst" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Beendet" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Es wird abgebrochen" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" +<<<<<<< TREE msgstr "Software-Liste wird geladen" #. TRANSLATORS: %s is the name of a package @@ -1103,6 +1564,21 @@ msgstr "Netzwerkverbindung nicht verfügbar" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +msgstr "Softwareliste wird geladen" + +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "%sB von %sB heruntergeladen bei %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "%sB von %sB heruntergeladen" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Details" @@ -1125,16 +1601,25 @@ msgstr "Heruntergeladen" #. 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 "CD/DVD »%s« wird benötigt" #. 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 "" "Bitte legen Sie die oben angegebene CD-ROM/DVD in das Laufwerk »%s« ein, um " @@ -1255,14 +1740,56 @@ msgstr "_Beibehalten" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Bitte legen Sie die oben genannte CD/DVD in das Laufwerk »%s« ein, um " +"Software-Pakete von diesem Medium zu installieren." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "_Fortfahren" + +#. 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 "" +"Ihre Änderungen in »%s« mit einer neueren Version der Konfigurationsdatei " +"ersetzen?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"Falls Sie nicht wissen, warum die Datei bereits vorhanden ist, ist es " +"üblicherweise besser, diese zu entfernen." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "Ä_nderungen" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Beibehalten" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Ersetzen" #. 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 "_Details" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1542,3 +2069,62 @@ #~ msgstr "" #~ "Das Hinzufügen des Schlüssels zur Liste der vertrauenswürdigen Software-" #~ "Anbieter ist gescheitert" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "%s wird installiert" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "%s wird konfiguriert" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "%s wird entfernt" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Nach-Installations-Trigger %s wird aufgerufen" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "%s wird komplett entfernt" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "%s wird aktualisiert" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "%s wird heruntergeladen" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "" +#~ "Es war nicht möglich, die neueste Version aller Pakete zu installieren." + +#~ msgid "Waiting for other tasks" +#~ msgstr "Warten auf andere Vorgänge" + +#~ msgid "System is already up-to-date" +#~ msgstr "System ist bereits auf dem neuesten Stand" + +#~ msgid "System is not up-to-date" +#~ msgstr "System ist nicht auf dem neuesten Stand" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Eine Systemaktualisierung ist unnötig" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Konfigurationsdatei »%s« wurde geändert" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Möchten Sie die neue Version benutzen?" +>>>>>>> MERGE-SOURCE === modified file 'po/dv.po' --- po/dv.po 2013-03-10 00:01:34 +0000 +++ po/dv.po 2013-06-03 17:47:29 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE # Divehi translation for aptdaemon # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # This file is distributed under the same license as the aptdaemon package. @@ -1419,3 +1420,565 @@ #, python-format msgid "but %s is to be installed" msgstr "" +======= +# Divehi translation for aptdaemon +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the aptdaemon package. +# FIRST AUTHOR , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: aptdaemon\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-28 10:52+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Divehi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../data/org.debian.apt.policy.in.h:1 +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:2 +msgid "Authentication is required to install a local package file." +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:4 +msgid "" +"Authentication is required to query the software repositories for " +"installable packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:5 +msgid "Authentication is required to remove software packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:6 +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 "" + +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:10 +msgid "Install package file" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "" + +#: ../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 +msgid "Update package information" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:15 +msgid "Upgrade packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "ނިޒާމް ތަރައްގީ ކުރުން" + +#: ../aptdaemon/core.py:1237 +msgid "Do not shutdown the daemon because of inactivity" +msgstr "" + +#: ../aptdaemon/core.py:1242 +msgid "Show internal processing information" +msgstr "އެތެރޭގައި ހިގަމުންދާ މައުލޫމާތުތައް ދައްކާ" + +#: ../aptdaemon/core.py:1246 +msgid "Quit and replace an already running daemon" +msgstr "" + +#: ../aptdaemon/core.py:1250 +msgid "Store profile stats in the specified file" +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 +msgid "Installed packages" +msgstr "އަޅާފައިވާ ޕެކޭޖުތައް" + +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" + +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "އަޕްޑޭޓްކުރެވިފައިވާ ކޭޗް" + +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "ފޮހެލެވިފައިވާ ޓްރަސްޓެޑް ކީ" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "ފޮހެލެވިފައިވާ ޕެކޭޖުތައް" + +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "އަޕްޑޭޓްކުރެވިފައިވާ ޕެކޭޖުތައް" + +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "ތަރައްގީކުރެވިފައިވާ ނިޒާމު" + +#: ../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 +msgid "Successful" +msgstr "ފުރިހަމަވެއްޖެ" + +#: ../aptdaemon/enums.py:158 +msgid "Canceled" +msgstr "ބާތިލުވެއްޖެ" + +#: ../aptdaemon/enums.py:159 +msgid "Failed" +msgstr "ފޭލްވެއްޖެ" + +#: ../aptdaemon/enums.py:169 +msgid "Installing file" +msgstr "ފައިލު އެޅެމުންދަނީ" + +#: ../aptdaemon/enums.py:170 +msgid "Installing packages" +msgstr "ޕެކޭޖުތައް އެޅެމުންދަނީ" + +#: ../aptdaemon/enums.py:171 +msgid "Adding key from file" +msgstr "ފައިލުން ކީއެއް އިތުރުކުރުން" + +#: ../aptdaemon/enums.py:172 +msgid "Updating cache" +msgstr "ކޭޗް އަޕްޑޭޓްވަނީ" + +#: ../aptdaemon/enums.py:173 +msgid "Removing trusted key" +msgstr "ޓްރަސްޓެޑް ކީ ފޮހެވެމުންދަނީ" + +#: ../aptdaemon/enums.py:174 +msgid "Removing packages" +msgstr "ޕެކޭޖުތައް ފޮހެވެމުންދަނީ" + +#: ../aptdaemon/enums.py:175 +msgid "Updating packages" +msgstr "ޕެކޭޖުތައް އަޕްޑޭޓްވަނީ" + +#: ../aptdaemon/enums.py:176 +msgid "Upgrading system" +msgstr "ނިޒާމު ތަރައްގީވަމުންދަނީ" + +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +msgid "Applying changes" +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 +msgid "Check your Internet connection." +msgstr "އިންޓަނެޓް ކަނެކްޝަން ރަގަޅުތޯ ބަލާ" + +#: ../aptdaemon/enums.py:215 +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 "" + +#: ../aptdaemon/enums.py:220 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "" + +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" +"މިއީ ސީރިއަސް މައްސަލައެއް. އިރުކޮޅަކުން މަސައްކަތްކުރޭ. މިމައްސަލަ ދެން " +"ދިމާވެއްޖެނަމަ، މި އުފެއްދިފަރާތަށް މި މައްސަލަ ހުށައަޅާ." + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" + +#: ../aptdaemon/enums.py:233 +msgid "There isn't any need for an update." +msgstr "އެއްވެސް އަޕްޑޭޓެއް ބޭނުމެއްނުވޭ" + +#: ../aptdaemon/enums.py:234 +msgid "There isn't any need for an installation" +msgstr "އެއްވެސް އިންސްޓޯލެއް ބޭނުމެއްނުވޭ" + +#: ../aptdaemon/enums.py:236 +msgid "There isn't any need for a removal." +msgstr "އެއްވެސް ފޮހެލުމެއް ބޭނުމެއްނުވޭ" + +#: ../aptdaemon/enums.py:237 +msgid "" +"You requested to remove a package which is an essential part of your system." +msgstr "" + +#: ../aptdaemon/enums.py:240 +msgid "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." +msgstr "" + +#: ../aptdaemon/enums.py:242 +msgid "The installation or removal of a software package failed." +msgstr "" + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "މިކަން ވެގެންނުވާނެ" + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 +msgid "Failed to download package files" +msgstr "ޕެކޭޖް ފައިލުތައް ޑައުންލޯޑްކުރުން ފޭލްވެއްޖެ" + +#: ../aptdaemon/enums.py:270 +msgid "Failed to download repository information" +msgstr "ރިޕޮސިޓޮރީ މައުލޫމާތު ޑައުންލޯޑުކުރުން ފޭލްވެއްޖެ" + +#: ../aptdaemon/enums.py:271 +msgid "Package dependencies cannot be resolved" +msgstr "ޕެކޭޖު ޑިޕެންޑެންސީތައް ހައްލެއްނުކުރެވުނު" + +#: ../aptdaemon/enums.py:272 +msgid "The package system is broken" +msgstr "ޕެކޭޖު ނިޒާމު ހަލާކުވެފައި" + +#: ../aptdaemon/enums.py:273 +msgid "Key was not installed" +msgstr "ކީ އެޅިފަކާއެއް ނެތް" + +#: ../aptdaemon/enums.py:274 +msgid "Key was not removed" +msgstr "ކީއެއް ނުފޮހެވުނު" + +#: ../aptdaemon/enums.py:275 +msgid "Failed to lock the package manager" +msgstr "ޕެކޭޖު މެނޭޖާ ތަޅުލުން ފޭލްވެއްޖެ" + +#: ../aptdaemon/enums.py:276 +msgid "Failed to load the package list" +msgstr "ޕެކޭޖު ލިސްޓް ލޯޑްކުރުން ފޭލްވެއްޖެ" + +#: ../aptdaemon/enums.py:277 +msgid "Package does not exist" +msgstr "ޕެކޭޖެއް ނުވޭ" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "ޕެކޭޖު ކުރީގައި އަޕްޑޭޓްކުރެވިފައި" + +#: ../aptdaemon/enums.py:279 +msgid "Package is already installed" +msgstr "ޕެކޭޖު ކުރިންވެސް އިންސްޓޯލްކުރެވިފައި" + +#: ../aptdaemon/enums.py:280 +msgid "Package isn't installed" +msgstr "ޕެކޭޖް އެޅިފަކާއެއް ނެތް" + +#: ../aptdaemon/enums.py:281 +msgid "Failed to remove essential system package" +msgstr "" + +#: ../aptdaemon/enums.py:283 +msgid "Task cannot be monitored or controlled" +msgstr "" + +#: ../aptdaemon/enums.py:284 +msgid "Package operation failed" +msgstr "ފެކޭޖު ހިންގުން ފޭލްވެއްޖެ" + +#: ../aptdaemon/enums.py:285 +msgid "Requires installation of untrusted packages" +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 +msgid "Waiting for service to start" +msgstr "ހިދުމަތް ފެށެންދެން މަޑުކުރަނީ" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +msgid "Waiting for required medium" +msgstr "" + +#: ../aptdaemon/enums.py:301 +msgid "Waiting for other software managers to quit" +msgstr "" + +#: ../aptdaemon/enums.py:302 +msgid "Waiting for configuration file prompt" +msgstr "" + +#: ../aptdaemon/enums.py:304 +msgid "Running task" +msgstr "ޓާސްކް ހިނގަމުންދަނީ" + +#: ../aptdaemon/enums.py:305 +msgid "Downloading" +msgstr "ޑައުންލޯޑް ވަމުންދަނީ" + +#: ../aptdaemon/enums.py:306 +msgid "Cleaning up" +msgstr "ސާފުކުރެވެމުންދަނީ" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:309 +msgid "Finished" +msgstr "ނިމިއްޖެ" + +#: ../aptdaemon/enums.py:310 +msgid "Cancelling" +msgstr "ކެންސެލްވަނީ" + +#: ../aptdaemon/enums.py:311 +msgid "Loading software list" +msgstr "ސޮފްޓްވެއާ ލިސްޓް ލޯޑްވަނީ" + +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Downloaded %sB of %sB at %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Downloaded %sB of %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +msgid "Details" +msgstr "ތަފްޞީލްތައް" + +#. TRANSLATORS: %s represents the name of a CD or DVD +#: ../aptdaemon/gtkwidgets.py:620 +#, python-format +msgid "CD/DVD '%s' is required" +msgstr "" + +#. TRANSLATORS: %s is the name of the CD/DVD drive +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"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 +msgid "_Replace" +msgstr "_ބަދަލުކުރޭ (ރިޕްލޭސް)" + +#. TRANSLATORS: expander label in the error dialog +#: ../aptdaemon/gtkwidgets.py:743 +msgid "_Details" +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 ޑައުންލޯޑް ކުރަނީ" +>>>>>>> MERGE-SOURCE === modified file 'po/el.po' --- po/el.po 2013-03-10 00:01:34 +0000 +++ po/el.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,28 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-02-26 18:45+0000\n" "Last-Translator: Filippos Kolyvas \n" "Language-Team: Greek \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-10-23 17:04+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Greek \n" +>>>>>>> MERGE-SOURCE "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" @@ -28,9 +40,15 @@ "Για να δείτε την λίστα με κλειδιά που εμπιστεύεστε, πρέπει να γίνει " "ταυτοποίηση." +<<<<<<< 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." @@ -38,40 +56,88 @@ "Χρειάζεται πιστοποίηση για να εκκαθαρίσετε τα ληφθέντα αρχεία πακέτων." #: ../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." +======= +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +>>>>>>> MERGE-SOURCE msgstr "" "Για να αλλάξετε τις ρυθμίσεις για τα αποθετήρια λογισμικού, πρέπει να γίνει " "ταυτοποίηση." -#: ../data/org.debian.apt.policy.in.h:9 +#: ../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 "Εγκαταστήστε ή αφαιρέστε πακέτα" @@ -137,7 +203,11 @@ "Για να εγκαταστήσετε αγορασμένο λογισμικό, πρέπει να γίνει ταυτοποίηση." #: ../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 @@ -391,7 +461,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 @@ -399,11 +479,21 @@ msgstr "Να μη γίνει φόρτωση κανενός πρόσθετου" #: ../aptdaemon/core.py:2197 +======= +msgstr "Μην τερματίσετε τον δαίμονα λόγω αδράνειας" + +#: ../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 @@ -415,26 +505,61 @@ 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 msgid "Do not make any changes to the system (Only of use to developers)" +======= +msgstr "Αποθήκευση στατιστικών προφίλ στο προσδιορισμένο αρχείο" + +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +>>>>>>> MERGE-SOURCE msgstr "" "Να μην γίνουν αλλαγές στο σύστημα (Χρήσιμο μόνο για τους προγραμματιστές)" +<<<<<<< TREE #: ../aptdaemon/enums.py:366 msgid "Installed file" msgstr "Εγκατεστημένο αρχείο" - +======= +#: ../aptdaemon/enums.py:136 +msgid "Installed file" +msgstr "Εγκατεστημένο αρχείο" + +#: ../aptdaemon/enums.py:137 +msgid "Installed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:367 msgid "Installed packages" msgstr "Εγκατεστημένα πακέτα" +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "Έγινε εισαγωγή κλειδιού από αρχείο" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" msgstr "Έγινε εισαγωγή κλειδιού από αρχείο" +======= +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "H cache ενημερώθηκε" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:369 msgid "Updated cache" msgstr "H cache ενημερώθηκε" @@ -446,19 +571,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "Αφαιρέθηκε έμπιστο κλειδί" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "Πακέτα που αφαιρέθηκαν" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "Πακέτα που αφαιρέθηκαν" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "Πακέτα που ενημερώθηκαν" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 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:144 +msgid "Applied changes" +msgstr "Οι αλλαγές πραγματοποιήθηκαν" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "Οι αλλαγές πραγματοποιήθηκαν" @@ -488,50 +641,105 @@ 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 "Εφαρμογή αλλαγών" @@ -574,6 +782,7 @@ #: ../aptdaemon/enums.py:452 msgid "Adding the key to the list of trusted software vendors failed" msgstr "" +<<<<<<< TREE "Η προσθήκη του κλειδιού στη λίστα προμηθευτών πιστοποιημένου περιεχομένου " "απέτυχε" @@ -630,10 +839,70 @@ 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" @@ -643,12 +912,20 @@ "απενεργοποιήστε τα, αφού είναι συχνά πηγή προβλημάτων.\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." @@ -656,7 +933,11 @@ "Αδυναμία αφαίρεσης επιλεγμένου κλειδιού. Βεβαιωθείτε ότι δώσατε έγκυρο " "αποτύπωμα." +<<<<<<< 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." @@ -665,7 +946,11 @@ "λογισμικού, π.χ. 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." @@ -673,7 +958,11 @@ "Αυτό είναι ένα σοβαρό πρόβλημα. Δοκιμάστε ξανά αργότερα. Αν το πρόβλημα αυτό " "εμφανιστεί ξανά, παρακαλώ αναφέρατε το σφάλμα στους προγραμματιστές." +<<<<<<< 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." @@ -681,26 +970,46 @@ "Ελέγξτε την ορθογραφία του ονόματος του πακέτου, και ότι το κατάλληλο " "αποθετήριο είναι ενεργοποιημένο." +<<<<<<< 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." @@ -708,8 +1017,13 @@ "Η σύνδεση με την υπηρεσία χάθηκε. Πιθανότατα η υπηρεσία παρασκηνίου να " "σταμάτησε να λειτουργεί." +<<<<<<< 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 @@ -727,8 +1041,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." @@ -811,39 +1135,92 @@ "παρέχει κάποιον διαχειριστή συνεδρίας 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 "" + +#: ../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" +<<<<<<< TREE msgstr "Το πακέτο δεν υπάρχει" #: ../aptdaemon/enums.py:572 @@ -851,27 +1228,57 @@ msgstr "Το πακέτο είναι ήδη ενημερωμένο" #: ../aptdaemon/enums.py:573 +======= +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../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 @@ -915,7 +1322,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 @@ -923,23 +1344,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 @@ -947,19 +1394,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 @@ -1078,6 +1549,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 "Λεπτομέρειες" @@ -1100,16 +1586,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 "Απαιτείτε 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 "" "Παρακαλώ εισάγετε το παραπάνω CD/DVD στον οδηγό '%s' για να εγκαταστήσετε " @@ -1230,11 +1725,51 @@ 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" +<<<<<<< TREE msgstr "Α_ντικατάσταση" +======= +msgstr "" + +>>>>>>> MERGE-SOURCE #. 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/en_AU.po' --- po/en_AU.po 2013-03-10 00:01:34 +0000 +++ po/en_AU.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-12-25 13:34+0000\n" "Last-Translator: Jared Norris \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-11 12:34+0000\n" +"Last-Translator: Stephen Norman \n" +>>>>>>> MERGE-SOURCE "Language-Team: English (Australia) \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" @@ -39,29 +50,69 @@ msgstr "Change software configuration" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "To change software settings, you need to authenticate." - +======= +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 "Authentication is required to upgrade software packages" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Change software repository" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Authentication is required to upgrade the system" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "To change software repository settings, you need to authenticate." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Cancel the task of another user" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Install package file" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "To install this package, you need to authenticate." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Install packages" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Remove packages" + +#: ../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 "Update package information" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "To update the software catalogue, you need to authenticate." @@ -124,9 +175,13 @@ msgstr "To install purchased software, you need to authenticate." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Upgrade packages" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "To install updated software, you need to authenticate." @@ -371,21 +426,37 @@ msgstr "Waiting for authentication" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Upgrade system" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Do not load any plugins" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Show internal processing information" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Quit and replace an already running daemon" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Listen on the DBus session bus (Only required for testing" @@ -395,53 +466,97 @@ msgstr "Perform operations in the given chroot" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Store profile stats in the specified file" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Do not make any changes to the system (Only of use to developers)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Do not make any changes to the system (Only of use to developers)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Installed file" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Installed packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Added key from file" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Updated cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Search done" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Removed trusted key" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Removed packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Updated packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Upgraded system" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Applied changes" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Repaired incomplete installation" @@ -467,53 +582,109 @@ msgstr "Reconfigured installed packages" #: ../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 "Successful" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Cancelled" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Failed" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Installing file" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Installing packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Adding key from file" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Updating cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Removing trusted key" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Removing packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Updating packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Upgrading system" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Applying changes" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Repairing incomplete installation" @@ -607,10 +778,69 @@ msgstr "Adding license key" #: ../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 "Installation of the package file failed" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Installation of software failed" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "Adding the key to the list of trused software vendors failed" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Refreshing the software list failed" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "Removing the vendor from the list of trusted ones failed" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Removing software failed" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Updating software failed" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Upgrading the system failed" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Applying software changes failed" + +#: ../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 "Check your Internet connection." +<<<<<<< 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" @@ -620,10 +850,15 @@ "they are a common source of problems.\n" "Furthermore run the following command in a 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 "The selected file may not be a GPG key file or it might be corrupt." +<<<<<<< TREE #: ../aptdaemon/enums.py:488 msgid "" "The selected key couldn't be removed. Check that you provided a valid " @@ -657,17 +892,63 @@ "is enabled." #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" +"The selected key couldn't be removed. Check if you provided a valid " +"fingerprint." + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" +"Check if you are currently running another software management tool, e.g. " +"Synaptic or Aptitude. Only one tool is allowed to make changes at the same " +"time." + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" +"Check the spelling of the package name and if you have enabled the " +"corresponding repository." + +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "There isn't any need for an update." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "There isn't any need for an installation" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "There isn't any need for a removal." +<<<<<<< TREE #: ../aptdaemon/enums.py:502 msgid "" "You requested to remove a package which is an essential part of your system." @@ -683,9 +964,27 @@ "crashed." #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:237 +msgid "" +"You requested to remove a package which is an essential part of your system." +msgstr "" +"You requested to remove a package which is an essential part of your system." + +#: ../aptdaemon/enums.py:240 +msgid "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." +msgstr "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." + +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "The installation or removal of a software package failed." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "The requested feature is not supported." @@ -783,69 +1082,165 @@ "PolicyKit session agent." #: ../aptdaemon/enums.py:563 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "This should not happen." + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 "" +"This error could be caused by required additional software packages which " +"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." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"The action would require the installation of packages from sources that are " +"not authenticated." + +#: ../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 "Failed to download package files" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Failed to download repository information" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Package dependencies cannot be resolved" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "The package system is broken" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Key was not installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Key was not removed" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Failed to lock the package manager" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Failed to load the package list" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Package does not exist" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Package is already up to date" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Package is already up-to-date" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Package is already installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Package isn't installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Failed to remove essential system package" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Task cannot be monitored or controlled" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Package operation failed" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Requires installation of untrusted packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Previous installation hasn't been completed" @@ -887,53 +1282,111 @@ msgstr "An unhandleable error occured" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "An unknown error occurred" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Waiting for service to start" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Waiting" +======= +#: ../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 "Waiting for required medium" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Waiting for other software managers to quit" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Waiting for configuration file prompt" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Running task" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Downloading" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Querying software sources" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Cleaning up" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Resolving dependencies" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Finished" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Cancelling" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Loading software list" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1050,6 +1503,19 @@ msgstr "Network isn't available" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Downloaded %sB of %sB at %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Downloaded %sB of %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Details" @@ -1072,12 +1538,17 @@ msgstr "Downloaded" #. 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 "CD/DVD '%s' is required" #. TRANSLATORS: %s is the name of the CD/DVD drive +<<<<<<< TREE #: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820 #, python-format msgid "" @@ -1201,14 +1672,59 @@ msgstr "_Keep" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." +msgstr "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinue" + +#. 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 "" +"Replace your changes in '%s' with a later version of the configuration file?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Changes" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Keep" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Replace" #. 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 "_Details" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1482,3 +1998,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "Adding the key to the list of trused software vendors failed" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Installing %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Configuring %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Removing %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Running post-installation trigger %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Purging %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Upgrading %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Downloading %s" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Waiting for other tasks" + +#~ msgid "System is already up-to-date" +#~ msgstr "System is already up-to-date" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "There isn't any need for a system update" + +#~ msgid "System is not up-to-date" +#~ msgstr "System is not up-to-date" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Do you want to use the new version?" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "It was not possible to install the latest version of all packages." + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Configuration file '%s' changed" +>>>>>>> MERGE-SOURCE === modified file 'po/en_CA.po' --- po/en_CA.po 2013-03-10 00:01:34 +0000 +++ po/en_CA.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2011-01-16 11:47+0000\n" "Last-Translator: Daniel LeBlanc \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-02-09 18:53+0000\n" +"Last-Translator: Itai Molenaar \n" +>>>>>>> MERGE-SOURCE "Language-Team: English (Canada) \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" @@ -39,29 +50,69 @@ 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 "Authentication is required to upgrade software packages" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Change software repository" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Authentication is required to upgrade the system" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "To change software repository settings, you need to authenticate." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Cancel the task of another user" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Install package file" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "To install this package, you need to authenticate." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Install packages" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Remove packages" + +#: ../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 "Update package information" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "To update the software catalog, you need to authenticate." @@ -124,9 +175,13 @@ msgstr "To install purchased software, you need to authenticate." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Upgrade packages" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "To install updated software, you need to authenticate." @@ -367,21 +422,37 @@ msgstr "Waiting for authentication" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Upgrade system" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Do not shutdown the daemon because of inactivity" +<<<<<<< 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 "Show internal processing information" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Quit and replace an already running daemon" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "" @@ -391,53 +462,97 @@ msgstr "" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Store profile stats in the specified file" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Do not make any changes to the system (Only of use to developers)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Do not make any changes to the system (Only of use to developers)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Installed file" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Installed packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Added key from file" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Updated cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Removed trusted key" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Removed packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Updated packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Upgraded system" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Applied changes" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Repaired incomplete installation" @@ -463,53 +578,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 "Successful" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Cancelled" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Failed" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Installing file" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Installing packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Adding key from file" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Updating cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Removing trusted key" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Removing packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Updating packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Upgrading system" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Applying changes" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Repairing incomplete installation" @@ -603,10 +774,69 @@ 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 "Installation of the package file failed" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Installation of software failed" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "Adding the key to the list of trusted software vendors failed" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Refreshing the software list failed" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "Removing the vendor from the list of trusted ones failed" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Removing software failed" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Updating software failed" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Upgrading the system failed" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Applying software changes failed" + +#: ../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 "Check your Internet connection." +<<<<<<< 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" @@ -616,11 +846,16 @@ "because they are a common source of problems.\n" "Furthermore, run the following command in a 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 "" "The selected file might not be a GPG key file or it might be corrupt." +<<<<<<< TREE #: ../aptdaemon/enums.py:488 msgid "" "The selected key couldn't be removed. Check that you provided a valid " @@ -654,25 +889,78 @@ "is enabled." #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" +"The selected key couldn't be removed. Check if you provided a valid " +"fingerprint." + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" +"Check if you are currently running another software management tool, e.g. " +"Synaptic or aptitude. Only one tool is allowed to make changes at the same " +"time." + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" +"Check the spelling of the package name and if you have enabled the " +"corresponding repository." + +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "There is no need for an update." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "There is no need for an installation." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "There is no need for a removal." +<<<<<<< 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 "" "You have requested to remove a package which is an essential part of your " "system." +<<<<<<< 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." @@ -680,10 +968,15 @@ "The connection to the daemon was lost. Most likely, the background daemon " "crashed." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "The installation or removal of a software package failed." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "" @@ -764,69 +1057,164 @@ msgstr "" #: ../aptdaemon/enums.py:563 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "This should not happen." + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 "" +"This error could be caused by required additional software packages being " +"missing or not-installable. Alternatively, there could be a conflict between " +"software packages that are not allowed to be installed at the same time." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"The action would require the installation of packages from unauthenticated " +"sources." + +#: ../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 "Failed to download package files" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Failed to download repository information" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Package dependencies cannot be resolved" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "The package system is broken" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Key was not installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Key was not removed" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Failed to lock the package manager" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Failed to load the package list" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Package does not exist" +<<<<<<< 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 "Package is already up-to-date" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Package is already installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Package isn't installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Failed to remove an essential system package" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Task cannot be monitored or controlled" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Package operation failed" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Requires installation of untrusted packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Previous installation hasn't been completed" @@ -868,53 +1256,111 @@ msgstr "An unhandlable error occured" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "An unknown error occurred" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Waiting for service to start" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Waiting" +======= +#: ../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 "Waiting for required medium" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Waiting for other software managers to quit" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Waiting for configuration file prompt" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Running task" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Downloading" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Cleaning up" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Resolving dependencies" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Finished" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Cancelling" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Loading software list" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1031,6 +1477,19 @@ msgstr "Network isn't available" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Downloaded %sB of %sB at %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Downloaded %sB of %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Details" @@ -1053,12 +1512,17 @@ msgstr "Downloaded" #. 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 "CD/DVD '%s' is required" #. TRANSLATORS: %s is the name of the CD/DVD drive +<<<<<<< TREE #: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820 #, python-format msgid "" @@ -1182,14 +1646,59 @@ msgstr "_Keep" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." +msgstr "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinue" + +#. 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 "" +"Replace your changes in '%s' with a later version of the configuration file?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Changes" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Keep" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Replace" #. 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 "_Details" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1457,3 +1966,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "Adding the key to the list of trusted software vendors failed" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Installing %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Configuring %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Removing %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Running post-installation trigger %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Purging %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Upgrading %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Downloading %s" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "It was not possible to install the latest for all packages." + +#~ msgid "Waiting for other tasks" +#~ msgstr "Waiting for other tasks" + +#~ msgid "System is already up-to-date" +#~ msgstr "System is already up-to-date" + +#~ msgid "System is not up-to-date" +#~ msgstr "System is not up-to-date" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "There is no need for a system update" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Configuration file '%s' changed" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Do you want to use the new version?" +>>>>>>> MERGE-SOURCE === modified file 'po/en_GB.po' --- po/en_GB.po 2013-03-10 00:01:34 +0000 +++ po/en_GB.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-12-26 23:46+0000\n" "Last-Translator: Andi Chandler \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-27 15:20+0000\n" +"Last-Translator: Robert Readman \n" +>>>>>>> MERGE-SOURCE "Language-Team: English (United Kingdom) \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" @@ -39,29 +50,69 @@ msgstr "Change software configuration" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "To change software settings, you need to authenticate." - +======= +msgid "Authentication is required to repair broken installations" +msgstr "Authentication is required to repair broken installations" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Authentication is required to upgrade software packages" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Change software repository" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Authentication is required to upgrade the system" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "To change software repository settings, you need to authenticate." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Cancel the task of another user" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Install package file" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "To install this package, you need to authenticate." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Install packages" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Remove packages" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Repair broken installations" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Update package information" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "To update the software catalogue, you need to authenticate." @@ -124,9 +175,13 @@ msgstr "To install purchased software, you need to authenticate." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Upgrade packages" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "To install updated software, you need to authenticate." @@ -371,21 +426,37 @@ msgstr "Waiting for authentication" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Upgrade system" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Do not shutdown the daemon due to inactivity" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Do not load any plugins" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Show internal processing information" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Stop and replace an already running daemon" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Listen on the DBus session bus (Only required for testing)" @@ -395,53 +466,97 @@ msgstr "Perform operations in the given chroot" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Store profile stats in the specified file" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Do not make any changes to the system (Only of use to developers)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Do not make any changes to the system (Only of use to developers)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Installed file" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Installed packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Added key from file" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Updated cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Search done" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Removed trusted key" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Removed packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Updated packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Upgraded system" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Applied changes" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Repaired incomplete installation" @@ -467,53 +582,109 @@ msgstr "Reconfigured installed packages" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Repaired incomplete installation" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Repaired broken dependencies" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Successful" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Cancelled" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Failed" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Installing file" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Installing packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Adding key from file" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Updating cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Removing trusted key" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Removing packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Updating packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Upgrading system" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Applying changes" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Repairing incomplete installation" @@ -607,10 +778,69 @@ msgstr "Adding license key" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Repairing incomplete installation" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Repairing broken deps" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Installation of the package file failed" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Installation of software failed" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "Adding the key to the list of trusted software vendors failed" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Refreshing the software list failed" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "Removing the vendor from the list of trusted ones failed" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Removing software failed" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Updating software failed" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Upgrading the system failed" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Applying software changes failed" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Repairing incomplete installation failed" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Repairing broken dependencies failed" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Check your Internet connection." +<<<<<<< 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" @@ -620,10 +850,15 @@ "a common source of problems.\n" "Now run the following command in a 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 "The selected file may not be a GPG key file or it might be corrupt." +<<<<<<< TREE #: ../aptdaemon/enums.py:488 msgid "" "The selected key couldn't be removed. Check that you provided a valid " @@ -657,24 +892,77 @@ "is enabled." #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" +"The selected key couldn't be removed. Check if you provided a valid " +"fingerprint." + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" +"Check if you are currently running another software management tool, e.g. " +"Synaptic or aptitude. Only one tool is allowed to make changes at the same " +"time." + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" +"Check the spelling of the package name and if you have enabled the " +"corresponding repository." + +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "There isn't any need to update." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "There isn't any need for an installation" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "There isn't any need for a removal." +<<<<<<< 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 "" "You requested to remove a package which is an essential part of your system." +<<<<<<< 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." @@ -682,10 +970,15 @@ "The connection to the daemon was lost. The background daemon probably " "crashed." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "The installation or removal of a software package failed." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "The requested feature is not supported." @@ -783,69 +1076,168 @@ "a PolicyKit session agent." #: ../aptdaemon/enums.py:563 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "This should not happen." + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 "" +"This error could be caused by requiring additional software packages which " +"are missing or not installable. Alternatively, there could be a conflict " +"between software packages which are not allowed to be installed at the same " +"time." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"The action would require the installation of packages from unauthenticated " +"sources." + +#: ../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 "" +"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." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Failed to download package files" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Failed to download repository information" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Package dependencies cannot be resolved" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "The package system is broken" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Key was not installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Key was not removed" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Failed to lock the package manager" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Failed to load the package list" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Package does not exist" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Package is already up to date" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Package is already up-to-date" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Package is already installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Package isn't installed" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Failed to remove essential system package" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Task cannot be monitored or controlled" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Package operation failed" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Requires installation of untrusted packages" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Previous installation hasn't been completed" @@ -887,53 +1279,111 @@ msgstr "An unhandled error occured" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Previous installation hasn't been completed" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "An unknown error occurred" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Waiting for service to start" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Waiting" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Waiting" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:606 +======= +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Waiting for required medium" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Waiting for other software managers to quit" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Waiting for configuration file prompt" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Running task" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Downloading" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Querying software sources" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Cleaning up" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Resolving dependencies" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Finished" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Cancelling" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Loading software list" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1050,6 +1500,19 @@ msgstr "Network isn't available" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Downloaded %sB of %sB at %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Downloaded %sB of %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Details" @@ -1072,12 +1535,17 @@ msgstr "Downloaded" #. 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 "CD/DVD '%s' is required" #. TRANSLATORS: %s is the name of the CD/DVD drive +<<<<<<< TREE #: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820 #, python-format msgid "" @@ -1201,14 +1669,59 @@ msgstr "_Keep" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." +msgstr "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinue" + +#. 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 "" +"Replace your changes in '%s' with a later version of the configuration file?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Changes" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Keep" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Replace" #. 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 "_Details" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1482,3 +1995,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "Adding the key to the list of trusted software vendors failed" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Installing %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Configuring %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Removing %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Running post-installation trigger %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Purging %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Upgrading %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Downloading %s" + +#~ msgid "System is not up-to-date" +#~ msgstr "System is not up-to-date" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "It was not possible to install the latest version of all packages." + +#~ msgid "Waiting for other tasks" +#~ msgstr "Waiting for other tasks" + +#~ msgid "System is already up-to-date" +#~ msgstr "System is already up-to-date" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "There isn't any need for a system update" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Configuration file '%s' changed" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Do you want to use the new version?" +>>>>>>> MERGE-SOURCE === modified file 'po/eo.po' --- po/eo.po 2013-03-10 00:01:34 +0000 +++ po/eo.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-09-15 16:37+0000\n" "Last-Translator: Michael Moroni \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-08 09:27+0000\n" +"Last-Translator: Michael Vogt \n" +>>>>>>> MERGE-SOURCE "Language-Team: Esperanto \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" @@ -39,30 +50,70 @@ msgstr "Ŝanĝi programarajn agordojn" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Aŭtentokontrolo necesas por ŝanĝi programajn agordojn." - +======= +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 "Aŭtentokontrolo estas necesa por promocii programpakaĵojn" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Ŝanĝi programarajn deponejon" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Aŭtentokontrolo estas necesa por promocii la sistemon" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Aŭtentokontrolo necesas por ŝanĝi agordojn pri programaraj deponejoj." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Nuligi la taskon de alia uzanto" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Instali pakaĵdosieron" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Aŭtentokontrolo necesas por instali ĉi tiun pakaĵon." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Instali pakaĵojn" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Forigi pakaĵojn" + +#: ../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 "Ĝisdatigi pakaĵajn informojn" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Aŭtentokontrolo necesas por ĝisdatigi la programaran katalogon." @@ -125,9 +176,13 @@ msgstr "Aŭtentokontrolo necesas por instali aĉetitan programaron." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Ĝisdatigitaj pakaĵoj" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "Aŭtentokontrolo necesas por instali ĝisdatigitan programaron." @@ -369,7 +424,15 @@ msgstr "Atendanta aŭtentokontrolon" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Promocii sistemon" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE msgstr "Ne ĉesigi la demonon pro neaktiveco" #: ../aptdaemon/core.py:2193 @@ -377,13 +440,23 @@ msgstr "Ne ŝargi iujn kromprogramojn" #: ../aptdaemon/core.py:2197 +======= +msgstr "Ne ĉesigu la demonon pro neaktiveco" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Montri informojn pri interna traktado" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Ĉesigi kaj anstataŭigi jam aktivan demonon" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Aŭskulti je la DBus-seancbuso (nur postulata por testado)" @@ -393,53 +466,97 @@ msgstr "Efektivigi operaciojn en la elektita ‘chroot’" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Konservi profilstatojn en la specifan dosieron" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Ne fari ajnan ŝanĝon al la sistemo (Nur uzinda por programistoj)" #: ../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 "Instalita dosiero" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Instalitaj pakaĵoj" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Aldonis ŝlosilon el dosiero" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Aktualigis kaŝmemoron" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Serĉo farita" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Forigis fidatan ŝlosilon" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Forigis pakaĵojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Ĝisdatigis pakaĵojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Promociis sistemon" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Aplikis ŝanĝojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Riparis nekompletan instalon" @@ -465,53 +582,109 @@ msgstr "Reagordis instalitajn pakaĵojn" #: ../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 "Sukcesis" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Nuligita" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Fiaskis" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Instalas dosieron" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Instalas pakaĵojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Aldonas ŝlosilon el dosiero" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Aktualigas kaŝmemoron" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Forigas fidatan ŝlosilon" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Forigas pakaĵojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Ĝisdatigas pakaĵojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Promocias sistemon" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Aplikas ŝanĝojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Riparas nekompletan instalon" @@ -606,10 +779,69 @@ msgstr "Aldonanta permesilŝlosilon" #: ../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 "Kontrolu vian interret-konekton" +<<<<<<< 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" @@ -619,12 +851,20 @@ "ilin, ĉar ili estas kutima fonto da problemoj.\n" "Aldone, rulu la sekvan komandon en terminalo: 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 "" "Eble aŭ la elektita dosiero ne estas GPG-ŝlosila dosiero aŭ ĝi estas fuŝita." +<<<<<<< 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." @@ -632,7 +872,11 @@ "Ne eblis forigi la elektitan ŝlosilon. Kontrolu ĉu vi provizis validan " "fingropremon." +<<<<<<< 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." @@ -640,7 +884,11 @@ "Kontrolu ĉu vi nun uzas alian programar-mastruman ilon, ekz. Synaptic aŭ " "aptitue. Nur unu ilo samtempe povas fari ŝanĝojn." +<<<<<<< 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." @@ -648,7 +896,11 @@ "Tio ĉi estas serioza problemo. Reprovu poste. Se tiu ĉi problemo prezentas " "sin denove, bonvolu raporti eraron al la programistoj" +<<<<<<< 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." @@ -656,33 +908,58 @@ "Kontrolu la literumadon de la pakaĵnomo, kaj kontrolu ĉu la ĝusta deponejo " "estas ebligita." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Ne necesas ĝisdatigi." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Mankas neceso por instalado" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Ne necasas forigado." +<<<<<<< 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 "Vi petis forigi pakaĵon kiu estas esenca parto de via sistemo." +<<<<<<< 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 "La konekto al la demono perdiĝis. Verŝajne la fona demono kolapsis." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "Fiaskis la instalo aŭ forigo de programara pakaĵo." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "La petita trajto ne estas subtenata" @@ -698,8 +975,16 @@ "taskojn." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Tio ne devintus okazi." + +#: ../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." @@ -776,69 +1061,156 @@ 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 "" +"Ĉi tiu eraro povas esti kaŭzata de postulataj aldonaj pakaĵoj kiuj aŭ mankas " +"aŭ estas neinstaleblaj. Plie povas esti konflikto inter programaraj pakaĵoj " +"kiuj ne rajtas instaliĝi samtempe." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Ĉi tiu ago postulas la instaladon de pakaĵoj el neaŭtentigitaj fontoj." + +#: ../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 "Fiaskis elŝuti pakaĵdosierojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Fiaskis elŝuti deponejajn informojn" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Pakaĵaj dependecoj ne povas esti solvataj" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "La pakaĵa sistemo estas kaduka" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Ŝlosilo estas neinstalita" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Ŝlosilo estas neforigita" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Fiaskis ŝlosi la pakaĵadministrilon" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Fiaskis ŝargi la pakaĵliston" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Pakaĵo ne ekzistas" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Pakaĵo estas jam ĝisdata" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Pakaĵo jam estas ĝisdata" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Pakaĵo jam estas instalita" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Pakaĵo ne estas instalita" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Fiaskis forigi estencan sistempakaĵon" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Tasko ne povas esti monitorata aŭ kontrolata" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Pakaĵoperacio fiaskis" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Postulas instalon de nefidataj pakaĵoj" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Antaŭa instalo ne estis kompletigita" @@ -880,53 +1252,111 @@ msgstr "Okazis netraktebla eraro" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Okazis nekonata eraro" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Atendas la starton de servo" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Atendas" +======= +#: ../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 "Atendas postulatan datumportilon" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Atendas ĝis aliaj programaraj administriloj ĉesas" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Atendas la fenestron de la agordodosiero" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Aktiva tasko" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Elŝutas" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Petanta pri programarfontoj" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Purigado" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Solvas dependojn" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Finita" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Nuligas" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Ŝargas programaran liston" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1043,6 +1473,19 @@ msgstr "Reto ne disponeblas" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Elŝutis %sB el %sB je %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Elŝutis %sB el %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Detaloj" @@ -1065,16 +1508,25 @@ msgstr "Elŝutis" #. 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 "Lumdisko '%s' estas bezonata" #. 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 "" "Metu la supre indikitan CD/DVD en ingo '%s' por instali programarajn " @@ -1195,14 +1647,52 @@ msgstr "_Konservi" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Bonvolu meti la supran lumdiskon en la diskingon '%s' por instali " +"programarajn pakaĵojn el la datumportilo." + +#: ../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 "_Konservi" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Anstataŭigi" #. 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 "_Detaloj" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1476,3 +1966,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "Fiaskis la aldono de la ŝlosilo al la listo de fidata programaro" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Instalado de %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Agordado de %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Forigado de %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Rulas post-instalan ekagilon %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Viŝado de %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Promociado de %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Elŝutado de %s" + +#~ msgid "System is not up-to-date" +#~ msgstr "Sistemo ne estas ĝisdata" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "Ne eblis instali la lastan version de ĉiuj pakaĵoj." + +#~ msgid "System is already up-to-date" +#~ msgstr "Sistemo estas jam ĝisdata" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Ne necesas ĝisdatigi la sistemon" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Atendas je aliaj taskoj" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Agorda dosiero \"%s\" ŝanĝiĝis" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Ĉu vi volas uzi la novan version?" +>>>>>>> MERGE-SOURCE === modified file 'po/es.po' --- po/es.po 2013-03-10 00:01:34 +0000 +++ po/es.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,26 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-12-30 08:46+0000\n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-27 05:59+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Paco Molinero \n" "Language-Team: Spanish \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" @@ -40,30 +50,70 @@ msgstr "Cambiar la configuración del software" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Para cambiar la configuración del software, necesita autenticarse." - +======= +msgid "Authentication is required to repair broken installations" +msgstr "Se requiere autenticación para poder reparar instalaciones rotas" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Se requiere autenticación para actualizar paquetes de software" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Cambiar el repositorio de software" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Se requiere autenticación para actualizar el sistema" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Para cambiar la configuración de los repositorios, necesita autenticarse." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Cancelar la tarea de otro usuario" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Instalar archivo de paquete" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Para instalar este paquete, necesita autenticarse." - -#: ../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 "Reparar instalaciones rotas" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Actualizar información de paquetes" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Para actualizar el catálogo de software, necesita autenticarse." @@ -128,9 +178,13 @@ msgstr "Para instalar software comprado, necesita autenticarse." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Actualizar paquetes" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "Para instalar software actualizado, necesita autenticarse." @@ -379,21 +433,37 @@ msgstr "Esperando la autenticación" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Actualizar sistema" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "No parar el demonio en caso de inactividad" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "No cargar ningún complemento" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Mostrar información del procesamiento interno" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Salir y sustituir un demonio que ya esté ejecutándose" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Escuchar en el bus de sesión de DBus (necesario solo para pruebas" @@ -403,54 +473,99 @@ msgstr "Realiza operaciones en el chroot dado" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Guardar estadísticas de perfil en el archivo especificado" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "" "No haga ningún cambio en el sistema (sólo para uso de los desarrolladores)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "" +"No haga ningún cambio en el sistema (sólo para uso de los desarrolladores)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Archivo instalado" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Paquetes instalados" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Clave añadida desde archivo" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Caché actualizada" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Búsqueda realizada" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Clave de confianza eliminada" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Paquetes desinstalados" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Paquetes actualizados" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Sistema actualizado" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Cambios aplicados" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Instalación incompleta reparada" @@ -476,53 +591,109 @@ msgstr "Reconfigurados los paquetes instalados" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Instalación incompleta reparada" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Dependencias rotas reparadas" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Completado" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Cancelado" +<<<<<<< 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 archivo" +<<<<<<< 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 "Añadiendo clave desde archivo" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Actualizando caché" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Eliminando clave de confianza" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Desinstalando paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Actualizando paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Actualizando 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 los cambios" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Reparando instalación incompleta" @@ -617,10 +788,71 @@ msgstr "Añadiendo clave de licencia" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Reparando instalación incompleta" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Reparando dependencias rotas" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Falló la instalación del archivo 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 "" +"Hubo un fallo al agregar la clave a la lista de proveedores de software de " +"confianza" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Falló la actualización de la lista de software" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "Hubo un fallo al eliminar el proveedor de la lista de confianza" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Falló la eliminación de software" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Falló la actualización de software" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Falló la actualización del sistema" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Falló la aplicación de cambios de software" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Falló la reparación de la instalación incompleta" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Falló la reparación de las dependencias rotas" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Compruebe su conexió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" @@ -631,13 +863,21 @@ "Posteriormente, ejecute el siguiente comando en un 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 "" "Puede que el archivo seleccionado no sea un archivo de clave GPG o que esté " "dañado." +<<<<<<< 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." @@ -645,7 +885,11 @@ "La calve seleccionada no se puede eliminar. Compruebe que suministró una " "huella 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." @@ -654,7 +898,11 @@ "software, por ejemplo Synaptic o aptitude. Solamente se puede usar una " "herramienta cada vez." +<<<<<<< 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." @@ -662,7 +910,11 @@ "Este es un problema serio. Vuelva a intentarlo más tarde. Si el problema " "vuelve a aparecer, informe del error a los desarrolladores." +<<<<<<< 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." @@ -670,25 +922,45 @@ "Compruebe la ortografía del nombre del paquete y si está activado el " "repositorio apropiado." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "No hay necesidad de una actualización." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "No hay necesidad de una instalación" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "No hay necesidad de 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 "" "Ha solicitado desinstalar un paquete que es parte esencial de su 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." @@ -696,10 +968,15 @@ "Se ha perdido la conexión con el demonio. Probablemente el demonio de " "segundo plano ha dejado de funcionar." +<<<<<<< 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 característica solicitada no está permitida." @@ -715,8 +992,16 @@ "paquetes relacionadas." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Esto no debería ocurrir." + +#: ../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." @@ -796,69 +1081,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 "" +"Este error puede ser causado por paquetes de software adicionales necesarios " +"que faltan o no son instalables. Además podría haber un conflicto entre los " +"paquetes de software a los que no se les permite ser instalados al mismo " +"tiempo." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"La acción puede necesitar la instalación de paquetes de fuentes no " +"autenticadas." + +#: ../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 haber fallado por un error en los paquetes " +"correspondientes de software o se canceló de una manera incorrecta. Debe " +"reparar esto antes de poder instalar o eliminar cualquier otro software." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Falló al descargar los archivos 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 repositorio" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Las dependencias del paquete no se pueden resolver" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "El paquete de sistema está roto" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "La clave no ha sido instalada" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "La clave no ha sido eliminada" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Falló al bloquear el gestor 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 lista de paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "El paquete no existe" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "El paquete ya esta actualizado a la fecha" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "El paquete ya está actualizado" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "El paquete ya está instalado" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "El paquete no está instalado" +<<<<<<< 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 tarea no pudo monitorizarse o controlarse" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Falló la operación con el paquete" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Se requiere la instalación de paquetes no confiables" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Una instalación previa no se completó" @@ -900,7 +1277,19 @@ msgstr "Ocurrió un error que no se puede manejar" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Una instalación previa no se completó" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Ocurrió un error desconocido" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" +<<<<<<< TREE msgstr "Esperando el servicio para iniciar" #: ../aptdaemon/enums.py:605 @@ -908,45 +1297,91 @@ msgstr "Esperando" #: ../aptdaemon/enums.py:606 +======= +msgstr "Esperando el inicio del servicio" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Esperando" + +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Esperando el soporte requerido" +<<<<<<< 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 gestores de paquetes se cierren" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Esperando la solicitud del archivo de configuración" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Ejecutando tarea" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Descargando" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Consultando los orígenes del software" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Limpiando" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Resolviendo dependencias" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Finalizado" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Cancelando" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Cargando la lista de software" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1063,6 +1498,19 @@ msgstr "La red no está 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" @@ -1085,16 +1533,25 @@ msgstr "Descargado" #. 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 "Se requiere el 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 "" "Inserte el CD/DVD en «%s» para instalar desde él los paquetes de software." @@ -1214,14 +1671,56 @@ msgstr "_Mantener" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Inserte el CD/DVD anterior en la unidad «%s» para instalar paquetes de " +"software desde el soporte." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinuar" + +#. 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 "" +"¿Reemplazar sus cambios en «%s» con la última versión del archivo 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 no sabe por qué el archivo ya está allí, generalmente es seguro " +"reemplazarlo." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Cambios" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Mantener" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Reemplazar" #. 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 @@ -1497,3 +1996,61 @@ #~ msgstr "" #~ "Hubo un fallo al añadir la clave a la lista de proveedores 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 "Desinstalando %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Ejecutando 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 "Actualizando %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Descargando %s" + +#~ msgid "System is already up-to-date" +#~ msgstr "El sistema ya está actualizado" + +#~ msgid "System is not up-to-date" +#~ msgstr "El sistema no está actualizado" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "No fue posible instalar lo último para todos los paquetes." + +#~ msgid "There isn't any need for a system update" +#~ msgstr "No hay necesidad de una actualización del sistema" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Se cambió el archivo de configuración «%s»" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "¿Desea usar la nueva versión?" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Esperando a otras tareas" +>>>>>>> MERGE-SOURCE === modified file 'po/et.po' --- po/et.po 2013-03-10 00:01:34 +0000 +++ po/et.po 2013-06-03 17:47:29 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE # Estonian translation for aptdaemon # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # This file is distributed under the same license as the aptdaemon package. @@ -1466,3 +1467,587 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "Võtme lisamine usaldusväärsete tarkvaratootjate loetelusse nurjus" +======= +# Estonian translation for aptdaemon +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the aptdaemon package. +# FIRST AUTHOR , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: aptdaemon\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-28 13:10+0000\n" +"Last-Translator: mahfiaz \n" +"Language-Team: Estonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../data/org.debian.apt.policy.in.h:1 +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" +"Autentimiseks tuleb katkestada teise kasutaja paketihalduse ülesanne." + +#: ../data/org.debian.apt.policy.in.h:2 +msgid "Authentication is required to install a local package file." +msgstr "Kohaliku paketifaili paigaldamiseks on vajalik autentimine" + +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "Tarkvarapakettide paigaldamiseks on vajalik autentimine" + +#: ../data/org.debian.apt.policy.in.h:4 +msgid "" +"Authentication is required to query the software repositories for " +"installable packages" +msgstr "" +"Tarkvaraallikatest uuenduste kohta küsimise jaoks on vajalik autentimine" + +#: ../data/org.debian.apt.policy.in.h:5 +msgid "Authentication is required to remove software packages" +msgstr "Tarkvarapakettide eemaldamiseks on vajalik autentimine" + +#: ../data/org.debian.apt.policy.in.h:6 +msgid "Authentication is required to repair broken installations" +msgstr "Katkiste paigalduste parandamiseks on vajalik autentimine" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Tarkvarapakettide uuendamiseks on vajalik autentimine" + +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Süsteemi uuendamiseks on vajalik autentimine" + +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Katkesta teise kasutaja toiming" + +#: ../data/org.debian.apt.policy.in.h:10 +msgid "Install package file" +msgstr "Paigalda paketifail" + +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Paigalda paketid" + +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Eemalda paketid" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Paranda katkised paigaldused" + +#: ../data/org.debian.apt.policy.in.h:14 +msgid "Update package information" +msgstr "Uuenda pakettide informatsiooni" + +#: ../data/org.debian.apt.policy.in.h:15 +msgid "Upgrade packages" +msgstr "Uuenda pakette" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Uuenda süsteemi" + +#: ../aptdaemon/core.py:1237 +msgid "Do not shutdown the daemon because of inactivity" +msgstr "Deemoni tööd tegevusetuse pärast ei lõpetata" + +#: ../aptdaemon/core.py:1242 +msgid "Show internal processing information" +msgstr "Sisemiste protsesside informatsiooni kuvamine" + +#: ../aptdaemon/core.py:1246 +msgid "Quit and replace an already running daemon" +msgstr "Lõpeta ja asenda juba käivitatud deemon" + +#: ../aptdaemon/core.py:1250 +msgid "Store profile stats in the specified file" +msgstr "Talleta profiili andmed valitud faili" + +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Süsteemi ei tehta mingeid muudatusi (kasulik ainult arendajatele)" + +#: ../aptdaemon/enums.py:136 +msgid "Installed file" +msgstr "Paigaldatud fail" + +#: ../aptdaemon/enums.py:137 +msgid "Installed packages" +msgstr "Paigaldati paketid" + +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "Lisati võti failist" + +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "Uuendati vahemälu" + +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "Eemaldati usaldatud võti" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "Eemaldati paketid" + +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "Uuendati pakette" + +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "Uuendatud süsteem" + +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "Muudatused rakendati" + +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Mittetäielik paigaldus on parandatud" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Katkised sõltuvused on parandatud" + +#: ../aptdaemon/enums.py:157 +msgid "Successful" +msgstr "Edukas" + +#: ../aptdaemon/enums.py:158 +msgid "Canceled" +msgstr "Tühistatud" + +#: ../aptdaemon/enums.py:159 +msgid "Failed" +msgstr "Nurjus" + +#: ../aptdaemon/enums.py:169 +msgid "Installing file" +msgstr "Faili paigaldamine" + +#: ../aptdaemon/enums.py:170 +msgid "Installing packages" +msgstr "Pakettide paigaldamine" + +#: ../aptdaemon/enums.py:171 +msgid "Adding key from file" +msgstr "Võtme lisamine failist" + +#: ../aptdaemon/enums.py:172 +msgid "Updating cache" +msgstr "Puhvri uuendamine" + +#: ../aptdaemon/enums.py:173 +msgid "Removing trusted key" +msgstr "Usaldatut võtme eemaldamine" + +#: ../aptdaemon/enums.py:174 +msgid "Removing packages" +msgstr "Pakettide eemaldamine" + +#: ../aptdaemon/enums.py:175 +msgid "Updating packages" +msgstr "Pakettide uuendamine" + +#: ../aptdaemon/enums.py:176 +msgid "Upgrading system" +msgstr "Süsteemi uuendamine" + +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +msgid "Applying changes" +msgstr "Muudatuste rakendamine" + +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Mittetäieliku paigalduse parandamine" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Katkiste sõltuvuste parandamine" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Paketifaili paigaldamine nurjus" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Tarkvara paigaldamine nurjus" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "Võtme lisamine usaldusväärsete tarkvaratootjate loetelusse nurjus" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Tarkvaraloendi uuendamine nurjus" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "Tootja eemaldamine usaldusväärsete tarkvaratootjate loetelust nurjus" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Tarkvara eemaldamine nurjus" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Tarkvara uuendamine nurjus" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Süsteemi uuendamine nurjus" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Tarkvaramuudatuste rakendamine nurjus" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Mittetäieliku paigalduse parandamine nurjus" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Katkiste sõltuvuste parandamine nurjus" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +msgid "Check your Internet connection." +msgstr "Kontrolli oma internetiühendust." + +#: ../aptdaemon/enums.py:215 +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 "" +"Kontrolli, kas kasutad kolmanda osapoole tarkvaraallikaid. Kui nii, siis " +"keela need, kuna tavaliselt need on probleemide põhjuseks.\n" +"Järgmiseks käivita terminalis järgnev käsk: apt-get install -f" + +#: ../aptdaemon/enums.py:220 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "Valitud fail pole GPG võtmefail või see on rikutud." + +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" +"Valitud võtit ei suudetud eemaldada. Kontrolli, kas sisestatud sõrmejälg oli " +"õige." + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" +"Kontrolli, kas sa praegu ei kasuta ka teisi tarkvarahalduse tööriistu nagu " +"Synaptic või aptitude. Korraga saab muudatusi läbi viia ainult üks tööriist." + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" +"See on tõsine probleem. Proovi hiljem uuesti. Kui probleem esineb uuesti, " +"raporteeri sellest veast arendajatele." + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" +"Kontrolli paketi nime õigekirja ning kas vastav tarkvaraallikas on lubatud." + +#: ../aptdaemon/enums.py:233 +msgid "There isn't any need for an update." +msgstr "Uuendamiseks puudub vajadus." + +#: ../aptdaemon/enums.py:234 +msgid "There isn't any need for an installation" +msgstr "Paigaldamiseks puudub vajadus" + +#: ../aptdaemon/enums.py:236 +msgid "There isn't any need for a removal." +msgstr "Eemaldamiseks puudub vajadus." + +#: ../aptdaemon/enums.py:237 +msgid "" +"You requested to remove a package which is an essential part of your system." +msgstr "Sa palusid eemaldada paketti, mis on süsteemi oluline osa." + +#: ../aptdaemon/enums.py:240 +msgid "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." +msgstr "" +"Ühendus deemoniga katkes. Kõige tõenäolisemalt jooksis taustadeemon kokku." + +#: ../aptdaemon/enums.py:242 +msgid "The installation or removal of a software package failed." +msgstr "Tarkvara paigaldamine või eemaldamine nurjus." + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Seda ei tohiks juhtuda." + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 "" +"Selle vea võisid põhjustada tarkvara lisapaketid, mis on kas puudu või pole " +"paigaldatavad. Lisaks võib esineda vastuolu tarkvarapakettide vahel, mis ei " +"saa olla paigaldatud samal ajal." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "See toiming nõuaks pakettide paigaldamist autentimata allikatest." + +#: ../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 "" +"Paigaldus võis nurjuda vea tõttu vastavas tarkvarapaketis või katkestati see " +"mittesobival viisil. Enne, kui saab muud tarkvara paigaldada või eemaldada, " +"tuleb see parandada." + +#: ../aptdaemon/enums.py:269 +msgid "Failed to download package files" +msgstr "Paketifailide allalaadimine nurjus" + +#: ../aptdaemon/enums.py:270 +msgid "Failed to download repository information" +msgstr "Tarkvaraallika teabe allalaadimine nurjus" + +#: ../aptdaemon/enums.py:271 +msgid "Package dependencies cannot be resolved" +msgstr "Paketi sõltuvusi pole võimalik lahendada" + +#: ../aptdaemon/enums.py:272 +msgid "The package system is broken" +msgstr "Paketisüsteem on katki" + +#: ../aptdaemon/enums.py:273 +msgid "Key was not installed" +msgstr "Võtit ei paigaldatud" + +#: ../aptdaemon/enums.py:274 +msgid "Key was not removed" +msgstr "Võtit ei eemaldatud" + +#: ../aptdaemon/enums.py:275 +msgid "Failed to lock the package manager" +msgstr "Paketihalduri lukustamine nurjus" + +#: ../aptdaemon/enums.py:276 +msgid "Failed to load the package list" +msgstr "Paketiloendi laadimine nurjus" + +#: ../aptdaemon/enums.py:277 +msgid "Package does not exist" +msgstr "Paketti ei eksisteeri" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Pakett juba on kaasaegne" + +#: ../aptdaemon/enums.py:279 +msgid "Package is already installed" +msgstr "Pakett on juba paigaldatud" + +#: ../aptdaemon/enums.py:280 +msgid "Package isn't installed" +msgstr "Pakett ei ole paigaldatud" + +#: ../aptdaemon/enums.py:281 +msgid "Failed to remove essential system package" +msgstr "Olulise süsteemipaketi eemaldamine nurjus" + +#: ../aptdaemon/enums.py:283 +msgid "Task cannot be monitored or controlled" +msgstr "Toimingut pole võimalik jälgida ega juhtida" + +#: ../aptdaemon/enums.py:284 +msgid "Package operation failed" +msgstr "Paketitoiming nurjus" + +#: ../aptdaemon/enums.py:285 +msgid "Requires installation of untrusted packages" +msgstr "Nõuab mitteusaldusväärsete pakettide paigaldamist" + +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Eelnev paigaldus ei jõudnud lõpule" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Esines tundmatu tõrge" + +#: ../aptdaemon/enums.py:298 +msgid "Waiting for service to start" +msgstr "Teenuse käivitumise järel ootamine" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Ootamine" + +#: ../aptdaemon/enums.py:300 +msgid "Waiting for required medium" +msgstr "Nõutud andmekandja järel ootamine" + +#: ../aptdaemon/enums.py:301 +msgid "Waiting for other software managers to quit" +msgstr "Teiste tarkvarahaldurite lõpetamise järel ootamine" + +#: ../aptdaemon/enums.py:302 +msgid "Waiting for configuration file prompt" +msgstr "Seadistusfaili kohta käiva küsimuse järel ootamine" + +#: ../aptdaemon/enums.py:304 +msgid "Running task" +msgstr "Käesolev toiming" + +#: ../aptdaemon/enums.py:305 +msgid "Downloading" +msgstr "Allalaadimine" + +#: ../aptdaemon/enums.py:306 +msgid "Cleaning up" +msgstr "Puhastamine" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Sõltuvuste lahendamine" + +#: ../aptdaemon/enums.py:309 +msgid "Finished" +msgstr "Lõpetatud" + +#: ../aptdaemon/enums.py:310 +msgid "Cancelling" +msgstr "Tühistamine" + +#: ../aptdaemon/enums.py:311 +msgid "Loading software list" +msgstr "Tarkvaraloendi laadimine" + +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Allalaaditud %sB %sB-st kiirusel %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Allalaaditud %sB %sB-st" + +#: ../aptdaemon/gtkwidgets.py:305 +msgid "Details" +msgstr "Üksikasjad" + +#. TRANSLATORS: %s represents the name of a CD or DVD +#: ../aptdaemon/gtkwidgets.py:620 +#, python-format +msgid "CD/DVD '%s' is required" +msgstr "Vajalik on CD/DVD plaat '%s'" + +#. TRANSLATORS: %s is the name of the CD/DVD drive +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." +msgstr "" +"Palun sisesta ülalmainitud CD/DVD-plaat seadmesse '%s', et sellelt saaks " +"tarkvara paigaldada." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "_Jätka" + +#. 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 "" +"Kas asendada muudatustega fail '%s' hilisema seadistusfaili versiooniga?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"Kui sa ei tea, miks see fail juba seal on, on selle asendamine tavaliselt " +"turvaline." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Muudatused" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Jäta alles" + +#: ../aptdaemon/gtkwidgets.py:655 +msgid "_Replace" +msgstr "_Asenda" + +#. TRANSLATORS: expander label in the error dialog +#: ../aptdaemon/gtkwidgets.py:743 +msgid "_Details" +msgstr "_Üksikasjad" + +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "%s paigaldamine" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "%s seadistamine" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "%s eemaldamine" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "%s järelpaigalduse sooritamine" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "%s täielik eemaldamine" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "%s uuendamine" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "%s allalaadimine" +>>>>>>> MERGE-SOURCE === modified file 'po/eu.po' --- po/eu.po 2013-03-10 00:01:34 +0000 +++ po/eu.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-04-26 20:21+0000\n" "Last-Translator: Ibai Oihanguren \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-08 09:27+0000\n" +"Last-Translator: Mikel Pascual Aldabaldetreku \n" +>>>>>>> MERGE-SOURCE "Language-Team: Basque \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,30 +51,70 @@ msgstr "Aldatu software-konfigurazioa" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Software-ezarpenak aldatzeko, autentifikatu behar duzu" - +======= +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 "Autentifikazioa behar da software-paketeak eguneratzeko" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Aldatu softwarearen errepositorioa" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Autentifikazioa behar da sistema eguneratzeko" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Software errepositorioaren ezarpenak aldatzeko autentikatu egin behar zara" - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Beste erabiltzaile baten ataza ezeztatu" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Pakete-fitxategia instalatu" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Pakete hau instalatzeko zure burua identifikatu behar duzu" - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Paketeak instalatu" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Paketeak kendu" + +#: ../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 "Pakete-informazioa eguneratu" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Software katalogoa eguneratzeko autentikatu egin behar zara" @@ -130,7 +181,11 @@ msgstr "Erositako softwarea instalatzeko autentikatu egin behar zara" #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" +<<<<<<< TREE msgstr "Paketeak bertsio-berritu" #: ../data/org.debian.apt.policy.in.h:45 @@ -381,7 +436,17 @@ msgstr "Autentikazioaren zai" #: ../aptdaemon/core.py:2188 +======= +msgstr "Paketeak eguneratu" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Sistema eguneratu" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE msgstr "Ez itzali daemon-a inaktibitateagatik" #: ../aptdaemon/core.py:2193 @@ -389,13 +454,23 @@ msgstr "Ez kargatu pluginik" #: ../aptdaemon/core.py:2197 +======= +msgstr "Inaktibitatea badago ere, ez daemon-a itzali" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Barneko prozesu-informazioa erakutsi" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Jadanik martxan dagoen daemon bat itxi eta ordezkatu" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "DBus saioko bus-ean entzun (Probak egiteko bakarrik beharrezkoa" @@ -405,7 +480,11 @@ msgstr "" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" +<<<<<<< TREE msgstr "Profilaren estatistikak zehaztutako fitxategian gorde" #: ../aptdaemon/core.py:2221 @@ -413,19 +492,41 @@ msgstr "Ez egin aldaketarik sistemari (garatzaileek erabiltzeko soilik)" #: ../aptdaemon/enums.py:366 +======= +msgstr "Zehaztutako fitxategian gorde profila-estatistikak" + +#: ../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 "Instalatu den fitxategia" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Paketeak instalatuta" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Fitxategiko gakoa gehituta" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" +<<<<<<< TREE msgstr "Cache-a eguneratuta" #: ../aptdaemon/enums.py:370 @@ -433,25 +534,47 @@ msgstr "Bilaketa eginda" #: ../aptdaemon/enums.py:371 +======= +msgstr "Cachea eguneratuta" + +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Gako fidagarria kenduta" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Paketeak ezabatuta" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Paketeak eguneratuta" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Sistema bertsio-berrituta" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Aldaketak aplikatuta" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Osatu gabeko instalazioa konponduta" @@ -477,53 +600,109 @@ msgstr "Instalatutako paketeak berkonfiguratu dira" #: ../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 "Arrakasta" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Ezeztatuta" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Huts egin du" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Fitxategia instalatzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Paketeak instalatzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Fitxategiko gakoa gehitzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Cache-a eguneratzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Gako fidagarria kentzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Paketeak ezabatzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Paketeak eguneratzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Sistema bertsio-berritzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Aldaketak aplikatzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Osatu gabeko instalazioa konpontzen" @@ -619,10 +798,69 @@ msgstr "Lizentzia-gakoa gehitzen" #: ../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 "Egiaztatu zure Interneterako konexioa." +<<<<<<< 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" @@ -632,17 +870,29 @@ "itzazu, arazoak ekarri ohi dituzte eta.\n" "Honez gain, exekutatu agindu hau terminal batean: 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 "Hautatutako fitxategia ez da GPG gako-fitxategia edo apurtuta dago." +<<<<<<< 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." @@ -651,7 +901,11 @@ "Synaptic edo aptitude. Aldaketak egiteko aldi berean tresna bakar bat " "onartzen da." +<<<<<<< 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." @@ -659,7 +913,11 @@ "Arazo larria da hau. Saiatu berriro geroxeago. Arazo hau berriro agertzen " "bada, mesedez eman errorearen berri garatzaileei." +<<<<<<< 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." @@ -667,33 +925,58 @@ "Egiaztatu pakete-izena ondo idatzi duzula, eta errepositorio egokia gaituta " "dagoela." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Ez dago eguneratzeko beharrik." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Ez dago instalatzeko beharrik" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Ez dago ezabatzeko beharrik." +<<<<<<< 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 "" "Zure sistemarentzat funtsezkoa den pakete bat ezabatzeko eskatu duzu." +<<<<<<< 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 "" "Daemon-arekiko konexioa galdu da. Ziurrenik, atzealdeko daemon-a kraskatu da." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." +<<<<<<< TREE msgstr "Huts egin du software-pakete bat instalatu edo ezabatzeak." #: ../aptdaemon/enums.py:509 @@ -708,8 +991,18 @@ msgstr "" #: ../aptdaemon/enums.py:514 +======= +msgstr "Huts egin du software-pakete baten instalazio edo kentzeak." + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Hau ez litzateke gertatu behar." + +#: ../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." @@ -782,69 +1075,157 @@ 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 "" +"Falta diren edo instalatu ezin diren beste software-pakete batzuk direla-eta " +"gertatu daiteke errore hau. Baita, aldi berean instalatu ezin diren software-" +"paketeen arteko gatazka egon liteke." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Autentifikatu gabeko jatorrietako paketeak instalatu beharko lirateke " +"ekintza hau burutzeko." + +#: ../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 "Ezin izan dira pakete-fitxategiak deskargatu" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Ezin izan da errepositorio-informazioa deskargatu" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Ezin dira paketeen menpekotasunak ebatzi" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Pakete-sistema apurtuta dago" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Ez da gakoa instalatu" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Ez da gakoa kendu" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Ezin izan da pakete-kudeatzailea blokeatu" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Ezin izan da pakete-zerrenda kargatu" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Paketea ez da existitzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Paketea dagoeneko eguneratuta dago" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Jadanik eguneratuta dago paketea" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Jadanik instalatuta dago paketea" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Paketa ez dago instalatuta" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Ezin izan da sistemarentzako funtsezkoa den paketea ezabatu" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Ezin da ataza monitorizatu edo kontrolatu" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Huts egin du pakete-ekintzak" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Pakete ez fidagarrien instalazioa behar du" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Ez da aurreko instalazioa osatu" @@ -886,53 +1267,111 @@ msgstr "Errore manieazina gertatu da" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Errore ezezaguna gertatu da" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Zerbitzua hasi arte itxaroten" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Zain" +======= +#: ../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 "Beharrezko euskarriari itxaroten" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Beste software-kudeatzaileak itxi arte itxaroten" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Konfigurazio-fitxategi elkarrizketari itxaroten" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Ataza exekutatzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Deskargatzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Software-jatorriak kontsultatzen" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Garbitzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Menpekotasunak ebazten" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Burututa" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Ezeztatzen" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Software-zerrenda kargatzen" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1049,6 +1488,19 @@ msgstr "Sarea ez dago eskuragarri" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "%sB / %sB deskargatuta (%sB/s)" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "%sB / %sB deskargatuta" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Xehetasunak" @@ -1071,16 +1523,25 @@ msgstr "Deskargatuta" #. 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' CD/DVDa behar da" #. 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 "" "Sartu goiko CD/DVDa '%s' unitatean eta instalatu software-paketeak bertatik." @@ -1200,14 +1661,52 @@ msgstr "_Mantendu" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Goian zehaztutako CD/DVDa sartu ezazu '%s' unitatean, euskarritik instalatu " +"ahal izateko osftware-paketeak." + +#: ../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 "_Mantendu" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Ordezkatu" #. 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 "_Xehetasunak" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1478,3 +1977,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "" #~ "Gakoa software-hornitzaile fidagarrien zerrendara gehitzeak huts egin du" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "%s instalatzen" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "%s konfiguratzen" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "%s kentzen" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Instalazio-ondorengo %s abiarazlea exekutatzen" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "%s purgatzen" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "%s eguneratzen" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "%s deskargatzen" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "Ezin izan dira pakete guztietako berrienak instalatu." + +#~ msgid "Waiting for other tasks" +#~ msgstr "Beste atazei itxaroten" + +#~ msgid "System is already up-to-date" +#~ msgstr "Jadanik eguneratuta dago sistema" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Ez dago sistema eguneratzeko beharrik" + +#~ msgid "System is not up-to-date" +#~ msgstr "Sistema ez dago eguneratuta" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Aldatu egin da '%s' konfigurazio-fitxategia" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Bertsio berria erabili nahi al duzu?" +>>>>>>> MERGE-SOURCE === modified file 'po/fi.po' --- po/fi.po 2013-03-10 00:01:34 +0000 +++ po/fi.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-01-08 14:13+0000\n" "Last-Translator: Heikki Mattila \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-27 20:47+0000\n" +"Last-Translator: Timo Jyrinki \n" +>>>>>>> MERGE-SOURCE "Language-Team: Finnish \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" @@ -39,29 +50,69 @@ msgstr "Muuta ohjelmistoasetuksia" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Sinun tulee tunnistautua muuttaaksesi ohjelmistoasetuksia" - +======= +msgid "Authentication is required to repair broken installations" +msgstr "Rikkinäisten asennusten korjaaminen vaatii todennuksen" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Käyttäjän todennus vaaditaan ohjelmapakettien päivittämiseen" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Vaihda ohjelmalähde" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Käyttäjän todennus vaaditaan järjestelmän päivittämiseen" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "Ohjelmalähteiden asetuksien muuttaminen vaatii tunnistautumisen." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Perus toisen käyttäjän tehtävä" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Asenna pakettitiedosto" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Paketin asennus vaatii tunnistautumisen." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Asenna paketit" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Poista paketit" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Korjaa rikkinäiset asennukset" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Päivitä pakettitiedot" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Ohjelmistoluettelon päivitys vaatii tunnistautumisen." @@ -126,9 +177,13 @@ msgstr "Maksullisten ohjelmistojen asennus vaatii tunnistautumisen." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Päivitä paketit" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "Päivitettyjen ohjelmistojen asennus vaatii tunnistautumisen." @@ -373,21 +428,37 @@ msgstr "Odotetaan tunnistautumista" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Päivitä järjestelmä" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Älä sammuta taustaprosessia inaktiivisuuden takia" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Älä lataa mitään liitännäisiä" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Näytä sisäiset käsittelytiedot" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Lopeta ja korvaa jo käynnissä oleva taustaprosessi" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Kuuntele DBus-istuntoväylää (Vaadittu ainoastaan testausta varten" @@ -397,54 +468,99 @@ msgstr "Suorita toimenpiteet määritetyssä chroot-ympäristössä" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Tallenna profiilin tiedot tiedostoon" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "" "Älä tee järjestelmään mitään muutoksia (hyödyllinen vain kehittäjille)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "" +"Älä tee järjestelmään mitään muutoksia (hyödyllinen vain kehittäjille)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Asennettiin tiedosto" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Asennetut paketit" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Avain lisätty tiedostosta" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Välimuisti päivitetty" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Haku valmis" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Poistettiin luotettu avain" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Poistetut paketit" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Päivitetyt paketit" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Järjestelmä päivitetty" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Muutokset toteutettu" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Korjattiin keskeneräinen asennus" @@ -470,53 +586,109 @@ msgstr "Asennettujen pakettien asetukset tehty uudelleen" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Korjattiin keskeneräinen asennus" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Korjattiin rikkinäiset riippuvuudet" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Onnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Peruttiin" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Epäonnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Asennetaan tiedostoa" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Asennetaan paketteja" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Lisätään avainta tiedostosta" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Päivitetään välimuistia" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Poistetaan luotettua avainta" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Poistetaan paketteja" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Päivitetään paketteja" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Päivitetään järjestelmää" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Toteutetaan muutoksia" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Korjataan keskeneräistä asennusta" @@ -613,10 +785,73 @@ msgstr "Lisätään lisenssiavain" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Korjataan keskeneräistä asennusta" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Korjataan rikkinäisiä riippuvuuksia" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Pakettitiedoston asennus epäonnistui" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Ohjelmiston asennus epäonnistui" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"Avaimen lisääminen luotettavien ohjelmistotoimittajien luetteloon ei " +"onnistunut" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Ohjelmistoluettelon päivitys epäonnistui" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "" +"Avaimen poistaminen luotettavien ohjelmistotoimittajien luettelosta ei " +"onnistunut" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Ohjelmiston poisto epäonnistui" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Ohjelmiston päivitys epäonnistui" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Järjestelmän päivitys epäonnistui" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Ohjelmistomuutosten toteutus epäonnistui" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Keskeneräisen asennuksen korjaus epäonnistui" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Rikkinäisten riippuvuuksien korjaus epäonnistui" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Tarkista Internet-yhteys." +<<<<<<< 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" @@ -626,29 +861,51 @@ "ne pois käytöstä, sillä ne ovat yleensä syynä ongelmiin. Tämän jälkeen aja " "Päätteessä komento 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 "" "Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on " "vahingoittunut." +<<<<<<< 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 "" "Valittua avainta ei voi poistaa. Tarkista että annoit oikean sormenjäljen." +<<<<<<< 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 "Tarkista, ettet käytä samalla toista sovellusta pakettienhallintaan (esim. " "Synaptic tai aptitude). Useampi kuin yksi sovellus ei voi tehdä muutoksia " "samanaikaisesti." +======= +"Tarkasta, ettei mikään muu paketinhallintaohjelma, kuten Synaptic tai " +"aptitude, ole käytössä. Useamman paketinhallintaohjelman suorittaminen " +"samanaikaisesti ei ole sallittua." +>>>>>>> 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." @@ -656,7 +913,11 @@ "Tämä on vakava ongelma, yritä myöhemmin uudestaan. Jos ongelma toistuu, " "raportoi siitä kehittäjille." +<<<<<<< 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." @@ -664,34 +925,59 @@ "Tarkista paketin nimen oikeinkirjoitus ja että sopiva ohjelmalähde on " "käytettävissä." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Päivitykselle ei ole tarvetta." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Asennukselle ei ole tarvetta." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Poistamiselle ei ole tarvetta." +<<<<<<< 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 "" "Valitsit poistettavaksi paketin, joka on olennainen osa järjestelmää." +<<<<<<< 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 "Yhteys taustapalveluun kadotettiin, se todennäköisesti kaatui." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "Ohjelmapaketin asentaminen tai poistaminen epäonnistui." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "Haluttua ominaisuutta ei tueta" @@ -706,8 +992,16 @@ "hallintaan tarkoitettu ohjelma, vaikuttaa olevan ohjelmointivirhe." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Näin ei pitäisi tapahtua." + +#: ../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." @@ -788,69 +1082,158 @@ "istuntoagenttia" #: ../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 "" +"Virhe saattaa johtua siitä, että asentamiseen vaaditaan jokin " +"ohjelmapaketti, joka ei ole saatavilla. Toisaalta kyseessä saattaa myös olla " +"ristiriita asennetun paketin ja asennettavana olevan paketin välillä, eikä " +"näitä voida asentaa samanaikaisesti." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "Toiminto vaatisi pakettien asentamista varmentamattomista lähteistä." + +#: ../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 "" +"Asennus on saattanut epäonnistua ohjelmapaketissa olevan virheen tai " +"pakotetun keskeyttämisen takia. Ongelma täytyy korjata, ennen kuin voit " +"asentaa tai poistaa lisää sovelluksia." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Pakettitiedostojen noutaminen epäonnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Pakettitietojen noutaminen epäonnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Pakettien riippuvuuksia ei voi selvittää" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Pakettijärjestelmä on rikkinäinen" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Avainta ei asennettu" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Avainta ei poistettu" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Paketinhallinnan lukitus epäonnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Pakettiluettelon lataaminen epäonnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Pakettia ei ole olemassa" +<<<<<<< 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 "Paketti on jo ajan tasalla" +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Paketti on jo asennettu" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Pakettia ei ole asennettu" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Järjestelmälle oleellisen paketin poisto epäonnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Tehtävää ei voi valvoa tai hallita" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Pakettitoiminto epäonnistui" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Vaatii luottamattomien pakettien asentamista" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Aiempi asennus on jäänyt keskeneräiseksi" @@ -892,53 +1275,111 @@ msgstr "Tapahtui virhe, jota ei voitu käsitellä" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Aiempi asennus on jäänyt keskeneräiseksi" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Tapahtui tuntematon virhe" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Odotetaan palvelun käynnistymistä" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Odotetaan" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Odotetaan" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:606 +======= +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Odotetaan vaadittua mediaa" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Odotetaan muiden pakettienhallintasovellusten sulkemista" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Odota asetustiedostokyselyä" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Suoritetaan tehtävää" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Noudetaan" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Tutkitaan ohjelmalähteitä" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Siistitään" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Ratkaistaan riippuvuuksia" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Valmis" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Perutaan" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Ladataan ohjelmaluetteloa" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1055,6 +1496,19 @@ msgstr "Verkkoa ei saatavilla" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Ladattu %sB / %sB (%sB/s)" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Ladattu %sB / %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Yksityiskohdat" @@ -1077,16 +1531,25 @@ msgstr "Noudettu" #. 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 "CD/DVD ”%s” vaaditaan" #. 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 "" "Asenna yllä mainittu CD/DVD asemaan ”%s” asentaaksesi ohjelmistopaketteja " @@ -1207,14 +1670,56 @@ msgstr "_Säilytä" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Syötä kyseinen CD/DVD-levy asemaan ”%s” asentaaksesi ohjelmapaketteja " +"medialta." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "J_atka" + +#. 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 "" +"Korvataanko tiedostossa ”%s” olevat muutokset uudemmalla asetustiedoston " +"versiolla?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"Jos et tiedä miksi tiedosto on jo olemassa, on yleensä turvallista korvata " +"se." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Muutokset" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Säilytä" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "Ko_rvaa" #. 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 "_Yksityiskohdat" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1490,3 +1995,61 @@ #~ msgstr "" #~ "Avaimen lisääminen luotettavien ohjelmistotoimittajien luetteloon ei " #~ "onnistunut" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Asennetaan %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Tehdään asetuksia: %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Poistetaan %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Suoritetaan jälkiasennusliipaisinta %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Poistetaan asetuksineen %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Päivitetään %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Noudetaan %s" + +#~ msgid "System is already up-to-date" +#~ msgstr "Järjestelmä on jo ajan tasalla" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Järjestelmäpäivitykselle ei ole tarvetta" + +#~ msgid "System is not up-to-date" +#~ msgstr "Järjestelmä ei ole ajan tasalla" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Odotetaan muita tehtäviä" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Asetustiedosto ”%s” on muuttunut" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Haluatko käyttää uutta versiota?" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "Kaikkien pakettien uusinta versiota ei ollut mahdollista asentaa" +>>>>>>> MERGE-SOURCE === modified file 'po/fr.po' --- po/fr.po 2013-03-10 00:01:34 +0000 +++ po/fr.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-01-16 21:09+0000\n" "Last-Translator: Pierre Slamich \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-27 06:57+0000\n" +"Last-Translator: Bruno Patri \n" +>>>>>>> MERGE-SOURCE "Language-Team: French \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" @@ -40,32 +51,72 @@ msgstr "Modifier la configuration du logiciel" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." +======= +msgid "Authentication is required to repair broken installations" +msgstr "" +"L'authentification est nécessaire pour réparer les installations cassées" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +>>>>>>> MERGE-SOURCE msgstr "" "Vous devez vous authentifier pour modifier la configuration du logiciel." +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Modifier le dépôt logiciel" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "L'authentification est nécessaire pour mettre le système à niveau" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Pour modifier la configuration des dépôts logiciels, vous devez vous " "authentifier." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Annuler la tâche d'un autre utilisateur" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Installer un paquet" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Vous devez vous authentifier pour installer ce paquet." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Installer des paquets" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Supprimer des paquets" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Réparer les installations cassées" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Mettre à jour les informations sur les paquets" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "" @@ -134,9 +185,13 @@ msgstr "Vous devez vous authentifier pour installer le logiciel acheté." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Mettre à jour les paquets" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "Vous devez vous authentifier pour mettre à jour des logiciels." @@ -389,19 +444,35 @@ msgstr "En attente d'authentification" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Mettre le système à niveau" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Ne pas quitter le démon s'il est inactif" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Ne charger aucune extension" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Affiche les informations de traitement interne" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Quitte et relance un démon en cours d'exécution" #: ../aptdaemon/core.py:2207 @@ -414,7 +485,13 @@ msgstr "Effectue les opérations dans l’environnement chroot spécifié" #: ../aptdaemon/core.py:2216 +======= +msgstr "Quitter et relancer un démon en cours d'exécution" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" +<<<<<<< TREE msgstr "Enregistre les statistiques du profil dans le fichier spécifié" #: ../aptdaemon/core.py:2221 @@ -424,45 +501,89 @@ "développeurs)" #: ../aptdaemon/enums.py:366 +======= +msgstr "Enregistrer les statistiques du profil dans le fichier spécifié" + +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "" +"Ne faire aucune modification sur le système (Utile uniquement pour les " +"développeurs)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Fichier installé" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Paquets installés" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Clé ajoutée depuis un fichier" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Cache mis à jour" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Recherche terminée" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Clé de confiance supprimée" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Paquets supprimés" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Paquets mis à jour" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Système mis à niveau" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Changements appliqués" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Installation incomplète réparée" @@ -488,53 +609,109 @@ msgstr "Paquets installés reconfigurés" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Installation incomplète réparée" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Dépendances cassées réparées" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Succès" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Annulé" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Échec" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Installation du fichier" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Installation des paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Ajout de la clé depuis un fichier" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Mise à jour du cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Suppression de la clé de confiance" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Suppression des paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Mise à jour des paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Mise à niveau du système" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Application des changements" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Réparation d'une installation incomplète" @@ -631,10 +808,73 @@ msgstr "Ajout de la clé de licence" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Réparation d'une installation incomplète" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Réparation des dépendances cassées" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "L'installation du paquet logiciel a échoué" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "L'installation des logiciels a échoué" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"L'ajout de la clef à la liste des fournisseurs de logiciels de confiance a " +"échoué." + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "L'actualisation de la liste des logiciels a échoué" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "" +"La suppression du fournisseur de logiciels de la liste des fournisseurs de " +"confiance a échoué." + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "La suppression des logiciels a échoué" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "La mise à jour des logiciels a échoué" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "La mise à jour du système a échoué" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Les modifications logicielles ont échoué." + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Échec de la réparation d'une installation incomplète" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Échec de la réparation des dépendances cassées" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Vérifiez votre connexion à 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" @@ -645,13 +885,21 @@ "De plus, exécutez la commande suivante dans un terminal : sudo 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 "" "Le fichier sélectionné ne semble pas être une clé GPG ou alors il est " "corrompu." +<<<<<<< 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." @@ -659,7 +907,11 @@ "Impossible de supprimer la clé sélectionnée. Vérifiez que l'empreinte " "spécifiée est valide." +<<<<<<< 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." @@ -668,7 +920,11 @@ "Synaptic ou Aptitude. Un seul outil à la fois est autorisé à apporter des " "changements." +<<<<<<< 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." @@ -676,7 +932,11 @@ "Ceci un problème sérieux. Veuillez réessayer plus tard. Si le problème " "persiste, signalez-le aux développeurs." +<<<<<<< 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." @@ -684,26 +944,46 @@ "Vérifiez que le nom du paquet est écrit correctement et que le dépôt " "approprié est actif." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Aucune mise à jour n'est nécessaire." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Aucune installation n'est nécessaire" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Aucune suppression n'est nécessaire." +<<<<<<< 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 "" "Vous avez demandé à supprimer un paquet essentiel au fonctionnement du " "système." +<<<<<<< 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." @@ -711,10 +991,15 @@ "La connexion au démon a été perdue. C'est probablement parce que le démon a " "quitté inopinément." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "L'installation ou la suppression d'un paquet logiciel a échoué." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "La fonctionnalité demandée n'est pas prise en charge." @@ -730,8 +1015,16 @@ "à la gestion des paquets." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Ceci ne devrait pas arriver." + +#: ../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." @@ -816,69 +1109,159 @@ "environnement de bureau ne fourni pas un agent de session 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 "" +"Cette erreur peut être due à des paquets supplémentaires requis qui ne sont " +"pas disponibles (ou ne pouvant pas être installés). De plus, il peut y avoir " +"un conflit entre paquets qui ne peuvent pas être installés en même temps." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Cette action nécessitera l'installation de paquets depuis des dépôts non " +"authentifiés." + +#: ../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 "" +"L'installation a pu échouer du fait d'une erreur dans le paquet ou car elle " +"a été interrompue brutalement. Vous devez corriger ceci avant de pouvoir " +"installer ou supprimer d'autres logiciels." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Le téléchargement des paquets a échoué" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Le téléchargement des informations du dépôt a échoué" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Impossible de résoudre les dépendances du paquet" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Le système de paquets est cassé" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "La clé n'a pas été installée" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "La clé n'a pas été supprimée" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Impossible de verrouiller le gestionnaire de paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Impossible de charger la liste des paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Le paquet n'existe pas" +<<<<<<< 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 "Le paquet est déjà à jour" +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Le paquet est déjà installé" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Le paquet n'est pas installé" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Impossible de supprimer un paquet essentiel du système" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "La tâche ne peut être ni surveillée, ni contrôlée" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Échec du traitement du paquet" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Nécessite l'installation de paquets non vérifiés" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "L'installation précédente était incomplète" @@ -920,53 +1303,111 @@ msgstr "Une erreur impossible à traiter est survenue" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "L'installation précédente était incomplète" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Une erreur inconnue est survenue" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "En attente de démarrage du service" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "En attente" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "En attente" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:606 +======= +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "En attente du média requis" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "En attente de l'arrêt d'un autre gestionnaire de paquets" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "En attente d'une demande de configuration" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Tâche en cours d'exécution" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Téléchargement" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Interrogation des Sources de Logiciels" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Nettoyage" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Résolution des dépendances" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Terminé" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Annulation" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Chargement de la liste des logiciels" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1083,6 +1524,19 @@ msgstr "Le réseau n'est pas disponible" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "%s octets sur %s octets téléchargés à %s octets/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "%s octets sur %s octets téléchargés" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Détails" @@ -1105,16 +1559,25 @@ msgstr "Téléchargé" #. 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 "Le CD/DVD « %s » est requis" #. 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 "" "Veuillez insérer le CD ci-dessus dans le lecteur « %s » pour installer les " @@ -1237,14 +1700,56 @@ msgstr "_Conserver" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Veuillez insérer le CD/DVD « %s » dans le lecteur pour installer les paquets " +"qu'il contient." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinuer" + +#. 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 "" +"Remplacer les modifications que vous aviez effectuées dans '%s' par une " +"version ultérieure du fichier de configuration ?" + +#: ../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 vous ne savez pas pourquoi le fichier est déjà là, il est généralement " +"sans danger de le remplacer." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Changements" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Conserver" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Remplacer" #. 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 "_Détails" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1520,3 +2025,63 @@ #~ msgstr "" #~ "L'ajout de la clé à la liste des fournisseurs de logiciels de confiance a " #~ "échoué" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Installation de %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Configuration de %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Suppression de %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Exécution des actions différées (« trigger ») de %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Suppression complète de %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Mise à jour de %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Téléchargement de %s" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "" +#~ "Il n'a pas été possible d'installer les dernières versions pour tous les " +#~ "paquets" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Il n'y a aucun besoin de mettre à jour le système" + +#~ msgid "Waiting for other tasks" +#~ msgstr "En attente d'autres tâches" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Le fichier de configuration « %s » a été modifié" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Voulez-vous utiliser la dernière version ?" + +#~ msgid "System is already up-to-date" +#~ msgstr "Le système est déjà à jour" + +#~ msgid "System is not up-to-date" +#~ msgstr "Le système n'est pas à jour" +>>>>>>> MERGE-SOURCE === modified file 'po/gl.po' --- po/gl.po 2013-03-10 00:01:34 +0000 +++ po/gl.po 2013-06-03 17:47:29 +0000 @@ -8,63 +8,146 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-02-02 05:57+0000\n" "Last-Translator: Xosé \n" "Language-Team: Galician \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-28 10:18+0000\n" +"Last-Translator: Miguel Anxo Bouzada \n" +"Language-Team: Galician \n" +>>>>>>> MERGE-SOURCE "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" "Language: gl\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 +<<<<<<< TREE msgid "List keys of trusted vendors" msgstr "Lista das chaves dos fornecedores de confianza" +======= +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" +"Requírese a autenticación para cancelar as tarefas de xestión de paquetes " +"doutro usuario." +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:2 +<<<<<<< TREE msgid "To view the list of trusted keys, you need to authenticate." msgstr "Para ver a lista de chaves de confianza debe autenticarse." +======= +msgid "Authentication is required to install a local package file." +msgstr "" +"Requírese a autenticación para instalar un ficheiro de paquetes local." +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:3 ../aptdaemon/console.py:612 msgid "Remove downloaded package files" msgstr "Retirar os ficheiros de paquetes descargados" +======= +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "Requírese a autenticación para instalar paquetes de software" +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:4 msgid "To clean downloaded package files, you need to authenticate." msgstr "" +<<<<<<< TREE "Para limpar os ficheiros de paquetes descargados necesita autenticarse." +======= +"Requírese a autenticación para buscar paquetes instalábeis nos repositorios " +"de software" +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:5 +<<<<<<< TREE msgid "Change software configuration" msgstr "Cambiar a configuración do software" +======= +msgid "Authentication is required to remove software packages" +msgstr "Requírese a autenticación para eliminar os paquetes de software" +>>>>>>> MERGE-SOURCE #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Para cambiar a configuración do software necesita autenticarse." - +======= +msgid "Authentication is required to repair broken installations" +msgstr "Requirese autenticación para poder reparar instalacións rotas" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Requírese a autenticación para anovar os paquetes de software" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Cambiar o repositorio de software" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Requírese a autenticación para anovar o sistema" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "Para cambiar a configuración do repositorio debe autenticarse." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Cancelar a tarefa doutro usuario" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Instalar un ficheiro de paquetes" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Para instalar este paquete debe autenticarse" - -#: ../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 "Eliminar paquetes" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Reparar instalacións rotas" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Actualizar a información dos paquetes" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Para actualizar o catálogo de software debe autenticarse." @@ -129,9 +212,13 @@ msgstr "Para instalar software comprado necesita autenticarse." #: ../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 "Para instalar as anovacións de software debe autenticarse." @@ -377,21 +464,37 @@ msgstr "Agardando pola autenticación" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Anovar o sistema" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Non apagar o daemon cando estea inactivo" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Non cargar ningún engadido" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Mostrar información sobre o procesamento interno" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Saír e substituír un daemon que se estea a executar" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Escoitar no bus de sesión de DBus (requirido só para probas" @@ -401,53 +504,97 @@ msgstr "Realizar operacións no chroot indicado" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Almacenar as estatísticas do perfil no ficheiro indicado" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Non facer cambios no sistema (Só para programadores)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Non facer cambios no sistema (Só para programadores)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Ficheiro instalado" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Paquetes instalados" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Engadiuse unha chave desde un ficheiro" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Actualizouse a caché" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Busca realizada" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Eliminouse unha chave de confianza" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Elimináronse paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Actualizáronse paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Anovouse o sistema" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Aplicáronse as modificacións" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Reparouse a instalación incompleta" @@ -473,53 +620,109 @@ msgstr "Reconfiguráronse paquetes instalados" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Reparouse a instalación incompleta" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Repararonse as dependencias rotas" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Satisfactoriamente" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Cancelado" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Fallou" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Instalando o ficheiro" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Instalando os paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Engadindo unha chave desde un ficheiro" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Actualizando a caché" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Eliminando unha chave de confianza" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Eliminando os paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Actualizando os paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Anovando o 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 as modificacións" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Reparando a instalación incompleta" @@ -616,10 +819,72 @@ msgstr "A engadir a clave da licenza" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Reparando a instalación incompleta" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Reparando as dependencias rotas" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Fallou a instalación do paquete" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Fallou a instalación do software" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"Algo fallou ao engadir a chave á lista de distribuidores de programas de " +"confianza" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Fallou a actualización da lista de programas" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "" +"Fallou a eliminación do distribuidor da lista de vendedores de confianza" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Fallou a eliminación do software" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Fallou a actualización do software" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Fallou a anovación do sistema" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Produciuse un fallo ao aplicar os cambios do software" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Produciuse un fallo ao reparar a instalación incompleta" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Produciuse un fallo ao reparar as dependencias rotas" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Comprobe a conexión á 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" @@ -629,21 +894,38 @@ "desactíveos, dado que son unha fonte frecuente de problemas.\n" "Alén disto, execute a orde seguinte nun 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 "" "Poida que o ficheiro seleccionado non sexa un ficheiro de chave GPG ou que " "estea danado." +<<<<<<< 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 "Non é posíbel eliminar a chave seleccionar. Comprobe que forneceu unha " "pegada dixital válida." +======= +"Non foi posíbel eliminar a chave seleccionada. Verifique se indicou unha " +"pegada dixital correcta." +>>>>>>> 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." @@ -652,7 +934,11 @@ "actualmente, p.ex. Synaptic ou aptitude. Só pode haber unha ferramenta " "facendo cambios ao mesmo tempo." +<<<<<<< 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." @@ -660,7 +946,11 @@ "Este problema é serio. Ténteo de novo máis tarde. Se este problema aparece " "de novo, informe do erro aos desenvolvedores." +<<<<<<< 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." @@ -668,25 +958,45 @@ "Comprobe a ortografía do nome do paquete e se está activado o repositorio " "axeitado." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Non hai necesidade de ningunha actualización." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Non hai necesidade de instalar nada" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Non hai necesidade de eliminar nada" +<<<<<<< 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 "" "Solicitou eliminar un paquete que constitúe unha parte esencial do 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." @@ -694,10 +1004,15 @@ "Perdeuse a conexión co daemon. O máis probábel é que o daemon de fondo " "tivese un fallo fatal." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "Fallou a instalación ou eliminación dun paquete de software." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "Non se admite a funcionalidade solicitada." @@ -713,8 +1028,16 @@ "coa xestión de paquetes." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Isto non debería acontecer." + +#: ../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." @@ -795,69 +1118,159 @@ "fornece un axente de 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 "" +"Este erro podería ser debido a que faltan paquetes de software adicionais ou " +"que non se poden instalar. Alén disto, podería haber un conflito entre " +"paquetes de software que non estea permitido instalar ao mesmo tempo." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"A acción requiriría a instalación de paquetes de orixes non autenticadas." + +#: ../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 "" +"A instalación puido ter fallado por un erro nos los paquetes " +"correspondentes de software ou foi cancelada dun xeito incorrecto. Debe " +"reparar isto antes de poder instalar ou eliminar calquera otro software." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Fallou a descarga dos ficheiros de paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Fallou a descarga da información do repositorio" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Non é posíbel resolver as dependencias do paquete" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "O sistema de paquetes está roto" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Non se instalou a chave" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Non se eliminou a chave" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Non foi posíbel bloquear o xestor de paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Fallou a descarga da listaxe de paquetes" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Ese paquete non existe" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Este paquete xa está actualizado" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Ese paquete xa está actualizado" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Ese paquete xa está instalado" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Ese paquete non está instalado" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Fallou a eliminación dun paquete esencial do sistema" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Non é posíbel vixiar ou controlar esta tarefa" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Fallou a operación co paquete" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Require que se instalen paquetes nos que non se confía" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Non se completou unha instalación anterior" @@ -899,51 +1312,109 @@ msgstr "Produciuse un erro que non se pode xestionar" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Non se completou unha instalación anterior" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Produciuse un erro descoñecido" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Agardando polo arranque do servizo" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Agardando" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Agardando" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:606 +======= +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Agardando polo recurso requirido" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Agardando que rematen outros xestores de software" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Agardando polo indicador do ficheiro de configuración" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Executando a tarefa" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Descargando" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Solicitando as orixes de software" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Limpando" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Buscando as dependencias" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Rematado" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Cancelando" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" +<<<<<<< TREE msgstr "Cargando a lista do software" #. TRANSLATORS: %s is the name of a package @@ -1062,6 +1533,21 @@ msgstr "A rede non está dispoñíbel." #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +msgstr "Cargando a lista do software" + +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Descargáronse %sB de %sB a %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Descargáronse %sB de %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Detalles" @@ -1084,16 +1570,25 @@ msgstr "Recibido" #. 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 "Requírese o 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 "" "Insira o CD/DVD de enriba na unidade «%s» para instalar os paquetes de " @@ -1215,14 +1710,56 @@ msgstr "_Manter" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Introduza o CD/DVD mencionado no lector «%s» para instalar os paquetes de " +"software desde este recurso." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinuar" + +#. 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 "" +"Substituír as modificacións de «%s» por unha versión posterior do ficheiro " +"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 "" +"Se non sabe por que ese ficheiro xa se atopa aí, adoita ser máis seguro a " +"súa substitución." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Modificacións" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Manter" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Substituír" #. 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 @@ -1498,3 +2035,61 @@ #~ msgstr "" #~ "Algo fallou ao engadir a chave á lista de distribuidores de programas 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 "Eliminando %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Executando o disparador de post-instalación %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 "It was not possible to install the latest for all packages." +#~ msgstr "Non foi posíbel instalar as últimas versións de todos os paquetes" + +#~ msgid "System is already up-to-date" +#~ msgstr "O sistema xa está actualizado" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Non hai necesidade de actualizar o sistema" + +#~ msgid "System is not up-to-date" +#~ msgstr "O sistema non está actualizado" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Quere usar a nova versión?" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Agardando por outras tarefas" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Cambiouse o ficheiro de configuración «%s»" +>>>>>>> MERGE-SOURCE === modified file 'po/he.po' --- po/he.po 2013-03-10 00:01:34 +0000 +++ po/he.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-12-31 13:26+0000\n" "Last-Translator: Yaron \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-02-06 10:09+0000\n" +"Last-Translator: Omri Strumza \n" +>>>>>>> MERGE-SOURCE "Language-Team: Hebrew \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" @@ -39,29 +50,69 @@ 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 +174,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 "כדי להתקין תכנה עדכנית, עליך להזדהות." @@ -369,21 +424,37 @@ msgstr "Waiting for authentication" #: ../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 "Listen on the DBus session bus (Only required for testing" @@ -393,53 +464,97 @@ msgstr "Perform operations in the given chroot" #: ../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 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "השינויים חלו" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "התקנות שלא הושלמו תוקנו" @@ -465,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 "מתבצע תיקון להתקנות שלא הושלמו" @@ -605,10 +776,69 @@ 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" @@ -618,17 +848,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 "הקובץ הנבחר אינו מפתח 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 #: ../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." @@ -636,7 +878,11 @@ "נא לבדוק האם מופעל כרגע כלי אחר לניהול תכנה, לדוגמה: 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." @@ -644,37 +890,66 @@ "זוהי בעיה חמורה. יש לנסות שוב מאוחר יותר. אם בעיה זו מופיעה שוב, יש לדווח על " "הבעיה למפתחים." +<<<<<<< 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 @@ -691,8 +966,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." @@ -768,69 +1053,154 @@ "לבקשת ססמה: סביבת שולחן העבודה שלך אינה מספקת סוכן להפעלת 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 "" +"יתכן ששגיאה זו נגרמה על ידי חבילות תוכנה הנדרשות בנוסף שהן חסרות או שאינן " +"ניתנות להתקנה. יתרה מכך יתכן שישנה התנגשות בין חבילות התוכנה שאין להתקינן " +"באותו הזמן." + +#: ../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" msgstr "נדרשת התקנה של חבילות לא מורשות" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "ההתקנה הקודמת לא הושלמה" @@ -872,53 +1242,111 @@ msgstr "אירעה שגיאה שאינה ניתנת לטיפול" #: ../aptdaemon/enums.py:603 +======= +#: ../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 @@ -1035,6 +1463,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 "הורדו %sב' מתוך %sב' במהירות %sב'/ש" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "הורדו %sב' מתוך %sב'" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "פרטים" @@ -1057,16 +1498,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 "תקליטור ה־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 "" "נא להכניס את תקליטור ה־CD/DVD הנדרש לכונן '%s' לצורך התקנת חבילות ממנו." @@ -1183,14 +1633,51 @@ msgstr "_שמירה" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"נא להכניס את התקליטור/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" msgstr "_פרטים" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1462,3 +1949,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ 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 "It was not possible to install the latest for all packages." +#~ msgstr "לא ניתן היה להתקין את העדכניות מבין כל החבילות." + +#~ 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/hr.po' --- po/hr.po 2013-03-10 00:01:34 +0000 +++ po/hr.po 2013-06-03 17:47:29 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE # Croatian translation for aptdaemon # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # This file is distributed under the same license as the aptdaemon package. @@ -1418,3 +1419,563 @@ #, python-format msgid "but %s is to be installed" msgstr "" +======= +# Croatian translation for aptdaemon +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the aptdaemon package. +# FIRST AUTHOR , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: aptdaemon\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-04 23:14+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../data/org.debian.apt.policy.in.h:1 +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:2 +msgid "Authentication is required to install a local package file." +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:4 +msgid "" +"Authentication is required to query the software repositories for " +"installable packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:5 +msgid "Authentication is required to remove software packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:6 +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 "" + +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:10 +msgid "Install package file" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "" + +#: ../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 +msgid "Update package information" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:15 +msgid "Upgrade packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "" + +#: ../aptdaemon/core.py:1237 +msgid "Do not shutdown the daemon because of inactivity" +msgstr "" + +#: ../aptdaemon/core.py:1242 +msgid "Show internal processing information" +msgstr "" + +#: ../aptdaemon/core.py:1246 +msgid "Quit and replace an already running daemon" +msgstr "" + +#: ../aptdaemon/core.py:1250 +msgid "Store profile stats in the specified file" +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 +msgid "Installed packages" +msgstr "" + +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" + +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "" + +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "" + +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "" + +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "" + +#: ../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 +msgid "Successful" +msgstr "" + +#: ../aptdaemon/enums.py:158 +msgid "Canceled" +msgstr "" + +#: ../aptdaemon/enums.py:159 +msgid "Failed" +msgstr "" + +#: ../aptdaemon/enums.py:169 +msgid "Installing file" +msgstr "" + +#: ../aptdaemon/enums.py:170 +msgid "Installing packages" +msgstr "" + +#: ../aptdaemon/enums.py:171 +msgid "Adding key from file" +msgstr "" + +#: ../aptdaemon/enums.py:172 +msgid "Updating cache" +msgstr "" + +#: ../aptdaemon/enums.py:173 +msgid "Removing trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:174 +msgid "Removing packages" +msgstr "" + +#: ../aptdaemon/enums.py:175 +msgid "Updating packages" +msgstr "" + +#: ../aptdaemon/enums.py:176 +msgid "Upgrading system" +msgstr "" + +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +msgid "Applying changes" +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 +msgid "Check your Internet connection." +msgstr "" + +#: ../aptdaemon/enums.py:215 +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 "" + +#: ../aptdaemon/enums.py:220 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "" + +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" + +#: ../aptdaemon/enums.py:233 +msgid "There isn't any need for an update." +msgstr "" + +#: ../aptdaemon/enums.py:234 +msgid "There isn't any need for an installation" +msgstr "" + +#: ../aptdaemon/enums.py:236 +msgid "There isn't any need for a removal." +msgstr "" + +#: ../aptdaemon/enums.py:237 +msgid "" +"You requested to remove a package which is an essential part of your system." +msgstr "" + +#: ../aptdaemon/enums.py:240 +msgid "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." +msgstr "" + +#: ../aptdaemon/enums.py:242 +msgid "The installation or removal of a software package failed." +msgstr "" + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "" + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 +msgid "Failed to download package files" +msgstr "" + +#: ../aptdaemon/enums.py:270 +msgid "Failed to download repository information" +msgstr "" + +#: ../aptdaemon/enums.py:271 +msgid "Package dependencies cannot be resolved" +msgstr "" + +#: ../aptdaemon/enums.py:272 +msgid "The package system is broken" +msgstr "" + +#: ../aptdaemon/enums.py:273 +msgid "Key was not installed" +msgstr "" + +#: ../aptdaemon/enums.py:274 +msgid "Key was not removed" +msgstr "" + +#: ../aptdaemon/enums.py:275 +msgid "Failed to lock the package manager" +msgstr "" + +#: ../aptdaemon/enums.py:276 +msgid "Failed to load the package list" +msgstr "" + +#: ../aptdaemon/enums.py:277 +msgid "Package does not exist" +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../aptdaemon/enums.py:279 +msgid "Package is already installed" +msgstr "" + +#: ../aptdaemon/enums.py:280 +msgid "Package isn't installed" +msgstr "" + +#: ../aptdaemon/enums.py:281 +msgid "Failed to remove essential system package" +msgstr "" + +#: ../aptdaemon/enums.py:283 +msgid "Task cannot be monitored or controlled" +msgstr "" + +#: ../aptdaemon/enums.py:284 +msgid "Package operation failed" +msgstr "" + +#: ../aptdaemon/enums.py:285 +msgid "Requires installation of untrusted packages" +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 +msgid "Waiting for service to start" +msgstr "" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +msgid "Waiting for required medium" +msgstr "" + +#: ../aptdaemon/enums.py:301 +msgid "Waiting for other software managers to quit" +msgstr "" + +#: ../aptdaemon/enums.py:302 +msgid "Waiting for configuration file prompt" +msgstr "" + +#: ../aptdaemon/enums.py:304 +msgid "Running task" +msgstr "" + +#: ../aptdaemon/enums.py:305 +msgid "Downloading" +msgstr "" + +#: ../aptdaemon/enums.py:306 +msgid "Cleaning up" +msgstr "" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:309 +msgid "Finished" +msgstr "" + +#: ../aptdaemon/enums.py:310 +msgid "Cancelling" +msgstr "" + +#: ../aptdaemon/enums.py:311 +msgid "Loading software list" +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 +msgid "Details" +msgstr "" + +#. TRANSLATORS: %s represents the name of a CD or DVD +#: ../aptdaemon/gtkwidgets.py:620 +#, python-format +msgid "CD/DVD '%s' is required" +msgstr "" + +#. TRANSLATORS: %s is the name of the CD/DVD drive +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"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 +msgid "_Replace" +msgstr "" + +#. TRANSLATORS: expander label in the error dialog +#: ../aptdaemon/gtkwidgets.py:743 +msgid "_Details" +msgstr "" + +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "" + +#: ../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 "" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "" +>>>>>>> MERGE-SOURCE === modified file 'po/hu.po' --- po/hu.po 2013-03-10 00:01:34 +0000 +++ po/hu.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-09-29 17:25+0000\n" "Last-Translator: Péter MÁTÓ \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-28 09:34+0000\n" +"Last-Translator: Gabor Kelemen \n" +>>>>>>> MERGE-SOURCE "Language-Team: Hungarian \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" @@ -40,29 +51,69 @@ msgstr "Szoftverbeállítások megváltoztatása" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "A szoftverbeállítások megváltoztatásához hitelesítésre van szükség." - +======= +msgid "Authentication is required to repair broken installations" +msgstr "A törött telepítések javításához hitelesítés szükséges." + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Hitelesítés szükséges a szoftvercsomagok frissítéséhez" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Szoftvertároló módosítása" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Hitelesítés szükséges a rendszer frissítéséhez" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "Hitelesítés szükséges a szoftvertároló-beállítások módosításához." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Másik felhasználó feladatának megszakítása" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Csomagfájl telepítése" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "A csomag telepítéséhez hitelesítés szükséges." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Csomagok telepítése" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Csomagok eltávolítása" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Törött telepítések javítása" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Csomaginformációk frissítése" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "A szoftverkatalógus frissítéséhez hitelesítés szükséges." @@ -126,9 +177,13 @@ msgstr "Hitelesítés szükséges a megvásárolt szoftverek telepítéséhez." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Csomagok frissítése" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "Frissített szoftver telepítéséhez hitelesítés szükséges." @@ -374,21 +429,37 @@ msgstr "Várakozás hitelesítésre" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Rendszer frissítése" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Ne álljon le a démon inaktivitás miatt" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Ne töltsön be semmilyen bővítményt" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Belső feldolgozási információk megjelenítése" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Kilépés és meglévő démon cseréje" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "A D-Bus munkamenetbusz figyelése (csak teszteléshez)" @@ -398,53 +469,97 @@ msgstr "Műveletek végrehajtása a megadott „chroot”-on belül" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Profilstatisztikák tárolása a megadott fájlban" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Ne változtasson meg semmit a rendszeren (csak fejlesztőknek)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Ne változtasson meg semmit a rendszeren (csak fejlesztőknek)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Fájl telepítve" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Csomagok telepítve" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Kulcs felvéve a fájlból" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Gyorsítótár frissítve" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Keresés kész" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Megbízható kulcs eltávolítva" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Csomagok eltávolítva" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Csomagok frissítve" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Rendszer frissítve" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Változtatások alkalmazva" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Befejezetlen telepítések javítva" @@ -470,53 +585,109 @@ msgstr "Újrakonfigurált telepített csomagok" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Befejezetlen telepítések javítva" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Törött függőségek javítva" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Sikeres" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Megszakítva" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Sikertelen" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Fájl telepítése" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Csomagok telepítése" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Kulcs hozzáadása fájlból" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Gyorsítótár frissítése" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Megbízható kulcs eltávolítása" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Csomagok eltávolítása" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Csomagok frissítése" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Rendszer frissítése" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Módosítások alkalmazása" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Befejezetlen telepítések javítása" @@ -610,10 +781,70 @@ msgstr "Licenc-kulcs hozzáadása" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Befejezetlen telepítések javítása" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Törött függőségek javítása" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "A csomagfájl telepítése meghiúsult" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "A szoftver telepítése meghiúsult" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"A kulcs hozzáadása a megbízható szoftvergyártók listájához meghiúsult" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "A csomaglisták frissítése meghiúsult" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "A gyártó eltávolítása a megbízható gyártók listájáról meghiúsult" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "A szoftver eltávolítása meghiúsult" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "A csomag frissítése meghiúsult" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "A rendszer frissítése meghiúsult" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "A csomagok változásainak jóváhagyása meghiúsult" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "A befejezetlen telepítések javítása meghiúsult" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "A törött függőségek javítása meghiúsult" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Ellenőrizze internetkapcsolatát." +<<<<<<< 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" @@ -623,11 +854,19 @@ "tiltsa le ezeket, mivel gyakran problémák forrásai.\n" "Ezen kívül futtassa a „sudo apt-get install -f” parancsot terminálban." +<<<<<<< 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 "A kiválasztott fájl nem GPG kulcsfájl, vagy sérült." +<<<<<<< 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." @@ -635,7 +874,11 @@ "A kiválasztott kulcs nem távolítható el. Ellenőrizze, hogy érvényes " "ujjlenyomatot adott-e meg." +<<<<<<< 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." @@ -643,7 +886,11 @@ "Ellenőrizze, hogy nem fut-e jelenleg másik szoftverkezelő eszköz, például a " "Synaptic vagy az aptitude. Egyszerre csak egy eszköz végezhet módosításokat." +<<<<<<< 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." @@ -651,7 +898,11 @@ "Ez egy komoly probléma. Próbálja újra később. Ha ez a probléma újra előáll, " "jelentse be hibaként a fejlesztőknek." +<<<<<<< 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." @@ -659,34 +910,59 @@ "Ellenőrizze a csomagnév helyesírását, és hogy a megfelelő tároló " "engedélyezve van-e." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Nincs szükség frissítésre." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Nincs szükség telepítésre." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Nincs szükség eltávolításra." +<<<<<<< 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 "A rendszer alapvető részét képező csomag eltávolítását kérte." +<<<<<<< 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 "" "A kapcsolat elveszett a démonnal. Valószínűleg összeomlott a háttérdémon." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "Egy szoftvercsomag telepítése vagy eltávolítása meghiúsult." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "A kért funkció nem támogatott." @@ -702,8 +978,16 @@ "tevő szoftverben." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Ennek nem lenne szabad megtörténnie." + +#: ../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." @@ -780,69 +1064,159 @@ 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 "" +"Ezt a hibát olyan szükséges további szoftvercsomagok okozhatják, amelyek " +"hiányoznak vagy nem telepíthetők. Ezen kívül egyidejűleg nem telepíthető " +"csomagok közötti ütközés is okozhatja." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"A művelet nem hitelesített forrásokból származó csomagok telepítését igényli." + +#: ../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 "" +"A telepítés megszakadását az adott szoftvercsomag hibája okozhatta, vagy " +"barátságtalan módon megszakították. Ezt ki kell javítania, mielőtt további " +"szoftvereket telepítene vagy eltávolítana." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "A csomagfájlok letöltése meghiúsult" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "A tárolóinformációk letöltése meghiúsult" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "A csomagfüggőségek nem oldhatók fel" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "A csomagrendszer sérült" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Nincs telepítve a kulcs" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "A kulcs nem került eltávolításra" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "A csomagkezelő zárolása meghiúsult" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "A csomaglista betöltése meghiúsult" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "A csomag nem létezik" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "A csomag már a legfrissebb verziójú" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "A csomag már naprakész" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "A csomag már telepítve van" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "A csomag nincs telepítve" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Az alapvető rendszercsomag eltávolítása meghiúsult" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "A feladat nem figyelhető meg vagy nem irányítható" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "A csomagművelet meghiúsult" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Nem megbízható csomagok telepítését igényli" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Egy korábbi telepítés nem fejeződött be" @@ -884,53 +1258,111 @@ msgstr "Nem kezelhető hiba történt" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Egy korábbi telepítés nem fejeződött be" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Ismeretlen hiba történt" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Várakozás a szolgáltatás elindulására" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Várakozás" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Várakozás" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:606 +======= +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Várakozás a szükséges adathordozóra" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Várakozás más szoftverkezelők kilépésére" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Várakozás a beállítófájl parancssorára" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Feladat futtatása" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Letöltés" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Szoftverforrások lekérdezése" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Frissítés befejezése" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Függőségek feloldása" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Befejezve" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Megszakítás" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Szoftverlista betöltése" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1047,6 +1479,19 @@ msgstr "A hálózat nem érhető el" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Letöltve: %sB/%sB, sebesség: %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Letöltve: %sB/%sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Részletek" @@ -1069,13 +1514,21 @@ msgstr "Letöltve" #. 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” CD/DVD szükséges" #. 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 " @@ -1084,6 +1537,7 @@ "Helyezze be a fenti CD-t/DVD-t a(z) „%s” meghajtóba a rajta lévő " "szoftvercsomagok telepítéséhez." +<<<<<<< TREE #: ../aptdaemon/gtkwidgets.py:776 ../aptdaemon/gtkwidgets.py:796 #: ../aptdaemon/gtk3widgets.py:824 ../aptdaemon/gtk3widgets.py:843 msgid "C_ontinue" @@ -1198,14 +1652,50 @@ msgstr "_Megtartás" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "_Folytatás" + +#. 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 "" +"Lecseréli a változtatásait a(z) „%s” fájlban a beállítófájl egy újabb " +"verziójával?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"Ha nem tudja, miért létezik már a fájl, általában nyugodtan lecserélheti." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Változtatások" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Megtartás" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Csere" #. 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 "_Részletek" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1480,3 +1970,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "" #~ "A kulcs hozzáadása a megbízható szoftvergyártók listájához meghiúsult" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "%s telepítése" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "%s konfigurálása" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "%s eltávolítása" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "A(z) %s telepítés utáni trigger futtatása" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "%s törlése" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "%s frissítése" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "%s letöltése" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Várakozás más feladatokra" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "A konfigurációs fájl („%s”) megváltozott" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Szeretné az új verziót használni?" + +#~ msgid "System is already up-to-date" +#~ msgstr "A rendszer már naprakész" + +#~ msgid "System is not up-to-date" +#~ msgstr "A rendszer nem naprakész" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Nincs szükség rendszerfrissítésre" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "Nem volt lehetséges minden csomag legújabb változatát telepíteni." +>>>>>>> MERGE-SOURCE === modified file 'po/id.po' --- po/id.po 2013-03-10 00:01:34 +0000 +++ po/id.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-03-02 11:08+0000\n" "Last-Translator: Arif Budiman \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-08 09:28+0000\n" +"Last-Translator: Michael Vogt \n" +>>>>>>> MERGE-SOURCE "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "Plural-Forms: nplurals=1; plural=0;\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" @@ -43,32 +54,72 @@ msgstr "Ubah konfigurasi perangkat lunak" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "" "Untuk mengubah pengaturan perangkat lunak, Anda perlu melakukan otentifikasi." - +======= +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 "Otentikasi yang diperlukan untuk meng-upgrade paket perangkat lunak" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Mengubah repositori perangkat lunak." +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Otentikasi yang diperlukan untuk meng-upgrade paket perangkat lunak" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Untuk merubah pengaturan repositori perangkat lunak, anda perlu melakukan " "otentifikasi." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Membatalkan tugas pengguna lain" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Memasang berkas paket" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Untuk memasang paket ini, Anda perlu melakukan otentifikasi." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Menginstal paket" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Hapus paket" + +#: ../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 "Update informasi paket" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "" @@ -140,9 +191,13 @@ "otentifikasi." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Upgrade paket" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "" @@ -388,21 +443,37 @@ msgstr "Menunggu otentikasi" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Upgrade sistem" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Jangan shutdown daemon karena ketidakaktifan" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Jangan memuat setiap pengaya" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Tampilkan informasi pemrosesan internal" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Berhenti dan mengganti daemon yang sudah berjalan" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "" @@ -412,53 +483,97 @@ msgstr "" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Menaruh statistik profil di berkas yang ditentukan" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Jangan melakukan perubahan pada sistem (Hanya untuk developer)" #: ../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 "File terinstall" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Paket-paket terinstall" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" msgstr "Tambahkan kunci dari berkas" #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "Tambahkan kunci dari berkas" + +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Tembolok terbarui" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Pencarian selesai" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Hapus kunci terpercaya" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Hapus paket-paket" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Paket-paket sudah terbarui" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Sistem sudah diperbaharui" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Terapkan perubahan" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Proses instal yang terputus sudah diperbaiki" @@ -484,53 +599,109 @@ msgstr "Mengkonfigurasi ulang paket-paket yang telah terpasang" #: ../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 "Dengan sukses" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Dibatalkan" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Gagal" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Memasang berkas" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Memasang paket-paket" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Tambahkan kunci dari berkas" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Memperbaharui tembolok" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Menghapus kunci yang dipercaya" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Menghapus paket-paket" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Memperbaharui paket-paket" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Upgrade sistem" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Sahkan perubahan" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Sedang melakukan perbaikan instalasi" @@ -624,10 +795,69 @@ 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 "Periksa koneksi Internet Anda." +<<<<<<< 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" @@ -637,24 +867,40 @@ "nonaktifkan mereka, karena mereka adalah sumber masalahnya.\n" "Selanjutnya jalankan perintah berikut di 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 "" "Berkas terpilih mungkin bukan berkas kunci GPG atau berkas mungkin korup." +<<<<<<< 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." @@ -662,39 +908,68 @@ "Ini adalah masalah serius. Coba lagi nanti. Jika masalah ini muncul lagi, " "tolong laporkan kesalahan ke pengembang." +<<<<<<< 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 "Tidak perlu untuk melakukan pembaruan." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Tidak perlu untuk melakukan pemasangan." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Tidak perlu untuk melakukan penghapusan." +<<<<<<< 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 "" "Anda diminta untuk menghapus sebuah paket yang merupakan bagian penting dari " "sistem anda." +<<<<<<< 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 "Koneksi ke daemon hilang. Daemon background crash." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." +<<<<<<< TREE msgstr "Pemasangan atau penghapusan Paket peranti lunak gagal." #: ../aptdaemon/enums.py:509 @@ -712,8 +987,18 @@ "tugas-tugas yang berhubungan dengan manajemen Paket." #: ../aptdaemon/enums.py:514 +======= +msgstr "Instalasi atau penghapusan paket peranti lunak gagal." + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Ini tidak seharusnya terjadi." + +#: ../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." @@ -776,67 +1061,156 @@ 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 "" +"Kesalahan ini dapat disebabkan oleh paket perangkat lunak tambahan yang " +"diperlukan yang hilang atau tidak dapat diinstal. Selain itu mungkin ada " +"konflik antara paket perangkat lunak yang tidak diizinkan untuk diinstal " +"pada waktu yang sama." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Tindakan yang diambil akan membutuhkan instalasi paket dari sumber yang " +"belum terotentikasi." + +#: ../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 "Gagal mengunduh berkas paket" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Gagal mengunduh informasi repositori" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Dependensi paket tidak bisa dipecahkan" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Sistem paket rusak" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Kunci tidak terinstal" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Kunci tidak dihapus" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Gagal untuk mengunci manajer paket" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Gagal untuk me-load daftar paket" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Paket tidak ada" +<<<<<<< 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 "Paket sudah merupakan paket terbaru" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Paket sudah terinstal" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Paket tidak terinstal" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Gagal untuk menghapus paket penting sistem" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Tugas tidak dapat dimonitor atau dikontrol" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Operasi paket gagal" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" +<<<<<<< TREE msgstr "Membutuhkan pemasangan dari paket yang tidak terpercaya" #: ../aptdaemon/enums.py:581 @@ -880,51 +1254,111 @@ msgstr "Terjadi kesalahan yang tidak dapat ditangani" #: ../aptdaemon/enums.py:603 +======= +msgstr "Membutuhkan instalasi paket yang tidak dipercaya" + +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Galat tak dikenal terjadi" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Menunggu servis untuk memulai" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Sedang menunggu" +======= +#: ../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 "Menunggu untuk media yang dibutuhkan" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Menunggu peranti lunak lainnya untuk keluar" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Menunggu prompt berkas konfigurasi" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Tugas yang berjalan" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Mengunduh" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Membersihkan" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Menghitung dependensi" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Selesai" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Membatalkan" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" +<<<<<<< TREE msgstr "Memuat daftar perangkat lunak" #. TRANSLATORS: %s is the name of a package @@ -1043,6 +1477,21 @@ msgstr "Jaringan tidak tersedia" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +msgstr "Meload daftar perangkat lunak" + +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Terunduh %sB dari %sB pada %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Terunduh %sB dari %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Rincian" @@ -1065,16 +1514,25 @@ msgstr "Telah diunduh" #. 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 "Membutuhkan '%s' CD/DVD" #. 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 "" "Tolong masukkan CD/DVD ke dalam penggerak '%s' untuk memasang perangkat " @@ -1193,14 +1651,52 @@ msgstr "_Pertahankan" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Silakan masukkan CD/DVD di atas ke drive '%s' untuk menginstal paket " +"perangkat lunak dari medium." + +#: ../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 "_Pertahankan" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Timpa" #. 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 "_Rincian" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1469,3 +1965,62 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "Gagal menambahkan kunci pada daftar piranti lunak yang aman" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Menginstal %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Sedang mengonfigurasi %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Memindahkan %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Menjalankan pemacu %s setelah instalasi" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Menggabungkan %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Diperbaharui %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Mengunduh %s" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Tidak ada kebutuhan untuk memperbahuri sistem" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "" +#~ "Tidak memungkinkan untuk menginstal paket terakhir untuk semua paket-paket." + +#~ msgid "Waiting for other tasks" +#~ msgstr "Menunggu tugas lainnya" + +#~ msgid "System is already up-to-date" +#~ msgstr "Sistem sudah terbaru" + +#~ msgid "System is not up-to-date" +#~ msgstr "Sistem tidak dalam kondisi terbaru" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Berkas konfigurasi '%s' berubah" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Apakah Anda ingin memakai versi baru?" +>>>>>>> MERGE-SOURCE === modified file 'po/is.po' --- po/is.po 2013-03-10 00:01:34 +0000 +++ po/is.po 2013-06-03 17:47:29 +0000 @@ -9,16 +9,28 @@ msgstr "" "Project-Id-Version: po_aptdaemon-is\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2011-01-16 11:54+0000\n" "Last-Translator: Sveinn í Felli \n" "Language-Team: Icelandic \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-08 09:28+0000\n" +"Last-Translator: Baldur \n" +"Language-Team: Icelandic \n" +>>>>>>> MERGE-SOURCE "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" @@ -41,33 +53,76 @@ msgstr "Breyta stillingum hugbúnaðar" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Til að breyta stillingum hugbúnaðar, þarft þú að auðkenna þig." - +======= +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 "Breyta hugbúnaðar uppruna" +======= +#: ../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" +>>>>>>> MERGE-SOURCE +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Setja upp pakkaskrá" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Til að setja upp þennan pakka, þarft þú að auðkenna þig." +======= +#: ../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 "Uppfæra pakkaupplýsingar" +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Fjarlægja pakka" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Til að uppfæra hugbúnaðar vörulistann, þarft þú að auðkenna þig." - +======= +#: ../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 "Setja upp eða fjarlægja pakka" @@ -125,7 +180,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 "Uppfæra pakka" #: ../data/org.debian.apt.policy.in.h:45 @@ -360,21 +419,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 "" @@ -384,9 +461,13 @@ 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 "" @@ -396,37 +477,88 @@ msgstr "Uppsett skrá" #: ../aptdaemon/enums.py:367 +======= +#: ../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 "Uppsettir pakkar" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" msgstr "Bæti við lykli frá skrá" - +======= +#: ../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 "Uppfært skyndiminni" #: ../aptdaemon/enums.py:370 msgid "Search done" +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "Fjarlægðir treystir lyklar" +======= +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "Fjarlægðir pakka" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 msgid "Updated packages" msgstr "Uppfærðir pakkar" +======= +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:374 msgid "Upgraded system" msgstr "Uppfært kerfi" +======= +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "Skráðar breytingar" @@ -456,53 +588,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 "Hætt við" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Mistókst" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Set upp skrá" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Set upp pakka" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Bæti við lykli frá skrá" +<<<<<<< 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 "Fjarlægi treystan lykil" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Fjarlægi pakka" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Uppfæri pakka" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Uppfæri kerfið" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Virkja breytingar" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Geri við ófullkomna uppsetningu" @@ -596,73 +784,177 @@ 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 "" "Skráin sem þú hefur valið er hugsanlega ekki GPG lykilskrá eða hún gæti " "verið skemmd." +<<<<<<< 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 "Það er engin þörf fyrir uppfærslu." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Það er engin þörf fyrir uppsetningu" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Það er engin þörf fyrir það að fjarlægja." +<<<<<<< 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." msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "" @@ -675,8 +967,16 @@ msgstr "" #: ../aptdaemon/enums.py:514 +======= +#: ../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." @@ -736,39 +1036,92 @@ 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" +<<<<<<< TREE msgstr "Pakkinn er ekki til" #: ../aptdaemon/enums.py:572 @@ -776,29 +1129,59 @@ msgstr "" #: ../aptdaemon/enums.py:573 +======= +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../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" msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "" @@ -840,7 +1223,19 @@ msgstr "" #: ../aptdaemon/enums.py:603 +======= +#: ../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 "Bíð eftir að þjónusta ræsist" #: ../aptdaemon/enums.py:605 @@ -848,22 +1243,47 @@ 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 "Bíð eftir diski sem til þarf" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Bíð eftir að aðrir hugbúnaðarstjórar ljúki sér af" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Bíð eftir kvaðningu úr stillingaskrá" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Keyri verk" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Sæki gögn" @@ -871,20 +1291,41 @@ msgid "Querying software sources" msgstr "" +<<<<<<< TREE #: ../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" +<<<<<<< TREE msgstr "Hleð inn hugbúnaðarlista" #. TRANSLATORS: %s is the name of a package @@ -1003,6 +1444,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 "" @@ -1025,16 +1481,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 "CD/DVD '%s' er krafist" #. 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 "" @@ -1149,11 +1614,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/it.po' --- po/it.po 2013-03-10 00:01:34 +0000 +++ po/it.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-01-28 09:35+0000\n" "Last-Translator: Milo Casagrande \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-27 22:55+0000\n" +"Last-Translator: Milo Casagrande \n" +>>>>>>> MERGE-SOURCE "Language-Team: Italian \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" @@ -40,31 +51,72 @@ msgstr "Modifica la configurazione software" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "È necessario autenticarsi per modificare le impostazioni software." - +======= +msgid "Authentication is required to repair broken installations" +msgstr "È richiesto autenticarsi per riparare le installazioni danneggiate" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "" +"È richiesto autenticarsi per eseguire l'avanzamento dei pacchetti software" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Modifica il repository software" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "È richiesto autenticarsi per eseguire l'avanzamento del sistema" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "È necessario autenticarsi per modificare le impostazioni dei repository " "software." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Annulla l'attività di un altro utente" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Installa il file di pacchetto" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "È necessario autenticarsi per installare questo pacchetto." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Installa i pacchetti" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Rimuovi i pacchetti" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Ripara installazioni danneggiate" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Aggiorna le informazioni dei pacchetti" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "È necessario autenticarsi per aggiornare il catalogo del software." @@ -130,9 +182,13 @@ msgstr "È necessario autenticarsi per installare software acquistato." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Esegui l'avanzamento dei pacchetti" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "È necessario autenticarsi per installare software aggiornato." @@ -381,7 +437,15 @@ msgstr "In attesa dell'autenticazione" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Esegui l'avanzamento del sistema" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE msgstr "Non arresta il demone per inattività" #: ../aptdaemon/core.py:2193 @@ -389,13 +453,23 @@ msgstr "Non caricare alcun plugin" #: ../aptdaemon/core.py:2197 +======= +msgstr "Non arrestare il demone per inattività" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Mostra informazioni di elaborazione interne" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Esce e sostituisce un demone già in esecuzione" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Resta in ascolto sul bus D-Bus di sessione (solo per eseguire test)" @@ -405,53 +479,98 @@ msgstr "Esegue operazioni nel chroot fornito" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Memorizza le statistiche di profilo nel file specificato" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Non applica alcuna modifica al sistema (utile solo per sviluppatori)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "" +"Non applicare alcun cambiamento al sistema (utile solo per sviluppatori)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "File installati" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Pacchetti installati" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Chiave aggiunta dal file" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Cache aggiornata" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Ricerca terminata" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Chiave fidata rimossa" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Pacchetti rimossi" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Pacchetti aggiornati" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Sistema avanzato" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Cambiamenti applicati" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Installazione incompleta riparata" @@ -477,51 +596,107 @@ msgstr "Pacchetti installati riconfigurati" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Installazione incompleta riparata" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Dipendenze mancanti riparate" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Riuscito" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Annullato" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Non riuscito" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Installazione del file" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Installazione pacchetti" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Aggiunta della chiave dal file" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Aggiornamento della cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Rimozione della chiave fidata" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Rimozione dei pacchetti" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Aggiornamento pacchetti" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Avanzamento del sistema" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" +<<<<<<< TREE msgstr "Applicazione delle modifiche" #: ../aptdaemon/enums.py:423 @@ -619,10 +794,73 @@ msgstr "Aggiunta chiave licenza" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +msgstr "Applicazione dei cambiamenti" + +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Riparazione installazione incompleta" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Riparazione delle dipendenze mancanti" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Installazione del file del pacchetto non riuscita" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Installazione del software non riuscita" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"Aggiunta della chiave all'elenco dei vendor di software fidati non riuscita" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Aggiornamento dell'elenco del software non riuscito" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "" +"Rimozione del vendor di software dall'elenco di quelli fidati non riuscita" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Rimozione software non riuscita" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Aggiornamento software non riuscito" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Avanzamento del sistema non riuscito" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Applicazione dei cambiamenti software non riuscita" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Riparazione dell'installazione incompleta non riuscita" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Riparazione delle dipendenze mancanti non riuscita" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Controllare la propria connessione 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" @@ -632,13 +870,21 @@ "disabilitarli, poiché questi sono talvolta causa di problemi.\n" "Inoltre eseguire il seguente comando in un terminale: 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 "" "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe " "essere danneggiato." +<<<<<<< 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." @@ -646,7 +892,11 @@ "La chiave selezionata non può essere rimossa. Verificare di aver fornito una " "firma valida." +<<<<<<< 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." @@ -655,7 +905,11 @@ "Synpatic o aptitude) non sia in esecuzione. Solo uno strumento di gestione " "del software è autorizzato a effettuare modifiche." +<<<<<<< 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." @@ -663,7 +917,11 @@ "Questo è un problema grave. Provare di nuovo in un secondo momento. Se il " "problema compare ancora, segnalare l'errore agli sviluppatori." +<<<<<<< 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." @@ -671,26 +929,46 @@ "Verificare che il nome del pacchetto sia corretto e che il suo repository " "sia attivo." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Non c'è alcuna necessità di un aggiornamento." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Non c'è alcuna necessità di una installazione" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Non c'è alcuna necessità di una rimozione." +<<<<<<< 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 "" "È stato richiesto di rimuovere un pacchetto che è una parte essenziale 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." @@ -698,7 +976,11 @@ "La connessione al demone è stata persa. Probabilmente il demone in " "background è andato in crash." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "Installazione o la rimozione di un pacchetto software non riuscita." @@ -712,13 +994,24 @@ "you to install/remove software and to perform other package management " "related tasks." msgstr "" +<<<<<<< TREE "Sembra esserci un errore di programmazione in aptdaemon, il software che " "consente di installare e rimuovere programmi e di eseguire altre attività di " "gestione dei pacchetti." #: ../aptdaemon/enums.py:514 +======= +"Non è riuscita l'installazione o la rimozione di un pacchetto software." + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Ciò non dovrebbe accadere." + +#: ../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." @@ -800,69 +1093,161 @@ "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 "" +"Questo errore potrebbe essere causato da alcuni pacchetti software " +"aggiuntivi richiesti che risultano però mancanti o non installabili. Inoltre " +"potrebbe esserci un conflitto tra pacchetti software che non è possibile " +"installare contemporaneamente." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"L'azione potrebbe richiedere l'installazione di pacchetti da sorgenti non " +"autenticate." + +#: ../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 "" +"L'installazione potrebbe non essere riuscita a causa di un errore nel " +"relativo pacchetto software oppure non è stata annullata correttamente. È " +"necessario riparare questo pacchetto prima di poter installare o rimuovere " +"qualsiasi altro software." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Scaricamento dei file di pacchetto non riuscito" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Scaricamento delle informazioni del repository non riuscito" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Le dipendenze dei pacchetti non possono essere risolte" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Il sistema di pacchetti è danneggiato" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "La chiave non è stata installata" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "La chiave non è stata rimossa" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Blocco del gestore di pacchetti non riuscito" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Caricamento dell'elenco di pacchetti non riuscito" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Il pacchetto non esiste" +<<<<<<< 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 "Il pacchetto è già aggiornato" +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Il pacchetto è già installato" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Il pacchetto non è installato" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Rimozione di pacchetto di sistema essenziale non riuscita" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Impossibile monitorare o controllare le attività" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Operazione di pacchetto non riuscita" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Richiede l'installazione di pacchetti non fidati" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "L'installazione precedente non è stata completata" @@ -904,53 +1289,111 @@ msgstr "Si è verificato un errore non gestibile" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "L'installazione precedente non è stata completata" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Si è verificato un errore sconosciuto" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "In attesa dell'avvio del servizio" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "In attesa" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "In attesa" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:606 +======= +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "In attesa del supporto richiesto" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "In attesa dell'uscita di altri gestori di software" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "In attesa della richiesta del file di configurazione" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Esecuzione attività" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Scaricamento" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Interrogazione sorgenti software" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Pulizia" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Risoluzione delle dipendenze" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Terminato" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Annullamento" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Caricamento elenco software" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1067,6 +1510,19 @@ msgstr "Rete non disponibile" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Scaricati %sB su %sB a %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Scaricati %sB su %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Dettagli" @@ -1089,16 +1545,25 @@ msgstr "Scaricati" #. 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 "È richiesto il 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 "" "Inserire il CD/DVD nell'unità «%s» per installare pacchetti software dal " @@ -1219,14 +1684,56 @@ msgstr "_Mantieni" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Inserire il CD/DVD indicato nell'unità «%s» per installare pacchetti " +"software da tale supporto." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "C_ontinua" + +#. 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 "" +"Sostituire i propri cambiamenti a «%s» con una versione più recente del file " +"di configurazione?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"Qualora si ingori il motivo di questo messaggio, è consigliabile scegliere " +"di sostituire il file." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Cambiamenti" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Mantieni" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Sostituisci" #. 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 "_Dettagli" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1501,3 +2008,63 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "" #~ "Aggiunta della chiave all'elenco dei vendor di software fidati non riuscita" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Installazione di %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Configurazione di %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Rimozione di %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Esecuzione comando di post installazione %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Pulizia di %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Avanzamento di %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Scaricamento di %s" + +#~ msgid "System is not up-to-date" +#~ msgstr "Il sistema non è aggiornato" + +#~ msgid "System is already up-to-date" +#~ msgstr "Il sistema è già aggiornato" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Non c'è alcuna necessità di un aggiornamento di sistema" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "" +#~ "Non è stato possibile installare la versione più recente di tutti i " +#~ "pacchetti." + +#~ msgid "Waiting for other tasks" +#~ msgstr "In attesa di altre attività" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Il file di configurazione «%s» è cambiato" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Usare la nuova versione?" +>>>>>>> MERGE-SOURCE === modified file 'po/ja.po' --- po/ja.po 2013-03-10 00:01:34 +0000 +++ po/ja.po 2013-06-03 17:47:29 +0000 @@ -7,65 +7,150 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-01-24 01:57+0000\n" "Last-Translator: Koichi Akabe \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-19 17:59+0000\n" +"Last-Translator: Shushi Kurose \n" +>>>>>>> MERGE-SOURCE "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "Plural-Forms: nplurals=1; plural=0;\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 +<<<<<<< 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 "パッケージの削除" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +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:14 +msgid "Update package information" +msgstr "パッケージ情報の更新" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:13 msgid "Install or remove packages" msgstr "パッケージのインストールまたは削除" @@ -123,7 +208,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 @@ -354,7 +443,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 "Do not shutdown the daemon because of inactivity" #: ../aptdaemon/core.py:2193 @@ -362,11 +461,21 @@ msgstr "どのプラグインもロードしない" #: ../aptdaemon/core.py:2197 +======= +msgstr "Do not shutdown the daemon because of inactivity" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Show internal processing information" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Quit and replace an already running daemon" #: ../aptdaemon/core.py:2207 @@ -378,7 +487,13 @@ msgstr "指定されたchroot環境で操作を実行します" #: ../aptdaemon/core.py:2216 +======= +msgstr "Quit and replace an already running daemon" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" +<<<<<<< TREE msgstr "Store profile stats in the specified file" #: ../aptdaemon/core.py:2221 @@ -390,13 +505,37 @@ msgstr "インストール済のファイル" #: ../aptdaemon/enums.py:367 +======= +msgstr "Store profile stats in the specified file" + +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Do not make any changes to the system (Only of use to developers)" + +#: ../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 "キャッシュを更新しました" @@ -408,19 +547,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "信頼された鍵を削除しました" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "信頼された鍵を削除しました" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "パッケージを削除しました" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "パッケージを削除しました" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "パッケージを更新しました" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 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:144 +msgid "Applied changes" +msgstr "変更を適用しました" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "変更を適用しました" @@ -450,53 +617,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 "不完全なインストール状態を修復しています" @@ -590,10 +813,69 @@ 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" @@ -602,63 +884,123 @@ "サードパーティのリポジトリを使用しているかどうかを確認してください。利用している場合、トラブルの原因になる場合があるので無効にしてください。\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." +<<<<<<< TREE msgstr "選択された鍵は削除できません。有効なフィンガープリントを入力したか確認してください" +======= +msgstr "選択した鍵を削除できませんでした。フィンガープリントが有効なものかどうかを確認してください。" +>>>>>>> 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。同時にソフトウェアの変更を行えるのは 1 つのツールのみです。" +======= +"他のソフトウェア管理ツール（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 #: ../aptdaemon/enums.py:496 +======= +#: ../aptdaemon/enums.py:231 +>>>>>>> MERGE-SOURCE msgid "" +<<<<<<< TREE "Check the spelling of the package name, and that the appropriate repository " "is enabled." msgstr "パッケージ名のスペルや、パッケージに合ったリポジトリが有効になっているか確認してください。" +======= +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "パッケージ名のスペルおよび有効化しているリポジトリが対応しているかどうかを確認してください。" +>>>>>>> MERGE-SOURCE +<<<<<<< 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." msgstr "ソフトウェアのインストールまたは削除が失敗しました。" +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "要求された機能はサポートされていません。" @@ -668,12 +1010,21 @@ "There seems to be a programming error in aptdaemon, the software that allows " "you to install/remove software and to perform other package management " "related tasks." +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +>>>>>>> MERGE-SOURCE msgstr "" "ソフトウェアをインストール/削除したり、他のパッケージ管理に関連したタスクを行うソフトウェアである、aptdaemonのプログラミングエラーのようです。" +<<<<<<< TREE #: ../aptdaemon/enums.py:514 +======= +#: ../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." @@ -741,39 +1092,110 @@ 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" +<<<<<<< TREE msgstr "鍵はインストールされませんでした" +======= +msgstr "鍵はインストールされませんでした。" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" +<<<<<<< TREE msgstr "鍵は削除されませんでした" +======= +msgstr "鍵は削除されませんでした。" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" +<<<<<<< TREE msgstr "パッケージが存在しません" #: ../aptdaemon/enums.py:572 @@ -781,27 +1203,77 @@ msgstr "パッケージはすでに最新です" #: ../aptdaemon/enums.py:573 +======= +msgstr "パッケージが存在しません。" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "パッケージは既に最新の状態です。" + +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" +<<<<<<< TREE msgstr "パッケージはインストール済です" +======= +msgstr "パッケージはインストール済です。" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" +<<<<<<< TREE msgstr "パッケージはインストールされていません" +======= +msgstr "パッケージはインストールされていません。" +>>>>>>> MERGE-SOURCE +<<<<<<< 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 @@ -845,7 +1317,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 @@ -853,23 +1339,57 @@ 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" +<<<<<<< TREE msgstr "他のソフトウェアマネージャーの終了を待っています" +======= +msgstr "他のソフトウェア・マネージャの終了を待っています。" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" +<<<<<<< TREE msgstr "タスクを実行中です" +======= +msgstr "タスクを実行中です。" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" +<<<<<<< TREE msgstr "ダウンロード中です" #: ../aptdaemon/enums.py:612 @@ -877,19 +1397,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 @@ -1008,6 +1550,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 "詳細情報" @@ -1030,16 +1587,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' という名のCD/DVDが必要です" #. 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' に入れてください。" @@ -1154,12 +1720,48 @@ msgstr "そのまま(_K)" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "さきほどのCD/DVDからソフトウェアパッケージをインストールためにCD/DVD'%s'ドライブに挿入してください" + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "続行(_O)" + +#. 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 "そのまま(_K)" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "置き換える(_R)" #. 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 "詳細(_D)" #. TRANSLATORS: %s is the name of a package manager @@ -1429,3 +2031,48 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "信頼済みソフトウェアベンダーリストへの鍵の追加に失敗しました" +======= +msgstr "詳細(_D)" + +#: ../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 "Do you want to use the new version?" +#~ msgstr "新しいバージョンを使用しますか？" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "設定ファイル '%s' は変更されています" +>>>>>>> MERGE-SOURCE === modified file 'po/kk.po' --- po/kk.po 2013-03-10 00:01:34 +0000 +++ po/kk.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2011-08-19 16:56+0000\n" "Last-Translator: jmb_kz \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-29 14:00+0000\n" +"Last-Translator: jmb_kz \n" +>>>>>>> MERGE-SOURCE "Language-Team: Kazakh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "Plural-Forms: nplurals=1; plural=0;\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" @@ -39,29 +50,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 "Бағдарламалар тізімдемесін жаңарту үшін, аутентификация қажет." @@ -124,9 +177,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 "Жаңартуларды орнату үшін, аутентификация қажет." @@ -360,7 +417,15 @@ 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 @@ -368,11 +433,21 @@ msgstr "" #: ../aptdaemon/core.py:2197 +======= +msgstr "Белсенді болмағаны үшін демонды өшірмеңіз" + +#: ../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 @@ -384,53 +459,99 @@ msgstr "" #: ../aptdaemon/core.py:2216 +======= +msgstr "Шығу және жұмыс істеп тұрған демонды алмастыру" + +#: ../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 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Іске асқан өзгертулер" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Жөнделінген аяқталмаған орнатылым" @@ -456,53 +577,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 "Аяқталмаған орнатылымды жөнделуде" @@ -596,10 +773,69 @@ 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" @@ -610,23 +846,39 @@ "мәселелер мен қателердің көзі болады. Содан кейін терминалда 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 #: ../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." @@ -634,39 +886,68 @@ "Бұл ауыр мәселе. Кейінірек қайталаңыз. Мәселе тағы да қайталанса, қате " "туралы есепті өндірушілерге жіберіңіз." +<<<<<<< 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." msgstr "Пакеттің орнатылуы немесе жойылуы сәтсіз болады." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "" @@ -679,8 +960,16 @@ msgstr "" #: ../aptdaemon/enums.py:514 +======= +#: ../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." @@ -743,69 +1032,159 @@ 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" msgstr "Сенімсіз пакеттік орнатылуы тиіс" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Алдыңғы орнатылым аяқталған жоқ" @@ -847,53 +1226,111 @@ msgstr "" #: ../aptdaemon/enums.py:603 +======= +#: ../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 @@ -1010,6 +1447,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/s жылдамдықта %sB-нан, %sB жүктелінді" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "%sB-нан, %sB жүктелінді" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Толық ақпарат" @@ -1032,16 +1482,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\" CD/DVD қажет" #. 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 "" @@ -1160,14 +1619,56 @@ msgstr "_Қалдыру" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Бағдарламаның пакеттерін дискіден орнату үшін, дисководқа \"%s\" CD/DVD " +"салыңыз" + +#: ../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" msgstr "_Толық ақпарат" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1435,3 +1936,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ 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 "There isn't any need for a system update" +#~ msgstr "Жүйенің жаңартылуы қажет емес" + +#~ msgid "System is not up-to-date" +#~ msgstr "Жүйе жаңартылмаған" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "Барлық пакеттердің соңғы үлгісін қойылуы мүмкін емес." + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "%s конфигурациялы файл өзгертілді" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Жаңа үлгісін қолданғыңыз келеді ме?" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Басқа тапсырмаларын күту" +>>>>>>> MERGE-SOURCE === modified file 'po/ko.po' --- po/ko.po 2013-03-10 00:01:34 +0000 +++ po/ko.po 2013-06-03 17:47:29 +0000 @@ -7,65 +7,150 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-01-30 12:15+0000\n" "Last-Translator: Kim Boram \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-02-13 16:51+0000\n" +"Last-Translator: Bundo \n" +>>>>>>> MERGE-SOURCE "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "Plural-Forms: nplurals=1; plural=0;\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 "패키지 제거" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +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:14 +msgid "Update package information" +msgstr "패키지 정보 업데이트" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:13 msgid "Install or remove packages" msgstr "패키지 설치 혹은 제거" @@ -123,7 +208,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 @@ -354,7 +443,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 @@ -362,11 +461,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 @@ -378,7 +491,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 @@ -388,15 +507,43 @@ #: ../aptdaemon/enums.py:366 msgid "Installed file" msgstr "설치한 파일" - +======= +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 +msgid "Installed packages" +msgstr "설치한 패키지" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:367 msgid "Installed packages" msgstr "설치한 패키지" +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "파일로부터 추가된 키" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:368 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 "업데이트한 캐시" @@ -408,19 +555,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "제거한 신뢰하는 키" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "제거된 인증키" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "제거된 패키지" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "제거한 패키지" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "업데이트된 패키지" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 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:144 +msgid "Applied changes" +msgstr "변경사항 적용됨" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "바뀐 내용 적용함" @@ -450,51 +625,139 @@ 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" +<<<<<<< TREE msgstr "취소함" +======= +msgstr "취소됨" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" +<<<<<<< TREE msgstr "파일 설치" +======= +msgstr "파일을 설치합니다" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" +<<<<<<< TREE msgstr "패키지 설치" +======= +msgstr "패키지를 설치합니다" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" msgstr "캐시 업데이트" +<<<<<<< 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" +<<<<<<< TREE msgstr "패키지 제거" +======= +msgstr "패키지를 삭제합니다" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" +<<<<<<< TREE msgstr "패키지 업데이트" +======= +msgstr "패키지를 업데이트 합니다" +>>>>>>> MERGE-SOURCE +<<<<<<< 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 @@ -590,74 +853,232 @@ 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." +<<<<<<< TREE msgstr "인터넷 연결 상태를 확인하십시오." +======= +msgstr "인터넷 연결상태를 점검하십시오." +>>>>>>> MERGE-SOURCE +<<<<<<< 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 "일반적으로 문제의 원인이 되는 서드 파티 저장소를 사용 여부를 확인한 후 사용하고 있는 서드 파티 저장소를 사용하지 않도록 " "설정하십시오.또한 다음 명령을 터미널에서 실행하십시오: apt-get install -f" +======= +"써드파티 저장소들을 사용중인지 확인하십시요. 만약 그렇다면 해지하십시요. 그 이유는 그것들은 문제들의 공통적인 근원이기 때문입니다. " +"추가적으로 다음 명령을 터미널에서 실행하십시요: 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." +<<<<<<< TREE msgstr "선택된 파일은 GPG 키 파일이 아니거나 올바르지 않은 파일입니다." +======= +msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못되었습니다." +>>>>>>> MERGE-SOURCE +<<<<<<< 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." +<<<<<<< TREE msgstr "선택한 키를 제거할 수 없습니다. 올바른 지문을 제공하는지 확인하십시오." +======= +msgstr "선택된 키를 제거할수 없습니다. 유효한 핑거프린트를 제공했는지 확인하십시요." +>>>>>>> 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 "현재 시냅틱 또는 apttiude와 같은 다른 소프트웨어 관리 도구를 실행 중인지 확인하십시오. 한번에 한 개의 도구만이 시스템을 바꿀 " "수 있습니다." +======= +"현재 다른 소프트웨어 관리자 도구, 예를 들면 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." +<<<<<<< TREE msgstr "" "이것은 심각한 문제입니다. 잠시 뒤 다시 시도하십시오. 만약 이러한 문제가 계속 발생한다면 개발자에게 오류를 보고해 주십시오." +======= +msgstr "이것은 심각한 문제입니다. 다음에 다시 시도하십시오. 만약 이러한 문제가 계속 발생한다면 개발자에게 오류를 보고해 주십시오" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:496 +======= +#: ../aptdaemon/enums.py:231 +>>>>>>> MERGE-SOURCE msgid "" +<<<<<<< TREE "Check the spelling of the package name, and that the appropriate repository " "is enabled." msgstr "패키지 이름의 철자를 확인하십시오, 패키지 이름으로 적합한 저장소를 사용하도록 합니다." +======= +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "패키지 이름의 철자를 점점하십시요 그리고 해당 저장소의 사용이 가능한지 여부도 점검하십시요." +>>>>>>> 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." +<<<<<<< TREE msgstr "시스템의 필수 패키지를 제거할 것을 요청했습니다." +======= +msgstr "시스템의 필수적인 부분에 해당하는 패키지를 지울 것을 요청하였습니다." +>>>>>>> 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." +<<<<<<< TREE msgstr "데몬 연결을 잃어 버렸습니다. 백그라운드 데몬이 충돌한 것이 이유일 가능서이 높습니다." +======= +msgstr "데몬 연결을 잃어 버렸습니다. 필시 백그라운드 데몬이 충돌했기 때문입니다." +>>>>>>> MERGE-SOURCE +<<<<<<< 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 @@ -674,8 +1095,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." @@ -746,39 +1177,114 @@ "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 "" +"이 오류는 잃어버렸거나 혹은 설치할수 없는 그러나 요구되는 추가적인 패키지로 부터 기인합니다. 더우기 동시 설치가 허용되지 않는 " +"패키지들간에 충돌이 있을수 있습니다." + +#: ../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" +<<<<<<< TREE msgstr "패키지 파일 다운로드에 실패했습니다" +======= +msgstr "패키지 파일 다운로드에 실패하였습니다" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" +<<<<<<< TREE msgstr "패키지 의존성을 해결할 수 없습니다" +======= +msgstr "패키지 의존관계를 해결할 수 없습니다" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" +<<<<<<< TREE msgstr "키를 제거하지 않았습니다" +======= +msgstr "키가 제거되지 않았습니다" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" +<<<<<<< TREE msgstr "패키지가 존재하지 않습니다" #: ../aptdaemon/enums.py:572 @@ -786,27 +1292,69 @@ msgstr "페키지를 모두 업데이트했습니다" #: ../aptdaemon/enums.py:573 +======= +msgstr "패키지가 존재하지 않습니다" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "패키지는 이미 최신입니다" + +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" +<<<<<<< TREE msgstr "패키지를 이미 설치했습니다" +======= +msgstr "패키지가 이미 설치되었음" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" +<<<<<<< TREE msgstr "패키지를 설치되지 않았습니다" +======= +msgstr "패키지가 설치되지 않았음" +>>>>>>> MERGE-SOURCE +<<<<<<< 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" 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 @@ -850,7 +1398,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 @@ -858,23 +1420,61 @@ 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" msgstr "설정 파일 프롬프트를 기다립니다" +<<<<<<< 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 @@ -882,19 +1482,51 @@ 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" +<<<<<<< TREE msgstr "완료함" +======= +msgstr "완료됨" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" +<<<<<<< TREE msgstr "취소 중" +======= +msgstr "취소중" +>>>>>>> MERGE-SOURCE +<<<<<<< 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 @@ -1013,7 +1645,23 @@ 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 of %sB 속도 %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" +<<<<<<< TREE msgstr "자세한 내용" #: ../aptdaemon/gtkwidgets.py:458 ../aptdaemon/gtk3widgets.py:463 @@ -1033,18 +1681,34 @@ #: ../aptdaemon/gtkwidgets.py:500 ../aptdaemon/gtk3widgets.py:505 msgid "Downloaded" msgstr "다운로드함" +======= +msgstr "자세한 정보" +>>>>>>> MERGE-SOURCE #. 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' 드라이브에 넣어주십시오." @@ -1159,12 +1823,48 @@ msgstr "유지(_K)" #: ../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 "유지(_K)" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "바꾸기(_R)" #. 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 "자세한 내용(_D)" #. TRANSLATORS: %s is the name of a package manager @@ -1434,3 +2134,41 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "신뢰할 수 있는 소프트웨어 공급자 목록에 키를 추가할 수 없습니다" +======= +msgstr "자세한 내용(_D)" + +#: ../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 다운로드 중" +>>>>>>> MERGE-SOURCE === modified file 'po/ku.po' --- po/ku.po 2013-03-10 00:01:34 +0000 +++ po/ku.po 2013-06-03 17:47:29 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE # Kurdish translation for aptdaemon # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the aptdaemon package. @@ -1418,3 +1419,568 @@ #, python-format msgid "but %s is to be installed" msgstr "" +======= +# Kurdish translation for aptdaemon +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the aptdaemon package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: aptdaemon\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-01-17 08:55+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Kurdish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../data/org.debian.apt.policy.in.h:1 +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" +"Ji bo endamêkî din vatinîya kargera pakêtan betal bikin destûra rastandinê " +"pêwîste." + +#: ../data/org.debian.apt.policy.in.h:2 +msgid "Authentication is required to install a local package file." +msgstr "Ji bo sazkirina paketên heremî re rastandin pêwîste." + +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "Ji bo sazkirina paketên nivisbarîyan re rastandin pêwîste." + +#: ../data/org.debian.apt.policy.in.h:4 +msgid "" +"Authentication is required to query the software repositories for " +"installable packages" +msgstr "" +"Hundirê barxana nivîsbarîya de paketên sazkirinê ji bo pirsyar bikin " +"rastandin pêwîste." + +#: ../data/org.debian.apt.policy.in.h:5 +msgid "Authentication is required to remove software packages" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:6 +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 "" + +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:10 +msgid "Install package file" +msgstr "" + +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Pakêtan saz bike" + +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Pakêtan rake" + +#: ../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 "Agahiya pakêtan rojane bike" + +#: ../data/org.debian.apt.policy.in.h:15 +msgid "Upgrade packages" +msgstr "Pakêtan bilind bike" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Pergalê bilind bike" + +#: ../aptdaemon/core.py:1237 +msgid "Do not shutdown the daemon because of inactivity" +msgstr "" + +#: ../aptdaemon/core.py:1242 +msgid "Show internal processing information" +msgstr "" + +#: ../aptdaemon/core.py:1246 +msgid "Quit and replace an already running daemon" +msgstr "" + +#: ../aptdaemon/core.py:1250 +msgid "Store profile stats in the specified file" +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 +msgid "Installed packages" +msgstr "Pakêtên sazbûyî" + +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" + +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "Pêşbîr hate rojanekirin" + +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "Pakêtên rakirî" + +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "Pakêt hatin rojanekirin" + +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "Pergal hate bilindkirin" + +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "Guhartin bi kêr hat" + +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:157 +msgid "Successful" +msgstr "Serkeftî" + +#: ../aptdaemon/enums.py:158 +msgid "Canceled" +msgstr "Hat betalkirin" + +#: ../aptdaemon/enums.py:159 +msgid "Failed" +msgstr "Biserneket" + +#: ../aptdaemon/enums.py:169 +msgid "Installing file" +msgstr "Pel tê sazkirin" + +#: ../aptdaemon/enums.py:170 +msgid "Installing packages" +msgstr "Pakêt tê sazkirin" + +#: ../aptdaemon/enums.py:171 +msgid "Adding key from file" +msgstr "" + +#: ../aptdaemon/enums.py:172 +msgid "Updating cache" +msgstr "Pêşbîr tê rojanekirin" + +#: ../aptdaemon/enums.py:173 +msgid "Removing trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:174 +msgid "Removing packages" +msgstr "Pakêt tên rakirin" + +#: ../aptdaemon/enums.py:175 +msgid "Updating packages" +msgstr "Pakêt tên rojanekirin" + +#: ../aptdaemon/enums.py:176 +msgid "Upgrading system" +msgstr "Pergal tê bilindkirin" + +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +msgid "Applying changes" +msgstr "Guherandin tên bi kar anîn" + +#: ../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 +msgid "Check your Internet connection." +msgstr "" + +#: ../aptdaemon/enums.py:215 +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 "" + +#: ../aptdaemon/enums.py:220 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "" +"Pelê hilbijartî dibe ku ne pelê mifteyan ya GPG be an jî dibe ku xerabe be." + +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" + +#: ../aptdaemon/enums.py:233 +msgid "There isn't any need for an update." +msgstr "" + +#: ../aptdaemon/enums.py:234 +msgid "There isn't any need for an installation" +msgstr "" + +#: ../aptdaemon/enums.py:236 +msgid "There isn't any need for a removal." +msgstr "" + +#: ../aptdaemon/enums.py:237 +msgid "" +"You requested to remove a package which is an essential part of your system." +msgstr "" + +#: ../aptdaemon/enums.py:240 +msgid "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." +msgstr "" + +#: ../aptdaemon/enums.py:242 +msgid "The installation or removal of a software package failed." +msgstr "" + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "" + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 +msgid "Failed to download package files" +msgstr "" + +#: ../aptdaemon/enums.py:270 +msgid "Failed to download repository information" +msgstr "" + +#: ../aptdaemon/enums.py:271 +msgid "Package dependencies cannot be resolved" +msgstr "" + +#: ../aptdaemon/enums.py:272 +msgid "The package system is broken" +msgstr "" + +#: ../aptdaemon/enums.py:273 +msgid "Key was not installed" +msgstr "" + +#: ../aptdaemon/enums.py:274 +msgid "Key was not removed" +msgstr "" + +#: ../aptdaemon/enums.py:275 +msgid "Failed to lock the package manager" +msgstr "" + +#: ../aptdaemon/enums.py:276 +msgid "Failed to load the package list" +msgstr "" + +#: ../aptdaemon/enums.py:277 +msgid "Package does not exist" +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../aptdaemon/enums.py:279 +msgid "Package is already installed" +msgstr "" + +#: ../aptdaemon/enums.py:280 +msgid "Package isn't installed" +msgstr "" + +#: ../aptdaemon/enums.py:281 +msgid "Failed to remove essential system package" +msgstr "" + +#: ../aptdaemon/enums.py:283 +msgid "Task cannot be monitored or controlled" +msgstr "" + +#: ../aptdaemon/enums.py:284 +msgid "Package operation failed" +msgstr "" + +#: ../aptdaemon/enums.py:285 +msgid "Requires installation of untrusted packages" +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 +msgid "Waiting for service to start" +msgstr "" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +msgid "Waiting for required medium" +msgstr "" + +#: ../aptdaemon/enums.py:301 +msgid "Waiting for other software managers to quit" +msgstr "" + +#: ../aptdaemon/enums.py:302 +msgid "Waiting for configuration file prompt" +msgstr "" + +#: ../aptdaemon/enums.py:304 +msgid "Running task" +msgstr "" + +#: ../aptdaemon/enums.py:305 +msgid "Downloading" +msgstr "" + +#: ../aptdaemon/enums.py:306 +msgid "Cleaning up" +msgstr "" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:309 +msgid "Finished" +msgstr "" + +#: ../aptdaemon/enums.py:310 +msgid "Cancelling" +msgstr "" + +#: ../aptdaemon/enums.py:311 +msgid "Loading software list" +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 +msgid "Details" +msgstr "" + +#. TRANSLATORS: %s represents the name of a CD or DVD +#: ../aptdaemon/gtkwidgets.py:620 +#, python-format +msgid "CD/DVD '%s' is required" +msgstr "" + +#. TRANSLATORS: %s is the name of the CD/DVD drive +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"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 +msgid "_Replace" +msgstr "" + +#. TRANSLATORS: expander label in the error dialog +#: ../aptdaemon/gtkwidgets.py:743 +msgid "_Details" +msgstr "" + +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "" + +#: ../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 "" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "" +>>>>>>> MERGE-SOURCE === modified file 'po/lt.po' --- po/lt.po 2013-03-10 00:01:34 +0000 +++ po/lt.po 2013-06-03 17:47:29 +0000 @@ -7,17 +7,28 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-09-17 20:17+0000\n" "Last-Translator: Aurimas Fišeras \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-08 09:29+0000\n" +"Last-Translator: Michael Vogt \n" +>>>>>>> MERGE-SOURCE "Language-Team: Lithuanian \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%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: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,30 +51,71 @@ msgstr "Keisti programinės įrangos konfigūraciją" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Programinės įrangos nuostatų keitimui turite patvirtinti tapatybę." - +======= +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 "" +"Reikalingas tapatumo nustatymas programinės įrangos paketams atnaujinti" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Keisti programinės įrangos saugyklą" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Reikalingas tapatumo nustatymas sistemai atnaujinti" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Programinės įrangos saugyklos nuostatų keitimui turite patvirtinti tapatybę." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Nutraukti kito naudotojo užduotį" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Įdiegti paketo failą" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Šiam paketui įdiegti turite patvirtinti tapatybę." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Įdiegti paketus" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Pašalinti paketus" + +#: ../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 "Atnaujinti paketų informaciją" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "" @@ -129,9 +181,13 @@ msgstr "Nupirktai programinei įrangai įdiegti turite patvirtinti tapatybę." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Atnaujinti paketus" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "Atnaujintai programinei įrangai įdiegti turite patvirtinti tapatybę." @@ -384,7 +440,15 @@ msgstr "Laukiama tapatybės patvirtinimo" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Atnaujinti sistemą" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE msgstr "Neišjungti tarnybos dėl neaktyvumo" #: ../aptdaemon/core.py:2193 @@ -392,11 +456,21 @@ msgstr "Neįkelti jokių papildinių" #: ../aptdaemon/core.py:2197 +======= +msgstr "" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Rodyti vidinio apdorojimo informaciją" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Baigti ir pakeisti jau paleistą tarnybą" #: ../aptdaemon/core.py:2207 @@ -408,7 +482,13 @@ msgstr "Vykdyti operacijas nurodytame „chroot“" #: ../aptdaemon/core.py:2216 +======= +msgstr "" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" +<<<<<<< TREE msgstr "Saugoti profilio statistiką nurodytame faile" #: ../aptdaemon/core.py:2221 @@ -416,45 +496,87 @@ msgstr "Neatlikti jokių sistemos pakeitimų (naudinga tik kūrėjams)" #: ../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 "Įdiegtas failas" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Įdiegti paketai" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Iš failo pridėtas raktas" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Podėlis atnaujintas" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Paieška baigta" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Patikimas raktas pašalintas" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Pašalinti paketai" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Atnaujinti paketai" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Atnaujinta sistema" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Pritaikyti pakeitimai" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Pataisytas nebaigtas diegimas" @@ -480,53 +602,109 @@ msgstr "Perkonfigūruoti įdiegti paketai" #: ../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 "Sėkmingas" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Nutraukta" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Nepavyko" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Diegiamas failas" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Diegiami paketai" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Pridedamas raktas iš failo" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Atnaujinamas podėlis" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Šalinamas patikimas raktas" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Šalinami paketai" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Atnaujinami paketai" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Atnaujinama sistema" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Pritaikomi pakeitimai" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Taisomas nebaigtas diegimas" @@ -620,10 +798,69 @@ msgstr "Pridedamas licencijos raktas" #: ../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 "Patikrinkite interneto ryšį." +<<<<<<< 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" @@ -633,11 +870,19 @@ "nes jos yra dažnas problemų šaltinis.\n" "Be to paleiskite šią komandą terminale: 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 "Pasirinktas failas gali būti sugadintas arba ne GPG rakto failas." +<<<<<<< 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." @@ -645,7 +890,11 @@ "Nepavyko pašalinti pasirinkto rakto. Patikrinkite, kad nurodėte teisingą " "kontrolinį kodą." +<<<<<<< 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." @@ -654,7 +903,11 @@ "pvz., „Synaptic“ ar „aptitude“. Vienu metu pakeitimus atlikti gali tik " "vienas įrankis." +<<<<<<< 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." @@ -662,40 +915,69 @@ "Tai yra rimta problema. Mėginkite vėliau. Jei problema pasikartos, " "praneškite apie klaidą kūrėjams." +<<<<<<< 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 "Patikrinkite paketo vardo rašybą ir kad įjungta tinkama saugykla." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Nėra jokio poreikio atnaujinimui." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Nėra jokio poreikio diegimui." +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Nėra jokio poreikio pašalinimui." +<<<<<<< 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 "Jūs paprašėte pašalinti paketą, kuris yra būtina sistemos dalis." +<<<<<<< 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 "" "Ryšys su tarnyba buvo prarastas. Greičiausiai užstrigo foninė tarnyba." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "Programinės įrangos paketo diegimas ar pašalinimas nepavyko." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "Paprašyta funkcija yra nepalaikoma." @@ -711,8 +993,16 @@ "klaida." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Taip neturėtų atsitikti." + +#: ../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." @@ -789,69 +1079,152 @@ 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 "Nepavyko atsiųsti paketų failų" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Nepavyko atsiųsti saugyklų informacijos" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Nepavyko nustatyti paketų priklausomybių" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Paketų sistema sugadinta" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Raktas nebuvo įdiegtas" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Raktas nebuvo pašalintas" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Nepavyko blokuoti paketų tvarkytuvės" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Nepavyko įkelti paketų sąrašo" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Paketas neegzistuoja" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Paketas jau atnaujintas" +======= +#: ../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 "Paketas jau įdiegtas" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Paketas nėra įdiegtas" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Nepavyko pašalinti būtino sistemos paketo" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Užduotis negali būti stebima ar valdoma" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Paketo operacija nepavyko" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Reikalauja nepatikimų paketų įdiegimo" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Ankstesnis diegimas nebuvo baigtas" @@ -893,53 +1266,111 @@ msgstr "Įvyko neapdorojama klaida" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Įvyko nežinoma klaida" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Laukiama kol bus paleista tarnyba" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Laukiama" +======= +#: ../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 "Laukiama reikalingos laikmenos" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Laukiama kol išsijungs kitos programinės įrangos tvarkytuvės" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Laukiama konfigūracijos failo pranešimo" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Vykdoma užduotis" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Atsiunčiama" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Užklausiamos programinės įrangos saugyklos" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Išvaloma" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Sprendžiamos priklausomybių sąsajos" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Baigta" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Nutraukiama" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Įkeliamas programinės įrangos sąrašas" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1056,6 +1487,19 @@ msgstr "Tinklas neprieinamas" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Atsiųsta %s B iš %s B (%s B/s)" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Atsiųsta %s B iš %s B" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Išsamiai" @@ -1078,16 +1522,25 @@ msgstr "Atsiųsta" #. 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 "Reikalingas „%s“ CD/DVD" #. 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 "" "Įdėkite aukščiau nurodytą CD/DVD į įrenginį „%s“ programinės įrangos " @@ -1207,14 +1660,52 @@ msgstr "_Palikti" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Prašome įdėti CD/DVD į diskasukį „%s“ programinės įrangos paketų iš " +"laikmenos diegimui." + +#: ../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 "_Palikti" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "Pa_keisti" #. 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 "_Išsamiau" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1490,3 +1981,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "Nepavyko pridėti rakto į patikimų programinės įrangos tiekėjų sąrašą" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Diegiamas %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Konfigūruojamas %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Šalinamas %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Naikinamas %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Atnaujinamas %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Atsiunčiamas %s" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "Nepavyko įdiegti visų paketų naujausių versijų." + +#~ msgid "Waiting for other tasks" +#~ msgstr "Laukiama kitų užduočių" + +#~ msgid "System is already up-to-date" +#~ msgstr "Sistema jau atnaujinta" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Nėra poreikio atnaujinti sistemą" + +#~ msgid "System is not up-to-date" +#~ msgstr "Sistema nėra atnaujinta" + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Konfigūracijos failas „%s“ pakeistas" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Ar norite naudoti naują versiją?" +>>>>>>> MERGE-SOURCE === modified file 'po/lv.po' --- po/lv.po 2013-03-10 00:01:34 +0000 +++ po/lv.po 2013-06-03 17:47:29 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE # Latvian translation for aptdaemon # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the aptdaemon package. @@ -1490,3 +1491,593 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "" #~ "Neizdevās pievienot atslēgu uzticamo programmatūras piegādātāju sarakstam" +======= +# Latvian translation for aptdaemon +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the aptdaemon package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: aptdaemon\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-28 15:35+0000\n" +"Last-Translator: Pēteris Krišjānis \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-31 05:35+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../data/org.debian.apt.policy.in.h:1 +msgid "" +"Authentication is required to cancel the package management taks of another " +"user." +msgstr "" +"Nepieciešama autentifikācija, lai atceltu cita lietotāja pakotņu pārvaldības " +"uzdevumus." + +#: ../data/org.debian.apt.policy.in.h:2 +msgid "Authentication is required to install a local package file." +msgstr "Nepieciešama autentifikācija, lai instalētu lokālu pakotnes failu" + +#: ../data/org.debian.apt.policy.in.h:3 +msgid "Authentication is required to install software packages" +msgstr "Nepieciešama autentifikācija, lai instalētu programmatūras pakotnes" + +#: ../data/org.debian.apt.policy.in.h:4 +msgid "" +"Authentication is required to query the software repositories for " +"installable packages" +msgstr "" +"Nepieciešama autentifikācija, lai pārbaudītu, vai programmatūras krātuvēs " +"nav instalējamu pakotņu" + +#: ../data/org.debian.apt.policy.in.h:5 +msgid "Authentication is required to remove software packages" +msgstr "Nepieciešama autentifikācija, lai noņemtu programmatūras pakotnes" + +#: ../data/org.debian.apt.policy.in.h:6 +msgid "Authentication is required to repair broken installations" +msgstr "Lai salabotu sabeigtās instalācijas, nepieciešama autentifikācija" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Nepieciešama autentifikācija, lai uzlabotu programmatūras pakotnes" + +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Nepieciešama autentifikācija, lai uzlabotu sistēmu" + +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Atcelt cita lietotāja darbību" + +#: ../data/org.debian.apt.policy.in.h:10 +msgid "Install package file" +msgstr "Instalēt pakotņu failu" + +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Instalēt pakotnes" + +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Noņemt pakotnes" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Salabot sabeigtās instalācijas" + +#: ../data/org.debian.apt.policy.in.h:14 +msgid "Update package information" +msgstr "Atjaunināt informāciju par pakotnēm" + +#: ../data/org.debian.apt.policy.in.h:15 +msgid "Upgrade packages" +msgstr "Uzlabot pakotnes" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Uzlabot sistēmu" + +#: ../aptdaemon/core.py:1237 +msgid "Do not shutdown the daemon because of inactivity" +msgstr "Neizslēgt dēmonu aktivitātes trūkuma dēļ" + +#: ../aptdaemon/core.py:1242 +msgid "Show internal processing information" +msgstr "Parādīt informāciju par iekšējiem procesiem" + +#: ../aptdaemon/core.py:1246 +msgid "Quit and replace an already running daemon" +msgstr "Iziet un aizvietot jau palaisto dēmonu" + +#: ../aptdaemon/core.py:1250 +msgid "Store profile stats in the specified file" +msgstr "Saglabāt profīla statistiku norādītā failā" + +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Neizdarīt nekādas izmaiņas sistēmā (Tikai izstrādātāju izmantošanai)" + +#: ../aptdaemon/enums.py:136 +msgid "Installed file" +msgstr "Instalēts fails" + +#: ../aptdaemon/enums.py:137 +msgid "Installed packages" +msgstr "Uzinstalēja pakotnes" + +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "Pievienoja atslēgu no faila" + +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "Atjaunināja kešu" + +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "Izņēma uzticamu atslēgu" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "Izņēma pakotnes" + +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "Uzlaboja pakotnes" + +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "Uzlaboja sistēmu" + +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "Pielietoja izmaiņas" + +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Salaboja nepabeigtu instalāciju" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Salaboja sabeigtās atkarības" + +#: ../aptdaemon/enums.py:157 +msgid "Successful" +msgstr "Veiksmīgi" + +#: ../aptdaemon/enums.py:158 +msgid "Canceled" +msgstr "Atcelts" + +#: ../aptdaemon/enums.py:159 +msgid "Failed" +msgstr "Neveiksmīgi" + +#: ../aptdaemon/enums.py:169 +msgid "Installing file" +msgstr "Instalē failu" + +#: ../aptdaemon/enums.py:170 +msgid "Installing packages" +msgstr "Instalē pakotnes" + +#: ../aptdaemon/enums.py:171 +msgid "Adding key from file" +msgstr "Pievieno atslēgu no faila" + +#: ../aptdaemon/enums.py:172 +msgid "Updating cache" +msgstr "Atjaunina kešu" + +#: ../aptdaemon/enums.py:173 +msgid "Removing trusted key" +msgstr "Izņem uzticamu atslēgu" + +#: ../aptdaemon/enums.py:174 +msgid "Removing packages" +msgstr "Noņem pakotnes" + +#: ../aptdaemon/enums.py:175 +msgid "Updating packages" +msgstr "Atjaunina pakotnes" + +#: ../aptdaemon/enums.py:176 +msgid "Upgrading system" +msgstr "Uzlabo sistēmu" + +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +msgid "Applying changes" +msgstr "Pielieto izmaiņas" + +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Labo nepabeigtu instalāciju" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Labo sabeigtās atkarības" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Pakotnes faila instalēšana neizdevās" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Programmatūras instalēšana neizdevās" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"Neizdevās pievienot atslēgu uzticamo programmatūras piegādātāju sarakstam" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Programmatūras saraksta atsvaidzināšana neizdevās" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "Piegādātāja izņemšana no uzticamo saraksta neizdevās" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Programmatūras noņemšana neizdevās" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Programmatūras atjaunināšana neizdevās" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Sistēmas uzlabošana neizdevās" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Programmatūras izmaiņu pielietošana neizdevās" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Nepabeigtas instalācijas salabošana neizdevās" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Sabeigtu atkarību salabošana neizdevās" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +msgid "Check your Internet connection." +msgstr "Pārbaudiet jūsu Internet savienojumu." + +#: ../aptdaemon/enums.py:215 +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 "" +"Lūdzu, pārbaudiet, vai jūs izmantojat trešās puses krātuves. Ja jā, " +"deaktivizējiet tās, tā kā tās parasti ir problēmu cēlonis.\n" +"Pēc tam palaižat sekojošu komandu terminālī: apt-get install -f" + +#: ../aptdaemon/enums.py:220 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "Izvēlētais fails varētu nebūt GPG atslēga vai arī tas ir bojāts." + +#: ../aptdaemon/enums.py:222 +msgid "" +"The selected key couldn't be removed Check if you provided a valid " +"fingerprint." +msgstr "" +"Izvēlēto atslēgu neizdevās izņemt. Lūdzu pārbaudiet, vai jūs nodrošinājāt " +"korektu identificētājsummu." + +#: ../aptdaemon/enums.py:224 +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 the same " +"time." +msgstr "" +"Pārbaudiet, vai jums nav palaists kāds cits programmatūras pārvaldīšanas " +"rīks, piemēram Synaptic vai aptitude. Tikai viens rīks var veikt izmaiņas " +"dotajā brīdī." + +#: ../aptdaemon/enums.py:228 +msgid "" +"This is a serious problem. Try again later. If this problem appears again, " +"please report an error to the developers." +msgstr "" +"Šī ir nopietna problēma. Mēģiniet vēlāk vēlreiz. Ja šī problēma parādās " +"vēlreiz, lūdzu ziņojiet par šo kļūdu izstrādātājiem." + +#: ../aptdaemon/enums.py:231 +msgid "" +"Check the spelling of the package name and if you have got enabled the " +"corresponding repository." +msgstr "" +"Pārbaudiet pakotnes nosaukuma pareizrakstību, kā arī vai jūs esat " +"aktivizējuši attiecīgo krātuvi." + +#: ../aptdaemon/enums.py:233 +msgid "There isn't any need for an update." +msgstr "Nav nepieciešamības uzlabot." + +#: ../aptdaemon/enums.py:234 +msgid "There isn't any need for an installation" +msgstr "Nav nepieciešamības instalēšanai." + +#: ../aptdaemon/enums.py:236 +msgid "There isn't any need for a removal." +msgstr "Nav nepieciešamības noņemšanai." + +#: ../aptdaemon/enums.py:237 +msgid "" +"You requested to remove a package which is an essential part of your system." +msgstr "Jūs pieprasījāt noņemt pakotni, kas ir svarīga sistēmas sastāvdaļa." + +#: ../aptdaemon/enums.py:240 +msgid "" +"The connection to the daemon was lost. Most likely the background daemon " +"crashed." +msgstr "" +"Savienojums ar dēmonu tika zaudēts. Visticamāk ka fona dēmons avarēja." + +#: ../aptdaemon/enums.py:242 +msgid "The installation or removal of a software package failed." +msgstr "Programmatūras pakotnes instalēšana vai noņemšana neizdevās." + +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Šim nevajadzētu notikt." + +#: ../aptdaemon/enums.py:245 +msgid "" +"This error could be caused by required additional software packages which " +"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 "" +"Šī kļūda varētu būt izraisīta pieprasot papildus programmatūras pakotnes, " +"kas trūkst vai nav instalējamas. Vēl arī ir iespējams konflikts starp " +"programmatūras pakotnēm, kuras nav atļauts instalēt vienlaicīgi." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Šī darbība varētu prasīt pakotņu no neautentificētiem avotiem instalēšanu" + +#: ../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 "" +"Instalēšana varētu būt neizdevusies sakarā ar kļūdu atbilstošajā " +"programmatūras pakotnē vai arī tā tika pārtraukta nedraudzīgā veidā. Jums šī " +"situācija jālabo pirms jūs instalējat vai atinstalējat jebkuru citu " +"programmatūru." + +#: ../aptdaemon/enums.py:269 +msgid "Failed to download package files" +msgstr "Neizdevās lejupielādēt pakotņu failus" + +#: ../aptdaemon/enums.py:270 +msgid "Failed to download repository information" +msgstr "Neizdevās lejupielādēt informāciju par krātuvi" + +#: ../aptdaemon/enums.py:271 +msgid "Package dependencies cannot be resolved" +msgstr "Pakotnes atkarības neizdodas atrisināt" + +#: ../aptdaemon/enums.py:272 +msgid "The package system is broken" +msgstr "Pakotņu sistēma ir salauzta" + +#: ../aptdaemon/enums.py:273 +msgid "Key was not installed" +msgstr "Atslēga nebija uzinstalēta" + +#: ../aptdaemon/enums.py:274 +msgid "Key was not removed" +msgstr "Atslēga netika noņemta" + +#: ../aptdaemon/enums.py:275 +msgid "Failed to lock the package manager" +msgstr "Neizdevās noslēgt pakotņu pārvaldnieku" + +#: ../aptdaemon/enums.py:276 +msgid "Failed to load the package list" +msgstr "Neizdevās ielādēt pakotņu sarakstu" + +#: ../aptdaemon/enums.py:277 +msgid "Package does not exist" +msgstr "Pakotne neeksistē" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Pakotnei jau ir jaunākā versija" + +#: ../aptdaemon/enums.py:279 +msgid "Package is already installed" +msgstr "Pakotne jau ir uzinstalēta" + +#: ../aptdaemon/enums.py:280 +msgid "Package isn't installed" +msgstr "Pakotne nav uzinstalēta" + +#: ../aptdaemon/enums.py:281 +msgid "Failed to remove essential system package" +msgstr "Neizdevās noņemt svarīgu sistēmas pakotni" + +#: ../aptdaemon/enums.py:283 +msgid "Task cannot be monitored or controlled" +msgstr "Uzdevumu neizdodas novērot vai kontrolēt" + +#: ../aptdaemon/enums.py:284 +msgid "Package operation failed" +msgstr "Darbība ar pakotni neizdevās" + +#: ../aptdaemon/enums.py:285 +msgid "Requires installation of untrusted packages" +msgstr "Pieprasa neuzticamu pakotņu instalēšanu" + +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Iepriekšējā instalēšana nav pabeigta" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Uzradās nezināma kļūda" + +#: ../aptdaemon/enums.py:298 +msgid "Waiting for service to start" +msgstr "Gaidam servisa palaišanos" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Gaida" + +#: ../aptdaemon/enums.py:300 +msgid "Waiting for required medium" +msgstr "Gaidam pieprasīto mēdiju" + +#: ../aptdaemon/enums.py:301 +msgid "Waiting for other software managers to quit" +msgstr "Gaidam, kad citi programmatūras pārvaldnieki tiks aizvērti" + +#: ../aptdaemon/enums.py:302 +msgid "Waiting for configuration file prompt" +msgstr "Gaidam konfigurācijas faila norādi" + +#: ../aptdaemon/enums.py:304 +msgid "Running task" +msgstr "Veic darbību" + +#: ../aptdaemon/enums.py:305 +msgid "Downloading" +msgstr "Lejupielādē" + +#: ../aptdaemon/enums.py:306 +msgid "Cleaning up" +msgstr "Satīra" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Atrisina atkarības" + +#: ../aptdaemon/enums.py:309 +msgid "Finished" +msgstr "Pabeigts" + +#: ../aptdaemon/enums.py:310 +msgid "Cancelling" +msgstr "Atsauc" + +#: ../aptdaemon/enums.py:311 +msgid "Loading software list" +msgstr "Ielādē programmatūras sarakstu" + +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Lejupielādē %sB no %sB pie ātruma %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Lejupielādē %sB no %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +msgid "Details" +msgstr "Sīkāka informācija" + +#. TRANSLATORS: %s represents the name of a CD or DVD +#: ../aptdaemon/gtkwidgets.py:620 +#, python-format +msgid "CD/DVD '%s' is required" +msgstr "Tiek pieprasīts CD/DVD '%s'" + +#. TRANSLATORS: %s is the name of the CD/DVD drive +#: ../aptdaemon/gtkwidgets.py:622 +#, python-format +msgid "" +"Please insert the above CD/DVD into the drive '%s' to install software " +"packages from the medium." +msgstr "" +"Lūdzu, ievietojiet doto CD/DVD dzinī '%s', lai instalētu programmatūras " +"pakotnes no mēdija." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "T_urpināt" + +#. 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 "" +"Aizvietot jūsu izmaiņas '%s' ar vēlāku šī konfigurācijas faila versiju?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"Ja jūs nezināt, kāpēc dotais fails ir tur, tad parasti ir droši to aizvietot." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Izmaiņas" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Paturēt" + +#: ../aptdaemon/gtkwidgets.py:655 +msgid "_Replace" +msgstr "_Aizvietot" + +#. TRANSLATORS: expander label in the error dialog +#: ../aptdaemon/gtkwidgets.py:743 +msgid "_Details" +msgstr "_Detaļas" + +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Instalē %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Konfigurē %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Noņem %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Palaiž pēcinstalēšanas trigeri %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Tīra %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Uzlabo %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Lejupielādē %s" +>>>>>>> MERGE-SOURCE === modified file 'po/ms.po' --- po/ms.po 2013-03-10 00:01:34 +0000 +++ po/ms.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-01-02 10:23+0000\n" "Last-Translator: abuyop \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-11-03 22:35+0000\n" +"Last-Translator: FULL NAME \n" +>>>>>>> MERGE-SOURCE "Language-Team: Malay \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" @@ -42,34 +53,77 @@ msgstr "Ubah konfigurasi perisian" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Untuk mengubah tetapan perisian, anda perlu dapatkan pengesahihan." - +======= +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 "Ubah repositori perisian" +======= +#: ../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." +======= +#: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +>>>>>>> MERGE-SOURCE msgstr "" "Untuk mengubah tetapan repositori perisian, anda perlukan pengsahihan." -#: ../data/org.debian.apt.policy.in.h:9 +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Pasang fail pakej" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Untuk memasang pakej ini, anda perlukan pengsahihan." +======= +#: ../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 "Kemaskini informasi pakej" +======= +#: ../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 "Untuk mengemakini katalog perisian, anda perlukan pengsahihan." - +======= +#: ../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 "Pasang atau buang pakej" @@ -129,7 +183,11 @@ msgstr "Untuk memasang perisian, anda perlukan pengsahihan." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" +<<<<<<< TREE msgstr "Tingkatkan pakej-pakej" #: ../data/org.debian.apt.policy.in.h:45 @@ -378,7 +436,17 @@ msgstr "Menunggu pengsahihan" #: ../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 "Jangan menutup daemon disebabkan ketiadaaan aktviti" #: ../aptdaemon/core.py:2193 @@ -386,11 +454,21 @@ msgstr "Jangan muat apa-apa pemalam" #: ../aptdaemon/core.py:2197 +======= +msgstr "" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Tunjukkan informasi pemprosesan dalam" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Tutup dan gantikan sebuah daemon yang sedang berjalan" #: ../aptdaemon/core.py:2207 @@ -402,6 +480,11 @@ msgstr "Lakukan operasi didalam chroot yang diberikan" #: ../aptdaemon/core.py:2216 +======= +msgstr "" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Simpan stat profil dalam fail yang ditentukan" @@ -411,18 +494,45 @@ "Jangan membuat apa-apa perubahan kepada sistem (Hanya berguna kepada " "pembangun)" +<<<<<<< TREE #: ../aptdaemon/enums.py:366 msgid "Installed file" msgstr "Fail dipasang" - +======= +#: ../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 +msgid "Installed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:367 msgid "Installed packages" msgstr "Pakej dipasang" +======= +#: ../aptdaemon/enums.py:138 +msgid "Added key from file" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:368 msgid "Added key from file" msgstr "Telah menambah kunci daripada fail" +======= +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:369 msgid "Updated cache" msgstr "Telah kemaskini cache" @@ -434,19 +544,47 @@ #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" msgstr "Telah membuang kunci dipercayai" - +======= +#: ../aptdaemon/enums.py:140 +msgid "Removed trusted key" +msgstr "" + +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +msgstr "" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" msgstr "Pakej-pakej yang telah dibuang" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:373 msgid "Updated packages" msgstr "Pakej-pakej yang telah dikemaskini" +======= +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:374 msgid "Upgraded system" msgstr "Sistem yang telah ditingkatkan" +======= +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +msgstr "" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "Perubahan yang telah digunakan" @@ -476,50 +614,105 @@ msgstr "Konfigur semula pakej yang dipasang" #: ../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 "Berjaya" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Dibatalkan" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Gagal" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Memasang fail" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Memasang pakej-pakej" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Menambah kunci daripada fail" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Mengemaskini cache" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Membuang kunci dipercayai" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Membuang pakej-pakej" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Mengemaskini pakej-pakej" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Meningkatkan sistem" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Menerapkan perubahan" @@ -562,6 +755,7 @@ #: ../aptdaemon/enums.py:452 msgid "Adding the key to the list of trusted software vendors failed" msgstr "" +<<<<<<< TREE "Menambah kunci ke senarai pembekal perisian yang dipercayai mengalami " "kegagalan" @@ -618,10 +812,70 @@ msgstr "Menambah kunci lesen" #: ../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 "Periksa sambungan Internet anda." +<<<<<<< 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" @@ -631,12 +885,20 @@ "nyahbolehkan mereka, kerana mereka adalah penyebab masalah biasa.\n" "Apalagi jalankan arahan berikut didalam satu 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 "" "Fail yang dipilih mungkin bukan fail kekunci GPG atau fail mungkin buruk." +<<<<<<< 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." @@ -644,7 +906,11 @@ "kekunci pilihan tidak dapat dibuangkan. Semak sama ada anda telah masukkan " "fingerprint yang sah." +<<<<<<< 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." @@ -652,7 +918,11 @@ "Semak sama ada anda sedang jalankan alat pengurusan perisian yang lain, cth. " "Sypnatic atau aptitude. Hanya satu alat dibenarkan untuk membuat perubahan." +<<<<<<< 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." @@ -660,31 +930,55 @@ "Ini adalah masalah penting. Cuba lagi kemudian. Jika masalah ini muncul " "semula, sila laporkan ralat kepada pembangun." +<<<<<<< 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 "Semak ejaan nama pakej, dan repositori tersebut dibenarkan." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Tiada keperluan untuk kemaskini." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Tiada keperluan untuk pemasangan" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Tiada keperluan untuk membuang." +<<<<<<< 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 "" "Anda meminta untuk membuang sebuah pakej yang penting kepada sistem anda." +<<<<<<< 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." @@ -692,8 +986,13 @@ "Sambungan kepada daemon telah hilang. Kemungkinan besar daemon latarbelakang " "telah mati." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." +<<<<<<< TREE msgstr "Pemasangan atau pembuangan sebuah pakej perisian telah gagal." #: ../aptdaemon/enums.py:509 @@ -711,8 +1010,18 @@ "pengurusan pakej." #: ../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." @@ -791,39 +1100,92 @@ "menyediakan ejen sesi Kit Polisi." #: ../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 "Gagal untuk memuat-turun fail-fail pakej" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Gagal untuk memuat-turun informasi repositori" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Keperluan pakej tidak dapat diselesaikan" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Sistem pakej adalah rosak" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Kunci tidak dipasang" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Kunci tidak dibuang" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Gagal untuk mengunci pengurus pakej" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Gagal untuk memuat senarai pakej" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" +<<<<<<< TREE msgstr "Pakej tidak wujud" #: ../aptdaemon/enums.py:572 @@ -831,27 +1193,57 @@ msgstr "Pakej sudah dikemaskini" #: ../aptdaemon/enums.py:573 +======= +msgstr "" + +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "" + +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Pakej sudah dipasang" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Pakej tidak dipasang" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Gagal untuk membuang pakej sistem yang diperlukan" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Tugas tidak dapat diperhatikan atau dikawal" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Operasi pakej telah gagal" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" +<<<<<<< TREE msgstr "Memerlukan pemasangan pakej-pakej yang tidak dipercayai" #: ../aptdaemon/enums.py:581 @@ -895,7 +1287,21 @@ msgstr "Ralat yang tidak boleh dikendalikan berlaku" #: ../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 "Menunggu untuk servis bermula" #: ../aptdaemon/enums.py:605 @@ -903,23 +1309,49 @@ msgstr "Menunggu" #: ../aptdaemon/enums.py:606 +======= +msgstr "" + +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "" + +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Menunggu untuk medium yang diperlukan" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Menunggu untuk pengurus perisian lain untuk tutup" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Menunggu untuk prompt fail konfigurasi" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Menjalankan tugas" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" +<<<<<<< TREE msgstr "Sedang dimuat-turun" #: ../aptdaemon/enums.py:612 @@ -927,19 +1359,43 @@ msgstr "Menanya sumber perisian" #: ../aptdaemon/enums.py:613 +======= +msgstr "" + +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" +<<<<<<< TREE msgstr "Sedang membersihkan" #: ../aptdaemon/enums.py:616 +======= +msgstr "" + +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Selesai" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Sedang membatalkan" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" +<<<<<<< TREE msgstr "Memuat senarai perisian" #. TRANSLATORS: %s is the name of a package @@ -1058,6 +1514,21 @@ msgstr "Rangkaian tiada" #: ../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 "Butiran" @@ -1080,16 +1551,25 @@ msgstr "Dimuat turun" #. 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 "CD/DVD '%s' diperlukan" #. 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 "" "Sila masukkan CD/DVD kedalam pemacu '%s' untuk memasang pakej perisian " @@ -1210,11 +1690,51 @@ msgstr "_Simpan" #: ../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" +<<<<<<< TREE msgstr "_Gantikan" +======= +msgstr "" + +>>>>>>> MERGE-SOURCE #. 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 "_Butiran" === modified file 'po/nb.po' --- po/nb.po 2013-03-10 00:01:34 +0000 +++ po/nb.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2012-02-26 20:26+0000\n" "Last-Translator: Mathias Bynke \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-13 14:12+0000\n" +"Last-Translator: magnusp \n" +>>>>>>> MERGE-SOURCE "Language-Team: Norwegian Bokmal \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" @@ -39,30 +50,70 @@ msgstr "Endre programvareoppsett" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "Du må autentisere deg for å endre programvareinnstillinger." - +======= +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 "Autentisering krever for å oppgradere programvarepakkene" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Endre programvarearkiv" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Autentisering kreves for å oppgradere systemet" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "" "Du må autentisere deg for å endre innstillinger for programvarearkiver." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "Avbryte en annen brukers oppgaver" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Installer pakkefil" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "For å installere denne pakken må du autentisere deg." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Installer pakker" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Fjern pakker" + +#: ../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 "Oppdater pakkeinformasjon" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Du må autentisere deg for å oppdatere programvarekatalogen." @@ -125,9 +176,13 @@ msgstr "Du må autentisere deg for å installere kjøpt programvare." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Oppgrader pakker" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "Du må autentisere deg for å installere den oppdaterte programvaren" @@ -371,21 +426,37 @@ msgstr "Venter på autentisering" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Oppgrader system" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Ikke avslutt daemon ved inaktivitet" +<<<<<<< TREE #: ../aptdaemon/core.py:2193 msgid "Do not load any plugins" msgstr "Ikke last noen programtillegg" #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Vis informasjon om interne prosesser" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Avslutt og erstatt en kjørende daemon" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "" @@ -395,53 +466,97 @@ msgstr "Utfør operasjoner i angitt chroot" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Lagre profilstatistikk i angitt fil" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "Ikke gjør noen endringer på systemet (til bruk for utviklere)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "Ikke gjør noen endringer på systemet (til bruk for utviklere)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Installert fil" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Installerte pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "La til nøkkel fra fil" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Mellomlager oppdatert" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Søket er utført" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Fjernet sikker nøkkel" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Fjernede pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Oppdaterte pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Oppgradert system" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Endringer utført" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Reparer ufullstendige installasjoner" @@ -467,53 +582,109 @@ msgstr "Satt opp installerte pakker på nytt" #: ../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 "Vellykket" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Avbrutt" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Mislyktes" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Installerer fil" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Installerer pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Legger til nøkkel fra fil" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Oppdaterer mellomlager" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Fjerner sikker nøkkel" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Fjerner pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Oppdaterer pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Oppgraderer system" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Utfører endringer" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Reparerer ufullstendig installasjon" @@ -607,10 +778,69 @@ msgstr "Legger til lisensnøkkel" #: ../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 "Installasjon av pakkefil mislyktes" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Installasjon av programvare mislyktes" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "Legger nøkkelen til listen over betrodde programvareutgivere." + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Mislyktes oppdatering av programvarelisten" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "Mislyktes fjerning av klarert leverandør fra listen" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Fjerning av programvare mislyktes" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Oppdatering av programvare mislyktes" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Oppgradering av systemet mislyktes" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Bruk av programvareendringer mislyktes" + +#: ../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 "Undersøk internettforbindelsen din." +<<<<<<< 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" @@ -620,11 +850,19 @@ "kilde til problemer - og du må kanskje deaktivere dem.\n" "I tillegg bør du kjøre følgende kommando i terminalen: 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 "Den valgte filen er ikke en GPG-fil, eller er skadet." +<<<<<<< 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." @@ -632,7 +870,11 @@ "Den valgte nøkkelen kan ikke fjernes. Kontroller at du oppgir et gyldig " "fingeravtrykk." +<<<<<<< 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." @@ -640,7 +882,11 @@ "Kontroller om du kjører et annet programvareverktøy, som Synaptic eller " "aptitude. Kun ett verktøy kan gjøre endringer om gangen." +<<<<<<< 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." @@ -648,7 +894,11 @@ "Dette er et alvorlig problem. Prøv igjen senere. Om problemet vedvarer, " "vennligst send feilmelding til utviklerene." +<<<<<<< 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." @@ -656,34 +906,59 @@ "Kontroller staving av pakkenavnet og at det riktige programvarearkivet er " "aktivert." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Det behøves ingen oppdatering." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Det behøves ingen installasjon" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Ingen fjerning behøves." +<<<<<<< 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 "Du har bedt om fjerning av en pakke som er viktig for systemet." +<<<<<<< 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 "" "Mistet forbindelsen til daemon. Sannsynligvis kræsjet bakgrunns-daemonen." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "Installasjon/fjerning av programvarepakke mislyktes." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "Den etterspurte funksjonen er ikke støttet." @@ -696,8 +971,16 @@ msgstr "" #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Dette skulle ikke skjedd." + +#: ../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." @@ -770,69 +1053,156 @@ 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 "" +"Denne feilen kan skyldes at det kreves ekstra programvarepakker som mangler " +"eller ikke kan installeres. I tillegg kan det være en konflikt mellom " +"programvarepakker som ikke kan være installert på samme tid." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Handlingen vil kreve at det installeres pakker fra en ikke-autentisert kilde." + +#: ../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 "Nedlasting av pakkefiler mislyktes" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Nedlasting av pakkearkiv-informasjon mislyktes" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Pakkeavhengigheter kunne ikke løses" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Pakkesystemet er ødelagt" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Nøkkel ble ikke installert" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Nøkkel ble ikke fjernet" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Låsing av pakkebehandleren mislyktes" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Lasting av pakkelisten mislyktes" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Pakken eksisterer ikke" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Pakken er allerede oppdatert." +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Pakken er allerede ajour" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Pakken er allerede installert" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Pakken er ikke installert" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Fjerning av betydningsfull systempakke mislyktes" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Oppgaven kan ikke overvåkes eller kontrolleres" +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Pakkeoperasjon mislyktes" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Krever installasjon av usikre pakker" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Tidligere installasjon har ikke blitt fullført" @@ -874,53 +1244,111 @@ msgstr "En uhåndterbar feil oppsto" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "En ukjent feil oppsto" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Venter på at tjeneste skal starte" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Venter" +======= +#: ../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 "Venter på påkrevd medie" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Venter på at annen programvarebehandler skal avsluttes" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Venter på dialog for oppsettsfil" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Kjører oppgave" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Laster ned" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Spør programvarekilder" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Rydder opp" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Løser avhengigheter" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Fullført" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +======= +#: ../aptdaemon/enums.py:310 +>>>>>>> MERGE-SOURCE msgid "Cancelling" msgstr "Avbryter" +<<<<<<< TREE #: ../aptdaemon/enums.py:618 +======= +#: ../aptdaemon/enums.py:311 +>>>>>>> MERGE-SOURCE msgid "Loading software list" msgstr "Laster pakkeliste" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package #: ../aptdaemon/enums.py:635 #, python-format @@ -1037,6 +1465,19 @@ msgstr "Nettverk ikke tilgjengelig" #: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318 +======= +#: ../aptdaemon/gtkwidgets.py:290 +#, python-format +msgid "Downloaded %sB of %sB at %sB/s" +msgstr "Lastet ned %sB av %sB fra %sB/s" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "Lastet ned %sB av %sB" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "Detaljer" @@ -1059,16 +1500,25 @@ msgstr "Lastet ned" #. 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 "Behøver 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 "" "Vennligst sett inn angitt CD/DVD i '%s' for å installere programvare fra den." @@ -1187,14 +1637,55 @@ msgstr "_Behold" #: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035 +======= +"packages from the medium." +msgstr "" +"Vennligst sett inn CD/DVD i '%s'. Dette er påkrevd for installering av " +"programvarepakkene." + +#: ../aptdaemon/gtkwidgets.py:626 +msgid "C_ontinue" +msgstr "F_ortsett" + +#. 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 "" +"Erstatt endringene i '%s' med en senere versjon av konfigurasjonsfilen?" + +#: ../aptdaemon/gtkwidgets.py:642 +msgid "" +"If you don't know why the file is there already, it is usually safe to " +"replace it." +msgstr "" +"Det går vanligvis fint å erstatte den hvis du ikke helt vet hvorfor filen i " +"utgangspunktet er der." + +#: ../aptdaemon/gtkwidgets.py:651 +msgid "_Changes" +msgstr "_Endringer" + +#: ../aptdaemon/gtkwidgets.py:654 +msgid "_Keep" +msgstr "_Behold" + +#: ../aptdaemon/gtkwidgets.py:655 +>>>>>>> MERGE-SOURCE msgid "_Replace" msgstr "_Erstatt" #. 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 "_Detaljer" +<<<<<<< TREE #. TRANSLATORS: %s is the name of a package manager #: ../aptdaemon/lock.py:179 #, python-format @@ -1465,3 +1956,61 @@ #~ msgid "Adding the key to the list of trused software vendors failed" #~ msgstr "" #~ "Klarte ikke å legge til nøkkelen i listen over betrodde programvareutgivere" +======= +#: ../aptdaemon/progress.py:41 +#, python-format +msgid "Installing %s" +msgstr "Installerer %s" + +#: ../aptdaemon/progress.py:42 +#, python-format +msgid "Configuring %s" +msgstr "Setter opp %s" + +#: ../aptdaemon/progress.py:43 +#, python-format +msgid "Removing %s" +msgstr "Fjerner %s" + +#: ../aptdaemon/progress.py:44 +#, python-format +msgid "Running post-installation trigger %s" +msgstr "Kjører etter-installasjonsutløser %s" + +#: ../aptdaemon/progress.py:45 +#, python-format +msgid "Purging %s" +msgstr "Fjerner %s" + +#: ../aptdaemon/progress.py:46 +#, python-format +msgid "Upgrading %s" +msgstr "Oppgraderer %s" + +#: ../aptdaemon/progress.py:142 +#, python-format +msgid "Downloading %s" +msgstr "Laster ned %s" + +#~ msgid "There isn't any need for a system update" +#~ msgstr "Det behøves ingen systemoppdatering" + +#~ msgid "Waiting for other tasks" +#~ msgstr "Venter på andre oppgaver" + +#~ msgid "System is already up-to-date" +#~ msgstr "Systemet er allerede ajour" + +#~ msgid "System is not up-to-date" +#~ msgstr "Systemet er ikke ajour" + +#~ msgid "Do you want to use the new version?" +#~ msgstr "Vil du bruke den nye versjonen?" + +#~ msgid "It was not possible to install the latest for all packages." +#~ msgstr "Det var ikke mulig å installere siste versjon for enkelte pakker." + +#, python-format +#~ msgid "Configuration file '%s' changed" +#~ msgstr "Konfigurasjonfil '%s' endret" +>>>>>>> MERGE-SOURCE === modified file 'po/nds.po' --- po/nds.po 2013-03-10 00:01:34 +0000 +++ po/nds.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2011-01-16 11:58+0000\n" "Last-Translator: Michael Vogt \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2009-12-08 09:26+0000\n" +"Last-Translator: Michael Vogt \n" +>>>>>>> MERGE-SOURCE "Language-Team: German, Low \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" @@ -39,29 +50,67 @@ 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" +>>>>>>> MERGE-SOURCE +msgstr "" + +<<<<<<< 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 "Eene Opgav vun e'em annern Bruker löschen." +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Paketdatei installeren" +<<<<<<< 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 "Pakete installeren" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Pakete löschen" + +#: ../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 "Paketinformatschoonen opfrischen." +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "" @@ -123,9 +172,13 @@ msgstr "" #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" msgstr "Paketverschoonen opfrischen" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:45 msgid "To install updated software, you need to authenticate." msgstr "" @@ -358,6 +411,13 @@ msgstr "" #: ../aptdaemon/core.py:2188 +======= +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Kumplettes System opfrischen" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" msgstr "Sluten Se de Dämon nich wenn he leddig schient" @@ -365,12 +425,21 @@ msgid "Do not load any plugins" msgstr "" +<<<<<<< TREE #: ../aptdaemon/core.py:2197 +======= +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Binnen Verarbeidensinformatschonen opwiesen" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" +<<<<<<< TREE msgstr "Sluten un wesseln Se en al lopen Dämon ut" #: ../aptdaemon/core.py:2207 @@ -382,6 +451,11 @@ msgstr "" #: ../aptdaemon/core.py:2216 +======= +msgstr "" + +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "De Profilstatistik in de angeven Datei spiekern" @@ -389,42 +463,89 @@ msgid "Do not make any changes to the system (Only of use to developers)" msgstr "" +<<<<<<< TREE #: ../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 "Installerte Datei" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Installertes Paket" +<<<<<<< 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" +>>>>>>> MERGE-SOURCE +msgstr "" + +<<<<<<< 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 "" #: ../aptdaemon/enums.py:371 msgid "Removed trusted key" +======= +#: ../aptdaemon/enums.py:141 +msgid "Removed packages" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 msgid "Removed packages" +======= +#: ../aptdaemon/enums.py:142 +msgid "Updated packages" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 msgid "Updated packages" +======= +#: ../aptdaemon/enums.py:143 +msgid "Upgraded system" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 msgid "Upgraded system" +======= +#: ../aptdaemon/enums.py:144 +msgid "Applied changes" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 msgid "Applied changes" msgstr "" @@ -454,53 +575,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,71 +771,175 @@ 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." msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "" @@ -671,8 +952,16 @@ msgstr "" #: ../aptdaemon/enums.py:514 +======= +#: ../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,69 +1021,151 @@ 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" msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "" @@ -836,53 +1207,110 @@ msgstr "" #: ../aptdaemon/enums.py:603 +======= +#: ../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" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< 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 +1427,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 "" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "" @@ -1021,16 +1462,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 "" @@ -1145,11 +1595,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/ne.po' --- po/ne.po 2013-03-10 00:01:34 +0000 +++ po/ne.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,26 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2011-01-16 11:58+0000\n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-26 23:07+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Rabi Poudyal \n" "Language-Team: Nepali \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" @@ -39,29 +49,69 @@ 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 +173,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 +412,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,25 +452,45 @@ 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 msgid "Updated cache" msgstr "" @@ -410,25 +500,49 @@ msgstr "" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:139 +msgid "Updated cache" +msgstr "" + +#: ../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 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "लागू गरिएका परिवर्तनहरू" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "" @@ -454,53 +568,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,71 +764,175 @@ 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." msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "" @@ -671,8 +945,16 @@ msgstr "" #: ../aptdaemon/enums.py:514 +======= +#: ../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,69 +1014,151 @@ 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" msgstr "" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "" @@ -836,53 +1200,110 @@ msgstr "" #: ../aptdaemon/enums.py:603 +======= +#: ../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" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< 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 +1420,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 "" + +#: ../aptdaemon/gtkwidgets.py:295 +#, python-format +msgid "Downloaded %sB of %sB" +msgstr "" + +#: ../aptdaemon/gtkwidgets.py:305 +>>>>>>> MERGE-SOURCE msgid "Details" msgstr "" @@ -1021,16 +1455,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 "" @@ -1145,11 +1588,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/nl.po' --- po/nl.po 2013-03-10 00:01:34 +0000 +++ po/nl.po 2013-06-03 17:47:29 +0000 @@ -7,16 +7,27 @@ msgstr "" "Project-Id-Version: aptdaemon\n" "Report-Msgid-Bugs-To: FULL NAME \n" +<<<<<<< TREE "POT-Creation-Date: 2012-12-17 11:07+0000\n" "PO-Revision-Date: 2013-01-02 08:13+0000\n" "Last-Translator: Hannie Dumoleyn \n" +======= +"POT-Creation-Date: 2010-03-26 09:22+0000\n" +"PO-Revision-Date: 2010-03-27 09:38+0000\n" +"Last-Translator: cumulus007 \n" +>>>>>>> MERGE-SOURCE "Language-Team: Dutch \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" @@ -42,30 +53,70 @@ msgstr "Softwareconfiguratie wijzigen" #: ../data/org.debian.apt.policy.in.h:6 +<<<<<<< TREE msgid "To change software settings, you need to authenticate." msgstr "" "Om softwareinstellingen te kunnen wijzigen dient u te zich aan te melden." - +======= +msgid "Authentication is required to repair broken installations" +msgstr "Authenticatie is vereist om gebroken installaties te herstellen" + +#: ../data/org.debian.apt.policy.in.h:7 +msgid "Authentication is required to upgrade software packages" +msgstr "Authenticatie is vereist om softwarepakketten op te waarderen" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:7 msgid "Change software repository" msgstr "Verander softwarebron" +======= +#: ../data/org.debian.apt.policy.in.h:8 +msgid "Authentication is required to upgrade the system" +msgstr "Authenticatie is vereist om het systeem op te waarderen" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:8 msgid "To change software repository settings, you need to authenticate." msgstr "Uw authenticatie is vereist als u softwarebronnen wilt aanpassen." - +======= #: ../data/org.debian.apt.policy.in.h:9 +msgid "Cancel the task of another user" +msgstr "De taak van een andere gebruiker beëindigen" +>>>>>>> MERGE-SOURCE + +#: ../data/org.debian.apt.policy.in.h:10 msgid "Install package file" msgstr "Een pakketbestand installeren" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:10 msgid "To install this package, you need to authenticate." msgstr "Uw authenticatie is vereist als u dit pakket wilt installeren." - -#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:11 +msgid "Install packages" +msgstr "Pakketten installeren" +>>>>>>> MERGE-SOURCE + +<<<<<<< TREE +#: ../data/org.debian.apt.policy.in.h:11 +======= +#: ../data/org.debian.apt.policy.in.h:12 +msgid "Remove packages" +msgstr "Pakketten verwijderen" + +#: ../data/org.debian.apt.policy.in.h:13 +msgid "Repair broken installations" +msgstr "Gebroken installaties herstellen" + +#: ../data/org.debian.apt.policy.in.h:14 +>>>>>>> MERGE-SOURCE msgid "Update package information" msgstr "Pakketinformatie bijwerken" +<<<<<<< TREE #: ../data/org.debian.apt.policy.in.h:12 msgid "To update the software catalog, you need to authenticate." msgstr "Uw authenticatie is vereist om de software-catalogus te vernieuwen." @@ -133,7 +184,11 @@ msgstr "Authenticatie is vereist om gekochte software te installeren." #: ../data/org.debian.apt.policy.in.h:44 +======= +#: ../data/org.debian.apt.policy.in.h:15 +>>>>>>> MERGE-SOURCE msgid "Upgrade packages" +<<<<<<< TREE msgstr "Pakketten upgraden" #: ../data/org.debian.apt.policy.in.h:45 @@ -390,7 +445,17 @@ msgstr "Wachten op authenticatie" #: ../aptdaemon/core.py:2188 +======= +msgstr "Pakketten opwaarderen" + +#: ../data/org.debian.apt.policy.in.h:16 +msgid "Upgrade system" +msgstr "Systeem opwaarderen" + +#: ../aptdaemon/core.py:1237 +>>>>>>> MERGE-SOURCE msgid "Do not shutdown the daemon because of inactivity" +<<<<<<< TREE msgstr "De daemon niet afsluiten wegens inactiviteit" #: ../aptdaemon/core.py:2193 @@ -398,13 +463,23 @@ msgstr "Geen plug-ins laden" #: ../aptdaemon/core.py:2197 +======= +msgstr "De daemon niet afsluiten vanwege inactiviteit" + +#: ../aptdaemon/core.py:1242 +>>>>>>> MERGE-SOURCE msgid "Show internal processing information" msgstr "Interne verwerkingsinformatie weergeven" +<<<<<<< TREE #: ../aptdaemon/core.py:2202 +======= +#: ../aptdaemon/core.py:1246 +>>>>>>> MERGE-SOURCE msgid "Quit and replace an already running daemon" msgstr "Afsluiten en een reeds draaiende daemon vervangen" +<<<<<<< TREE #: ../aptdaemon/core.py:2207 msgid "Listen on the DBus session bus (Only required for testing" msgstr "Luisteren op de DBus-sessiebus (Alleen vereist voor testen)" @@ -414,9 +489,13 @@ msgstr "Acties uitvoeren in de gegeven chroot" #: ../aptdaemon/core.py:2216 +======= +#: ../aptdaemon/core.py:1250 +>>>>>>> MERGE-SOURCE msgid "Store profile stats in the specified file" msgstr "Profielstatistieken opslaan in het opgegeven bestand" +<<<<<<< TREE #: ../aptdaemon/core.py:2221 msgid "Do not make any changes to the system (Only of use to developers)" msgstr "" @@ -424,45 +503,87 @@ "ontwikkelaars)" #: ../aptdaemon/enums.py:366 +======= +#: ../aptdaemon/core.py:1254 +msgid "Do not make any changes to the system (Only of use to developers)" +msgstr "" +"Geen wijzigingen in het systeem aanbrengen (Alleen bruikbaar voor " +"ontwikkelaars)" + +#: ../aptdaemon/enums.py:136 +>>>>>>> MERGE-SOURCE msgid "Installed file" msgstr "Geïnstalleerd bestand" +<<<<<<< TREE #: ../aptdaemon/enums.py:367 +======= +#: ../aptdaemon/enums.py:137 +>>>>>>> MERGE-SOURCE msgid "Installed packages" msgstr "Geïnstalleerde pakketten" +<<<<<<< TREE #: ../aptdaemon/enums.py:368 +======= +#: ../aptdaemon/enums.py:138 +>>>>>>> MERGE-SOURCE msgid "Added key from file" msgstr "Sleutel uit bestand toegevoegd" +<<<<<<< TREE #: ../aptdaemon/enums.py:369 +======= +#: ../aptdaemon/enums.py:139 +>>>>>>> MERGE-SOURCE msgid "Updated cache" msgstr "Cache bijgewerkt" +<<<<<<< TREE #: ../aptdaemon/enums.py:370 msgid "Search done" msgstr "Doorzoeken voltooid" #: ../aptdaemon/enums.py:371 +======= +#: ../aptdaemon/enums.py:140 +>>>>>>> MERGE-SOURCE msgid "Removed trusted key" msgstr "Vertrouwde sleutel verwijderd" +<<<<<<< TREE #: ../aptdaemon/enums.py:372 +======= +#: ../aptdaemon/enums.py:141 +>>>>>>> MERGE-SOURCE msgid "Removed packages" msgstr "Pakketten verwijderd" +<<<<<<< TREE #: ../aptdaemon/enums.py:373 +======= +#: ../aptdaemon/enums.py:142 +>>>>>>> MERGE-SOURCE msgid "Updated packages" msgstr "Pakketten bijgewerkt" +<<<<<<< TREE #: ../aptdaemon/enums.py:374 +======= +#: ../aptdaemon/enums.py:143 +>>>>>>> MERGE-SOURCE msgid "Upgraded system" msgstr "Systeem opgewaardeerd" +<<<<<<< TREE #: ../aptdaemon/enums.py:375 +======= +#: ../aptdaemon/enums.py:144 +>>>>>>> MERGE-SOURCE msgid "Applied changes" msgstr "Toegepaste wijzigingen" +<<<<<<< TREE #: ../aptdaemon/enums.py:376 msgid "Repaired incomplete installation" msgstr "Incomplete installatie gerepareerd" @@ -488,53 +609,109 @@ msgstr "Geïnstalleerde pakketten die zijn geherconfigureerd" #: ../aptdaemon/enums.py:397 +======= +#: ../aptdaemon/enums.py:145 +msgid "Repaired incomplete installation" +msgstr "Incomplete installatie gerepareerd" + +#: ../aptdaemon/enums.py:146 +msgid "Repaired broken dependencies" +msgstr "Gebroken afhankelijkheden hersteld" + +#: ../aptdaemon/enums.py:157 +>>>>>>> MERGE-SOURCE msgid "Successful" msgstr "Geslaagd" +<<<<<<< TREE #: ../aptdaemon/enums.py:398 +======= +#: ../aptdaemon/enums.py:158 +>>>>>>> MERGE-SOURCE msgid "Canceled" msgstr "Geannuleerd" +<<<<<<< TREE #: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680 +======= +#: ../aptdaemon/enums.py:159 +>>>>>>> MERGE-SOURCE msgid "Failed" msgstr "Mislukt" +<<<<<<< TREE #: ../aptdaemon/enums.py:414 +======= +#: ../aptdaemon/enums.py:169 +>>>>>>> MERGE-SOURCE msgid "Installing file" msgstr "Bestand installeren" +<<<<<<< TREE #: ../aptdaemon/enums.py:415 +======= +#: ../aptdaemon/enums.py:170 +>>>>>>> MERGE-SOURCE msgid "Installing packages" msgstr "Pakketten installeren" +<<<<<<< TREE #: ../aptdaemon/enums.py:416 +======= +#: ../aptdaemon/enums.py:171 +>>>>>>> MERGE-SOURCE msgid "Adding key from file" msgstr "Sleutel uit bestand toevoegen" +<<<<<<< TREE #: ../aptdaemon/enums.py:417 +======= +#: ../aptdaemon/enums.py:172 +>>>>>>> MERGE-SOURCE msgid "Updating cache" msgstr "Cache bijwerken" +<<<<<<< TREE #: ../aptdaemon/enums.py:418 +======= +#: ../aptdaemon/enums.py:173 +>>>>>>> MERGE-SOURCE msgid "Removing trusted key" msgstr "Vertrouwde sleutel verwijderen" +<<<<<<< TREE #: ../aptdaemon/enums.py:419 +======= +#: ../aptdaemon/enums.py:174 +>>>>>>> MERGE-SOURCE msgid "Removing packages" msgstr "Pakketten verwijderen" +<<<<<<< TREE #: ../aptdaemon/enums.py:420 +======= +#: ../aptdaemon/enums.py:175 +>>>>>>> MERGE-SOURCE msgid "Updating packages" msgstr "Pakketten bijwerken" +<<<<<<< TREE #: ../aptdaemon/enums.py:421 +======= +#: ../aptdaemon/enums.py:176 +>>>>>>> MERGE-SOURCE msgid "Upgrading system" msgstr "Systeem upgraden" +<<<<<<< TREE #: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615 +======= +#: ../aptdaemon/enums.py:177 ../aptdaemon/enums.py:308 +>>>>>>> MERGE-SOURCE msgid "Applying changes" msgstr "Wijzigingen worden doorgevoerd" +<<<<<<< TREE #: ../aptdaemon/enums.py:423 msgid "Repairing incomplete installation" msgstr "Incomplete installatie herstellen" @@ -632,10 +809,73 @@ msgstr "Licentiesleutel wordt toegevoegd" #: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480 +======= +#: ../aptdaemon/enums.py:178 +msgid "Repairing incomplete installation" +msgstr "Incomplete installatie herstellen" + +#: ../aptdaemon/enums.py:179 +msgid "Repairing broken deps" +msgstr "Gebroken afhankelijkheden herstellen" + +#: ../aptdaemon/enums.py:190 +msgid "Installation of the package file failed" +msgstr "Installatie van het pakket-bestand is mislukt" + +#: ../aptdaemon/enums.py:191 +msgid "Installation of software failed" +msgstr "Installatie van de software is mislukt" + +#: ../aptdaemon/enums.py:192 +msgid "Adding the key to the list of trused software vendors failed" +msgstr "" +"Het toevoegen van een sleutel aan de lijst van vertrouwde software-" +"leveranciers is mislukt" + +#: ../aptdaemon/enums.py:194 +msgid "Refreshing the software list failed" +msgstr "Het vernieuwen van de softwarelijst is mislukt" + +#: ../aptdaemon/enums.py:195 +msgid "Removing the vendor from the list of trusted ones failed" +msgstr "" +"Het verwijderen van de software-leverancier van de vertrouwde lijst is " +"mislukt" + +#: ../aptdaemon/enums.py:197 +msgid "Removing software failed" +msgstr "Het verwijderen van de software is mislukt" + +#: ../aptdaemon/enums.py:198 +msgid "Updating software failed" +msgstr "Het updaten van de software is mislukt" + +#: ../aptdaemon/enums.py:199 +msgid "Upgrading the system failed" +msgstr "Het upgraden van het systeem is mislukt" + +#: ../aptdaemon/enums.py:200 +msgid "Applying software changes failed" +msgstr "Het aanpassen van de software is mislukt" + +#: ../aptdaemon/enums.py:201 +msgid "Repairing incomplete installation failed" +msgstr "Herstellen van incomplete installatie mislukt" + +#: ../aptdaemon/enums.py:202 +msgid "Repairing broken dependencies failed" +msgstr "Herstellen van gebroken afhankelijkheden mislukt" + +#: ../aptdaemon/enums.py:213 ../aptdaemon/enums.py:214 +>>>>>>> MERGE-SOURCE msgid "Check your Internet connection." msgstr "Controleer uw internetverbinding." +<<<<<<< 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" @@ -646,13 +886,21 @@ "zijn.\n" "Voer ook de volgende opdracht uit in een Terminalvenster: 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 "" "Het geselecteerde bestand is misschien geen GPG-sleutel, of het kan " "beschadigd zijn." +<<<<<<< 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." @@ -660,7 +908,11 @@ "De geselecteerde sleutel kon niet verwijderd worden. Controleer of u een " "geldige sleutel-id hebt opgegeven." +<<<<<<< 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." @@ -669,7 +921,11 @@ "Synaptic of aptitude. Er kan slechts een pakketbeheerder tegelijk " "aanpassingen doen." +<<<<<<< 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." @@ -677,7 +933,11 @@ "Dit is een ernstig probleem. Probeer het later opnieuw. Als dit probleem " "nogmaals optreedt, meld dan een fout aan de ontwikkelaars." +<<<<<<< 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." @@ -685,25 +945,45 @@ "Controleer of de pakketnaam juist gespeld is en of de juiste softwarebronnen " "geactiveerd zijn." +<<<<<<< TREE #: ../aptdaemon/enums.py:498 +======= +#: ../aptdaemon/enums.py:233 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an update." msgstr "Bijwerken is niet nodig." +<<<<<<< TREE #: ../aptdaemon/enums.py:499 +======= +#: ../aptdaemon/enums.py:234 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for an installation" msgstr "Het is niet nodig om te installeren" +<<<<<<< TREE #: ../aptdaemon/enums.py:501 +======= +#: ../aptdaemon/enums.py:236 +>>>>>>> MERGE-SOURCE msgid "There isn't any need for a removal." msgstr "Het is niet nodig om te verwijderen." +<<<<<<< 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 "" "U wilt een pakket verwijderen dat een essentieel onderdeel is van uw systeem." +<<<<<<< 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." @@ -711,10 +991,15 @@ "De verbinding met de daemon is verloren. Waarschijnlijk is de achtergrond-" "daemon vastgelopen." +<<<<<<< TREE #: ../aptdaemon/enums.py:507 +======= +#: ../aptdaemon/enums.py:242 +>>>>>>> MERGE-SOURCE msgid "The installation or removal of a software package failed." msgstr "De installatie of verwijdering van een softwarepakket is mislukt." +<<<<<<< TREE #: ../aptdaemon/enums.py:509 msgid "The requested feature is not supported." msgstr "De gevraagde functie wordt niet ondersteund." @@ -730,8 +1015,16 @@ "gerelateerde taken kunt uitvoeren." #: ../aptdaemon/enums.py:514 +======= +#: ../aptdaemon/enums.py:244 +msgid "This should not happen." +msgstr "Dit hoort niet te gebeuren." + +#: ../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." @@ -815,69 +1108,160 @@ "PolicyKit-sessieagent." #: ../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 "" +"Deze fout wordt veroorzaakt door vereiste optionele softwarepakketten die " +"missen of niet installeerbaar zijn. Ook kan er een conflict zijn tussen " +"softwarepakketten die niet tegelijkertijd geïnstalleerd mogen worden." + +#: ../aptdaemon/enums.py:251 +msgid "" +"The action would require the installation of packages from not authenticated " +"sources." +msgstr "" +"Deze actie vereist de installatie van pakketten uit onvertrouwde bronnen." + +#: ../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 "" +"De installatie kan mislukt zijn door een fout in het betreffende " +"softwarepakket, of doordat het installatieproces op een onjuiste wijze werd " +"afgebroken. Deze fout dient hersteld te worden alvorens u andere software " +"kunt installeren of verwijderen." + +#: ../aptdaemon/enums.py:269 +>>>>>>> MERGE-SOURCE msgid "Failed to download package files" msgstr "Pakketbestanden downloaden is mislukt" +<<<<<<< TREE #: ../aptdaemon/enums.py:564 +======= +#: ../aptdaemon/enums.py:270 +>>>>>>> MERGE-SOURCE msgid "Failed to download repository information" msgstr "Softwarebron-informatie downloaden is mislukt" +<<<<<<< TREE #: ../aptdaemon/enums.py:565 +======= +#: ../aptdaemon/enums.py:271 +>>>>>>> MERGE-SOURCE msgid "Package dependencies cannot be resolved" msgstr "Pakketafhankelijkheden kunnen niet opgelost worden" +<<<<<<< TREE #: ../aptdaemon/enums.py:566 +======= +#: ../aptdaemon/enums.py:272 +>>>>>>> MERGE-SOURCE msgid "The package system is broken" msgstr "Het pakketsysteem is gebroken" +<<<<<<< TREE #: ../aptdaemon/enums.py:567 +======= +#: ../aptdaemon/enums.py:273 +>>>>>>> MERGE-SOURCE msgid "Key was not installed" msgstr "Sleutel is niet geïnstalleerd" +<<<<<<< TREE #: ../aptdaemon/enums.py:568 +======= +#: ../aptdaemon/enums.py:274 +>>>>>>> MERGE-SOURCE msgid "Key was not removed" msgstr "Sleutel is niet verwijderd" +<<<<<<< TREE #: ../aptdaemon/enums.py:569 +======= +#: ../aptdaemon/enums.py:275 +>>>>>>> MERGE-SOURCE msgid "Failed to lock the package manager" msgstr "Kon de pakketbeheerder niet vergrendelen" +<<<<<<< TREE #: ../aptdaemon/enums.py:570 +======= +#: ../aptdaemon/enums.py:276 +>>>>>>> MERGE-SOURCE msgid "Failed to load the package list" msgstr "Kon de pakkettenlijst niet vergrendelen" +<<<<<<< TREE #: ../aptdaemon/enums.py:571 +======= +#: ../aptdaemon/enums.py:277 +>>>>>>> MERGE-SOURCE msgid "Package does not exist" msgstr "Pakket bestaat niet" +<<<<<<< TREE #: ../aptdaemon/enums.py:572 msgid "Package is already up to date" msgstr "Pakket is al bijgewerkt" +======= +#: ../aptdaemon/enums.py:278 +msgid "Package is already up-to-date" +msgstr "Pakket is al actueel" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:573 +======= +#: ../aptdaemon/enums.py:279 +>>>>>>> MERGE-SOURCE msgid "Package is already installed" msgstr "Pakket is al geïnstalleerd" +<<<<<<< TREE #: ../aptdaemon/enums.py:574 +======= +#: ../aptdaemon/enums.py:280 +>>>>>>> MERGE-SOURCE msgid "Package isn't installed" msgstr "Pakket is niet geïnstalleerd" +<<<<<<< TREE #: ../aptdaemon/enums.py:575 +======= +#: ../aptdaemon/enums.py:281 +>>>>>>> MERGE-SOURCE msgid "Failed to remove essential system package" msgstr "Kon essentieel systeempakket niet verwijderen" +<<<<<<< TREE #: ../aptdaemon/enums.py:577 +======= +#: ../aptdaemon/enums.py:283 +>>>>>>> MERGE-SOURCE msgid "Task cannot be monitored or controlled" msgstr "Taak kan niet bijgehouden of bestuurd worden." +<<<<<<< TREE #: ../aptdaemon/enums.py:578 +======= +#: ../aptdaemon/enums.py:284 +>>>>>>> MERGE-SOURCE msgid "Package operation failed" msgstr "Pakkethandeling is mislukt" +<<<<<<< TREE #: ../aptdaemon/enums.py:579 +======= +#: ../aptdaemon/enums.py:285 +>>>>>>> MERGE-SOURCE msgid "Requires installation of untrusted packages" msgstr "Vereist installatie van onvertrouwde pakketten" +<<<<<<< TREE #: ../aptdaemon/enums.py:581 msgid "Previous installation hasn't been completed" msgstr "Vorige installatie is niet voltooid" @@ -919,53 +1303,111 @@ msgstr "Er is een onhandelbare fout opgetreden" #: ../aptdaemon/enums.py:603 +======= +#: ../aptdaemon/enums.py:287 +msgid "Previous installation hasn't been completed" +msgstr "Vorige installatie is niet voltooid" + +#: ../aptdaemon/enums.py:288 +msgid "An unknown error occurred" +msgstr "Er is een onbekende fout opgetreden" + +#: ../aptdaemon/enums.py:298 +>>>>>>> MERGE-SOURCE msgid "Waiting for service to start" msgstr "Wachten op het starten van de dienst" +<<<<<<< TREE #: ../aptdaemon/enums.py:605 msgid "Waiting" msgstr "Wachten" +======= +#: ../aptdaemon/enums.py:299 +msgid "Waiting" +msgstr "Wachten" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../aptdaemon/enums.py:606 +======= +#: ../aptdaemon/enums.py:300 +>>>>>>> MERGE-SOURCE msgid "Waiting for required medium" msgstr "Wachten op vereist medium" +<<<<<<< TREE #: ../aptdaemon/enums.py:607 +======= +#: ../aptdaemon/enums.py:301 +>>>>>>> MERGE-SOURCE msgid "Waiting for other software managers to quit" msgstr "Wachten totdat andere softwarebeheerders zijn afgesloten" +<<<<<<< TREE #: ../aptdaemon/enums.py:608 +======= +#: ../aptdaemon/enums.py:302 +>>>>>>> MERGE-SOURCE msgid "Waiting for configuration file prompt" msgstr "Wachten op het venster van het configuratiebestand" +<<<<<<< TREE #: ../aptdaemon/enums.py:610 +======= +#: ../aptdaemon/enums.py:304 +>>>>>>> MERGE-SOURCE msgid "Running task" msgstr "Actieve taak" +<<<<<<< TREE #: ../aptdaemon/enums.py:611 +======= +#: ../aptdaemon/enums.py:305 +>>>>>>> MERGE-SOURCE msgid "Downloading" msgstr "Downloaden" +<<<<<<< TREE #: ../aptdaemon/enums.py:612 msgid "Querying software sources" msgstr "Softwarebronnen doorzoeken" #: ../aptdaemon/enums.py:613 +======= +#: ../aptdaemon/enums.py:306 +>>>>>>> MERGE-SOURCE msgid "Cleaning up" msgstr "Opruimen" +<<<<<<< TREE #: ../aptdaemon/enums.py:616 +======= +#: ../aptdaemon/enums.py:307 +msgid "Resolving dependencies" +msgstr "Afhankelijkheden oplossen" + +#: ../aptdaemon/enums.py:309 +>>>>>>> MERGE-SOURCE msgid "Finished" msgstr "Gereed" +<<<<<<< TREE #: ../aptdaemon/enums.py:617 +====