From d0872127d0bf37f07b6f898b1ea5d21eb271d147 Mon Sep 17 00:00:00 2001 From: James Antill Date: Mar 26 2010 15:47:45 +0000 Subject: - Latest yum-3_2_X head. --- diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 021acc6..898e06b 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -1,23173 +1,1608 @@ -diff --git a/Makefile b/Makefile -index f1921d0..d75b220 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,6 +8,8 @@ VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec) - RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec) - CVSTAG=yum-$(subst .,_,$(VERSION)-$(RELEASE)) - PYTHON=python -+WEBHOST = yum.baseurl.org -+WEB_DOC_PATH = /srv/projects/yum/web/download/docs/yum-api/ - - all: subdirs - -@@ -38,10 +40,23 @@ install: - - .PHONY: docs test - --DOCS = yum rpmUtils callback.py yumcommands.py shell.py output.py cli.py \ -- yummain.py -+DOCS = yum rpmUtils callback.py yumcommands.py shell.py output.py cli.py utils.py\ -+ yummain.py -+ -+# packages needed for docs : yum install epydoc graphviz - docs: -- epydoc -n yum -o docs/epydoc -u http://linux.duke.edu/projects/yum $(DOCS) --graph all -+ @rm -rf docs/epydoc/$(VERSION) -+ @mkdir -p docs/epydoc/$(VERSION) -+ @epydoc -o docs/epydoc/$(VERSION) -u http://yum.baseurl.org --name "Yum" --graph all $(DOCS) -+ -+upload-docs: docs -+# Upload to yum website -+ @rm -rf yum-apidoc-$(VERSION).tar.gz -+ @dir=$$PWD; cd $$dir/docs/epydoc; tar zcf $$dir/yum-apidoc-$(VERSION).tar.gz $(VERSION) -+ @scp yum-apidoc-$(VERSION).tar.gz $(WEBHOST):$(WEB_DOC_PATH)/. -+ @ssh $(WEBHOST) "cd $(WEB_DOC_PATH); tar zxvf yum-apidoc-$(VERSION).tar.gz; rm yum-apidoc-$(VERSION).tar.gz" -+ @rm -rf yum-apidoc-$(VERSION).tar.gz -+ - - doccheck: - epydoc --check $(DOCS) -diff --git a/output.py b/output.py -index 110aa0b..b09730a 100755 ---- a/output.py -+++ b/output.py -@@ -392,6 +392,11 @@ class YumOutput: - total_width) - if not thelps: - continue -+ # We prefer to overflow: the last column, and then earlier -+ # columns. This is so that in the best case (just overflow the -+ # last) ... grep still "works", and then we make it prettier. -+ if helps and (d == (cols - 1)) and (thelps / 2) < helps: -+ continue - if thelps < helps: - continue - helps = thelps -@@ -405,6 +410,21 @@ class YumOutput: - total_width -= diff - continue - -+ overflowed_columns = 0 -+ for d in xrange(0, cols): -+ if not data[d]: -+ continue -+ overflowed_columns += 1 -+ if overflowed_columns: -+ # Split the remaining spaces among each overflowed column -+ # equally -+ norm = total_width / overflowed_columns -+ for d in xrange(0, cols): -+ if not data[d]: -+ continue -+ columns[d] += norm -+ total_width -= norm -+ - # Split the remaining spaces among each column equally, except the - # last one. And put the rest into the remainder column - cols -= 1 -diff --git a/po/es.po b/po/es.po -index 49bf1c4..4ac1f0a 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -1,15 +1,16 @@ - # Fedora Spanish translation of yum.yum-3_2_X. - # This file is distributed under the same license as the yum.yum-3_2_X. package. --# Héctor Daniel Cabrera , 2009. -+# - # Domingo Becker , 2009. -+# Héctor Daniel Cabrera , 2009, 2010. - # - msgid "" - msgstr "" - "Project-Id-Version: Fedora Spanish translation of yum.yum-3_2_X.\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" - "PO-Revision-Date: \n" --"Last-Translator: Héctor Daniel Cabrera \n" -+"Last-Translator: Héctor Daniel Cabrera \n" - "Language-Team: Fedora Spanish \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,33 +18,53 @@ msgstr "" - "X-Poedit-Language: Spanish\n" - "X-Poedit-Country: ARGENTINA\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 -+#: ../output.py:947 -+#: ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Actualizando" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 -+#: ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "Eliminando" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 -+#: ../callback.py:51 -+#: ../callback.py:53 -+#: ../output.py:946 -+#: ../output.py:1659 -+#: ../yum/rpmtrans.py:74 -+#: ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Instalando" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 -+#: ../callback.py:58 -+#: ../output.py:1484 -+#: ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Obsoleto" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 -+#: ../output.py:1070 -+#: ../output.py:1442 -+#: ../output.py:1491 - msgid "Updated" - msgstr "Actualizado" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 -+#: ../output.py:1438 - msgid "Erased" - msgstr "Eliminado" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 -+#: ../callback.py:57 -+#: ../callback.py:59 -+#: ../output.py:1068 -+#: ../output.py:1434 -+#: ../output.py:1646 - msgid "Installed" - msgstr "Instalado" - -@@ -65,68 +86,79 @@ msgstr "Error: estado de salida no válido: %s de %s" - msgid "Erased: %s" - msgstr "Eliminado: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 -+#: ../output.py:948 -+#: ../output.py:1648 - msgid "Removing" - msgstr "Eliminando" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 -+#: ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Limpieza" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "El comando \"%s\" ya ha sido definido" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Configurando los repositorios" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Leyendo en archivos locales los metadatos de los repositorios" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 -+#: ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Error de configuración: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 -+#: ../cli.py:1272 -+#: ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Error de opciones: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Instalado: %s-%s en %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr " Construido: %s en %s" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr " Enviado: %s en %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "Necesita ingresar algún comando" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "No existe el comando: %s. Por favor, utilice %s --help" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "Requerimientos de disco:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" --msgstr " Como mínimo se necesitan %dMB en el sistema de archivos %s.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" -+msgstr " Como mínimo se necesitan %dMB más en el sistema de archivos %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -134,259 +166,271 @@ msgstr "" - "Resumen de errores\n" - "-------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." --msgstr "" --"Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." -+msgstr "Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "Saliendo de acuerdo al comando del usuario" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Descargando paquetes:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Error al descargar los paquetes:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 -+#: ../yum/__init__.py:4195 - msgid "Running rpm_check_debug" - msgstr "Ejecutando el rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 -+#: ../yum/__init__.py:4204 - msgid "ERROR You need to update rpm to handle:" - msgstr "ERROR Necesita actualizar el rpm para manipular:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 -+#: ../yum/__init__.py:4207 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "ERROR con el rpm_check_debug vs depsolve:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "El RPM necesita ser actualizado" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "Por favor, reporte este error en %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Ejecutando prueba de transacción" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Prueba de transacción finalizada" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Error en la verificación de la transacción:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "La prueba de transacción ha sido exitosa" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Ejecutando transacción" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." - msgstr "" --"Se rechaza la importación automática de claves cuando se ejecuta " --"desatendida.\n" -+"Se rechaza la importación automática de claves cuando se ejecuta desatendida.\n" - "Utilice \"-y\" para forzar." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 -+#: ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Tal vez quería decir: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 -+#: ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." --msgstr "" --"El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) " --"instalado." -+msgstr "El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) instalado." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 -+#: ../cli.py:607 -+#: ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "No existe disponible ningún paquete %s%s%s." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 -+#: ../cli.py:748 - msgid "Package(s) to install" - msgstr "Paquete(s) a instalarse" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 -+#: ../cli.py:693 -+#: ../cli.py:727 -+#: ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Nada para hacer" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d paquetes han sido seleccionados para ser actualizados" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "No se han seleccionando paquetes para ser actualizados" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d paquetes han sido seleccionados para ser eliminados" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "No se han seleccionado paquetes para ser eliminados" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" - msgstr "Paquete(s) a desactualizar" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr " (desde %s)" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "El paquete instalado %s%s%s%s no se encuentra disponible." - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "Paquete(s) a reinstalar" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "No se ha ofrecido ningún paquete" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "Concordante: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "Aviso: No se ha encontrado ningún resultado para: %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "No se ha encontrado ningún resultado" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" --"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente " --"los nombres de los archivos.\n" -+"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente los nombres de los archivos.\n" - " Puede usar \"%s*/%s%s\" y/o \"%s*bin/%s%s\" para conseguir eso" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "No se ha encontrado ningún paquete para %s" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Limpiando todo" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "Limpiando encabezados" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Limpiando paquetes" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Limpiando metadatos xml" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "Limpiando el caché de la base de datos" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "Limpiando metadatos expirados del caché" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "Limpiando datos de rpmdb en el caché" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "Limpiando complementos" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Grupos instalados:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Grupos disponibles:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Listo" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 -+#: ../cli.py:1006 -+#: ../cli.py:1012 -+#: ../yum/__init__.py:2788 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Aviso: el grupo %s no existe." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" --msgstr "" --"En los grupos solicitados no existe disponible ningún paquete para ser " --"instalado o actualizado" -+msgstr "En los grupos solicitados no existe disponible ningún paquete para ser instalado o actualizado" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d paquete(s) a instalar" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 -+#: ../yum/__init__.py:2800 - #, python-format - msgid "No group named %s exists" - msgstr "No existe ningún grupo denominado %s" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "No existen paquetes a eliminarse de los grupos" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d paquete(s) a eliminar" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "Ya se encuentra instalado el paquete %s, ignorando" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "Descartando paquete no comparable %s.%s" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" --msgstr "" --"No existe instalado otro %s, agregando a la lista para instalación posible" -+msgstr "No existe instalado otro %s, agregando a la lista para instalación posible" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "Opciones de complementos" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Error en la línea de comando: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -397,109 +441,114 @@ msgstr "" - "\n" - "%s: la opción %s necesita un argumento" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color acepta una de las siguientes opciones: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "muestra este mensaje de ayuda y cierra" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "sea tolerante con los errores" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" - msgstr "se ejecuta completamente a partir del caché, pero no lo actualiza" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "configurar ubicación de archivo" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "tiempo máximo de espera del comando" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "nivel de depuración de la salida" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" --msgstr "" --"muestra duplicados en los repositorios, y en los comandos para mostrar/buscar" -+msgstr "muestra duplicados en los repositorios, y en los comandos para mostrar/buscar" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "nivel de error de la salida" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "nivel de depuración de salida para rpm" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "operación discreta" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "operación detallada" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "responde \"si\" a todas las preguntas" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "muestra la versión de Yum y finaliza" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "define la raíz de instalación" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "activa uno o más repositorios (los comodines son permitidos)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "desactiva uno o más repositorios (los comodines son permitidos)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "excluya paquete(s) de acuerdo a su nombre o glob " - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" --msgstr "" --"deshabilita la posibilidad de exclusión desde main, para un repositorio o " --"para todos" -+msgstr "deshabilita la posibilidad de exclusión desde main, para un repositorio o para todos" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "habilita el proceso de paquetes obsoletos durante las actualizaciones" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "deshabilita los complementos de Yum" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "deshabilita la verificación de firmas GPG" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "deshabilita complementos de acuerdo a su nombre" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "habilita complementos de acuerdo a su nombre" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "ignora paquetes con problemas de resolución de dependencias" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "controla la utilización de colores" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "define el valor de $releasever en los aarchivos de configuración de yum y de los repositorios" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "Ene" -@@ -552,105 +601,104 @@ msgstr "Dic" - msgid "Trying other mirror." - msgstr "Intentando con otro espejo." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nombre : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Arquitectura : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "Período : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Versión : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "Lanzamiento : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Tamaño : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Repositorio : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "Desde el repositorio : %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Enviado por : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Horario del envio : %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Horario de la construcción : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Horario de la instalación: %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Resumen : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "Licencia : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "Licencia : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Descripción:" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "s" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "si" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "n" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "no" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "Está de acuerdo [s/N]:" - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -659,150 +707,152 @@ msgstr "" - "\n" - "Grupo: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Group-Id: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Descripción: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Paquetes obligatorios:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Paquetes predeterminados:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr " Paquetes opcionales:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Paquetes condicionales:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "paquete: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " No existen dependencias para este paquete" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " dependencia: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Dependencia no satisfecha" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Repositorio : %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Resultado obtenido desde:" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "Descripción :" - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Licencia : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Nombre del archivo : %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Otro : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "Hubo un error mientras se calculaba el tamaño total de la descarga" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Tamaño total: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Tamaño total de la descarga: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "Tamaño instalado: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "Reinstalando" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" - msgstr "Desactualizando" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Instalando para las dependencias" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Actualizando para las dependencias" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Eliminando para las dependencias" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 -+#: ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "Ignorando (problemas de dependencias)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Paquete" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Arquitectura" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Versión" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Repositorio" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "Tamaño" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" reemplazando %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " reemplazando %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -813,7 +863,7 @@ msgstr "" - "Resumen de la transacción\n" - "%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" -@@ -822,7 +872,7 @@ msgstr "" - "Instalar %5.5s Paquete(s)\n" - "Actualizar %5.5s Paquete(s)\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" -@@ -833,32 +883,32 @@ msgstr "" - "Reinstalar %5.5s Paquete(s)\n" - "Desactualizar %5.5s Paquete(s)\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "Eliminado(s)" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Dependencia(s) eliminada(s)" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Dependencia(s) instalada(s)" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Dependencia(s) actualizada(s)" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Sustituido(s)" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Falló" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "dos" - -@@ -866,228 +916,389 @@ msgstr "dos" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" --" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " --"seconds\n" -+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" - "to exit.\n" - msgstr "" - "\n" --" Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s " --"dentro de %s%s%s segundos\n" -+" Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s dentro de %s%s%s segundos\n" - "para finalizar.\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "interrupción solicitada por el usuario" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Total" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "I" -+ - #: ../output.py:1203 -+msgid "O" -+msgstr "O" -+ -+#: ../output.py:1204 -+msgid "E" -+msgstr "E" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "R" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "D" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "U" -+ -+#: ../output.py:1217 - msgid "" - msgstr "" - --#: ../output.py:1204 -+#: ../output.py:1218 - msgid "System" - msgstr "Sistema" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "Se ha(n) indicado paquete(s), o IDs de transacciones erróneas" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." --msgstr "" --"Aviso: Desde la última transacción, han sido modificadas las bases de datos " --"(RPMDB)." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "ID" -+ -+#: ../output.py:1267 -+#: ../output.py:1520 -+msgid "Login user" -+msgstr "Registro de usuario" -+ -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "Día y hora" -+ -+#: ../output.py:1269 -+#: ../output.py:1522 -+msgid "Action(s)" -+msgstr "Acción(es)" -+ -+#: ../output.py:1270 -+#: ../output.py:1523 -+msgid "Altered" -+msgstr "Modificado" - --#: ../output.py:1289 -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "No se ha indicado un ID de transacción" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "Se ha indicado un ID de transacción no válido " - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "No se ha encontrado el ID de transacción indicado" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "¡Se ha encontrado más de un ID de transacción!" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "No se ha indicado ningún paquete, o ID de transacción" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "ID de transacción :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "Hora inicial :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 -+#: ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "Rpmdb inicial :" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "(%s segundos)" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "Hora final : " - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 -+#: ../output.py:1423 - msgid "End rpmdb :" - msgstr "Rpmdb final :" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "Usuario :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 -+#: ../output.py:1428 -+#: ../output.py:1430 - msgid "Return-Code :" - msgstr "Codigo-obtenido :" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "Abortado" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "Falla:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "Exito" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "Transacción realizada con:" - --#: ../output.py:1405 -+#: ../output.py:1444 -+#: ../output.py:1489 - msgid "Downgraded" - msgstr "Desactualizado" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "Extraño" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "Paquetes modificados:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "Información del scriptlet:" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "Errores:" - --#: ../output.py:1489 -+#: ../output.py:1481 -+#: ../output.py:1482 -+msgid "Install" -+msgstr "Instalar" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "Instalación de dependencias" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "Convirtiendo en obsoleto" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "Eliminar" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "Reinstalar" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "Desactualizar" -+ -+#: ../output.py:1490 -+msgid "Update" -+msgstr "Actualizar" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "Hora" -+ -+#: ../output.py:1547 - msgid "Last day" - msgstr "Ultimo día" - --#: ../output.py:1490 -+#: ../output.py:1548 - msgid "Last week" - msgstr "Ultima semana" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "Ultimas 2 semanas" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "Ultimos 3 meses" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "Ultimos 6 meses" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "Ultimo año" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "Hace más de un año" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "instalado" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "actualizado" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "obsoleto" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "eliminado" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Paquete %s.%s %s:%s-%s definido para ser %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Ejecutando prueba de transacción" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." --msgstr "" --"--> Reiniciando la resolución de las dependencias con las nuevas " --"modificaciones." -+msgstr "--> Reiniciando la resolución de las dependencias con las nuevas modificaciones." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> Resolución de dependencias finalizada" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 -+#: ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> Procesando dependencias: %s para el paquete: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> Dependencia no resuelta: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "Paquete: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" Necesita: %s" -+ -+#: ../output.py:1649 -+#: ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "Disponible" -+ -+#: ../output.py:1665 -+#: ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Procesando conflictos: %s choca con %s" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." --msgstr "" --"--> Construyendo el conjunto de las transacciones con los paquetes " --"seleccionados. Por favor aguarde." -+msgstr "--> Construyendo el conjunto de las transacciones con los paquetes seleccionados. Por favor aguarde." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." --msgstr "" --"---> Descargando el encabezado de %s para incluirlo en el conjunto de " --"transacciones." -+msgstr "---> Descargando el encabezado de %s para incluirlo en el conjunto de transacciones." -+ -+#: ../utils.py:93 -+msgid "Running" -+msgstr "Ejecutando" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "Durmiendo" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "Ininterrumplible" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombi" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Rastreado/Detenido" -+ -+#: ../utils.py:98 -+#: ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Desconocido" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " La otra aplicación es: PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " La otra aplicación es: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Memoria : %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Iniciado: %s - %s atrás" - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Estado : %s, pid: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "Error de PluginExit: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Error de yum: %s" -+ -+#: ../utils.py:235 -+#: ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1097,7 +1308,8 @@ msgstr "" - "\n" - "Saliendo por cancelación del usuario" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 -+#: ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1107,7 +1319,8 @@ msgstr "" - "\n" - "Saliendo por tubería rota" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 -+#: ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1118,20 +1331,20 @@ msgstr "" - "\n" - "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 -+#: ../yummain.py:211 - msgid "Complete!" - msgstr "¡Listo!" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "Necesita ser usuario root para poder ejecutar este comando." - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" --"However, you do not have any GPG public keys installed. You need to " --"download\n" -+"However, you do not have any GPG public keys installed. You need to download\n" - "the keys for packages you wish to install and install them.\n" - "You can do that by running the command:\n" - " rpm --import public.gpg.key\n" -@@ -1144,10 +1357,8 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" - "\n" --"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso " --"es bueno. \n" --"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita " --"descargar\n" -+"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso es bueno. \n" -+"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita descargar\n" - "e instalar las llaves de todos los paquetes que desee instalar.\n" - "Esto puede hacerlo si ejecuta el comando:\n" - " rpm --import public.gpg.key\n" -@@ -1157,339 +1368,344 @@ msgstr "" - "en la opción 'gpgkey' en la sección del repositorio, y yum \n" - "la instalará por usted.\n" - "\n" --"Para obtener mayor información, póngase en contacto con su distribución o " --"con su proveedor de paquetes.\n" -+"Para obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Error: Necesita pasar una lista de paquetes a %s " - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "Error: Es necesario un ítem con el cual corresponderse" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "Error: Es necesario un grupo o una lista de grupos" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Error: la limpieza necesita una opción: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Error: argumento de limpieza no válido: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "No hay argumento para el shell" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Nombre de archivo pasado al shell: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "El archivo %s indicado como argumento para el shell no existe." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Error: se ha indicado más de un archivo como argumento para el shell" - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PAQUETE..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Instala uno o varios paquetes en su sistema" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "Configurando el proceso de instalación" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PAQUETE...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Actualiza uno o varios paquetes en su sistema" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "Configurando el proceso de actualización" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "Muestra detalles acerca de un paquete o de un grupo de paquetes" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Paquetes instalados" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Paquetes disponibles" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Paquetes extra" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "Paquetes actualizados" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 -+#: ../yumcommands.py:324 -+#: ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Convirtiendo paquetes en obsoletos" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Paquetes añadidos recientemente" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "No hay paquetes que se correspondan con la lista" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Muestra un paquete o grupos de paquete" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "Elimina uno o varios paquetes de su sistema" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "Configurando el proceso de eliminación" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "Configurando el proceso de grupo" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "No existen grupos sobre los cuales ejecutar el comando" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Muestra los grupos de paquetes disponibles" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "Instala los paquetes en un grupo de su sistema" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "Elimina los paquetes de un grupo de su sistema" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Muestra detalles acerca de un grupo de paquetes" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Genera el caché de metadatos" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Creando los archivos de caché para todos los archivos de metadatos." - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" --msgstr "" --"Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" -+msgstr "Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Se ha creado el caché de metadatos" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "Elimina los datos del caché" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "Localiza el paquete que ofrezca el valor indicado" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Verifica la existencia de actualizaciones de paquetes" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Busca detalles en los paquetes para la cadena indicada" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Buscando paquetes:" - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "Actualiza los paquetes tomando en cuenta los obsoletos" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "Configurando el proceso de actualización" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "Instala un RPM local" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "Configurando el proceso de instalación local de paquetes" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "Determina qué paquetes ofrecen la dependencia indicada" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Buscando paquetes para la dependencia:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "Ejecuta una shell de Yum interactiva " - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Configurando la shell de Yum" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "Muestra las dependencias que necesita un paquete" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Buscando dependencias:" - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Muestra los repositorios de software configurados" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 -+#: ../yumcommands.py:823 - msgid "enabled" - msgstr "habilitado" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 -+#: ../yumcommands.py:850 - msgid "disabled" - msgstr "deshabilitado" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "Repo-id : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "Repo-name : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "Repo-status : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Repo-revision: " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "Repo-tags : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Repo-distro-tags: " - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "Repo-updated : " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "Repo-pkgs : " - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "Repo-size : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "Repo-baseurl : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Repo-metalink: " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr " Actualizados : " - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "Repo-mirrors : " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Desconocido" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "Nunca (último: %s)" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "Instante (último: %s)" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "%s segundo(s) (último: %s)" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "Repo-expire : " - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "Repo-exclude : " - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "Repo-include : " - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "Repositorio excluído:" -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 -+#: ../yumcommands.py:980 - msgid "repo id" - msgstr "id del repositorio" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 -+#: ../yumcommands.py:969 -+#: ../yumcommands.py:987 - msgid "status" - msgstr "estado" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "nombre del repositorio" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "Muestra un mensaje de ayuda del uso" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "No existe asistencia disponible para %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1499,7 +1715,7 @@ msgstr "" - "\n" - "apodos: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1509,144 +1725,98 @@ msgstr "" - "\n" - "apodo: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "Configurando el proceso de reinstalación" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "reinstalar un paquete" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" - msgstr "Configurando el proceso de desactualización" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" - msgstr "desactualizar un paquete a una versión anterior" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "Muestra una versión para la máquina y/o los repositorios disponibles." - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr " Grupos de la versión de Yum:" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr " Grupo :" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr " Paquetes:" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "Instalado:" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "Grupo-Instalado:" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "Disponible:" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "Grupo-Disponible:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "Mostrar, o utilizar, el historial de la transacción" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "Sub-comando de historia no válido, utilice: %s" - --#: ../yummain.py:128 --msgid "Running" --msgstr "Ejecutando" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "Verifica si hay problemas en la base de datos (rpmdb)" - --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "Durmiendo" -+#: ../yummain.py:102 -+msgid "Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " - - #: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Ininterrumplible" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombi" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Rastreado/Detenido" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " La otra aplicación es: PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " La otra aplicación es: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Memoria : %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Iniciado: %s - %s atrás" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Estado : %s, pid: %d" -- --#: ../yummain.py:173 --msgid "" --"Another app is currently holding the yum lock; waiting for it to exit..." --msgstr "" --"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " -- --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Error: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 -+#: ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Error(es) desconocido(s): Código de salida: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Resolviendo dependencias" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" --msgstr "" --" Podría intentar utilizar el comando --skip-broken para sortear el problema" -+msgstr " Podría intentar utilizar el comando --skip-broken para sortear el problema" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" --msgstr "" --" Podría intentar ejecutar: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 -+#: ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" -+msgstr "Podría intentar ejecutar: rpm- Va --nofiles --nodigest" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1654,7 +1824,7 @@ msgstr "" - "\n" - "Dependencias resueltas" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1670,8 +1840,7 @@ msgstr "doTsSetup() desaparecerá en alguna versión posterior de Yum.\n" - - #: ../yum/depsolve.py:97 - msgid "Setting up TransactionSets before config class is up" --msgstr "" --"Configurando TransactionSets antes de la activación de clase de configuración" -+msgstr "Configurando TransactionSets antes de la activación de clase de configuración" - - #: ../yum/depsolve.py:148 - #, python-format -@@ -1693,177 +1862,167 @@ msgstr "Posible correspondencia para %s desde %s" - msgid "Matched %s to require for %s" - msgstr "Se ha encontrado %s para poder solicitar %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Miembro: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 -+#: ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "%s convertido para instalar" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Agregando paquete %s en modo %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Eliminando paquete %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s necesita: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s necesita %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "El requerimiento que se necesita ya fue buscado, haciendo trampa" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "El requerimiento necesitado no es un nombre de paquete. Buscando: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Proveedor posible: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "El modo es %s para el proveedor de %s: %s" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "Modo para el paquete que ofrece %s: %s" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "TSINFO: el paquete %s que necesita %s ha sido marcado para eliminarse" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." --msgstr "" --"TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la " --"dependencia." -+msgstr "TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la dependencia." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: Actualizando %s para resolver la dependencia." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" --msgstr "" --"No es posible encontrar un camino de actualización para la dependencia para: " --"%s" -- --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Requerimiento %s irresoluble para %s" -+msgstr "No es posible encontrar un camino de actualización para la dependencia para: %s" - --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Rápidamente se ha localizado %s al ser requerido por %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." --msgstr "" --"%s se encuentra entre los paquetes provistos, pero ya está instalado, " --"eliminando. " -+msgstr "%s se encuentra entre los paquetes provistos, pero ya está instalado, eliminando. " - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "El paquete de solución posible %s posee una nueva instancia en ts." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." --msgstr "" --"El paquete de solución posible %s posee una nueva instancia ya instalada." -+msgstr "El paquete de solución posible %s posee una nueva instancia ya instalada." - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "" --"No se encuentra una dependencia: es necesario %s para poder instalar el " --"paquete %s" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "%s ya se encuentra en ts, ignorándolo" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: Seleccionado %s como actualización de %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: Seleccionando %s como una instalación para %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 -+#: ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Exito - transacción vacía" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 -+#: ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Reiniciando el bucle" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Finalizando el proceso de dependencias" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "%s desde %s tiene problemas de resolución de dependencias" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Exito - dependencias resueltas" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Verificando dependencias para %s" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "localizando a %s como un requerimiento de %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Ejecutando compare_providers() para %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 -+#: ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "mejor arquitectura en po %s" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "%s hace obsoleto a %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1872,124 +2031,137 @@ msgstr "" - "archdist comparó %s con %s en %s\n" - " Vencedor: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "sourcerpm común %s y %s" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "el paquete principal %s está instalado para %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "prefijo común de %s entre %s y %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Mejor orden: %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" --msgstr "" --"Al repositorio %r le falta un nombre en su configuración, utilizando el id" -+msgstr "Al repositorio %r le falta un nombre en su configuración, utilizando el id" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "los complementos ya se encuentran inicializados" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmDBSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Leyendo RPDMDB local" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Configurando sacos de paquetes" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" --msgstr "" --"el objeto del repositorio para el repositorio %s necesita de un método a " --"_resetSack\n" -+msgstr "el objeto del repositorio para el repositorio %s necesita de un método a _resetSack\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "por lo tanto, este repositorio no puede ser restaurado.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Construyendo objeto de actualizaciones" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() desaparecerá en alguna versión posterior de Yum.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Obteniendo metadatos de grupo" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Agregando archivo de grupos desde el repositorio: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Falló al agregarse el archivo de grupos desde el repositorio: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "No hay grupos disponibles en ningún repositorio" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "Obteniendo metadatos de etiquetas de paquete (pkgtags)" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Agregando etiquetas del repositorio: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Falló al agregarse etiquetas de paquetes para el repositorio: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Importando información adicional de listas de archivo" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "El programa %s%s%s se encuentra en el paquete yum-utils." - --#: ../yum/__init__.py:785 --msgid "" --"There are unfinished transactions remaining. You might consider running yum-" --"complete-transaction first to finish them." --msgstr "" --"Existen transacciones restantes no finalizadas. Podría considerar primero " --"ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." -+#: ../yum/__init__.py:849 -+msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." -+msgstr "Existen transacciones restantes no finalizadas. Podría considerar primero ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Etapa %i ignorando dependencias rotas" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "El proceso de ignorar dependencias rotas llevó %i vueltas" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -1997,81 +2169,88 @@ msgstr "" - "\n" - "Paquetes ignorados por problemas de dependencias:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s de %s" - --#: ../yum/__init__.py:1083 --msgid "" --"Warning: scriptlet or other non-fatal errors occurred during transaction." --msgstr "" --"Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la " --"transacción." -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "Advertencia: Las bases de datos (RPMDB) han sido modificadas por un elemento ajeno a yum." - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "no se encuentra necesita" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "conflicto instalado" -+ -+#: ../yum/__init__.py:1180 -+msgid "Warning: scriptlet or other non-fatal errors occurred during transaction." -+msgstr "Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la transacción." -+ -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "Falló al eliminar archivo de transacción %s" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "¡se suponía que %s estuviera instalado, pero no lo está! " - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "¡se suponía que %s estuviera eliminado, pero no lo está! " - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "No es posible verificar si se encuentra activo el PID %s" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." --msgstr "" --"Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." -+msgstr "Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "No se ha podido crear el bloqueo en %s: %s" - --#: ../yum/__init__.py:1373 --msgid "Package does not match intended download" --msgstr "El paquete no se corresponde con la descarga pretendida" -+#: ../yum/__init__.py:1470 -+msgid "Package does not match intended download. Suggestion: run yum clean metadata" -+msgstr "El paquete no se corresponde con la descarga pretendida. Sugerimos ejecutar el siguiente comando: yum clean metadata" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1486 - msgid "Could not perform checksum" - msgstr "No se pudo realizar una suma de verificación" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1489 - msgid "Package does not match checksum" - msgstr "El paquete no se corresponde con la suma de verificación" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1531 - #, python-format - msgid "package fails checksum but caching is enabled for %s" --msgstr "" --"el paquete no ha superado la suma de verificación, pero el caché se " --"encuentra habilitado para %s" -+msgstr "el paquete no ha superado la suma de verificación, pero el caché se encuentra habilitado para %s" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1534 -+#: ../yum/__init__.py:1563 - #, python-format - msgid "using local copy of %s" - msgstr "utilizando una copia local de %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1575 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2082,416 +2261,433 @@ msgstr "" - " * libre %s\n" - " * necesario %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1624 - msgid "Header is not complete." - msgstr "El encabezado no está completo." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1661 - #, python-format --msgid "" --"Header not in local cache and caching-only mode enabled. Cannot download %s" --msgstr "" --"El encabezado no se encuentra en el caché local, y está habilitado el modo " --"de solo cacheo. No es posible descargar %s" -+msgid "Header not in local cache and caching-only mode enabled. Cannot download %s" -+msgstr "El encabezado no se encuentra en el caché local, y está habilitado el modo de solo cacheo. No es posible descargar %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1716 - #, python-format - msgid "Public key for %s is not installed" - msgstr "No se ha instalado la llave pública de %s " - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1720 - #, python-format - msgid "Problem opening package %s" - msgstr "Problemas abriendo el paquete %s" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1728 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "La llave pública de %s no es confiable" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1732 - #, python-format - msgid "Package %s is not signed" - msgstr "El paquete %s no está firmado" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1770 - #, python-format - msgid "Cannot remove %s" - msgstr "No es posible eliminar %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1774 - #, python-format - msgid "%s removed" - msgstr "%s eliminado" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1820 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "No es posible eliminar %s archivo %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1824 - #, python-format - msgid "%s file %s removed" - msgstr "%s archivo %s eliminado" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1826 - #, python-format - msgid "%d %s files removed" - msgstr "%d %s archivos eliminados" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1895 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "Más de una correspondencia exacta en el saco para %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1901 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Nada se corresponde con %s.%s %s:%s-%s desde la actualización" - --#: ../yum/__init__.py:2026 --msgid "" --"searchPackages() will go away in a future version of " --"Yum. Use searchGenerator() instead. \n" --msgstr "" --"searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar " --"utilice searchGenerator(). \n" -+#: ../yum/__init__.py:2180 -+msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" -+msgstr "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar utilice searchGenerator(). \n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2219 - #, python-format - msgid "Searching %d packages" - msgstr "Buscando %d paquetes" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2223 - #, python-format - msgid "searching package %s" - msgstr "buscando paquete %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2235 - msgid "searching in file entries" - msgstr "buscando en las entradas de archivo" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2242 - msgid "searching in provides entries" - msgstr "buscando en las entradas \"provee\"" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2275 - #, python-format - msgid "Provides-match: %s" - msgstr "Lo que se ha indicado combina con: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2324 - msgid "No group data available for configured repositories" - msgstr "No existen datos de grupo disponibles en los repositorios configurados" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2355 -+#: ../yum/__init__.py:2374 -+#: ../yum/__init__.py:2405 -+#: ../yum/__init__.py:2411 -+#: ../yum/__init__.py:2493 -+#: ../yum/__init__.py:2497 -+#: ../yum/__init__.py:2814 - #, python-format - msgid "No Group named %s exists" - msgstr "No existe un grupo denominado %s" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2386 -+#: ../yum/__init__.py:2513 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "el paquete %s no fue marcado en el grupo %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2433 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Agregando paquete %s del grupo %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2437 - #, python-format - msgid "No package named %s available to be installed" - msgstr "No existe un paquete denominado %s disponible para ser instalado" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2539 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "La tupla %s de paquetes no pudo ser encontrada en el saco de paquetes" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2558 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "La tupla %s de paquetes no pudo ser encontrada en la base de datos" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2614 -+#: ../yum/__init__.py:2664 - msgid "Invalid version flag" - msgstr "Marca de versión no válida" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2634 -+#: ../yum/__init__.py:2639 - #, python-format - msgid "No Package found for %s" - msgstr "No se ha encontrado ningún paquete para %s" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2855 - msgid "Package Object was not a package object instance" - msgstr "El objeto de paquete no era una instancia de objeto de paquete" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2859 - msgid "Nothing specified to install" - msgstr "No se ha indicado nada para instalar" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2875 -+#: ../yum/__init__.py:3652 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "Verificando la provision virtual o provision de archivo de %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2881 -+#: ../yum/__init__.py:3197 -+#: ../yum/__init__.py:3365 -+#: ../yum/__init__.py:3658 - #, python-format - msgid "No Match for argument: %s" - msgstr "No hay nada concordante con el argumento: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2957 - #, python-format - msgid "Package %s installed and not available" - msgstr "El paquete %s está instalado y no se encuentra disponible" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2960 - msgid "No package(s) available to install" - msgstr "No existe(n) paquete(s) disponible(s) para instalar" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2972 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "Paquete: %s - ya se encuentra en un conjunto de transacción" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2998 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" - msgstr "El paquete %s se hace obsoleto con %s, que ya se encuentra instalado" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3001 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" --msgstr "" --"El paquete %s se hace obsoleto con %s, en su lugar se está intentando " --"instalar %s" -+msgstr "El paquete %s se hace obsoleto con %s, en su lugar se está intentando instalar %s" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3009 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "El paquete %s ya se encuentra instalado con su versión más reciente" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3023 - #, python-format - msgid "Package matching %s already installed. Checking for update." --msgstr "" --"El paquete concordante con %s ya se encuentra instalado. Verificando si " --"puede actualizarse." -+msgstr "El paquete concordante con %s ya se encuentra instalado. Verificando si puede actualizarse." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3126 - msgid "Updating Everything" - msgstr "Actualizando todo" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3147 -+#: ../yum/__init__.py:3262 -+#: ../yum/__init__.py:3289 -+#: ../yum/__init__.py:3315 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3182 -+#: ../yum/__init__.py:3362 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3253 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "El paquete ya es obsoleto: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3284 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3293 -+#: ../yum/__init__.py:3319 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" --msgstr "" --"Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%" --"s-%s" -+msgstr "Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3378 - msgid "No package matched to remove" - msgstr "No hay paquete correspondiente para ser eliminado" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3412 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "No es posible abrir el archivo: %s. Ignorando." -+msgid "Cannot open: %s. Skipping." -+msgstr "No es posible abrir: %s. Ignorando." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3415 -+#: ../yum/__init__.py:3514 -+#: ../yum/__init__.py:3598 - #, python-format - msgid "Examining %s: %s" - msgstr "Examinando %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3423 -+#: ../yum/__init__.py:3517 -+#: ../yum/__init__.py:3601 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" --msgstr "" --"No es posible añadir el paquete %s a la transacción. La arquitectura no es " --"compatible: %s" -+msgstr "No es posible añadir el paquete %s a la transacción. La arquitectura no es compatible: %s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3431 - #, python-format --msgid "" --"Package %s not installed, cannot update it. Run yum install to install it " --"instead." --msgstr "" --"El paquete %s no está instalado, no puede actualizarse. En su lugar, para " --"instalarlo, ejecute el comando yum install." -+msgid "Package %s not installed, cannot update it. Run yum install to install it instead." -+msgstr "El paquete %s no está instalado, no puede actualizarse. En su lugar, para instalarlo, ejecute el comando yum install." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3460 -+#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3606 - #, python-format - msgid "Excluding %s" - msgstr "Excluyendo %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3465 - #, python-format - msgid "Marking %s to be installed" - msgstr "Marcando %s para ser instalado" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3471 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "Marcando %s como una actualización de %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3478 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: no actualiza el paquete instalado." - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3511 -+#: ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "No es posible abrir el archivo: %s. Ignorando." -+ -+#: ../yum/__init__.py:3541 - msgid "Problem in reinstall: no package matched to remove" --msgstr "" --"Problema al reinstalar: no existe ningún paquete concordante para eliminar" -+msgstr "Problema al reinstalar: no existe ningún paquete concordante para eliminar" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3554 -+#: ../yum/__init__.py:3686 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "El paquete %s permite múltiples instalaciones, ignorando" - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3575 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" --msgstr "" --"Problema al reinstalar: no existe ningún paquete concordante con %s para " --"instalar" -+msgstr "Problema al reinstalar: no existe ningún paquete concordante con %s para instalar" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3678 - msgid "No package(s) available to downgrade" - msgstr "No existe(n) paquete(s) disponible(s) para desactualizar" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3731 - #, python-format - msgid "No Match for available package: %s" - msgstr "Ninguna correspondencia disponible para el paquete: %s" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3738 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Solo existe la posibilidad de actualizar el paquete: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3808 -+#: ../yum/__init__.py:3845 - #, python-format - msgid "Failed to downgrade: %s" - msgstr "Falló al desactualizar: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3877 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Obteniendo llave GPG desde %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3897 - msgid "GPG key retrieval failed: " - msgstr "La obtención de la llave GPG ha fallado:" - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3903 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Llave GPG no válida de %s: %s" -+ -+#: ../yum/__init__.py:3912 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "El análisis de la llave GPG ha fallado: la llave no posee valor %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3944 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3949 -+#: ../yum/__init__.py:4011 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Importando la llave GPG 0x%s \"%s\" desde %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3966 - msgid "Not installing key" - msgstr "No se está instalando la llave" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3972 - #, python-format - msgid "Key import failed (code %d)" - msgstr "La importación de la llave falló (código %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3973 -+#: ../yum/__init__.py:4032 - msgid "Key imported successfully" - msgstr "La llave ha sido importada exitosamente" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4037 - #, python-format - msgid "" --"The GPG keys listed for the \"%s\" repository are already installed but they " --"are not correct for this package.\n" -+"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" - "Check that the correct key URLs are configured for this repository." - msgstr "" --"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran " --"instaladas, pero con este paquete no son correctas.\n" --"Verifique que las URLs de la llave para este repositorio estén correctamente " --"configuradas." -+"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\n" -+"Verifique que las URLs de la llave para este repositorio estén correctamente configuradas." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3987 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "La importación de la(s) llave(s) no funcionó, ¿llave(s) equivocada(s)?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4006 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "La llave GPG de %s (0x%s) ya ha sido importada" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4026 - #, python-format - msgid "Not installing key for repo %s" - msgstr "No se está instalando la llave para el repositorio %s" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4031 - msgid "Key import failed" - msgstr "Falló la importación de la llave" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4157 - msgid "Unable to find a suitable mirror." - msgstr "No es posible encontrar un espejo que funcione." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4159 - msgid "Errors were encountered while downloading packages." - msgstr "Fueron encontrados errores mientras los paquetes eran descargados." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4209 - #, python-format - msgid "Please report this error at %s" - msgstr "Por favor, informe este error en %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4233 - msgid "Test Transaction Errors: " - msgstr "Errores de la prueba de transacción:" - -+#: ../yum/__init__.py:4334 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "No se ha podido definir un directorio de chaché: %s" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " - msgstr "Complementos cargados:" - --#: ../yum/plugins.py:216 ../yum/plugins.py:222 -+#: ../yum/plugins.py:216 -+#: ../yum/plugins.py:222 - #, python-format - msgid "No plugin match for: %s" - msgstr "No hay un complemento que se corresponda con: %s" -@@ -2499,8 +2695,7 @@ msgstr "No hay un complemento que se corresponda con: %s" - #: ../yum/plugins.py:252 - #, python-format - msgid "Not loading \"%s\" plugin, as it is disabled" --msgstr "" --"El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" -+msgstr "El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" - - #. Give full backtrace: - #: ../yum/plugins.py:264 -@@ -2525,11 +2720,8 @@ msgstr "Cargando el complemento \"%s\"" - - #: ../yum/plugins.py:316 - #, python-format --msgid "" --"Two or more plugins with the name \"%s\" exist in the plugin search path" --msgstr "" --"Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda " --"de complementos " -+msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" -+msgstr "Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda de complementos " - - #: ../yum/plugins.py:336 - #, python-format -@@ -2541,14 +2733,26 @@ msgstr "No se encuentra el archivo de configuración %s" - #: ../yum/plugins.py:339 - #, python-format - msgid "Unable to find configuration file for plugin %s" --msgstr "" --"No es posible encontrar el archivo de configuración para el complemento %s" -+msgstr "No es posible encontrar el archivo de configuración para el complemento %s" - - #: ../yum/plugins.py:501 - msgid "registration of commands not supported" - msgstr "registro de comando no soportado" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "no se encuentran necesita de" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "se ha instalado choca con" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s es uin duplicado con %s" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "Reempaquetando" - -@@ -2564,16 +2768,16 @@ msgstr "El RPM %s ha fallado la verificación md5" - - #: ../rpmUtils/oldUtils.py:151 - msgid "Could not open RPM database for reading. Perhaps it is already in use?" --msgstr "" --"No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se " --"encuentre en uso?" -+msgstr "No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se encuentre en uso?" - - #: ../rpmUtils/oldUtils.py:183 - msgid "Got an empty Header, something has gone wrong" - msgstr "Se obtuvo un encabezado vacío, algo ha salido mal" - --#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 --#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 -+#: ../rpmUtils/oldUtils.py:253 -+#: ../rpmUtils/oldUtils.py:260 -+#: ../rpmUtils/oldUtils.py:263 -+#: ../rpmUtils/oldUtils.py:266 - #, python-format - msgid "Damaged Header %s" - msgstr "Encabezado %s dañado" -@@ -2583,9 +2787,26 @@ msgstr "Encabezado %s dañado" - msgid "Error opening rpm %s - error %s" - msgstr "Error al abrir el rpm %s - error %s" - -+#~ msgid "Finished Transaction Test" -+#~ msgstr "Prueba de transacción finalizada" -+#~ msgid "" -+#~ " You could try running: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+#~ msgstr "" -+#~ " Podría intentar ejecutar: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+#~ msgid "Unresolvable requirement %s for %s" -+#~ msgstr "Requerimiento %s irresoluble para %s" -+#~ msgid "Missing Dependency: %s is needed by package %s" -+#~ msgstr "" -+#~ "No se encuentra una dependencia: es necesario %s para poder instalar el " -+#~ "paquete %s" - #~ msgid "" - #~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" - #~ "().\n" - #~ msgstr "" - #~ "getInstalledPackageObject() desaparecerá en alguna versión próxima de " - #~ "Yum, utilice en su lugar self.rpmdb.searchPkgTuple().\n" -+ -diff --git a/po/fi.po b/po/fi.po -index 363f1de..4347eba 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -1,49 +1,48 @@ - # Finnish translation of yum. - # Copyright (C) 2009 yum's COPYRIGHT HOLDER - # This file is distributed under the same license as the yum package. --# Ville-Pekka Vainio , 2009. -+# Ville-Pekka Vainio , 2009, 2010. - msgid "" - msgstr "" - "Project-Id-Version: yum\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" --"PO-Revision-Date: 2009-11-11 01:39+0200\n" -+"POT-Creation-Date: 2010-02-10 10:43-0500\n" -+"PO-Revision-Date: 2010-02-11 21:50+0200\n" - "Last-Translator: Ville-Pekka Vainio \n" - "Language-Team: Finnish \n" --"Language: fi\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Virtaal 0.4.1\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Päivitetään" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "Poistetaan" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Asennetaan" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Vanhennettu" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "Päivitetty" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "Poistettu" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "Asennettu" - -@@ -65,69 +64,74 @@ msgstr "Virhe: virheellinen tulostetila: %s, paketti %s" - msgid "Erased: %s" - msgstr "Poistettiin: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "Poistetaan" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Siivotaan" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "Komento ”%s” on jo määritelty" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Tehdään asennuslähdeasetuksia" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Luetaan asennuslähteiden metadataa paikallisista tiedostoista" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Asetusvirhe: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Valitsinvirhe: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Asennettiin : %s-%s ajassa %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr " Käännettiin : %s ajassa %s" - - # mitä on "commit" suomeksi? --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr " Suoritettiin: %s ajassa %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "Jokin komento on annettava" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "Komentoa %s ei ole olemassa. Käytä komentoa %s --help" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "Vaadittu levytila:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" - msgstr " Vähintään %d Mt levytilaa tarvitaan tiedostojärjestelmällä %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -135,65 +139,61 @@ msgstr "" - "Yhteenveto virheistä\n" - "--------------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Yritettiin suorittaa transaktio, mutta ei ole mitään tehtävää. Lopetetaan." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "Lopetetaan, käyttäjä antoi lopetuskomennon" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Ladataan paketteja:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Virhe pakettien latauksessa:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4194 - msgid "Running rpm_check_debug" - msgstr "Suoritetaan rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4203 - msgid "ERROR You need to update rpm to handle:" - msgstr "VIRHE RPM on päivitettävä, jotta se osaa käsitellä:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4206 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "VIRHE rpm_check_debugin ja riippuvuuksien tarkistuksen välillä:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "RPM on päivitettävä" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "Ilmoita tästä ongelmasta osoitteeseen %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Suoritetaan transaktiotestiä" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Transaktiotesti valmistui" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Transaktiotarkistuksen virhe:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "Transaktiotesti onnistui" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Suoritetaan transaktiota" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." -@@ -201,80 +201,85 @@ msgstr "" - "Avaimia ei tuoda automaattisesti, kun yumia suoritetaan ilman valvontaa.\n" - "Käytä valitsinta ”-y” tämän muuttamiseksi." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Tarkoititko: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "" - "Paketti tai paketit %s%s%s ovat saatavilla, mutta niitä ei ole asennettu." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "Pakettia %s%s%s ei ole saatavilla." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "Asennettavat paketit" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Ei mitään tehtävää" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d pakettia merkitty päivitettäväksi" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "Yhtään pakettia ei ole merkitty päivitettäväksi" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d pakettia merkitty poistettavaksi" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "Yhtään pakettia ei ole merkitty poistettavaksi" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" - msgstr "Vanhennettavat paketit" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr " (versiosta %s)" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "Asennettua pakettia %s%s%s%s ei ole saatavilla." - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "Uudelleenasennettavat paketit" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "Yhtään pakettia ei annettu" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "Löytyi: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "Varoitus: hakutuloksia ei löytynyt hakusanalle %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "Hakutuloksia ei löytynyt" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" -@@ -285,109 +290,113 @@ msgstr "" - " Hakusanoilla ”%s*/%s%s” ja/tai ”%s*bin/%s%s” saadaan niitä vastaava " - "toiminta." - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "Hakusanalla %s ei löytynyt pakettia" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Siivotaan kaikki" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "Siivotaan otsakkeet" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Siivotaan paketit" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Siivotaan XML-metadata" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "Siivotaan tiedokannan välimuisti" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "Siivotaan välimuistin vanhentumiseen liittyvä metadata" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "Siivotaan välimuistissa oleva rpm-tietokannan data" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "Siivotaan liitännäiset" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Asennetut ryhmät:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Saatavilla olevat ryhmät:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Valmis" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2787 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Varoitus: Ryhmää %s ei ole olemassa." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" - msgstr "" - "Missään pyydetyssä ryhmässä ei ole yhtään asennettavaa tai päivitettävää " - "pakettia" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d pakettia asennettavana" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2799 - #, python-format - msgid "No group named %s exists" - msgstr "Ryhmää nimeltä %s ei ole olemassa" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "Ei yhtään poistettavaa pakettia ryhmien perusteella" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d poistettavaa pakettia" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "Paketti %s on jo asennettu, ohitetaan" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "Hylätään paketti %s.%s, jota ei voi verrata" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Toista pakettia nimeltä %s ei ole asennettuna, lisätään mahdollisesti " - "asennettavien luetteloon" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "Liitännäisten valitsimet" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Komentorivivirhe: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -398,110 +407,120 @@ msgstr "" - "\n" - "%s: valitsin %s vaatii argumentin" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color vaatii yhden seuraavista argumenteista: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "näytä tämä ohjeviesti ja lopeta" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "hyväksy virheet" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" - msgstr "toimi kokonaan välimuistista, älä päivitä sitä" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "asetustiedoston sijainti" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "komennon suurin odotusaika" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "virheenjäljitystulosteiden taso" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "näytä duplikaatit asennuslähteissä ja list/search-komennoissa" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "virhetulostustaso" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "rpm:n virheenjäljitystulosteiden taso" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "hiljainen toiminta" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "yksityiskohtaset tulosteet" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "vastaa kyllä kaikkiin kysymyksiin" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "näytä Yumin versio ja lopeta" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "aseta asennusjuuri" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "jätä pois paketteja nimen tai jokerimerkkien perusteella" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "" - "ota pakettien pois jättäminen pois käytöstä pääasetuksille, jollekin " - "asennuslähteelle tai kaikelle" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "ota käyttöön vanhentuneiden pakettien käsittely päivitysten aikana" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "poista Yumin liitännäiset käytöstä" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "poista GPG-allekirjoitusten tarkistus käytöstä" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "poista liitännäisiä käytöstä nimen perusteella" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "ota liitännäisiä käyttöön nimen perusteella" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "ohita paketit, joilla on riippuvuusongelmia" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "käytetäänkö värejä" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+"aseta $releasever-muuttujan arvo yumin asetuksissa ja " -+"asennuslähdetiedostoissa" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "tammi" -@@ -554,105 +573,104 @@ msgstr "joulu" - msgid "Trying other mirror." - msgstr "Kokeillaan toista peilipalvelinta." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nimi : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Arkkitehtuuri : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "Epoch : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Versio : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "Julkaisu : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Koko : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Asennuslähde : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "Asennuslähteestä: %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Tekijä : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Tekoaika : %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Käännösaika : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Asennusaika : %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Yhteenveto : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "Lisenssi : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "Lisenssi : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Kuvaus: " - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "k" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "kyllä" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "e" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "ei" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "Onko tämä ok [k/E]: " - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -661,150 +679,151 @@ msgstr "" - "\n" - "Ryhmä: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Ryhmätunnus: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Kuvaus: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Pakolliset paketit:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Oletuspaketit:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr " Valinnaiset paketit:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Ehdolliset paketit:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "paketti: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " Tällä paketilla ei ole riippuvuuksia" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " riippuvuus: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Toteutumaton riippuvuus" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Asennuslähde: %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Vastaavuus :" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "Kuvaus : " - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Lisenssi : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Tiedostonimi: %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Muuta : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "Kokonaislatausmäärää laskettaessa tapahtui virhe" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Koko yhteensä: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Latausmäärä yhteensä: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "Koko asennettuna: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "Asennetaan uudelleen" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" - msgstr "Varhennetaan" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Asennetaan riippuvuuksien vuoksi" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Päivitetään riippuvuuksien vuoksi" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Poistetaan riippuvuuksien vuoksi" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "Ohitettiin (riippuvuusongelmia)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Paketti" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Arkkitehtuuri" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Versio" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Asennuslähde" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "Koko" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" korvaa %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " korvaa %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -815,7 +834,7 @@ msgstr "" - "Transaktion yhteenveto\n" - "%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" -@@ -824,7 +843,7 @@ msgstr "" - "Asennetaan %5.5s paketti(a)\n" - "Päivitetään %5.5s paketti(a)\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" -@@ -835,32 +854,32 @@ msgstr "" - "Asennetaan uudelleen %5.5s paketti(a)\n" - "Varhennetaan %5.5s paketti(a)\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "Poistettu" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Poistettu riippuvuuksia" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Asennettu riippuvuuksia" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Päivitetty riippuvuuksia" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Korvattu" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Epäonnistui" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "kahden" - -@@ -868,7 +887,7 @@ msgstr "kahden" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" -@@ -881,209 +900,365 @@ msgstr "" - "aikana\n" - "ohjelman lopettamiseksi.\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "käyttäjä keskeytti" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Yhteensä" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "A" -+ - #: ../output.py:1203 -+msgid "O" -+msgstr "Vanh." -+ -+#: ../output.py:1204 -+msgid "E" -+msgstr "P" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "U" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "Varh." -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "P" -+ -+#: ../output.py:1217 - msgid "" - msgstr "" - --#: ../output.py:1204 -+#: ../output.py:1218 - msgid "System" - msgstr "Järjestelmä" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "Annettu virheellinen transaktiotunnus tai paketit" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." --msgstr "" --"Varoitus: RPM-tietokantaa on muutettu edellisen yum-transaktion jälkeen." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "Tunniste" -+ -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "Kirjautunut käyttäjä" - --#: ../output.py:1289 -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "Päivämäärä ja kellonaika" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "Toiminnot" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "Muutettu" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "Transaktiotunnusta ei annettu" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "Annettiin virheellinen transaktiotunnus" - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "Annettua transaktiotunnusta ei löytynyt" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "Löytyi useampi kuin yksi transaktiotunnus!" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "Transaktiotunnusta tai pakettia ei annettu" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "Transaktiotunnus :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "Aloitusaika :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "RPM-tietokanta alussa :" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "(%s sekuntia)" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "Lopetusaika :" - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" - msgstr "RPM-tietokanta lopussa:" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "Käyttäjä :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" - msgstr "Lopetuskoodi :" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "Keskeytetty" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "Epäonnistui:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "Onnistui" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "Transaktio suoritettiin:" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" - msgstr "Varhennettu" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "Omituinen" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "Muutetut paketit:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "Sovelman tuloste:" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "Virheet:" - --#: ../output.py:1489 -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "Asennus" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "Riippuvuuden asennus" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "Vanhentava" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "Poisto" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "Uudelleenasennus" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "Varhennus" -+ -+#: ../output.py:1490 -+msgid "Update" -+msgstr "Päivitys" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "Aika" -+ -+#: ../output.py:1547 - msgid "Last day" - msgstr "Eilen" - --#: ../output.py:1490 -+#: ../output.py:1548 - msgid "Last week" - msgstr "Viime viikolla" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "Viimeisen kahden viikon aikana" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "Viimeisen kolmen kuukauden aikana" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "Viimeisen kuuden kuukauden aikana" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "Viime vuonna" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "Yli vuosi sitten" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "asennettavaksi" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "päivitettäväksi" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "vanhennettavaksi" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "poistettavaksi" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Paketti %s.%s %s:%s-%s asetettu %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Suoritetaan transaktiotarkistusta" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - "--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> Riippuvuuksien tarkistus valmistui" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> Käsitellään riipuvuutta: %s paketille: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> Ratkaisematon riippuvuus: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "Paketti: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" Vaatii: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "Saatavilla" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Käsitellään ristiriitaa: %s on ristiriidassa paketin %s kanssa" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "--> Täytetään transaktiojoukkoa valituilla paketeilla. Odota hetki." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." - msgstr "---> Ladataan paketin %s otsaketta transaktiojoukkoon lisäämseksi." - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:93 -+msgid "Running" -+msgstr "Suoritetaan" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "Unessa" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "Ei voi keskeyttää" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombi" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Jäljitetään/Pysäytetty" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Tuntematon" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " Toinen ohjelma on: PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " Toinen ohjelma on: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Muisti : %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Aloitettu : %s - %s sitten" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Tila : %s, pid: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "PluginExit-virhe: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Yum-virhe: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1093,7 +1268,7 @@ msgstr "" - "\n" - "Lopetetaan käyttäjän peruttua" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1103,7 +1278,7 @@ msgstr "" - "\n" - "Lopetetaan putken katkettua" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1114,15 +1289,15 @@ msgstr "" - "\n" - "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "Valmis!" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "Vain pääkäyttäjä voi suorittaa tämän komennon." - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1152,336 +1327,336 @@ msgstr "" - "\n" - "Lisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Virhe: komennolle %s on annettava luettelo paketeista" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "Virhe: Tarvitaan vastaava kohta" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "Virhe: Tarvitaan ryhmä tai ryhmäluettelo" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Virhe: clean vaatii valitsimen: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Virhe: virheellinen clean-argumentti: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "shellille ei annettu argumenttia" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Tiedostonimi välitettiin shellille: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "" - "Tiedosto %s annettiin argumenttina shellille, mutta sitä ei ole olemassa." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Virhe: useampi kuin yksi tiedosto annettiin argumenttina shellille." - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PAKETTI..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Asenna paketti tai paketteja järjestelmään" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "Aloitetaan asennusprosessi" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PAKETTI...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Päivitä paketti tai paketteja järjestelmään" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "Aloitetaan päivitysprosessi" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "Näytä tietoja paketista tai pakettiryhmästä" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Asennetut paketit" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Saatavilla olevat paketit" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Lisäpaketit" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "Päivitetyt paketit" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Vanhentavat paketit" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Äskettäin lisätyt paketit" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "Ei yhtään vastaavaa pakettia lueteltavaksi" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Luettele paketti tai pakettiryhmä" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "Poista paketti tai paketteja järjestelmästä" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "Aloitetaan poistoprosessi" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "Aloitetaan ryhmäprosessi" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "Ei ryhmiä joille suorittaa komentoa" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Luettele saatavilla olevat pakettiryhmät" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "Asenna ryhmään kuuluvat paketit järjestelmään" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "Poista ryhmään kuuluvat paketit järjestelmästä" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Näytä tietoja pakettiryhmästä" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Luo metadatavälimuisti" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Luodaan välimuistitiedostoja kaikille metadatatiedostoille" - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" - msgstr "Tämä voi kestää jonkin aikaa riippuen tietokoneen nopeudesta" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Metadatavälimuisti on luotu" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "Poista välimuistissa oleva data" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "Etsi annetun arvon tarjoava paketti" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Etsi saatavilla olevia pakettipäivityksiä" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Etsi pakettitiedoista annettua merkkijonoa" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Etsitään paketteja: " - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "Päivitä paketit ottaen vanhennukset huomioon" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "Aloitetaan päivitysprosessi" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "Asenna paikallinen RPM-tiedosto" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "Aloitetaan paikallinen pakettiprosessi" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "Selvitä mikä paketti tarjoaa annetun riippuvuuden" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Etsitään riippuvuutta paketeista:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "Suorita interaktiivinen yum-komentorivi" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Asetetaan Yum-komentoriviä" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "Luettele paketin riippuvuudet" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Etsitään riippuvuuksia: " - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Näytä asetetut asennuslähteet" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "käytössä" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "poissa käytöstä" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "Lähdetunnus : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "Lähdenimi : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "Lähteen tila : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Lähderevisio : " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "Lähteen tagit : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Lähteen jakelutagit: " - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "Lähde päivitetty : " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "Lähteen paketit : " - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "Lähteen koko : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "Lähteen baseurl : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Lähteen metalink : " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr " Päivitetty : " - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "Lähteen peilit : " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Tuntematon" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "Ei koskaan (viimeksi: %s)" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "Heti (viimeksi: %s)" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "%s sekunti(a) (viimeksi: %s)" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "Lähde vanhentuu : " - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "Lähde ohittaa : " - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "Lähde sisältää : " - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "Lähde ohitettu : " -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "lähdetunnus" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "tila" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "lähdenimi" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "Näytä käyttöohjeviesti" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "Ei ohjeita komennolle %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1491,7 +1666,7 @@ msgstr "" - "\n" - "muut nimet: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1501,145 +1676,100 @@ msgstr "" - "\n" - "toinen nimi: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "Aloitetaan uudelleenasennusprosessi" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "asenna paketti uudelleen" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" - msgstr "Aloitetaan varhennusprosessi" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" - msgstr "varhenna paketti" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "" - "Näytä koneella ja/tai käytettävissä olevissa asennuslähteissä oleva versio" - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr " Yum-versioryhmät:" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr " Ryhmä:" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr " Paketit:" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "Asennettu:" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "Asennettu ryhmässä:" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "Saatavilla:" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "Saatavilla ryhmässä:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "Näytä tai käytä transaktiohistoriaa" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "Virheellinen historyn alikomento, käytä: %s." - --#: ../yummain.py:128 --msgid "Running" --msgstr "Suoritetaan" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "Etsi ongelmia rpm-tietokannasta" - --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "Unessa" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Ei voi keskeyttää" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombi" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Jäljitetään/Pysäytetty" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " Toinen ohjelma on: PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " Toinen ohjelma on: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Muisti : %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Aloitettu : %s - %s sitten" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Tila : %s, pid: %d" -- --#: ../yummain.py:173 -+#: ../yummain.py:102 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Toinen ohjelma pitää tällä hetkellä yumin lukkoa, odotetaan että se " - "lopettaa..." - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Virhe: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Tuntematon virhe: lopetuskoodi: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Ratkaistaan riippuvuuksia" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr " Ongelman pystyy ehkä kiertämään valitsimella --skip-broken" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" - msgstr "" --" Kokeile komentoja: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+" Kannattaa myös kokeilla komennon rpm -Va --nofiles --nodigest suorittamista" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1647,7 +1777,7 @@ msgstr "" - "\n" - "Riippuvuudet on ratkaistu" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1685,171 +1815,166 @@ msgstr "Mahdollinen vastaavuus haulle %s paketissa %s" - msgid "Matched %s to require for %s" - msgstr "%s vastaa vaatimusta %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Jäsen: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "%s muutettu asennukseksi" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Lisätään paketti %s tilassa %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Poistetaan paketti %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s vaatii: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s vaatii %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "Tarvittava vaatimus on jo etsitty, huijataan" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "Tarvittava vaatimus ei ole pakettinimi. Etsitään: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Mahdollinen tarjoaja: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "Tila %s riippuvuuden %s: %s tarjoajalla" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" - "TSINFO: paketti %s, joka vaatii riippuvuuden %s on merkitty poistettavaksi" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: Päivitetään paketti %s riippuvuuden ratkaisemiseksi." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" - msgstr "Päivityspolkua ei löydetty riippuvuudelle: %s" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Ratkaisematon riippuvuus %s paketille %s" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Pikavastaavuus %s vaatimukselle %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "%s on tarjoavissa paketeissa, mutta se on jo asennettuna, poistetaan." - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi ts:ssä." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna." - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "Puuttuva riippuvuus: %s tarvitaan paketille %s" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "paketti %s on jo ts:ssä, ohitetaan" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: Merkitään paketti %s päivitykseksi paketille %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: Merkitään %s asennukseksi paketille %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Onnistui - tyhjä transaktio" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Käynnistetään silmukka uudelleen" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Riippuvuuksien käsittely päättyy" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "paketilla %s asennuslähteestä %s on riippuvuusongelmia" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Onnistui – riippuvuudet on ratkaistu" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Tarkistetaan paketin %s riippuvuuksia" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "etsitään riippuvuutta %s paketille %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Suoritetaan compare_providers() paketeille %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "po:ssa %s on parempi arkkitehtuuri" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "paketti %s vanhentaa paketin %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1858,103 +1983,122 @@ msgstr "" - "archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n" - " Voittaja: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "paketeilla %s ja %s on yhteinen lähde-RPM" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "peruspaketti %s on asennettu paketille %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "yhteinen %s merkin mittainen etuliite paketeilla %s ja %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Paras järjestys %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "Asennuslähteen %r asetuksista puuttuu nimi, käytetään tunnistetta" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "liitännäiset on jo alustettu" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Luetaan paikallista RPM-tietokantaa" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Asetetaan pakettisäkkejä" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "asennuslähteen %s oliosta puuttuu _resetSack-metodi\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "siksi tätä asennuslähdettä ei voi palauttaa alkutilaan.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Rakennetaan päivitysoliota" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Haetaan ryhmien metadataa" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Lisätään ryhmätiedosto asennuslähteestä: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Ryhmätiedoston lisääminen asennuslähteelle epäonnistui: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "Yhtään ryhmää ei ole saatavilla mistään asennuslähteestä" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "Haetaan pakettitagien metadataa" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Lisätään tagit asennuslähteestä: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Pakettitagien lisääminen asennuslähteelle epäonnistui: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Tuodaan lisää tiedostoluettelotietoa" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "Ohjelma %s%s%s on paketissa yum-utils." - --#: ../yum/__init__.py:785 -+#: ../yum/__init__.py:849 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." -@@ -1962,17 +2106,18 @@ msgstr "" - "Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua " - "suorittaa ensin yum-complete-transaction." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Skip-broken, kierros %i" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "Skip-broken vaati %i kierrosta" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -1980,79 +2125,91 @@ msgstr "" - "\n" - "Riippuvuusongelmien vuoksi ohitetut paketit:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s asennuslähteestä %s" - --#: ../yum/__init__.py:1083 -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "Varoitus: RPM-tietokantaa on muutettu yumin ulkopuolella." -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "puuttuvia riippuvuuksia" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "asennettu konflikti" -+ -+#: ../yum/__init__.py:1180 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Varoitus: sovelmien virheitä tai muita virheitä, jotka eivät ole vakavia, " - "tapahtui transaktion aikana." - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "Transaktiotiedoston %s poistaminen epäonnistui" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "%s piti olla asennettuna, mutta se ei ole!" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "%s piti olla poistettu, mutta se ei ole!" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Ei voida tarkistaa onko PID %s aktiivinen" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "Lukko %s on olemassa: toinen kopio on suorituksessa pidillä %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "Ei voitu luoda lukkoa sijaintiin %s: %s" - --#: ../yum/__init__.py:1373 -+#: ../yum/__init__.py:1470 - msgid "Package does not match intended download" - msgstr "Paketti ei vastaa aiottua latausta" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1485 - msgid "Could not perform checksum" - msgstr "Ei voitu laskea tarkistussummaa" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1488 - msgid "Package does not match checksum" - msgstr "Paketti ei vastaa tarkistussummaa" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1530 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1533 ../yum/__init__.py:1562 - #, python-format - msgid "using local copy of %s" - msgstr "käytetään paikallista kopiota paketista %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1574 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2063,11 +2220,11 @@ msgstr "" - " * vapaana %s\n" - " * tarvitaan %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1623 - msgid "Header is not complete." - msgstr "Otsake ei ole täydellinen." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1660 - #, python-format - msgid "" - "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2075,62 +2232,62 @@ msgstr "" - "Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva " - "tila on käytössä. Ei voida ladata otsaketta %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1715 - #, python-format - msgid "Public key for %s is not installed" - msgstr "Julkista avainta pakettia %s varten ei ole asennettu" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1719 - #, python-format - msgid "Problem opening package %s" - msgstr "Ongelma paketin %s avaamisessa" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1727 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "Paketin %s julkiseen avaimeen ei luoteta" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1731 - #, python-format - msgid "Package %s is not signed" - msgstr "Pakettia %s ei ole allekirjoitettu" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1769 - #, python-format - msgid "Cannot remove %s" - msgstr "Ei voida poistaa tiedostoa %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1773 - #, python-format - msgid "%s removed" - msgstr "tiedosto %s on poistettu" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1819 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "Ei voida poistaa %s-tyyppistä tiedostoa %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1823 - #, python-format - msgid "%s file %s removed" - msgstr "%s-tyyppinen tiedosto %s on poistettu" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1825 - #, python-format - msgid "%d %s files removed" - msgstr "%d %s-tyyppistä tiedostoa on poistettu" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1894 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "Säkissä on useampi kuin yksi identtinen vastaavuus haulle %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1900 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Mikään ei vastaa päivityksen pakettia %s.%s %s:%s-%s" - --#: ../yum/__init__.py:2026 -+#: ../yum/__init__.py:2179 - msgid "" - "searchPackages() will go away in a future version of " - "Yum. Use searchGenerator() instead. \n" -@@ -2138,181 +2295,181 @@ msgstr "" - "searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen " - "sijaan searchGenerator()-metodia.\n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2218 - #, python-format - msgid "Searching %d packages" - msgstr "Etsitään %d pakettia" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2222 - #, python-format - msgid "searching package %s" - msgstr "etsitään pakettia %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2234 - msgid "searching in file entries" - msgstr "etsitään tiedostoista" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2241 - msgid "searching in provides entries" - msgstr "etsitään tarjoajista" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2274 - #, python-format - msgid "Provides-match: %s" - msgstr "Tarjoajavastaavuus: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2323 - msgid "No group data available for configured repositories" - msgstr "Asetetuille asennuslähteille ei ole saatavilla ryhmädataa" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2354 ../yum/__init__.py:2373 ../yum/__init__.py:2404 -+#: ../yum/__init__.py:2410 ../yum/__init__.py:2492 ../yum/__init__.py:2496 -+#: ../yum/__init__.py:2813 - #, python-format - msgid "No Group named %s exists" - msgstr "Ryhmää nimeltä %s ei ole olemassa" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2385 ../yum/__init__.py:2512 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "pakettia %s ei ollut merkitty kuuluvaksi ryhmään %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2432 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Lisätään paketti %s ryhmästä %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2436 - #, python-format - msgid "No package named %s available to be installed" - msgstr "Pakettia nimeltä %s ei ole saatavilla asennusta varten" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2538 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "Paketti-tuplea %s ei löytynyt pakettisäkistä" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2557 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "Paketti-tuplea %s ei löytynyt RPM-tietokannasta" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2613 ../yum/__init__.py:2663 - msgid "Invalid version flag" - msgstr "Virheellinen versiolippu" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2633 ../yum/__init__.py:2638 - #, python-format - msgid "No Package found for %s" - msgstr "Riippuvuudelle %s ei löytynyt pakettia" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2854 - msgid "Package Object was not a package object instance" - msgstr "Pakettiolio ei ollutkaan pakettiolioinstanssi" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2858 - msgid "Nothing specified to install" - msgstr "Mitään ei määritelty asennettavaksi" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2874 ../yum/__init__.py:3651 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "Etsitään virtuaalista tai tiedostotarjoajaa argumentille %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2880 ../yum/__init__.py:3196 ../yum/__init__.py:3364 -+#: ../yum/__init__.py:3657 - #, python-format - msgid "No Match for argument: %s" - msgstr "Mikään ei vastaa argumenttia: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2956 - #, python-format - msgid "Package %s installed and not available" - msgstr "Paketti %s on asennettu, mutta ei saatavilla" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2959 - msgid "No package(s) available to install" - msgstr "Yhtään pakettia ei ole saatavilla asennettavaksi" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2971 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "Paketti: %s – on jo transaktiojoukossa" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2997 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" - msgstr "Paketin %s vanhentaa paketti %s, joka on jo asennettuna" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3000 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "Paketin %s vanhentaa paketti %s, yritetään paketti %s sen sijaan" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3008 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "Paketti %s on jo asennettuna ja uusin versio" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3022 - #, python-format - msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3125 - msgid "Updating Everything" - msgstr "Päivitetään kaikki" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3146 ../yum/__init__.py:3261 ../yum/__init__.py:3288 -+#: ../yum/__init__.py:3314 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "Vanhennettua pakettia ei päivitetä: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3181 ../yum/__init__.py:3361 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3252 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "Paketti on jo vanhennettu: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3283 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "Ei päivitetä vanhennettua pakettia: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3292 ../yum/__init__.py:3318 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "Jo päivitettyä pakettia ei enää päivitetä: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3377 - msgid "No package matched to remove" - msgstr "Yhtään poistopyyntöä vastaavaa pakettia ei ole" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3411 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." -+msgid "Cannot open: %s. Skipping." -+msgstr "Ei voida avata pakettia: %s. Ohitetaan." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3414 ../yum/__init__.py:3513 ../yum/__init__.py:3597 - #, python-format - msgid "Examining %s: %s" - msgstr "Tutkitaan %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3422 ../yum/__init__.py:3516 ../yum/__init__.py:3600 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva: " - "%s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3430 - #, python-format - msgid "" - "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2321,99 +2478,109 @@ msgstr "" - "Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install -" - "komento paketin asentamiseksi." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3459 ../yum/__init__.py:3521 ../yum/__init__.py:3605 - #, python-format - msgid "Excluding %s" - msgstr "Ohitetaan paketti %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3464 - #, python-format - msgid "Marking %s to be installed" - msgstr "Merkitään paketti %s asennettavaksi" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3470 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "Merkitään paketti %s päivitykseksi paketille %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3477 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: ei päivitä asennettua pakettia" - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3510 ../yum/__init__.py:3594 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." -+ -+#: ../yum/__init__.py:3540 - msgid "Problem in reinstall: no package matched to remove" - msgstr "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3553 ../yum/__init__.py:3685 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "Paketille %s sallitaan useita asennuksia, ohitetaan." - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3574 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3677 - msgid "No package(s) available to downgrade" - msgstr "Yhtään pakettia ei ole saatavilla varhennettavaksi" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3730 - #, python-format - msgid "No Match for available package: %s" - msgstr "Ei vastaavuutta saatavilla olevalle paketille: %s" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3737 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Vain päivitys saatavilla paketille: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3807 ../yum/__init__.py:3844 - #, python-format - msgid "Failed to downgrade: %s" - msgstr "Varhentaminen epäonnistui: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3876 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Noudetaan GPG-avain osoitteesta %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3896 - msgid "GPG key retrieval failed: " - msgstr "GPG-avaimen nouto epäonnistui: " - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3902 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Virheellinen GPG-avain osoitteesta %s: %s" -+ -+#: ../yum/__init__.py:3911 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "GPG-avaimen jäsentäminen epäonnistui: avaimessa ei ole arvoa %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3943 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo asennetuna" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3948 ../yum/__init__.py:4010 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Tuodaan GPG-avain 0x%s ”%s” osoitteesta %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3965 - msgid "Not installing key" - msgstr "Avainta ei asenneta" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3971 - #, python-format - msgid "Key import failed (code %d)" - msgstr "Avaimen tuonti epäonnistui (koodi %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3972 ../yum/__init__.py:4031 - msgid "Key imported successfully" - msgstr "Avaimen tuonti onnistui" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3977 ../yum/__init__.py:4036 - #, python-format - msgid "" - "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2424,41 +2591,46 @@ msgstr "" - "vastaa tätä pakettia.\n" - "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3986 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "Avainten tuonti ei auttanut, ovatko avaimet vääriä?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4005 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo tuotu" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4025 - #, python-format - msgid "Not installing key for repo %s" - msgstr "Ei asenneta avainta asennuslähteelle %s" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4030 - msgid "Key import failed" - msgstr "Avaimen tuonti epäonnistui" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4156 - msgid "Unable to find a suitable mirror." - msgstr "Sopivaa peilipalvelinta ei löytynyt." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4158 - msgid "Errors were encountered while downloading packages." - msgstr "Paketteja ladatessa tapahtui virheitä." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4208 - #, python-format - msgid "Please report this error at %s" - msgstr "Ilmoita tästä ongelmasta: %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4232 - msgid "Test Transaction Errors: " - msgstr "Testitransaktion virheitä: " - -+#: ../yum/__init__.py:4333 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "Välimuistihakemiston asettaminen epäonnistui %s" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2517,7 +2689,20 @@ msgstr "Liitännäisen %s asetustiedostoa ei löytynyt" - msgid "registration of commands not supported" - msgstr "komentojen rekisteröintiä ei tueta" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "on puuttuvia riippuvuuksia" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "on asennettuja konflikteja" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "paketti %s on paketin %s duplikaatti" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "Paketoidaan uudelleen" - -@@ -2550,6 +2735,24 @@ msgstr "Vioittunut otsake %s" - msgid "Error opening rpm %s - error %s" - msgstr "Virhe avattaessa RPM:ää %s – virhe %s" - -+#~ msgid "Finished Transaction Test" -+#~ msgstr "Transaktiotesti valmistui" -+ -+#~ msgid "" -+#~ " You could try running: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+#~ msgstr "" -+#~ " Kokeile komentoja: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+ -+#~ msgid "Unresolvable requirement %s for %s" -+#~ msgstr "Ratkaisematon riippuvuus %s paketille %s" -+ -+#~ msgid "Missing Dependency: %s is needed by package %s" -+#~ msgstr "Puuttuva riippuvuus: %s tarvitaan paketille %s" -+ - #~ msgid "" - #~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" - #~ "().\n" -diff --git a/po/fr.po b/po/fr.po -index 67454ff..7fecb6d 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -6,14 +6,15 @@ - # Thomas Canniot , 2008, 2009. - # Michaël Ughetto , 2008. - # Thomas Canniot , 2009. -+# Pablo Martin-Gomez , 2010. - msgid "" - msgstr "" - "Project-Id-Version: yum.master\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2009-10-15 15:45+0200\n" --"PO-Revision-Date: 2009-10-06 20:36+0100\n" --"Last-Translator: Michel Duquaine \n" --"Language-Team: French \n" -+"PO-Revision-Date: 2010-01-19 20:03+0100\n" -+"Last-Translator: Pablo Martin-Gomez \n" -+"Language-Team: Français \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -@@ -974,7 +975,6 @@ msgid "Success" - msgstr "Réussi" - - #: ../output.py:1392 --#, fuzzy - msgid "Transaction performed with:" - msgstr "Transaction effectuée avec :" - -@@ -993,12 +993,11 @@ msgstr "Paquets modifiés :" - - #: ../output.py:1412 - msgid "Scriptlet output:" --msgstr "" -+msgstr "Sortie du scriplet :" - - #: ../output.py:1418 --#, fuzzy - msgid "Errors:" --msgstr "Erreur : %s" -+msgstr "Erreurs :" - - #: ../output.py:1489 - msgid "Last day" -diff --git a/po/it.po b/po/it.po -index a6c8f13..7d8e38d 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -2,53 +2,54 @@ - # Italian translation of yum. - # Copyright (C) 2008 Red Hat, Inc. - # This file is distributed under the same license as the yum package. --# --# -+# -+# - # Silvio Pierro , 2008. - # Gianluca Busiello , 2008. - # mario_santagiuliana , 2009. --# Guido Grazioli , 2009. -+# Guido Grazioli , 2009-2010. - msgid "" - msgstr "" - "Project-Id-Version: yum-it 3.2.8\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" --"PO-Revision-Date: 2009-03-06 11:41+0100\n" --"Last-Translator: mario_santagiuliana \n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" -+"PO-Revision-Date: 2001-02-17 02:12+0100\n" -+"Last-Translator: Guido Grazioli \n" - "Language-Team: Italian \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: Lokalize 0.3\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Lokalize 0.3\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Aggiornamento" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" --msgstr "Cancellazione" -+msgstr "Eliminazione" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Installazione" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Reso obsoleto" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "Aggiornato" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" --msgstr "Cancellato" -+msgstr "Eliminato" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "Installato" - -@@ -68,329 +69,332 @@ msgstr "Errore: stato di output non valido: %s per %s" - #: ../callback.py:212 - #, python-format - msgid "Erased: %s" --msgstr "Cancellato: %s" -+msgstr "Eliminato: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "Rimozione in corso" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Pulizia" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "Comando \"%s\" già definito" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Settaggio repository" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Lettura dei metadati dei repository dai file locali" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Errore di configurazione: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Errore opzioni: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Installato: %s-%s da %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" --msgstr " Costruito : %s da %s" -+msgstr " Build : %s su %s" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" --msgstr " Committed: %s da %s" -+msgstr " Committed: %s su %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" --msgstr "È necessario dare qualche comando" -+msgstr "È necessario specificare un comando" -+ -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "Comando sconosciuto: %s. Eseguire %s --help" - --#: ../cli.py:309 -+#: ../cli.py:314 - msgid "Disk Requirements:\n" --msgstr "Requisiti su disco:\n" -+msgstr "Requisiti disco:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" --msgstr " Almeno %dMB necessari sul filesystem %s.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" -+msgstr " Servono almeno altri %dMB sul filesystem %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" - msgstr "" - "Riepilogo errori\n" --"-------------\n" -+"----------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "La transazione non contiene alcuna operazione da eseguire." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "Uscita richiesta dall'utente" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Download dei pacchetti:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Errore nel download dei pacchetti:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4195 - msgid "Running rpm_check_debug" - msgstr "Esecuzione rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4204 - msgid "ERROR You need to update rpm to handle:" --msgstr "" -+msgstr "ERRORE Occorre aggiornare rpm per gestire:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4207 - msgid "ERROR with rpm_check_debug vs depsolve:" --msgstr "ERRORE con rpm_check_debug su depsolve:" -+msgstr "ERRORE tra rpm_check_debug e depsolve:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" --msgstr "" -+msgstr "RPM deve essere aggiornato" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" --msgstr "Riportare questo errore in %s" -+msgstr "Riportare questo errore su %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Test di transazione in corso" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Test di transazione terminato" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Errore nel controllo transazione:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "Test di transazione eseguito con successo" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Transazione in corso" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." - msgstr "" --"L'importazione automatica delle chiavi è disabilitata in modalità non " --"interattiva.\n" -+"L'importazione automatica delle chiavi è disabilitata in modalità non interattiva.\n" - "Usare \"-y\" per abilitarla." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Forse si intendeva: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." --msgstr "Pacchetto(i) %s%s%s disponibili ma non installati." -+msgstr "Pacchetto %s%s%s disponibile, ma non installato." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "Nessun pacchetto %s%s%s disponibile." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "Pacchetto(i) da installare" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Niente da fare" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d pacchetti marcati per l'aggiornamento" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "Nessun pacchetto marcato per l'aggiornamento" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d pacchetti marcati per la rimozione" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "Nessun pacchetto marcato per la rimozione" - --#: ../cli.py:683 --#, fuzzy -+#: ../cli.py:692 - msgid "Package(s) to downgrade" --msgstr "Pacchetto(i) da installare" -+msgstr "Downgrade dei pacchetti" - --#: ../cli.py:707 --#, fuzzy, python-format -+#: ../cli.py:717 -+#, python-format - msgid " (from %s)" --msgstr " %s da %s" -+msgstr " (da %s)" - --#: ../cli.py:709 --#, fuzzy, python-format -+#: ../cli.py:719 -+#, python-format - msgid "Installed package %s%s%s%s not available." --msgstr "Nessun pacchetto %s%s%s disponibile." -+msgstr "Pacchetto installato %s%s%s%s non disponibile." - --#: ../cli.py:716 --#, fuzzy -+#: ../cli.py:726 - msgid "Package(s) to reinstall" --msgstr "Pacchetto(i) da installare" -+msgstr "Pacchetto(i) da reinstallare" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" --msgstr "Nessun pacchetto fornito" -+msgstr "Nessun pacchetto specificato" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "Trovato: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" --msgstr "Attenzione: Nessun pacchetto trovato per %s" -+msgstr "Attenzione: Nessun pacchetto trovato per: %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "Nessuna corrispondenza trovata" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" --"Attenzione: la versione 3.0.x di yum non fa match correttamente sui " --"filenames.\n" -+"Attenzione: la versione 3.0.x di yum non fa match correttamente sui filename.\n" - " Si può usare \"%s*/%s%s\" e/o \"%s*bin/%s%s\" per avere questo comportamento" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "Nessun pacchetto trovato per %s" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Pulizia completa" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" --msgstr "Pulizia headers" -+msgstr "Pulizia header" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Pulizia pacchetti" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Pulizia metadati xml" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" --msgstr "Pulizia database cache" -+msgstr "Pulizia cache database" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "Pulizia metadati expire-cache" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "Pulizia cache di rpmdb" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" --msgstr "Pulizia plugins" -+msgstr "Pulizia plugin" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Gruppi installati:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Gruppi disponibili:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Fatto" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Attenzione: Il gruppo %s non esiste." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" --msgstr "" --"Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione " --"o l'aggiornamento" -+msgstr "Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione o l'aggiornamento" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d pacchetto(i) da installare" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2800 - #, python-format - msgid "No group named %s exists" --msgstr "Non esiste nessun gruppo di nome %s" -+msgstr "Non esiste nessun gruppo con nome %s" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "Nessun pacchetto da rimuovere dai gruppi" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" --msgstr "%d pacchetto(i) da rimuovere" -+msgstr "%d pacchetto(i) da eliminare" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" --msgstr "Il pacchetto %s è già installato, lo salto" -+msgstr "Il pacchetto %s è già installato, verrà ignorato" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" --msgstr "Escludendo il pacchetto non comparabile %s.%s" -+msgstr "Esclusione del pacchetto non comparabile %s.%s" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" --msgstr "" --"Nessun altro %s installato, inserimento in lista per potenziale installazione" -+msgstr "Nessun altro %s installato, inserimento in lista per potenziale installazione" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" --msgstr "" -+msgstr "Opzioni plugin" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Errore di linea di comando: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -401,106 +405,115 @@ msgstr "" - "\n" - "%s: l'opzione %s richiede un argomento" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color deve specificare uno tra: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "mostra questo messaggio di aiuto ed esce" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "tollera gli errori" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" --msgstr "esecuzione esclusivamente in cache, senza aggiornarla" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" -+msgstr "esegui esclusivamente in cache, senza aggiornarla" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" --msgstr "configurazione locazione dei file" -+msgstr "percorso del file di configurazione" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" --msgstr "tempo di attesa comando massima" -+msgstr "tempo massimo di attesa comando" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "livello output di debug" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" --msgstr "Mostra comandi duplicati, nei repo, in lista/cerca" -+msgstr "mostra i duplicati nei repo, per i comandi list/search" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "livello output per gli errori" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "livello output di debug per rpm" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "modalità silenziosa" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "mostra più messaggi di log" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "risponde si a tutte le domande" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" --msgstr "mostra la versione di Yum e esce" -+msgstr "mostra la versione di yum ed esce" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" --msgstr "imposta il percorso d'installazione" -+msgstr "imposta la root d'installazione" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "abilita uno o più repository (wildcard consentite)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" --msgstr "disabilita uno o più repository (wildcard·consentite)" -+msgstr "disabilita uno o più repository (wildcard consentite)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" --msgstr "esclude pacchetto(i) per nome o glob" -+msgstr "esclude pacchetti per nome o glob" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "disabilita l'esclusione dal main, per un repo o per tutto" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "disabilita i plugin di Yum" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "disabilita il controllo della firma gpg" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "disabilita i plugin per nome" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "abilita i plugin per nome" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" --msgstr "Salto pacchetti con problemi di risoluzione dipendenze" -+msgstr "ignora pacchetti con problemi di risoluzione dipendenze" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "controlla se il colore è usato" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+"imposta $releasever nella configurazione di yum e nei file dei repo" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "Gen" -@@ -553,106 +566,104 @@ msgstr "Dic" - msgid "Trying other mirror." - msgstr "Connessione ad un altro mirror in corso." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nome : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Arch : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" --msgstr "Periodo : %s" -+msgstr "Epoch : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Versione : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" --msgstr "Release : %s" -+msgstr "Rilascio : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Dimensione : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Repo : %s" - --#: ../output.py:547 --#, fuzzy, python-format -+#: ../output.py:543 -+#, python-format - msgid "From repo : %s" --msgstr "Versione : %s" -+msgstr "Dal repo : %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Committer : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Data commit: %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Data build : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Data inst. : %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Sommario : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "Licenza : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "Licenza : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Descrizione: " - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "s" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "si" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "n" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "no" - --# --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " --msgstr "È corretto [s/N]: " -+msgstr "Procedere [s/N]: " - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -661,200 +672,208 @@ msgstr "" - "\n" - "Gruppo: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Id-Gruppo: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Descrizione: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Pacchetti necessari:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Pacchetti di default:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr "Pacchetti opzionali:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Pacchetti condizionali:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "pacchetto: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " Nessuna dipendenza per questo pacchetto" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " dipendenze: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Dipendenza non soddisfatte" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Repo : %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Corrispondenza trovata in:" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " --msgstr "Descrizione: " -+msgstr "Descrizione : " - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Licenza : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Nome file : %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Altro : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" --msgstr "" --"Si è verificato un errore nel calcolo della dimensione totale di download" -+msgstr "Si è verificato un errore nel calcolo della dimensione totale di download" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Dimensione totale: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Dimensione totale del download: %s" - --#: ../output.py:942 --#, fuzzy -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "Dimensione installata: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" --msgstr "Installazione" -+msgstr "Reinstallazione" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" --msgstr "" -+msgstr "Downgrade" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Installazioni per dipendenze" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Aggiornamenti per dipendenze" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Rimozioni per dipendenze" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" --msgstr "Saltato (problemi di dipendenze):" -+msgstr "Saltato (problemi di dipendenze)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Pacchetto" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Arch" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Versione" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Repository" - --#: ../output.py:978 -+# poco spazio, va come intestazione nella tabella di riepilogo -+#: ../output.py:985 - msgid "Size" - msgstr "Dim." - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" in sostituzione di %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " in sostituzione di %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" - "Transaction Summary\n" - "%s\n" - msgstr "" -+"\n" -+"Riepilogo della transazione\n" -+"%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" - "Upgrade %5.5s Package(s)\n" - msgstr "" -+"Installa %5.5s pacchetto/i\n" -+"Aggiorna %5.5s pacchetto/i\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" - "Reinstall %5.5s Package(s)\n" - "Downgrade %5.5s Package(s)\n" - msgstr "" -+"Elimina %5.5s pacchetto/i\n" -+"Reinstalla %5.5s pacchetto/i\n" -+"Downgrade %5.5s pacchetto/i\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" --msgstr "Rimosso" -+msgstr "Eliminato" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Dipendenza rimossa" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Dipendenza installata" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Dipendenza aggiornata" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Sostituito" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Fallito" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "due" - -@@ -862,233 +881,384 @@ msgstr "due" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 --#, fuzzy, python-format -+#: ../output.py:1151 -+#, python-format - msgid "" - "\n" --" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " --"seconds\n" -+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" - "to exit.\n" - msgstr "" - "\n" --" Download in corso interrotto, %spremi (ctrl-c) nuovamente%s entro %s%s%s " --"secondi per uscire\n" -+" Download interrotto, %spremi nuovamente (ctrl-c)%s entro %s%s%s secondi per " -+"uscire.\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "interruzione utente" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Totale" - -+# abbreviazione di Install -+#: ../output.py:1202 -+msgid "I" -+msgstr "I" -+ -+# abbreviazione di Obsolete - #: ../output.py:1203 --msgid "" --msgstr "" -+msgid "O" -+msgstr "O" - -+# Erase - #: ../output.py:1204 -+msgid "E" -+msgstr "E" -+ -+# Remove -+#: ../output.py:1205 -+msgid "R" -+msgstr "R" -+ -+# Downgrade -+#: ../output.py:1206 -+msgid "D" -+msgstr "D" -+ -+# Update -+#: ../output.py:1207 -+msgid "U" -+msgstr "U" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "" -+ -+#: ../output.py:1218 - msgid "System" --msgstr "" -+msgstr "Sistema" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" --msgstr "" -+msgstr "L'ID transazione, o il pacchetto specificato, non è corretto" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." --msgstr "" -+#: ../output.py:1266 -+msgid "ID" -+msgstr "ID" - --#: ../output.py:1289 -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "Utente loggato" -+ -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "Data e ora" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "Azione/i" -+ -+# intestazione nel senso di "numero di pacchetti lavorati" -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "Modifiche" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" --msgstr "" -+msgstr "ID transazione non specificato" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" --msgstr "" -+msgstr "L'ID transazione specificato non è corretto" - --#: ../output.py:1302 --#, fuzzy -+#: ../output.py:1341 - msgid "Not found given transaction ID" --msgstr "Transazione in corso" -+msgstr "L'ID transazione specificato non è stato trovato" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" --msgstr "" -+msgstr "Sono stati trovati ID transazione multipli!" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" --msgstr "" -+msgstr "ID transazione o pacchetto non specificato" - --#: ../output.py:1357 --#, fuzzy -+#: ../output.py:1396 - msgid "Transaction ID :" --msgstr "Errore nel controllo transazione:\n" -+msgstr "ID transazione :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" --msgstr "" -+msgstr "Ora inizio :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" --msgstr "" -+msgstr "rpmdb iniziale :" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" --msgstr "" -+msgstr "(%s secondi)" - --#: ../output.py:1379 --#, fuzzy -+#: ../output.py:1418 - msgid "End time :" --msgstr "Altro : " -+msgstr "Ora termine :" - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" --msgstr "" -+msgstr "rpmdb finale :" - --#: ../output.py:1385 --#, fuzzy -+#: ../output.py:1424 - msgid "User :" --msgstr "URL : %s" -+msgstr "Utente :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 --#, fuzzy -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" --msgstr "Id-Repo : " -+msgstr "Return-Code : " - --#: ../output.py:1387 --#, fuzzy -+#: ../output.py:1426 - msgid "Aborted" --msgstr "Reso obsoleto" -+msgstr "Interrotto" - --#: ../output.py:1389 --#, fuzzy -+#: ../output.py:1428 - msgid "Failure:" --msgstr "Fallito" -+msgstr "Errore:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" --msgstr "" -+msgstr "Completato" - --#: ../output.py:1392 --#, fuzzy -+#: ../output.py:1431 - msgid "Transaction performed with:" --msgstr "Errore nel controllo transazione:\n" -+msgstr "Transazione eseguita con:" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" --msgstr "" -+msgstr "Downgraded" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" --msgstr "" -+msgstr "Weird" - --#: ../output.py:1409 --#, fuzzy -+#: ../output.py:1448 - msgid "Packages Altered:" --msgstr "Nessun pacchetto fornito" -+msgstr "Pacchetti modificati:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" --msgstr "" -+msgstr "Output della scriptlet:" - --#: ../output.py:1418 --#, fuzzy -+#: ../output.py:1457 - msgid "Errors:" --msgstr "Errore: %s" -+msgstr "Errori:" - --#: ../output.py:1489 --msgid "Last day" --msgstr "" -+# queste sotto sono etichette a fianco della lista di pacchetti -+# per lo storico delle transazioni -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "Install" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "Dep-Install" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "Obsoleto" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "Eliminato" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "Reinstall" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "Downgrade" - - #: ../output.py:1490 -+msgid "Update" -+msgstr "Update" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "Data" -+ -+#: ../output.py:1547 -+msgid "Last day" -+msgstr "Ultime 24 ore" -+ -+#: ../output.py:1548 - msgid "Last week" --msgstr "" -+msgstr "Ultima settimana" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" --msgstr "" -+msgstr "Ultime 2 settimane" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" --msgstr "" -+msgstr "Ultimi 3 mesi" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" --msgstr "" -+msgstr "Ultimi 6 mesi" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" --msgstr "" -+msgstr "Ultimi 12 mesi" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" --msgstr "" -+msgstr "Più di un anno" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "installato" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "aggiornato" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "reso obsoleto" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" --msgstr "cancellato" -+msgstr "eliminato" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Esecuzione del controllo di transazione" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." --msgstr "" --"--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." -+msgstr "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" --msgstr "--> Risoluzione delle dipendenze terminata" -+msgstr "--> Risoluzione delle dipendenze completata" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" --msgstr "--> Esame delle dipendenze: %s per il pacchetto: %s" -+msgstr "--> Elaborazione dipendenza: %s per il pacchetto: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" --msgstr "--> Dipendenze non risolte: %s" -+msgstr "--> Dipendenza non risolta: %s" -+ -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "Pacchetto: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" richiede: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "Disponibile" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Controllo conflitto: %s va in conflitto con %s" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." --msgstr "" --"--> Inizializzazione della transazione con i pacchetti selezionati. " --"Attendere prego." -+msgstr "--> Inizializzazione della transazione con i pacchetti selezionati. Attendere prego." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." --msgstr "" --"---> Download degli header per %s per impacchettarli nel set di transazione." -+msgstr "---> Download degli header per %s per impacchettarli nel set di transazione." -+ -+#: ../utils.py:93 -+msgid "Running" -+msgstr "In esecuzione" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "In attesa" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "Non interrompibile" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombie" - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Tracciato/Arrestato" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Sconosciuto" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " L'altra applicazione è: PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " L'altra applicazione è: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Memoria : %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Avviato: %s - %s fa" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Stato : %s, pid: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "Errore ritorno del plugin: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Errore di yum: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1098,7 +1268,7 @@ msgstr "" - "\n" - "Uscita forzata da utente" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1108,28 +1278,30 @@ msgstr "" - "\n" - "Uscita per broken pipe" - --#: ../utils.py:145 ../yummain.py:50 --#, fuzzy, python-format -+#: ../utils.py:243 ../yummain.py:50 -+#, python-format - msgid "" - "\n" - "\n" - "%s" --msgstr "%s" -+msgstr "" -+"\n" -+"\n" -+"%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "Completo!" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." --msgstr "Occorre avere i privilegi di root per eseguire questo comando" -+msgstr "Occorre avere i privilegi di root per eseguire questo comando." - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" --"However, you do not have any GPG public keys installed. You need to " --"download\n" -+"However, you do not have any GPG public keys installed. You need to download\n" - "the keys for packages you wish to install and install them.\n" - "You can do that by running the command:\n" - " rpm --import public.gpg.key\n" -@@ -1142,365 +1314,350 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" - "\n" --"Il controllo dei pacchetti tramite chiavi GPG è abilitato. Questa è una " --"buona cosa. \n" --"Comunque, non ci sono chiavi pubbliche GPG installate: è necessario " --"scaricare le chiavi dei repository che si desidera utilizzare ed " --"installarle.\n" -+"Il controllo dei pacchetti via chiavi GPG è abilitato. Questa è una buona cosa.\n" -+"Tuttavia, non ci sono chiavi pubbliche GPG installate: è necessario scaricare\n" -+"le chiavi dei repository che si desidera utilizzare ed installarle.\n" - "Per importare una chiave pubblica GPG eseguire il comando:\n" - " rpm --import public.gpg.key\n" - "\n" - "\n" --"In alternativa è possibile specificare gli indirizzi delle chiavi dei " --"repository nell'opzione 'gpgkey' dei relativi file di configurazione; yum la " --"installerà automaticamente.\n" -+"In alternativa è possibile specificare gli indirizzi delle chiavi dei\n" -+"repository nell'opzione 'gpgkey' dei relativi file di configurazione; yum\n" -+"la installerà automaticamente.\n" - "\n" --"Per maggiori informazioni contattare il provider della distribuzione o del " --"pacchetto.\n" -+"Per altre informazioni contattare il supporto della distribuzione.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" --msgstr "Errore: Bisogna passare una lista di pkg a %s" -+msgstr "Errore: occorre passare una lista di pkg a %s" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" --msgstr "Errore: richiesto un elemento di corrispondenza" -+msgstr "Errore: richiesto un elemento per testare il match" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" --msgstr "Errore: Necessario un gruppo o una lista di gruppi" -+msgstr "Errore: un gruppo o una lista di gruppi sono necessari" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Errore: il comando clean richiede l'opzione: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Errore: argomento per il comando clean non valido: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "Nessun argomento per la shell" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Nome file passato alla shell: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "Il file %s dato come argomento per la shell non esiste." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Errore: più di un file passato come argomento alla shell." - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PACCHETTO..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Installa uno o più pacchetti nel sistema" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" --msgstr "Impostazione Processo di Installazione" -+msgstr "Impostazione processo di installazione" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PACCHETTO...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Aggiorna uno o più pacchetti nel sistema" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" --msgstr "Impostazione Processo di Aggiornamento" -+msgstr "Impostazione processo di aggiornamento" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" --msgstr "Visualizza dettagli su un pacchetto o gruppi di pacchetti" -+msgstr "Visualizza dettagli su un pacchetto o un gruppo di pacchetti" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Pacchetti installati" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Pacchetti disponibili" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Pacchetti extra" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" --msgstr "Pacchetti aggiornati" -+msgstr "Aggiornamenti disponibili" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Pacchetti resi obsoleti" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Pacchetti aggiunti di recente" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "Nessun pacchetto presente in lista" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Elenca un pacchetto o un gruppo di pacchetti" - --#: ../yumcommands.py:361 -+ -+# queste sotto sono le descrizioni dei comandi: yum --help -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" --msgstr "Rimuove uno o più pacchetti dal sistema" -+msgstr "Elimina uno o più pacchetti dal sistema" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" --msgstr "Impostazione Processo di Rimozione" -+msgstr "Impostazione processo di eliminazione" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" --msgstr "Settaggio dei processi di gruppo" -+msgstr "Impostazione processo di gruppo" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "Nessun gruppo sul quale eseguire il comando" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Elenca i gruppi di pacchetti disponibili" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" --msgstr "Installa i pacchetti di un gruppo nel sistema" -+msgstr "Installa nel sistema i pacchetti di un gruppo" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" --msgstr "Rimuove i pacchetti di un gruppo dal sistema" -+msgstr "Elimina dal sistema i pacchetti di un gruppo" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Visualizza i dettagli di un gruppo di pacchetti" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Genera la cache dei metadati" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Creazione dei file di cache per i metadati." - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" --msgstr "" --"L'operazione impiegherà del tempo che dipende dalla velocità del computer" -+msgstr "L'operazione impiegherà del tempo che dipende dalla velocità del computer" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Cache dei metadata creata" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" --msgstr "Rimuovere i dati nella cache" -+msgstr "Elimina i dati nella cache" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" --msgstr "Cerca quale pacchetto fornisce il valore dato" -+msgstr "Determina il pacchetto che fornisce il valore dato" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Cerca il termine passato nei dettagli dei pacchetti" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Ricerca dei pacchetti: " - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" --msgstr "Aggiornamento pacchetti tenendo conto degli obsoleti" -+msgstr "Aggiorna i pacchetti tenendo conto degli obsoleti" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" --msgstr "Impostazione Processo di Aggiornamento del sistema" -+msgstr "Impostazione processo di upgrade" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" --msgstr "Installa un RPM locale" -+msgstr "Installa un RPM in locale" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" --msgstr "Settaggio processamento pacchetti locali" -+msgstr "Impostazione processo per pacchetti in locale" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" --msgstr "Determina quale pacchetto soddisfa la dipendenza" -+msgstr "Determina quale pacchetto soddisfa la dipendenza specificata" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Ricerca dei pacchetti per dipendenze:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" --msgstr "Esegui una shell di yum interattiva" -+msgstr "Esegue una shell di yum interattiva" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Impostazione della shell di yum" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" --msgstr "Elenca le dipendenze del pacchetto" -+msgstr "Elenca le dipendenze di un pacchetto" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Ricerca delle dipendenze: " - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Mostra i repository di software configurati" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "abilitato" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "disabilitato" - --#: ../yumcommands.py:834 --#, fuzzy -+#: ../yumcommands.py:866 - msgid "Repo-id : " --msgstr "Id-Repo : " -+msgstr "Id-Repo : " - --#: ../yumcommands.py:835 --#, fuzzy -+#: ../yumcommands.py:867 - msgid "Repo-name : " --msgstr "Nome-Repo : " -+msgstr "Nome-Repo : " - --#: ../yumcommands.py:836 --#, fuzzy -+#: ../yumcommands.py:870 - msgid "Repo-status : " --msgstr "Stato-Repo : " -+msgstr "Stato-Repo : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Revisione-Repo: " - --#: ../yumcommands.py:842 --#, fuzzy -+#: ../yumcommands.py:877 - msgid "Repo-tags : " --msgstr "Repo-tags : " -+msgstr "Repo-tags : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Repo-distro-tags: " - --#: ../yumcommands.py:853 --#, fuzzy -+#: ../yumcommands.py:888 - msgid "Repo-updated : " --msgstr "Repo-aggiornato: " -+msgstr "Repo-updated : " - --#: ../yumcommands.py:855 --#, fuzzy -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " --msgstr "Repo-pkgs : " -+msgstr "Repo-pkgs : " - --#: ../yumcommands.py:856 --#, fuzzy -+#: ../yumcommands.py:891 - msgid "Repo-size : " --msgstr "Dim.-Repo : " -+msgstr "Dim.-Repo : " - --#: ../yumcommands.py:863 --#, fuzzy -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " --msgstr "Repo-baseurl: " -+msgstr "Repo-baseurl : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Repo-metalink: " - --#: ../yumcommands.py:875 --#, fuzzy -+#: ../yumcommands.py:910 - msgid " Updated : " --msgstr "Aggiornato" -+msgstr " Aggiornato :" - --#: ../yumcommands.py:878 --#, fuzzy -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " --msgstr "Repo-mirrors: " -- --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Sconosciuto" -+msgstr "Repo-mirrors : " - --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" --msgstr "" -+msgstr "Mai (ultimo: %s)" - --#: ../yumcommands.py:890 --#, fuzzy, python-format -+#: ../yumcommands.py:925 -+#, python-format - msgid "Instant (last: %s)" --msgstr "Data inst. : %s" -+msgstr "Istantaneo (ultimo: %s)" - --#: ../yumcommands.py:893 --#, fuzzy, python-format -+#: ../yumcommands.py:928 -+#, python-format - msgid "%s second(s) (last: %s)" --msgstr "Conflitti di %s: %s" -+msgstr "%s secondi (ultimo: %s)" - --#: ../yumcommands.py:895 --#, fuzzy -+#: ../yumcommands.py:930 - msgid "Repo-expire : " --msgstr "Dim.-Repo : " -+msgstr "Repo-expire : " - --#: ../yumcommands.py:898 --#, fuzzy -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " --msgstr "Repo-exclude: " -+msgstr "Repo-exclude : " - --#: ../yumcommands.py:902 --#, fuzzy -+#: ../yumcommands.py:937 - msgid "Repo-include : " --msgstr "Repo-include:" -+msgstr "Repo-include :" -+ -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "Repo-excluded: " - - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" --msgstr "repo id" -+msgstr "id repo" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "stato" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "nome repo" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" --msgstr "Mostra un messaggio utile per l'uso" -+msgstr "Mostra un'utile guida all'uso" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "Nessun aiuto disponibile per %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1510,7 +1667,7 @@ msgstr "" - "\n" - "alias: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1520,153 +1677,96 @@ msgstr "" - "\n" - "alias: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" --msgstr "Impostazione Processo di Reinstallazione" -+msgstr "Impostazione processo di reinstallazione" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" --msgstr "reinstalla un pacchetto" -+msgstr "Reinstalla un pacchetto" - --#: ../yumcommands.py:1060 --#, fuzzy -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" --msgstr "Impostazione Processo di Aggiornamento del sistema" -+msgstr "Impostazione processo di downgrade" - --#: ../yumcommands.py:1067 --#, fuzzy -+#: ../yumcommands.py:1120 - msgid "downgrade a package" --msgstr "reinstalla un pacchetto" -+msgstr "Esegue il downgrade di un pacchetto" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." --msgstr "" -+msgstr "Mostra una versione del sistema e/o dei repo disponibili." - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" --msgstr "" -+msgstr " Gruppi della versione di yum:" - --#: ../yumcommands.py:1121 --#, fuzzy -+#: ../yumcommands.py:1183 - msgid " Group :" --msgstr " Id-Gruppo: %s" -+msgstr " Gruppo :" - --#: ../yumcommands.py:1122 --#, fuzzy -+#: ../yumcommands.py:1184 - msgid " Packages:" --msgstr "Pacchetto" -+msgstr " Pacchetti:" - --#: ../yumcommands.py:1152 --#, fuzzy -+#: ../yumcommands.py:1213 - msgid "Installed:" --msgstr "Installato" -+msgstr "Installato:" - --#: ../yumcommands.py:1157 --#, fuzzy -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" --msgstr "Installato" -+msgstr "Group-Installed:" - --#: ../yumcommands.py:1166 --#, fuzzy -+#: ../yumcommands.py:1227 - msgid "Available:" --msgstr "Gruppi disponibili:" -+msgstr "Disponibile:" - --#: ../yumcommands.py:1172 --#, fuzzy -+#: ../yumcommands.py:1233 - msgid "Group-Available:" --msgstr "Gruppi disponibili:" -+msgstr "Group-Available:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" --msgstr "" -+msgstr "Visualizza e gestisci la cronologia delle transazioni" - --#: ../yumcommands.py:1239 -+# qui history rimane cosi' perchè intende il comando -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." --msgstr "" -- --#: ../yummain.py:128 --msgid "Running" --msgstr "In esecuzione" -- --#: ../yummain.py:129 --#, fuzzy --msgid "Sleeping" --msgstr "Addormentato" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Non interrompibile" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombie" -+msgstr "Sotto comando per history non valido, usare: %s." - --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Tracciato/Fermato" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " L'altra applicazione è: PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " L'altra applicazione è: %s" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "Identifica gli errori nell'rpmdb" - --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Memoria : %5s RSS (%5sB VSZ)" -+#: ../yummain.py:102 -+msgid "Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che esca..." - --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Partito: %s - %s fa" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Stato : %s, pid: %d" -- --#: ../yummain.py:173 --msgid "" --"Another app is currently holding the yum lock; waiting for it to exit..." --msgstr "" --"Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che " --"esca..." -- --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Errore: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" --msgstr "Errore(i) sconosciuto: Codice di uscita: %d:" -+msgstr "Errore sconosciuto: Codice di uscita: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Risoluzione dipendenze" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr " Si può provare ad usare --skip-broken per aggirare il problema" - --#: ../yummain.py:243 --#, fuzzy --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" --msgstr "" --" Provare a lanciare: package-cleanup --problems\n" --" package-cleanup --dupes" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" -+msgstr " Provare ad eseguire: rpm -Va --nofiles --nodigest" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1674,7 +1774,7 @@ msgstr "" - "\n" - "Dipendenze risolte" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1690,7 +1790,7 @@ msgstr "doTsSetup() verrà eliminato in una futura versione di yum.\n" - - #: ../yum/depsolve.py:97 - msgid "Setting up TransactionSets before config class is up" --msgstr "Settaggio set di transazione prima che sia attivo config class" -+msgstr "Impostazione del TransactionSets prima che sia attivo config class" - - #: ../yum/depsolve.py:148 - #, python-format -@@ -1710,176 +1810,165 @@ msgstr "Corrispondenza potenziale per %s da %s" - #: ../yum/depsolve.py:183 - #, python-format - msgid "Matched %s to require for %s" --msgstr "Individuato %s come requisito per %s" -+msgstr "Individuato %s come dipendenza per %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Membro: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" --msgstr "%s convertito in installa" -+msgstr "%s convertito in installazione" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Aggiunto il pacchetto %s in modo %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Rimozione pacchetto %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s richiede: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s richiede %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "Il requisito necessario è già stato controllato, imbroglio" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" --msgstr "Il requisito necessario non è il nome di un pacchetto. Guardando: %s" -+msgstr "Il requisito necessario non è il nome di un pacchetto. Ricerca di: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Provider potenziale: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "La modalità è %s per il provider di %s: %s" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" --msgstr "Modalità per la fornitura del pacchetto %s: %s" -+msgstr "Modalità per il pacchetto che fornisce %s: %s" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "TSINFO: il pacchetto %s richiede che %s sia marcato per la rimozione" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." --msgstr "" --"TSINFO: Verrà reso obsoleto %s, sostituendolo con %s per risolvere una " --"dipendenza." -+msgstr "TSINFO: Verrà reso obsoleto %s sostituendolo con %s per risolvere una dipendenza." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: Aggiornamento di %s per risolvere dip." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" --msgstr "" --"Impossibile trovare un percorso di aggiornamento per dipendenze per: %s" -+msgstr "Impossibile trovare un percorso di aggiornamento per dipendenze per: %s" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Requisito %s non risolvibile per %s" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Individuato %s come requisito per %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." --msgstr "%s è nei pacchetti forniti ma è già installato, Rimozione." -+msgstr "%s è nei pacchetti fornitori ma è già installato, viene rimosso." - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." --msgstr "" --"Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts." -+msgstr "Potenziale risoluzione del pacchetto %s ha una instanza più nuova in ts." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." --msgstr "" --"Potenziale risoluzione del pacchetto %s ha una istanza piu aggiornata " --"installata." -- --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "Dipendenza mancante: %s è necessario per il pacchetto %s" -+msgstr "Potenziale risoluzione del pacchetto %s ha una istanza più recente installata." - --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "%s è gia nel set delle transazioni (ts), verrà saltato" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: %s marcato come update per %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: %s marcato come installa per %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Successo - transazione vuota" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Riavvio del ciclo" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Processo delle dipendenze terminato" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "%s appartenente a %s ha problemi di dipendenze" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Successo - dipendenze risolte" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Controllo delle dipendenze per %s" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "ricerca di %s come un requisito di %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Esecuzione di compare_providers() per %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "migliore architettura in po %s" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "%s rende obsoleto %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1888,201 +1977,226 @@ msgstr "" - "archdist ha comparato %s a %s su %s\n" - " Vincitore: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "sourcerpm comune %s e %s" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "il pacchetto base %s è installato per %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "prefisso comune di %s tra %s e %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Ordine migliore: %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" --msgstr "Non è presente il nome nel repository %r, utilizzo l'id" -+msgstr "" -+"Nella configurazione non è presente il nome nel repo %r, uso dell'id" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "plugin già inizializzato" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmDBSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Lettura del RPMDB locale" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Settaggio pacchetti sack" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" --msgstr "" --"l'oggetto repository per il repository %s manca del metodo _resetSack\n" -+msgstr "l'oggetto repo per il repository %s manca del metodo _resetSack\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "quindi questo repository non può essere resettato.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() verrà eliminato in una futura versione di yum.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Costruzione oggetto aggiornamenti" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() verrà eliminato in una futura versione di Yum.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Scaricamento metadati del gruppo" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Aggiunta file di gruppo dal repository: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "Nessun gruppo disponibile in alcun repository" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "Scaricamento metadati pkgtags" -+ -+#: ../yum/__init__.py:740 -+#,, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Aggiunta tag dal repository: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Errore aggiungendo i Pgg Tags per il repository: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Import di informazioni addizionali sulla lista di file" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." --msgstr "" -+msgstr "Il programma %s%s%s si trova nel pacchetto yum-utils." - --#: ../yum/__init__.py:785 --msgid "" --"There are unfinished transactions remaining. You might consider running yum-" --"complete-transaction first to finish them." --msgstr "" --"Ci sono transazioni non completate. Considerare di lanciare prima yum-" --"complete-transaction per portarle a termine." -+#: ../yum/__init__.py:849 -+msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." -+msgstr "Ci sono transazioni non completate. Considerare di lanciare prima yum-complete-transaction per portarle a termine." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Ciclo skip-broken %i" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "Raggiunti %i cicli skip-broken" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" - msgstr "" - "\n" --"Pacchetti saltati a causa di problemi di dipendenza:" -+"Pacchetti ignorati a causa di problemi di dipendenza:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s da %s" - --#: ../yum/__init__.py:1083 --msgid "" --"Warning: scriptlet or other non-fatal errors occurred during transaction." --msgstr "" --"Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti " --"durante la transazione." -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "Attenione: RPMDB modificato al di fuori di yum." -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "dipendenze mancanti" - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "conflitto installato" -+ -+#: ../yum/__init__.py:1180 -+msgid "Warning: scriptlet or other non-fatal errors occurred during transaction." -+msgstr "Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti durante la transazione." -+ -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" --msgstr "Rimozione del file di transazione %s fallita" -+msgstr "Eliminazione del file di transazione %s fallita" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" --msgstr "" -+msgstr "%s doveva essere installato, ma non sembra esserlo!" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" --msgstr "" -+msgstr "%s doveva essere eliminato, ma non lo è stato!" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Non è possibile controllare se il PID %s è attivo" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "Lock %s attivo: altro processo in esecuzione con pid %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 --#, fuzzy, python-format -+#: ../yum/__init__.py:1425 -+#, python-format - msgid "Could not create lock at %s: %s " --msgstr "Impossibile trovare una corrispondenza per l'aggiornamento di %s" -+msgstr "Impossibile creare il lock su %s: %s" - --#: ../yum/__init__.py:1373 --msgid "Package does not match intended download" --msgstr "Il pacchetto non corrisponde al download desiderato" -+#: ../yum/__init__.py:1470 -+msgid "Package does not match intended download. Suggestion: run yum clean metadata" -+msgstr "Il pacchetto non corrisponde al download desiderato. Suggerimento: eseguire yum clean metadata" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1486 - msgid "Could not perform checksum" - msgstr "Non è possibile calcolare il checksum" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1489 - msgid "Package does not match checksum" - msgstr "Il pacchetto non corrisponde al checksum" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1531 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "il pacchetto ha fallito il checksum ma la cache è abilitata per %s" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 - #, python-format - msgid "using local copy of %s" - msgstr "utilizzo di una copia locale di %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1575 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2090,427 +2204,417 @@ msgid "" - " * needed %s" - msgstr "" - "Spazio insufficiente nella cartella di download %s\n" --" * libero %s\n" -+" * libero %s\n" - " * necessario %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1624 - msgid "Header is not complete." - msgstr "L'header non è completo." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1661 - #, python-format --msgid "" --"Header not in local cache and caching-only mode enabled. Cannot download %s" --msgstr "" --"Header non presente in cache locale e modalita solo-cache abilitata. " --"Impossibile scaricare %s" -+msgid "Header not in local cache and caching-only mode enabled. Cannot download %s" -+msgstr "Header non presente in cache locale e modalità solo-cache abilitata. Impossibile scaricare %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1716 - #, python-format - msgid "Public key for %s is not installed" - msgstr "La chiave pubblica per %s non è installata" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1720 - #, python-format - msgid "Problem opening package %s" - msgstr "Problemi nell'apertura di %s" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1728 - #, python-format - msgid "Public key for %s is not trusted" --msgstr "La chiave pubblica per %s non è sicura" -+msgstr "La chiave pubblica per %s non è trusted" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1732 - #, python-format - msgid "Package %s is not signed" - msgstr "Il pacchetto %s non è firmato" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1770 - #, python-format - msgid "Cannot remove %s" - msgstr "Non posso rimuovere %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1774 - #, python-format - msgid "%s removed" --msgstr "%s rimosso" -+msgstr "%s eliminato" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1820 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "Impossibile rimuovere %s file %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1824 - #, python-format - msgid "%s file %s removed" - msgstr "%s file %s rimosso" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1826 - #, python-format - msgid "%d %s files removed" - msgstr "%d %s file rimossi" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1895 - #, python-format - msgid "More than one identical match in sack for %s" --msgstr "Piu di una corrispondenza ugualein sack per %s" -+msgstr "Più di una corrispondenza identica nel sack per %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1901 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Nessuna corrispondenza %s.%s %s:%s-%s dall'aggiornamento" - --#: ../yum/__init__.py:2026 --msgid "" --"searchPackages() will go away in a future version of " --"Yum. Use searchGenerator() instead. \n" --msgstr "" --"searchPackages() verrà eliminato in una futura versione di yum.In " --"sostituzione usare searchGenerator(). \n" -+#: ../yum/__init__.py:2180 -+msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" -+msgstr "searchPackages() verrà eliminato in una futura versione di yum. In sostituzione usare searchGenerator(). \n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2219 - #, python-format - msgid "Searching %d packages" - msgstr "Ricerca dei pacchetti %d" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2223 - #, python-format - msgid "searching package %s" - msgstr "Ricerca del pacchetto %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2235 - msgid "searching in file entries" --msgstr "ricerca nelle voci dei file" -+msgstr "ricerca nelle file entries" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2242 - msgid "searching in provides entries" --msgstr "ricerca nelle voci fornite" -+msgstr "ricerca nelle provides entries" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2275 - #, python-format - msgid "Provides-match: %s" --msgstr "Corrispondenza tra i forniti: %s" -+msgstr "Provides-match: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2324 - msgid "No group data available for configured repositories" --msgstr "Nessun gruppo disponibile in alcun repository" -+msgstr "Non ci sono informazioni sui gruppi per i repository configurati" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 -+#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 -+#: ../yum/__init__.py:2814 - #, python-format - msgid "No Group named %s exists" - msgstr "Il gruppo %s non esiste" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 - #, python-format - msgid "package %s was not marked in group %s" --msgstr "Il pacchetto %s non è marcato nel gruppo %s" -+msgstr "Il pacchetto %s non è stato marcato nel gruppo %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2433 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Aggiunta del pacchetto %s dal gruppo %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2437 - #, python-format - msgid "No package named %s available to be installed" --msgstr "Nessun pacchetto di nome %s disponibile per l'installazione" -+msgstr "Nessun pacchetto con nome %s disponibile per l'installazione" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2539 - #, python-format - msgid "Package tuple %s could not be found in packagesack" --msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack" -+msgstr "Il pacchetto con tupla %s non è stato trovato nel packagesack" - --#: ../yum/__init__.py:2399 --#, fuzzy, python-format -+#: ../yum/__init__.py:2558 -+#, python-format - msgid "Package tuple %s could not be found in rpmdb" --msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack" -+msgstr "Il pacchetto con tupla %s non è stato trovato nel rpmdb" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 - msgid "Invalid version flag" - msgstr "Flag di versione non valido" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 - #, python-format - msgid "No Package found for %s" - msgstr "Nessun pacchetto trovato per %s" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2855 - msgid "Package Object was not a package object instance" --msgstr "L'oggetto pacchetto non era un'istanza dell'oggetto pacchetto" -+msgstr "L'oggetto Package non era un'istanza dell'oggetto pacchetto" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2859 - msgid "Nothing specified to install" - msgstr "Non è specificato niente da installare" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" --msgstr "Controllo per provide virtuale o file-provide per %s" -+msgstr "Controllo dei virtual provice o file-provide per %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 -+#: ../yum/__init__.py:3658 - #, python-format - msgid "No Match for argument: %s" - msgstr "Nessuna corrispondenza per l'argomento: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2957 - #, python-format - msgid "Package %s installed and not available" --msgstr "Il pacchetto %s è installato e non disponibile." -+msgstr "Il pacchetto %s è installato e non disponibile" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2960 - msgid "No package(s) available to install" - msgstr "Nessun pacchetto disponibile per l'installazione" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2972 - #, python-format - msgid "Package: %s - already in transaction set" --msgstr "Pacchetto: %s - già nel set di transizione" -+msgstr "Pacchetto: %s - già nel set di transazione" - --#: ../yum/__init__.py:2839 --#, fuzzy, python-format -+#: ../yum/__init__.py:2998 -+#, python-format - msgid "Package %s is obsoleted by %s which is already installed" --msgstr "" --"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " --"posto" -+msgstr "Il pacchetto %s è reso obsoleto da %s, che è già installato" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3001 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" --msgstr "" --"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " --"posto" -+msgstr "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3009 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "Il pacchetto %s è già aggiornato all'ultima versione" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3023 - #, python-format - msgid "Package matching %s already installed. Checking for update." --msgstr "" --"Corrispondenza del pacchetto %s già installato. Controllo aggiornamenti." -+msgstr "Il pacchetto corrispondente a %s è già installato. Controllo aggiornamenti." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3126 - msgid "Updating Everything" --msgstr "Aggiornamento Sistema" -+msgstr "Aggiornamento sistema" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 -+#: ../yum/__init__.py:3315 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" --msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s" -+msgstr "Il pacchetto obsoleto non verrà aggiornato: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3253 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" --msgstr "Il pacchetto è gia obsoleto: %s.%s %s:%s-%s" -+msgstr "Il pacchetto era già obsoleto: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 --#, fuzzy, python-format -+#: ../yum/__init__.py:3284 -+#, python-format - msgid "Not Updating Package that is obsoleted: %s" --msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s" -+msgstr "Il pacchetto obsoleto non verrà aggiornato: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" --msgstr "" --"Aggiornamento non necessario per il pacchetto già aggiornato: %s.%s %s:%s-%s" -+msgstr "Il pacchetto è già aggiornato: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3378 - msgid "No package matched to remove" --msgstr "Nessun pacchetto corrispondente per la rimozione" -+msgstr "Nessun pacchetto selezionato per l'eliminazione" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3412 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "Non posso aprire il file %s. Lo salto." -+msgid "Cannot open: %s. Skipping." -+msgstr "Impossibile aprire: %s. Verrà ignorato." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 - #, python-format - msgid "Examining %s: %s" --msgstr "Esame di %s: %s" -+msgstr "Analisi di %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" --msgstr "" --"Impossibile aggiungere il pacchetto %s alla transazione. Architettura non " --"compatibile: %s" -+msgstr "Impossibile aggiungere il pacchetto %s alla transazione. Architettura non compatibile: %s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3431 - #, python-format --msgid "" --"Package %s not installed, cannot update it. Run yum install to install it " --"instead." --msgstr "" --"Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire " --"yum install per installarlo." -+msgid "Package %s not installed, cannot update it. Run yum install to install it instead." -+msgstr "Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire yum install per installarlo." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 - #, python-format - msgid "Excluding %s" - msgstr "Esclusione di %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3465 - #, python-format - msgid "Marking %s to be installed" --msgstr "Marco %s per l'installazione" -+msgstr "Contrassegno %s per l'installazione" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3471 - #, python-format - msgid "Marking %s as an update to %s" --msgstr "%s marcato come aggiornamento di %s" -+msgstr "%s contrassegnato come aggiornamento di %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3478 - #, python-format - msgid "%s: does not update installed package." --msgstr "%s: non aggiornare il pacchetto installato" -+msgstr "%s: non aggiorna il pacchetto installato." -+ -+#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "Impossibile aprire il file: %s. Verrà ignorato." - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3541 - msgid "Problem in reinstall: no package matched to remove" --msgstr "" --"Problema nella reinstallazione: nessun pacchetto marcato per la rimozione" -+msgstr "Problema nella reinstallazione: nessun pacchetto corrispondente per la rimozione" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "Il pacchetto %s permette installazioni multiple, lo salto" - --#: ../yum/__init__.py:3413 --#, fuzzy, python-format -+#: ../yum/__init__.py:3575 -+#, python-format - msgid "Problem in reinstall: no package %s matched to install" --msgstr "" --"Problema nella reinstallazione: nessun pacchetto marcato per l'installazione" -+msgstr "Problema nella reinstallazione: nessun pacchetto corrispondente a %s per l'installazione" - --#: ../yum/__init__.py:3515 --#, fuzzy -+#: ../yum/__init__.py:3678 - msgid "No package(s) available to downgrade" --msgstr "Nessun pacchetto disponibile per l'installazione" -+msgstr "Nessun pacchetto disponibile per il downgrade" - --#: ../yum/__init__.py:3559 --#, fuzzy, python-format -+#: ../yum/__init__.py:3731 -+#, python-format - msgid "No Match for available package: %s" --msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" -+msgstr "Nessuna corrispondenza per il pacchetto disponibile: %s" - --#: ../yum/__init__.py:3565 --#, fuzzy, python-format -+#: ../yum/__init__.py:3738 -+#, python-format - msgid "Only Upgrade available on package: %s" --msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti" -+msgstr "Solo l'upgrade è disponibile per il pacchetto: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 --#, fuzzy, python-format -+#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 -+#, python-format - msgid "Failed to downgrade: %s" --msgstr "Dimensione totale del download: %s" -+msgstr "Downgrade fallito: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3877 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Recupero chiavi GPG da %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3897 - msgid "GPG key retrieval failed: " - msgstr "Recupero chiavi GPG fallito: " - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3903 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Chiave GPG non valida da %s: %s" -+ -+#: ../yum/__init__.py:3912 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "Analisi chiave GPG fallita: la chiave non ha valore %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3944 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" --msgstr "Chiave GPG in %s (0x%s) è già installata" -+msgstr "Chiave GPG in %s (0x%s) già installata" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Importazione chiave GPG 0x%s \"%s\" da %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3966 - msgid "Not installing key" - msgstr "Non installo le chiavi" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3972 - #, python-format - msgid "Key import failed (code %d)" - msgstr "Importazione chiave fallita (codice %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 - msgid "Key imported successfully" - msgstr "Chiave importata correttamente" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 - #, python-format - msgid "" --"The GPG keys listed for the \"%s\" repository are already installed but they " --"are not correct for this package.\n" -+"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" - "Check that the correct key URLs are configured for this repository." - msgstr "" --"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate " --"ma non sono corrette per il pacchetto.\n" --"Controllare che le URL delle chiavi di questo repository siano configurate " --"correttamente." -+"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per questo pacchetto.\n" -+"Controllare che le URL delle chiavi di questo repository siano configurate correttamente." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3987 - msgid "Import of key(s) didn't help, wrong key(s)?" --msgstr "Importazione della chiave(i) non utile, chiave(i) sbagliata?" -+msgstr "Importazione delle chiavi non sufficiente, chiave sbagliata?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4006 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "Chiave GPG in %s (0x%s) è già stata importata" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4026 - #, python-format - msgid "Not installing key for repo %s" - msgstr "La chiave per il repo %s non verrà installata" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4031 - msgid "Key import failed" - msgstr "Importazione chiave fallita" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4157 - msgid "Unable to find a suitable mirror." - msgstr "Impossibile trovare un mirror adatto." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4159 - msgid "Errors were encountered while downloading packages." - msgstr "Sono stati riscontrati degli errori durante il download dei pacchetti." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4209 - #, python-format - msgid "Please report this error at %s" --msgstr "Riportare questo errore in %s" -+msgstr "Riportare questo errore su %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4233 - msgid "Test Transaction Errors: " - msgstr "Errori nel test di transazione: " - -+#: ../yum/__init__.py:4334 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "Impossibile impostare la cachedir: %s" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " --msgstr "Plugin caricati:" -+msgstr "Plugin abilitati:" - - #: ../yum/plugins.py:216 ../yum/plugins.py:222 - #, python-format - msgid "No plugin match for: %s" --msgstr "Nessun plugin corrisponde per: %s" -+msgstr "Nessun plugin corrisponde a: %s" - - #: ../yum/plugins.py:252 - #, python-format - msgid "Not loading \"%s\" plugin, as it is disabled" --msgstr "Plugin \"%s\" non caricato, è disabilitato" -+msgstr "Plugin \"%s\" non caricato, perchè è disabilitato" - - #. Give full backtrace: - #: ../yum/plugins.py:264 -@@ -2526,7 +2630,7 @@ msgstr "Il plugin \"%s\" non specifica la versione API richiesta" - #: ../yum/plugins.py:276 - #, python-format - msgid "Plugin \"%s\" requires API %s. Supported API is %s." --msgstr "Il plugin \"%s\" richiede l'API %s. L'API supportata è %s" -+msgstr "Il plugin \"%s\" richiede l'API %s. L'API supportata è %s." - - #: ../yum/plugins.py:309 - #, python-format -@@ -2535,10 +2639,9 @@ msgstr "Caricamento del plugin \"%s\"" - - #: ../yum/plugins.py:316 - #, python-format --msgid "" --"Two or more plugins with the name \"%s\" exist in the plugin search path" -+msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" --"Esistono due o più plugin con il nome \"%s\" nel percorso di ricerca plugin" -+"Esistono due o più plugin con nome \"%s\" nel percorso di ricerca dei plugin" - - #: ../yum/plugins.py:336 - #, python-format -@@ -2556,14 +2659,27 @@ msgstr "Non posso trovare il file di configurazione per il plugin %s" - msgid "registration of commands not supported" - msgstr "registrazione dei comandi non supportata" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "ha una dipendenza mancante di" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "ha conflitti con pacchetti installati" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s è un duplicato di %s" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" --msgstr "Reimpacchetto" -+msgstr "Reimpacchettamento" - - #: ../rpmUtils/oldUtils.py:33 - #, python-format - msgid "Header cannot be opened or does not match %s, %s." --msgstr "L'header non può essere aperto o %s non corrisponde, %s." -+msgstr "L'header non può essere aperto o non corrisponde a %s, %s." - - #: ../rpmUtils/oldUtils.py:53 - #, python-format -@@ -2572,27 +2688,43 @@ msgstr "Controllo md5 dell'RPM %s fallito" - - #: ../rpmUtils/oldUtils.py:151 - msgid "Could not open RPM database for reading. Perhaps it is already in use?" --msgstr "Non posso aprire il database RPM per la lettura. Forse è gia in uso?" -+msgstr "" -+"Non è stato possibile aprire in lettura il database RPM. Forse è gia in uso?" - - #: ../rpmUtils/oldUtils.py:183 - msgid "Got an empty Header, something has gone wrong" --msgstr "Header ritornato vuoto, qualcosa è andato storto" -+msgstr "Ricevuto un header vuoto, qualcosa è andato storto" - - #: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 - #: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 - #, python-format - msgid "Damaged Header %s" --msgstr "Header danneggiato %s" -+msgstr "Header %s danneggiato" - - #: ../rpmUtils/oldUtils.py:281 - #, python-format - msgid "Error opening rpm %s - error %s" - msgstr "Errore nell'apertura dell'rpm %s - errore %s" - --#~ msgid "Matching packages for package list to user args" -+#~ msgid "Finished Transaction Test" -+#~ msgstr "Test di transazione terminato" -+ -+#~ msgid "" -+#~ " You could try running: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" - #~ msgstr "" --#~ "Ricerca corrispondenza degli argomenti dell'utente nella lista dei " --#~ "pacchetti" -+#~ " Provare a lanciare: package-cleanup --problems\n" -+#~ " package-cleanup --dupes" -+ -+#~ msgid "Unresolvable requirement %s for %s" -+#~ msgstr "Requisito %s non risolvibile per %s" -+ -+#~ msgid "Missing Dependency: %s is needed by package %s" -+#~ msgstr "Dipendenza mancante: %s è necessario per il pacchetto %s" -+ -+#~ msgid "Matching packages for package list to user args" -+#~ msgstr "Ricerca corrispondenza degli argomenti dell'utente nella lista dei pacchetti" - - #~ msgid "" - #~ "\n" -@@ -2630,21 +2762,14 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" - #~ msgid "Finished" - #~ msgstr "Finito" - --#~ msgid "" --#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple" --#~ "().\n" --#~ msgstr "" --#~ "getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple" --#~ "().\n" -+#~ msgid "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n" -+#~ msgstr "getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple().\n" - - #~ msgid "Parsing package install arguments" - #~ msgstr "Analisi degli argomenti di installazione dei pacchetti" - --#~ msgid "" --#~ "Failure finding best provider of %s for %s, exceeded maximum loop length" --#~ msgstr "" --#~ "Ricerca di un provider migliore di %s fallita per %s, superata la massima " --#~ "lunghezza del ciclo" -+#~ msgid "Failure finding best provider of %s for %s, exceeded maximum loop length" -+#~ msgstr "Ricerca di un provider migliore di %s fallita per %s, superata la massima lunghezza del ciclo" - - #~ msgid "Comparing best: %s to po: %s" - #~ msgstr "Comparando meglio: %s in po: %s" -@@ -2671,9 +2796,7 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" - #~ msgstr "bestpkg %s condivide piu del prefisso del nome con %s" - - #~ msgid "Invalid versioned dependency string, try quoting it." --#~ msgstr "" --#~ "Stringa di versione della dipendenza non valida, provare a metterla tra " --#~ "virgolette." -+#~ msgstr "Stringa di versione della dipendenza non valida, provare a metterla tra virgolette." - - #~ msgid "Package %s conflicts with %s." - #~ msgstr "Il pacchetto %s va in conflitto con %s." -@@ -2686,6 +2809,3 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s" - - #~ msgid "TSINFO: Updating %s to resolve conflict." - #~ msgstr "TSINFO: %s aggiornato per risolvere conflitti." -- --#~ msgid "%s conflicts with %s" --#~ msgstr "%s è in conflitto con %s" -diff --git a/po/ja.po b/po/ja.po -index c44488d..9753642 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -1,48 +1,47 @@ --# translation of yum.master.po to ja_JP --# SOME DESCRIPTIVE TITLE. --# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER --# This file is distributed under the same license as the PACKAGE package. --# Tadashi Jokagi , 2008-2009. -+# Japanese translation for yum. -+# # This file is distributed under the same license as the yum.yum-3_2_X. package. -+# Tadashi Jokagi 2008-2010. - # - msgid "" - msgstr "" --"Project-Id-Version: yum (yum-3_2_X)\n" -+"Project-Id-Version: yum-3_2_X\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" --"PO-Revision-Date: 2009-09-21 04:52+0900\n" -+"POT-Creation-Date: 2010-02-22 03:34+0900\n" -+"PO-Revision-Date: 2010-02-22 02:53+0900\n" - "Last-Translator: Tadashi Jokagi \n" --"Language-Team: Japanese \n" -+"Language-Team: Japanese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "更新" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "削除中" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "インストールしています" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "不要でした" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "更新しました" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "削除しました" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "インストールしました" - -@@ -64,68 +63,73 @@ msgstr "エラー: 不正な出力状態: %s for %s" - msgid "Erased: %s" - msgstr "削除しました: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "削除" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "整理中" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "コマンド「%s」はすでに定義済みです" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "リポジトリーの設定" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "ローカルファイルからリポジトリーのメタデータを読み込んでいます" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "設定エラー: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "オプションエラー: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" --msgstr "" -+msgstr "インストール: %s-%s (日時: %s)" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" --msgstr "" -+msgstr " 構築 : %s (日時: %s)" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" --msgstr "" -+msgstr " コミット : %s (日時: %s)" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "いくつかのコマンドを指定する必要があります" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "コマンド「%s」が見つかりません。「%s --help」を実行してください。" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "ディスク要求:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" --msgstr " 少なくとも %d MB の空き容量がファイルシステム %s で必要です。\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" -+msgstr " 少なくとも %dMB の空き容量がファイルシステム %s で必要です。\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -133,248 +137,255 @@ msgstr "" - "エラーの要約\n" - "-------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "トランザクションの実行を試みましたが、何もありませんでした。終了します。" - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "ユーザーコマンドを終了しています" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "パッケージをダウンロードしています:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "パッケージのダウンロードでエラー:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4182 - msgid "Running rpm_check_debug" - msgstr "rpm_check_debug を実行しています" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4191 - msgid "ERROR You need to update rpm to handle:" - msgstr "" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4194 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" --msgstr "" -+msgstr "更新には RPM が必要です" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "%s にこのエラーを報告してください" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "トランザクションのテストを実行しています" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "トランザクションのテストを終了しました" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "トランザクションの確認エラー\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "トランザクションのテストを成功しました" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "トランザクションを実行しています" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." - msgstr "" - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr "" - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "パッケージ %s%s%s は利用できますが、インストールしませんでした。" - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "パッケージ %s%s%s は利用できません。" - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "インストールするパッケージ" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "何もしません" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d 個のパッケージが更新の設定しました" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "更新と設定されたパッケージがありません" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d 個のパッケージが削除の設定しました" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "削除と設定されたパッケージがありません" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" - msgstr "ダウングレードするパッケージ" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" --msgstr "" -+msgstr " (%s から)" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "インストール済みパッケージ %s%s%s%s は利用できません。" - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "再インストールするパッケージ" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "パッケージが提供されていません" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "一致: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "警告: 一致するものが見つかりません: %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "見つかりませんでした" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "%s のパッケージが見つかりません" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "すべて掃除しています" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "ヘッダーを掃除しています" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "パッケージを掃除しています" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "XML メタデータを掃除しています" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "データベースキャッシュを掃除しています" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "期限切れのメタデータキャッシュを掃除しています" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "キャッシュ済み rpmdb データを掃除しています" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "プラグインを掃除しています" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "インストール済みグループ:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "利用可能なグループ" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "完了" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2775 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "警告: グループ %s が存在しません。" - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" - msgstr "" -+"インストールまたは更新に利用できるいくつかの要求されたグループにパッケージが" -+"ありません" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d 個のパッケージをインストールします" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2787 - #, python-format - msgid "No group named %s exists" - msgstr "グループ名 %s が存在しません" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "グループから削除するパッケージがありません" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d 個のパッケージを削除します" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "パッケージ %s は既にインストールされているので飛ばします" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "非互換のパッケージ %s.%s を破棄しています" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" - msgstr "" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" --msgstr "" -+msgstr "プラグインのオプション" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" --msgstr "コマンドラインエラー: %s" -+msgstr "コマンドライン エラー: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -383,107 +394,115 @@ msgid "" - msgstr "" - "\n" - "\n" --"%s: オプション %sは引数が必要です " -+"%s: オプション %s は引数が必要です " - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color がとることができる値な次のうちひとつです: auto、always、never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" --msgstr "このヘルプメッセージを表示して終了する" -+msgstr "このヘルプ メッセージを表示して終了する" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" --msgstr "" -+msgstr "エラーを黙認する" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" --msgstr "キャッシュから完全に実行します。キャッシュを更新しません" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" -+msgstr "キャッシュから完全に実行し、キャッシュを更新しません" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "構成ファイルの場所" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "コマンドの最大待ち時間" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "デバッグ情報の出力レベル" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "一覧/検索コマンドのリポジトリーの重複の表示" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "エラー出力レベル" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "rpm のデバッグ情報の出力レベル" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "静かに処理をする" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "冗長に処理をする" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "すべての問い合わせに「yes」で答える" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "Yum のバージョンを表示して終了する" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" --msgstr "インストールのベースディレクトリを設定する" -+msgstr "インストールのベース ディレクトリーを設定する" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "ひとつ以上のリポジトリーを有効にする (ワイルドカード許可)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "ひとつ以上のリポジトリーを無効にする (ワイルドカード許可)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "名前かワイルドカードでパッケージを除外する" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "更新中に不要な処理を有効にします" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "Yum プラグインを無効にする" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "GPG 署名の確認を無効にする" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "名前でプラグインを無効にする" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "名前でプラグインを有効にする" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "依存性に問題があるパッケージを飛ばす" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" --msgstr "" -+msgstr "色を使うかどうか制御する" -+ -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "yum 設定と repo ファイルに $releasever の値を設定する" - - #: ../output.py:305 - msgid "Jan" -@@ -537,106 +556,105 @@ msgstr "12 月" - msgid "Trying other mirror." - msgstr "他のミラーを試します。" - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "名前 : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "アーキテクチャ: %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "エポック : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "バージョン : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "リリース : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "容量 : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "リポジトリー : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "コミット者 : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "コミット日時 : %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "ビルド日時 : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "インストール日時 : %s " - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "要約 : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "ライセンス : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "ライセンス : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "説明 : " - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "y" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "はい" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "n" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "いいえ" - - # REMEMBER to Translate [Y/N] to the current locale --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "これでいいですか? [y/N]" - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -645,206 +663,215 @@ msgstr "" - "\n" - "グループ: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " グループ ID: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " 説明: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " 強制的なパッケージ:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " 標準パッケージ:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" --msgstr " オプションパッケージ:" -+msgstr " オプション パッケージ:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " 条件付パッケージ:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "パッケージ : %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " このパッケージの依存はありません" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " 依存性 : %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " 満たされていない依存性" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "リポジトリー : %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "説明 : " - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "ライセンス : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" --msgstr "リリース : %s" -+msgstr "ファイル名 : %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "その他 : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "総ダウンロード容量の計算中にエラーです" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "合計容量: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "総ダウンロード容量: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "インストール済み容量: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" --msgstr "再インストールをしています" -+msgstr "再インストール中" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" --msgstr "ダウングレードをしています" -+msgstr "ダウングレード中" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" --msgstr "依存性関連でのインストールをしています" -+msgstr "依存性関連でのインストールをします" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" --msgstr "依存性関連での更新をしています" -+msgstr "依存性関連での更新をします" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "依存性関連での削除をします" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "飛ばしました (依存性の問題)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" --msgstr "" -+msgstr "パッケージ" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" --msgstr "" -+msgstr "アーキテクチャ" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" --msgstr "" -+msgstr "バージョン" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" --msgstr "" -+msgstr "リポジトリー" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" --msgstr "" -+msgstr "容量" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" 置き換えています %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " 置き換えています %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" - "Transaction Summary\n" - "%s\n" - msgstr "" -+"\n" -+"トランザクションの要約\n" -+"%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" - "Upgrade %5.5s Package(s)\n" - msgstr "" -+"インストール %5.5s パッケージ\n" -+"アップグレード %5.5s パッケージ\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" - "Reinstall %5.5s Package(s)\n" - "Downgrade %5.5s Package(s)\n" - msgstr "" -+"削除 %5.5s パッケージ\n" -+"再インストール %5.5s パッケージ\n" -+"ダウングレード %5.5s パッケージ\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "削除しました" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "依存性の削除をしました" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "依存性関連をインストールしました" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "依存性を更新しました" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "置換しました" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "失敗しました" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" --msgstr "" -+msgstr "2" - - #. For translators: This is output like: - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" -@@ -852,220 +879,370 @@ msgid "" - "seconds\n" - "to exit.\n" - msgstr "" -+"\n" -+"現在のダウンロードを取り消しました。終了するには %s再度割り込み ([Ctrl][C]" -+"キー)%s を %s%s%s 秒以内に押してください。\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "ユーザーの割り込み" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "合計" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "I" -+ - #: ../output.py:1203 --msgid "" --msgstr "" -+msgid "O" -+msgstr "O" - - #: ../output.py:1204 -+msgid "E" -+msgstr "E" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "R" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "D" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "U" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "<未設定>" -+ -+#: ../output.py:1218 - msgid "System" --msgstr "" -+msgstr "システム" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" --msgstr "" -+msgstr "指定されたトランザクション ID、またはパッケージがおかしいです" -+ -+#: ../output.py:1266 -+msgid "ID" -+msgstr "ID" -+ -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "ログイン ユーザー" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "日時" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "操作" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" - msgstr "" - --#: ../output.py:1289 -+#: ../output.py:1310 - msgid "No transaction ID given" --msgstr "" -+msgstr "指定されたトランザクション ID がありません" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" --msgstr "" -+msgstr "指定されたトランザクション ID がおかしいです" - --#: ../output.py:1302 --#, fuzzy -+#: ../output.py:1341 - msgid "Not found given transaction ID" --msgstr "トランザクションを実行しています" -+msgstr "指定されたトランザクション ID が見つかりません" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" --msgstr "" -+msgstr "ひとつ以上のトランザクション ID が見つかりません!" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" --msgstr "" -+msgstr "指定されたトランザクション ID、またはパッケージが見つかりません" - --#: ../output.py:1357 --#, fuzzy -+#: ../output.py:1396 - msgid "Transaction ID :" --msgstr "トランザクションの確認エラー\n" -+msgstr "トランザクション ID :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" --msgstr "" -+msgstr "開始時間 :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" --msgstr "" -+msgstr "開始 rpmdb :" - --#: ../output.py:1378 --#, fuzzy, python-format -+#: ../output.py:1417 -+#, python-format - msgid "(%s seconds)" --msgstr "%s 秒 (最終: %s)" -+msgstr "(%s 秒)" - --#: ../output.py:1379 --#, fuzzy -+#: ../output.py:1418 - msgid "End time :" --msgstr "その他 : " -+msgstr "終了時間 : " - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" --msgstr "" -+msgstr "終了 rpmdb : " - --#: ../output.py:1385 --#, fuzzy -+#: ../output.py:1424 - msgid "User :" --msgstr "URL : %s" -+msgstr "ユーザー :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" --msgstr "" -+msgstr "終了コード :" - --#: ../output.py:1387 --#, fuzzy -+#: ../output.py:1426 - msgid "Aborted" --msgstr "不要でした" -+msgstr "中断しました" - --#: ../output.py:1389 --#, fuzzy -+#: ../output.py:1428 - msgid "Failure:" --msgstr "失敗しました" -+msgstr "失敗しました:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" --msgstr "" -+msgstr "成功" - --#: ../output.py:1392 --#, fuzzy -+#: ../output.py:1431 - msgid "Transaction performed with:" --msgstr "トランザクションの確認エラー\n" -+msgstr "トランザクションの実行:" - --#: ../output.py:1405 --#, fuzzy -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" --msgstr "ダウングレードをしています" -+msgstr "ダウングレードしました" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" --msgstr "" -+msgstr "異様" - --#: ../output.py:1409 --#, fuzzy -+#: ../output.py:1448 - msgid "Packages Altered:" --msgstr "パッケージが提供されていません" -+msgstr "切り替えたパッケージ:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" --msgstr "" -+msgstr "スクリプトの出力:" - --#: ../output.py:1418 --#, fuzzy -+#: ../output.py:1457 - msgid "Errors:" --msgstr "エラー: %s" -+msgstr "エラー:" - --#: ../output.py:1489 --msgid "Last day" --msgstr "" -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "インストール" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "依存インストール" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "不要削除" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "削除" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "再インストール" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "ダウングレード" - - #: ../output.py:1490 -+msgid "Update" -+msgstr "更新" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "時間" -+ -+#: ../output.py:1547 -+msgid "Last day" -+msgstr "昨日" -+ -+#: ../output.py:1548 - msgid "Last week" --msgstr "" -+msgstr "先週" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" --msgstr "" -+msgstr "最終 2 週" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" --msgstr "" -+msgstr "最終 3 ヶ月" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" --msgstr "" -+msgstr "最終 6 ヶ月" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" --msgstr "" -+msgstr "昨年" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" --msgstr "" -+msgstr "1 年以上前" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "インストール" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "更新" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "不要" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "削除" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> パッケージ %s.%s %s:%s-%s を%sに設定しました" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> トランザクションの確認を実行しています" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." - msgstr "--> 新しい変更と依存性の解決を再開しています。" - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> 依存性解決を終了しました" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> 依存性の処理をしています: %s のパッケージ: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> 未解決の依存性: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "パッケージ: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" 要求: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "利用可能" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> 衝突を処理しています: %s は %s と衝突しています" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - "---> トランザクションセットに束ねるために %s のヘッダーをダウンロードしていま" - "す" - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:93 -+msgid "Running" -+msgstr "実行中" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "スリープ中" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "割り込み不可" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "ゾンビ" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "不明" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " 他のアプリケーション: PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " 他のアプリケーション: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " メモリー: %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " 開始 : %s - %s 秒経過" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " 状態 : %s、PID: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "プラグインのエラー終了: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Yum エラー: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1075,7 +1252,7 @@ msgstr "" - "\n" - "ユーザーの取り消しで終了しています" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1085,7 +1262,7 @@ msgstr "" - "\n" - "パイプが壊れたため終了しています" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1096,15 +1273,15 @@ msgstr "" - "\n" - "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "完了しました!" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "このコマンドを実行するには root である必要があります。" - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1122,335 +1299,335 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "エラー: パッケージの一覧を %s に渡す必要があります" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "エラー: 一致する項目が必要です" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "エラー: グループ化グループの一覧が必要です" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "エラー: clean は引数をひとつ要求します: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "エラー: 不正な clean の引数です: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "シェルへの引数がありません" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "シェルに渡すファイル名: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "シェルへの引数として渡したファイル %s は存在しません。" - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "エラー: シェルへの引数としてひとつ以上のファイルを渡しました。" - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "パッケージ..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "システムにパッケージをインストールする" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "インストール処理の設定をしています" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[パッケージ...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "システムのパッケージを更新する" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "更新処理の設定をしています" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "パッケージもしくはパッケージのグループについての詳細を表示する" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "インストール済みパッケージ" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "利用可能なパッケージ" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "外部パッケージ" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "更新したパッケージ" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "パッケージを不要にしています" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "最近追加したパッケージ" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "表示するパッケージはありません" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "パッケージグループの一覧を表示する" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "システムから削除するパッケージ" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "削除処理の設定をしています" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "グループ処理の設定をしています" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" --msgstr "" -+msgstr "コマンドを実行するグループがありません" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "利用できるパッケージグループの一覧" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "システムのグループのパッケージをインストールする" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "システムからグループのパッケージを削除する" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "パッケージグループについての詳細を表示する" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "メタデータキャッシュを生成する" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "すべて飲めたデータファイルのキャッシュを作成します。" - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" --msgstr "" -+msgstr "これは、このコンピューターの速度に依存する時間をとるかもしれません" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "メタデータのキャッシュを作成しました" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "キャッシュデータを削除する" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" --msgstr "" -+msgstr "指定値を提供するパッケージを検索する" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "更新に利用できるパッケージを確認する" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "指定した文字列でパッケージの詳細を検索する" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "パッケージの検索中: " - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" --msgstr "" -+msgstr "不要になったパッケージを考慮しながらパッケージを更新する" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "更新処理の設定をしています" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "ローカル RPM のインストール" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "ローカルパッケージ処理の設定をしています" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "依存性のパッケージ検索:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "対話型の yum シェルを実行する" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Yum シェルの設定をしています" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "パッケージの依存性の一覧を表示する" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "依存性の検索中: " - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "ソフトウェアリポジトリーの構成を表示する" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "有効" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "無効" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " --msgstr "リポジトリーID : " -+msgstr "リポジトリー ID : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " --msgstr "リポジトリー名 : " -+msgstr "リポジトリー名 : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " --msgstr "リポジトリーの状態: " -+msgstr "リポジトリーの状態 : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "リポジトリーのリビジョン: " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " --msgstr "リポジトリータグ : " -+msgstr "リポジトリータグ : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "" - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " --msgstr "" -+msgstr "リポジトリー更新日 : " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "" - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " --msgstr "リポジトリー容量 : " -+msgstr "リポジトリー容量 : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " --msgstr "リポジトリー基点 URL: " -+msgstr "リポジトリー基準 URL : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " --msgstr "リポジトリー メタリンク: " -+msgstr "リポジトリーメタリンク: " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " --msgstr "更新しました : " -+msgstr " 更新日 : " - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " --msgstr "リポジトリー ミラー: " -+msgstr "リポジトリーミラー : " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "不明" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" --msgstr "" -+msgstr "ずっと (最終: %s)" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "インスタント (最終: %s)" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "%s 秒 (最終: %s)" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " --msgstr "リポジトリー期限 : " -+msgstr "" - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " --msgstr "リポジトリー除外 : " -+msgstr "" - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " --msgstr "リポジトリー内包 : " -+msgstr "" -+ -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "" - - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "リポジトリー ID" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "状態" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "リポジトリー名" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "役立つ使い方のメッセージを表示する" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "%s のヘルプは利用できません" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1460,7 +1637,7 @@ msgstr "" - "\n" - "別名: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1470,148 +1647,98 @@ msgstr "" - "\n" - "別名: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "再インストール処理の設定をしています" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "パッケージの再インストール" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" - msgstr "ダウングレード処理の設定をしています" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" - msgstr "パッケージのダウングレード" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "" - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" --msgstr "" -+msgstr " Yum バージョン グループ" - --#: ../yumcommands.py:1121 --#, fuzzy -+#: ../yumcommands.py:1183 - msgid " Group :" --msgstr " グループ ID: %s" -+msgstr " グループ :" - --#: ../yumcommands.py:1122 --#, fuzzy -+#: ../yumcommands.py:1184 - msgid " Packages:" --msgstr "外部パッケージ" -+msgstr "パッケージ :" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "インストール済み:" - --#: ../yumcommands.py:1157 --#, fuzzy -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" --msgstr "インストール済み:" -+msgstr "グループインストール済み:" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" --msgstr "利用可能:" -+msgstr "利用可能 :" - --#: ../yumcommands.py:1172 --#, fuzzy -+#: ../yumcommands.py:1233 - msgid "Group-Available:" --msgstr "利用可能:" -+msgstr "利用可能なグループ:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "" - --#: ../yummain.py:128 --msgid "Running" --msgstr "実行中" -- --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "スリープ中" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "割り込み不可" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "ゾンビ" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" - msgstr "" - --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " 他のアプリケーション: PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " 他のアプリケーション: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " メモリー: %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " 開始 : %s - %s 秒経過" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " 状態 : %s、PID: %d" -- --#: ../yummain.py:173 -+#: ../yummain.py:102 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "別のアプリケーションが現在 yum のロックを持っています。終了するまで待っていま" - "す..." - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "エラー: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "不明なエラー: 終了コード: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "依存性の解決をしています" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr " 問題を回避するために --skip-broken を用いることができません" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" --msgstr "" --" 実行を試せません: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" -+msgstr " これらを試行できます: rpm -Va --nofiles --nodigest" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1619,7 +1746,7 @@ msgstr "" - "\n" - "依存性を解決しました" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1648,300 +1775,305 @@ msgstr "構成ファイルの tsflag が不正です: %s" - msgid "Searching pkgSack for dep: %s" - msgstr "依存性の pkgSack を検索しています: %s" - --#: ../yum/depsolve.py:175 --#, python-format --msgid "Potential match for %s from %s" --msgstr "" -- --#: ../yum/depsolve.py:183 --#, python-format --msgid "Matched %s to require for %s" --msgstr "%s は %s の要求に一致しました" -- --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:202 - #, python-format - msgid "Member: %s" - msgstr "メンバー: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:216 ../yum/depsolve.py:731 - #, python-format - msgid "%s converted to install" - msgstr "%s をインストールに変更しました" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:223 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "モード %s にパッケージ %s を追加しています" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:233 - #, python-format - msgid "Removing Package %s" - msgstr "パッケージ %s の削除をしています" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:255 - #, python-format - msgid "%s requires: %s" - msgstr "%s の要求: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:296 -+#, python-format -+msgid "%s requires %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:323 - msgid "Needed Require has already been looked up, cheating" - msgstr "必要な要求は既に調べましたが不正をしています" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:333 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "必要な要求はパッケージ名ではありません。調べています: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:340 - #, python-format - msgid "Potential Provider: %s" - msgstr "" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Mode is %s for provider of %s: %s" --msgstr "%s のモードは %s が提供しています: %s" -+msgstr "" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:367 - #, python-format - msgid "Mode for pkg providing %s: %s" --msgstr "%s の提供しているパッケージのモード: %s" -+msgstr "" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:371 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:384 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:387 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "" - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:395 - #, python-format - msgid "Cannot find an update path for dep for: %s" - msgstr "依存する更新パスを見つけられません: %s" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "要求された %s は %s で解決しませんでした" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:426 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:468 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s を提供するパッケージはすでにインストールされています。削除しています。" - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:484 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:495 - #, python-format - msgid "Potential resolving package %s has newer instance installed." - msgstr "" - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "依存性の欠落: %s はパッケージ %s が必要としています" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:513 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "%s はすでに ts にあります。これを飛ばします" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:555 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: %s を更新として %s で設定しています" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:563 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: %s をインストールとして %s で設定しています" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:667 ../yum/depsolve.py:758 - msgid "Success - empty transaction" - msgstr "成功 - 空のトランザクション" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:706 ../yum/depsolve.py:721 - msgid "Restarting Loop" - msgstr "ループを再開しています" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:737 - msgid "Dependency Process ending" - msgstr "依存性の処理を終了しています" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:751 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "%s(%s) は依存性に問題があります" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:759 - msgid "Success - deps resolved" - msgstr "成功 - 依存性を解決しました" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:773 - #, python-format - msgid "Checking deps for %s" - msgstr "%s の依存性を確認しています" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:851 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "%s の要求として %s を検索しています" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1067 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "%s の compare_providers() を実行しています" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1094 ../yum/depsolve.py:1100 - #, python-format - msgid "better arch in po %s" - msgstr "" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1195 - #, python-format - msgid "%s obsoletes %s" - msgstr "" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1207 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" - " Winner: %s" - msgstr "" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1214 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "%s と %s の共通ソース RPM(SRPM)" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1218 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "ベースパッケージ %s は %s のためにインストールしています" -+ -+#: ../yum/depsolve.py:1224 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "%s から %s と %s の共通接頭辞" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1233 - #, python-format - msgid "Best Order: %s" - msgstr "最適の順序: %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "doConfigSetup() は Yum の将来のバージョンでなくなります。\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "リポジトリー %r は構成中に名前がありませんので ID を使います" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "プラグインは既に初期化されています" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "dbRpmDBSetup() は Yum の将来のバージョンでなくなります。\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "ローカルの RPMDB を読み込んでいます" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() は Yum の将来のバージョンでなくなります。\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() は Yum の将来のバージョンでなくなります。\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "したがって、このリポジトリーはリセットできません。\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "doUpdateSetup() は Yum の将来のバージョンでなくなります。\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "オブジェクトの更新を構築しています" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() は Yum の将来のバージョンでなくなります。\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "グループメタデータを取得しています" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "リポジトリーからグループファイルを追加しています: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "リポジトリーのグループファイルに追加できませんでした: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "いずれかのリポジトリーに利用できるグループはありません" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "メタデータ pkgtags を取得しています" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "リポジトリーからタグを追加しています: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "リポジトリーからパッケージタグの追加に失敗しました: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" --msgstr "追加ファイル一覧情報にインポートしています" -+msgstr "追加のファイル一覧情報にインポートしています" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." --msgstr "プログラム %s%s%s を yum-utils パッケージ内で発見しました。" -+msgstr "プログラム %s%s%s は yum-utils パッケージ内で見つかりました。" - --#: ../yum/__init__.py:785 -+#: ../yum/__init__.py:849 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." - msgstr "" --"終了していない残作業があります。それらを終了するためにはじめに yum-complete-" --"transaction の実行を検討するかもしれません。" -+"終了していない残作業があります。それらを終了するために、まず yum-complete-" -+"transaction の実行を検討すべきかもしれません。" - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -1949,80 +2081,95 @@ msgstr "" - "\n" - "パッケージは依存関係に問題があるため、飛ばします:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr "" - --#: ../yum/__init__.py:1083 -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "警告: RPMDB は yum 以外で変更されました。" -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "要求されたもの不足" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "インストール済みとの衝突" -+ -+#: ../yum/__init__.py:1180 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しまし" - "た。" - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "トランザクションファイル %s の削除に失敗しました" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" --msgstr "" -+msgstr "%s のインストールを想定したがそうではなかった!" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" --msgstr "" -+msgstr "%s の削除を想定したがそうではなかった!" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "PID %s がアクティブかどうかの確認に失敗しました" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "ロックファイル %s が存在します: PID %s として別に実行されています。" - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "%s でロックを作成できません: %s" - --#: ../yum/__init__.py:1373 --msgid "Package does not match intended download" --msgstr "パッケージは意図したダウンロードと一致しません" -+#: ../yum/__init__.py:1470 -+msgid "" -+"Package does not match intended download. Suggestion: run yum clean metadata" -+msgstr "" -+"パッケージは予定したダウンロードと一致しません。 提案: 「yum clean metadata」" -+"の実行" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1486 - msgid "Could not perform checksum" - msgstr "チェックサムの実行ができません" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1489 - msgid "Package does not match checksum" - msgstr "パッケージのチェックサムが一致しません" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1541 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗" - "します。" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1544 ../yum/__init__.py:1573 - #, python-format - msgid "using local copy of %s" - msgstr "%s のローカルコピーを使う" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1585 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2033,11 +2180,11 @@ msgstr "" - " * 空き容量 %s\n" - " * 必要容量 %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1634 - msgid "Header is not complete." - msgstr "ヘッダーが完了していません。" - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1671 - #, python-format - msgid "" - "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2045,62 +2192,62 @@ msgstr "" - "ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウン" - "ロードができません" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1726 - #, python-format - msgid "Public key for %s is not installed" - msgstr "%s の公開鍵がインストールされていません" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1730 - #, python-format - msgid "Problem opening package %s" - msgstr "パッケージ %s を開いている最中に問題です" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1738 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "%s の公開鍵が信頼されません" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1742 - #, python-format - msgid "Package %s is not signed" - msgstr "パッケージ %s は署名されていません" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1780 - #, python-format - msgid "Cannot remove %s" - msgstr "%s を削除できません" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1784 - #, python-format - msgid "%s removed" - msgstr "%s を削除しました" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1830 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "%s のファイル %s を削除できませんでした" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1834 - #, python-format - msgid "%s file %s removed" - msgstr "%s のファイル %s を削除しました" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1836 - #, python-format - msgid "%d %s files removed" - msgstr "%d %sファイルを削除しました" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1905 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1911 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "更新から %s.%s %s:%s-%s に一致しません" - --#: ../yum/__init__.py:2026 -+#: ../yum/__init__.py:2190 - msgid "" - "searchPackages() will go away in a future version of " - "Yum. Use searchGenerator() instead. \n" -@@ -2108,125 +2255,126 @@ msgstr "" - "searchPackages() は Yum の将来のバージョンでなくなりま" - "す。 代わりに searchGenerator() を使います。\n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2229 - #, python-format - msgid "Searching %d packages" - msgstr "%d 個のパッケージを検索しています" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2233 - #, python-format - msgid "searching package %s" - msgstr "パッケージ %s を検索しています" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2245 - msgid "searching in file entries" - msgstr "ファイルのエントリーから検索しています" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2252 - msgid "searching in provides entries" - msgstr "提供されたエントリーを検索しています" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2285 - #, python-format - msgid "Provides-match: %s" - msgstr "" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2334 - msgid "No group data available for configured repositories" - msgstr "構成されたリポジトリーに利用できるグループはありません" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2365 ../yum/__init__.py:2384 ../yum/__init__.py:2415 -+#: ../yum/__init__.py:2421 ../yum/__init__.py:2503 ../yum/__init__.py:2507 -+#: ../yum/__init__.py:2801 - #, python-format - msgid "No Group named %s exists" - msgstr "グループ名 %s が存在しません" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2396 ../yum/__init__.py:2523 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "パッケージ%s はグループ %s で設定されていません" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2443 - #, python-format - msgid "Adding package %s from group %s" - msgstr "パッケージ %s をグループ %s から追加しています" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2447 - #, python-format - msgid "No package named %s available to be installed" --msgstr "" -+msgstr "インストールに利用できるパッケージ名 %s がありません" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2549 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2568 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 --msgid "Invalid version flag" --msgstr "不正なバージョンフラグ" -- --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2621 ../yum/__init__.py:2626 - #, python-format - msgid "No Package found for %s" - msgstr "%s のパッケージが見つかりません" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2651 -+msgid "Invalid version flag" -+msgstr "不正なバージョンフラグ" -+ -+#: ../yum/__init__.py:2842 - msgid "Package Object was not a package object instance" - msgstr "" - "パッケージ オブジェクトはパッケージ オブジェクト インスタンスではありません" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2846 - msgid "Nothing specified to install" - msgstr "インストールへの指定がありません" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2862 ../yum/__init__.py:3639 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" --msgstr "" -+msgstr "%s の仮想提供かファイル提供を確認しています" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2868 ../yum/__init__.py:3184 ../yum/__init__.py:3352 -+#: ../yum/__init__.py:3645 - #, python-format - msgid "No Match for argument: %s" - msgstr "引数に一致しません: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2944 - #, python-format - msgid "Package %s installed and not available" - msgstr "パッケージ %s はインストール済みか利用できません" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2947 - msgid "No package(s) available to install" - msgstr "インストールに利用できるパッケージはありません" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2959 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "パッケージ: %s - すでにトランザクション設定をしています" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2985 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" --msgstr "パッケージ %s は既にインストールされている %s で古くなっています" -+msgstr "パッケージ %s は既にインストール済みの %s によって不要です" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:2988 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" --"パッケージ %s は %s に不要です。代わりに %s のインストールを試みています" -+"パッケージ %s は %s によって不要です。代わりに %s のインストールを試みていま" -+"す" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:2996 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "パッケージ %s はインストール済みか最新バージョンです" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3010 - #, python-format - msgid "Package matching %s already installed. Checking for update." - msgstr "" -@@ -2234,60 +2382,60 @@ msgstr "" - "す。" - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3113 - msgid "Updating Everything" - msgstr "すべて更新しています" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3134 ../yum/__init__.py:3249 ../yum/__init__.py:3276 -+#: ../yum/__init__.py:3302 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "既に不要なパッケージの更新はありません: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3169 ../yum/__init__.py:3349 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3240 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "パッケージは既に不要です: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3271 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "既に不要なパッケージの更新はありません: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3280 ../yum/__init__.py:3306 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "既にアップデートされているのでパッケージをアップデートしません: %s.%s %s:%s-%" - "s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3365 - msgid "No package matched to remove" - msgstr "削除に一致するパッケージはありません" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3399 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "ファイル %s が開けません。飛ばします。" -+msgid "Cannot open: %s. Skipping." -+msgstr "ファイルが開けません: %s を飛ばします。" - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3402 ../yum/__init__.py:3501 ../yum/__init__.py:3585 - #, python-format - msgid "Examining %s: %s" - msgstr "%s を調べています: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3410 ../yum/__init__.py:3504 ../yum/__init__.py:3588 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "トランザクションにパッケージ %s を追加できません。アーキテクチャに互換性があ" - "りません: %s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3418 - #, python-format - msgid "" - "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2296,99 +2444,108 @@ msgstr "" - "パッケージ %s はインストールされていないので更新できません。代わりに「yum " - "install」を実行してインストールしてください。" - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3447 ../yum/__init__.py:3509 ../yum/__init__.py:3593 - #, python-format - msgid "Excluding %s" - msgstr "%s の除外中" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3452 - #, python-format - msgid "Marking %s to be installed" - msgstr "%s をインストール済みとして設定しています" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3458 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "次のリポジトリーへの更新として %s を設定します: %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3465 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: インストールされたパッケージを更新しません。" - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3498 ../yum/__init__.py:3582 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "ファイル %s が開けません。飛ばします。" -+ -+#: ../yum/__init__.py:3528 - msgid "Problem in reinstall: no package matched to remove" - msgstr "再インストール中に問題: 削除するパッケージがありません" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3541 ../yum/__init__.py:3673 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "パッケージ %s は複数インストールが許可されています。飛ばします" - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3562 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" - msgstr "" --"再インストール中に問題: %s に一致したインストール用パッケージがありません" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3665 - msgid "No package(s) available to downgrade" - msgstr "ダウングレードに利用できるパッケージはありません" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3718 - #, python-format - msgid "No Match for available package: %s" --msgstr "利用可能なパッケージが一致しません: %s" -+msgstr "利用できるパッケージに一致しません: %s" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3725 - #, python-format - msgid "Only Upgrade available on package: %s" --msgstr "アップグレードでのみ利用できるパッケージ: %s" -+msgstr "アップグレードにのみ利用できるパッケージ: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 --#, fuzzy, python-format -+#: ../yum/__init__.py:3795 ../yum/__init__.py:3832 -+#, python-format - msgid "Failed to downgrade: %s" --msgstr "ダウングレードするパッケージ" -+msgstr "ダウングレードに失敗: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3864 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "%s から GPG 鍵を取得しています" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3884 - msgid "GPG key retrieval failed: " - msgstr "GPG 鍵の取得に失敗しました: " - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3890 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "%s からの GPG 鍵が正しくありません: %s" -+ -+#: ../yum/__init__.py:3899 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "GPG 鍵の解析に失敗しました: 鍵は値 %s を持っていません" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3931 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3936 ../yum/__init__.py:3998 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "GPG 公開鍵 0x%s 「%s」を %s からインポートしています" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3953 - msgid "Not installing key" - msgstr "インストールする鍵がありません" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3959 - #, python-format - msgid "Key import failed (code %d)" - msgstr "鍵のインポートに失敗しました (コード: %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3960 ../yum/__init__.py:4019 - msgid "Key imported successfully" - msgstr "鍵のインポートに成功しました" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3965 ../yum/__init__.py:4024 - #, python-format - msgid "" - "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2396,41 +2553,46 @@ msgid "" - "Check that the correct key URLs are configured for this repository." - msgstr "" - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3974 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:3993 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "GPG 鍵 %s (0x%s) はすでにインポートしています" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4013 - #, python-format - msgid "Not installing key for repo %s" - msgstr "リポジトリー %s の鍵がインストールされていません" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4018 - msgid "Key import failed" - msgstr "鍵のインポートに失敗しました" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4144 - msgid "Unable to find a suitable mirror." - msgstr "適当なミラーを見つけることができませんでした。" - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4146 - msgid "Errors were encountered while downloading packages." - msgstr "パッケージのダウンロード中にエラーに遭遇しました。" - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4196 - #, python-format - msgid "Please report this error at %s" - msgstr "%s にこのエラーを報告してください" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4220 - msgid "Test Transaction Errors: " - msgstr "テストトランザクションでエラー: " - -+#: ../yum/__init__.py:4321 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "cackedir が設定できません: %s" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2490,7 +2652,20 @@ msgstr "プラグイン %s の構成ファイルの検索に失敗しました" - msgid "registration of commands not supported" - msgstr "コマンドの登録をサポートしていません" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "は次の要求が不足ています: " -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "は次のインストール済みと衝突しています: " -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s は %s の複製です" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "再パッケージをしています" - -@@ -2525,6 +2700,27 @@ msgstr "ヘッダー %s は損傷があります" - msgid "Error opening rpm %s - error %s" - msgstr "RPM %s へのアクセスでエラー - %s エラー" - -+#~ msgid "Matched %s to require for %s" -+#~ msgstr "%s は %s の要求に一致しました" -+ -+#~ msgid "Unresolvable requirement %s for %s" -+#~ msgstr "要求された %s は %s で解決しませんでした" -+ -+#~ msgid "Missing Dependency: %s is needed by package %s" -+#~ msgstr "依存性の欠落: %s はパッケージ %s が必要としています" -+ -+#~ msgid "Finished Transaction Test" -+#~ msgstr "トランザクションのテストを終了しました" -+ -+#~ msgid "" -+#~ " You could try running: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+#~ msgstr "" -+#~ " 実行を試せません: package-cleanup --problems\n" -+#~ " package-cleanup --dupes\n" -+#~ " rpm -Va --nofiles --nodigest" -+ - #~ msgid "Matching packages for package list to user args" - #~ msgstr "ユーザーの引数にパッケージ一覧のパッケージを一致させています" - -diff --git a/po/pa.po b/po/pa.po -new file mode 100644 -index 0000000..bcf02a6 ---- /dev/null -+++ b/po/pa.po -@@ -0,0 +1,2678 @@ -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# -+# A S Alam , 2010. -+msgid "" -+msgstr "" -+"Project-Id-Version: \n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" -+"PO-Revision-Date: 2010-02-20 08:37+0530\n" -+"Last-Translator: A S Alam \n" -+"Language-Team: Punjabi/Panjabi \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Lokalize 1.0\n" -+"Plural-Forms: nplurals=2; plural=n != 1;\n" -+ -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 -+msgid "Updating" -+msgstr "ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../callback.py:49 ../yum/rpmtrans.py:73 -+msgid "Erasing" -+msgstr "ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 -+msgid "Installing" -+msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 -+msgid "Obsoleted" -+msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ" -+ -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 -+msgid "Updated" -+msgstr "ਅੱਪਡੇਟ ਕੀਤੇ" -+ -+#: ../callback.py:55 ../output.py:1438 -+msgid "Erased" -+msgstr "ਸਾਫ਼ ਕੀਤੇ" -+ -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 -+msgid "Installed" -+msgstr "ਇੰਸਟਾਲ ਕੀਤੇ" -+ -+#: ../callback.py:130 -+msgid "No header - huh?" -+msgstr "ਹੈੱਡ ਨਹੀਂ - ਓਹ?" -+ -+#: ../callback.py:168 -+msgid "Repackage" -+msgstr "ਮੁੜ-ਪੈਕੇਜ" -+ -+#: ../callback.py:189 -+#, python-format -+msgid "Error: invalid output state: %s for %s" -+msgstr "" -+ -+#: ../callback.py:212 -+#, python-format -+msgid "Erased: %s" -+msgstr "ਸਾਫ਼ ਕੀਤੇ: %s" -+ -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 -+msgid "Removing" -+msgstr "ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../callback.py:219 ../yum/rpmtrans.py:78 -+msgid "Cleanup" -+msgstr "ਸਾਫ਼ ਕਰੋ" -+ -+#: ../cli.py:107 -+#, python-format -+msgid "Command \"%s\" already defined" -+msgstr "ਕਮਾਂਡ \"%s\" ਪਹਿਲਾਂ ਦੀ ਦਿੱਤੀ ਹੈ" -+ -+#: ../cli.py:119 -+msgid "Setting up repositories" -+msgstr "ਰਿਪੋਜ਼ਟਰੀਆਂ ਸੈਟਅੱਪ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" -+ -+#: ../cli.py:130 -+msgid "Reading repository metadata in from local files" -+msgstr "ਲੋਕਲ ਫਾਇਲਾਂ ਤੋਂ ਰਿਪੋਜ਼ਟਰੀ ਮੇਟਾਡਾਟਾ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../cli.py:194 ../utils.py:193 -+#, python-format -+msgid "Config Error: %s" -+msgstr "ਸੰਰਚਨਾ ਗਲਤੀ: %s" -+ -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 -+#, python-format -+msgid "Options Error: %s" -+msgstr "ਚੋਣ ਗਲਤੀ: %s" -+ -+#: ../cli.py:227 -+#, python-format -+msgid " Installed: %s-%s at %s" -+msgstr " ਇੰਸਟਾਲ ਕੀਤਾ:%s-%s %s ਉੱਤੇ " -+ -+#: ../cli.py:229 -+#, python-format -+msgid " Built : %s at %s" -+msgstr " ਬਿਲਡ: %s %s ਉੱਤੇ " -+ -+#: ../cli.py:231 -+#, python-format -+msgid " Committed: %s at %s" -+msgstr " ਕਮਿਟ ਕੀਤਾ: %s %s ਉੱਤੇ" -+ -+#: ../cli.py:270 -+msgid "You need to give some command" -+msgstr "ਤੁਹਾਨੂੰ ਕੁਝ ਕਮਾਂਡ ਦੇਣ ਦੀ ਲੋੜ ਹੈ" -+ -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "" -+ -+#: ../cli.py:314 -+msgid "Disk Requirements:\n" -+msgstr "ਡਿਸਕ ਲੋੜਾਂ:\n" -+ -+#: ../cli.py:316 -+#, python-format -+msgid " At least %dMB more space needed on the %s filesystem.\n" -+msgstr " ਘੱਟੋ-ਘੱਟ %dMB ਹੋਰ ਖਾਲੀ ਥਾਂ %s ਫਾਇਲ ਸਿਸਟਮ ਉੱਤੇ ਚਾਹੀਦੀ ਹੈ।\n" -+ -+#. TODO: simplify the dependency errors? -+#. Fixup the summary -+#: ../cli.py:321 -+msgid "" -+"Error Summary\n" -+"-------------\n" -+msgstr "" -+"ਗਲਤੀ ਸੰਖੇਪ\n" -+"------------\n" -+ -+#: ../cli.py:364 -+msgid "Trying to run the transaction but nothing to do. Exiting." -+msgstr "" -+ -+#: ../cli.py:403 -+msgid "Exiting on user Command" -+msgstr "ਯੂਜ਼ਰ ਕਮਾਂਡ ਮੌਜੂਦ ਹੈ" -+ -+#: ../cli.py:407 -+msgid "Downloading Packages:" -+msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:" -+ -+#: ../cli.py:412 -+msgid "Error Downloading Packages:\n" -+msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:\n" -+ -+#: ../cli.py:426 ../yum/__init__.py:4195 -+msgid "Running rpm_check_debug" -+msgstr "" -+ -+#: ../cli.py:435 ../yum/__init__.py:4204 -+msgid "ERROR You need to update rpm to handle:" -+msgstr "" -+ -+#: ../cli.py:437 ../yum/__init__.py:4207 -+msgid "ERROR with rpm_check_debug vs depsolve:" -+msgstr "" -+ -+#: ../cli.py:443 -+msgid "RPM needs to be updated" -+msgstr "RPM ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ" -+ -+#: ../cli.py:444 -+#, python-format -+msgid "Please report this error in %s" -+msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ" -+ -+#: ../cli.py:450 -+msgid "Running Transaction Test" -+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਚੱਲ ਰਿਹਾ ਹੈ" -+ -+#: ../cli.py:466 -+msgid "Transaction Check Error:\n" -+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਗਲਤੀ:\n" -+ -+#: ../cli.py:473 -+msgid "Transaction Test Succeeded" -+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਸਫ਼ਲ ਰਿਹਾ" -+ -+#: ../cli.py:495 -+msgid "Running Transaction" -+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੱਲ ਰਹੀ ਹੈ" -+ -+#: ../cli.py:525 -+msgid "" -+"Refusing to automatically import keys when running unattended.\n" -+"Use \"-y\" to override." -+msgstr "" -+ -+#: ../cli.py:544 ../cli.py:578 -+msgid " * Maybe you meant: " -+msgstr " * ਸ਼ਾਇਦ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ: " -+ -+#: ../cli.py:561 ../cli.py:569 -+#, python-format -+msgid "Package(s) %s%s%s available, but not installed." -+msgstr "ਪੈਕੇਜ %s%s%s ਉਪਲੱਬਧ ਹਨ, ਪਰ ਇੰਸਟਾਲ ਨਹੀਂ।" -+ -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 -+#, python-format -+msgid "No package %s%s%s available." -+msgstr "%s%s%s ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।" -+ -+#: ../cli.py:612 ../cli.py:748 -+msgid "Package(s) to install" -+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+ -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 -+msgid "Nothing to do" -+msgstr "ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ" -+ -+#: ../cli.py:647 -+#, python-format -+msgid "%d packages marked for Update" -+msgstr "ਅੱਪਡੇਟ ਕਰਨ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" -+ -+#: ../cli.py:650 -+msgid "No Packages marked for Update" -+msgstr "ਅੱਪਡੇਟ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -+ -+#: ../cli.py:664 -+#, python-format -+msgid "%d packages marked for removal" -+msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" -+ -+#: ../cli.py:667 -+msgid "No Packages marked for removal" -+msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -+ -+#: ../cli.py:692 -+msgid "Package(s) to downgrade" -+msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+ -+#: ../cli.py:717 -+#, python-format -+msgid " (from %s)" -+msgstr " (%s ਵਲੋਂ)" -+ -+#: ../cli.py:719 -+#, python-format -+msgid "Installed package %s%s%s%s not available." -+msgstr "ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ %s%s%s%s ਉਪਲੱਬਧ ਨਹੀਂ।" -+ -+#: ../cli.py:726 -+msgid "Package(s) to reinstall" -+msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+ -+#: ../cli.py:739 -+msgid "No Packages Provided" -+msgstr "ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਦਿੰਦਾ" -+ -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "ਮਿਲਦੇ: %s" -+ -+#: ../cli.py:825 -+#, python-format -+msgid "Warning: No matches found for: %s" -+msgstr "" -+ -+#: ../cli.py:828 -+msgid "No Matches found" -+msgstr "ਕੋਈ ਮਿਲਦਾ ਨਹੀਂ" -+ -+#: ../cli.py:868 -+#, python-format -+msgid "" -+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n" -+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" -+msgstr "" -+ -+#: ../cli.py:884 -+#, python-format -+msgid "No Package Found for %s" -+msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ" -+ -+#: ../cli.py:896 -+msgid "Cleaning up Everything" -+msgstr "ਹਰ ਚੀਜ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../cli.py:912 -+msgid "Cleaning up Headers" -+msgstr "ਹੈੱਡਰ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -+ -+#: ../cli.py:915 -+msgid "Cleaning up Packages" -+msgstr "ਪੈਕੇਜ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -+ -+#: ../cli.py:918 -+msgid "Cleaning up xml metadata" -+msgstr "xml ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../cli.py:921 -+msgid "Cleaning up database cache" -+msgstr "ਡਾਟਾਬੇਸ ਕੈਸ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../cli.py:924 -+msgid "Cleaning up expire-cache metadata" -+msgstr "ਐਕਸਪਾਇਰ-ਕੈਸ਼ ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "ਕੈਸ਼ ਕੀਤਾ rpmdb ਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../cli.py:930 -+msgid "Cleaning up plugins" -+msgstr "ਪਲੱਗਇਨ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" -+ -+#: ../cli.py:955 -+msgid "Installed Groups:" -+msgstr "ਇੰਸਟਾਲ ਹੋਏ ਗਰੁੱਪ:" -+ -+#: ../cli.py:967 -+msgid "Available Groups:" -+msgstr "ਉਪਲੱਬਧ ਗਰੁੱਪ:" -+ -+#: ../cli.py:977 -+msgid "Done" -+msgstr "ਮੁਕੰਮਲ" -+ -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 -+#, python-format -+msgid "Warning: Group %s does not exist." -+msgstr "ਚੇਤਾਵਨੀ: ਗਰੁੱਪ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" -+ -+#: ../cli.py:1016 -+msgid "No packages in any requested group available to install or update" -+msgstr "ਮੰਗੇ ਗਏ ਗਰੁੱਪ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਪੈਕੇਜ ਇੰਸਟਾਲ ਜਾਂ ਅੱਪਡੇਟ ਲਈ ਉਪਲੱਬਧ ਨਹੀਂ" -+ -+#: ../cli.py:1018 -+#, python-format -+msgid "%d Package(s) to Install" -+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" -+ -+#: ../cli.py:1028 ../yum/__init__.py:2800 -+#, python-format -+msgid "No group named %s exists" -+msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ" -+ -+#: ../cli.py:1034 -+msgid "No packages to remove from groups" -+msgstr "ਗਰੁੱਪ ਵਿੱਚੋਂ ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -+ -+#: ../cli.py:1036 -+#, python-format -+msgid "%d Package(s) to remove" -+msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ" -+ -+#: ../cli.py:1078 -+#, python-format -+msgid "Package %s is already installed, skipping" -+msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ, ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../cli.py:1089 -+#, python-format -+msgid "Discarding non-comparable pkg %s.%s" -+msgstr "" -+ -+#. we've not got any installed that match n or n+a -+#: ../cli.py:1115 -+#, python-format -+msgid "No other %s installed, adding to list for potential install" -+msgstr "" -+ -+#: ../cli.py:1135 -+msgid "Plugin Options" -+msgstr "ਪਲੱਗਇਨ ਚੋਣਾਂ" -+ -+#: ../cli.py:1143 -+#, python-format -+msgid "Command line error: %s" -+msgstr "ਕਮਾਂਡ ਲਾਈਨ ਗਲਤੀ: %s" -+ -+#: ../cli.py:1156 -+#, python-format -+msgid "" -+"\n" -+"\n" -+"%s: %s option requires an argument" -+msgstr "" -+"\n" -+"\n" -+"%s:%s ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ" -+ -+#: ../cli.py:1209 -+msgid "--color takes one of: auto, always, never" -+msgstr "" -+ -+#: ../cli.py:1319 -+msgid "show this help message and exit" -+msgstr "ਇਹ ਮੱਦਦ ਸੁਨੇਹਾ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ" -+ -+#: ../cli.py:1323 -+msgid "be tolerant of errors" -+msgstr "" -+ -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" -+msgstr "" -+ -+#: ../cli.py:1329 -+msgid "config file location" -+msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਟਿਕਾਣਾ" -+ -+#: ../cli.py:1332 -+msgid "maximum command wait time" -+msgstr "ਵੱਧੋ-ਵੱਧ ਕਮਾਂਡ ਉਡੀਕ ਸਮਾਂ" -+ -+#: ../cli.py:1334 -+msgid "debugging output level" -+msgstr "ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ" -+ -+#: ../cli.py:1338 -+msgid "show duplicates, in repos, in list/search commands" -+msgstr "ਡੁਪਲੀਕੇਟ ਵੇਖੋ, ਰਿਪੋ ਵਿੱਚ, ਲਿਸਟ/ਖੋਜ ਕਮਾਂਡ ਵਿੱਚ" -+ -+#: ../cli.py:1340 -+msgid "error output level" -+msgstr "ਗਲਤੀ ਆਉਟਪੁੱਟ ਲੈਵਲ" -+ -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "rpm ਲਈ ਡੀੱਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ" -+ -+#: ../cli.py:1346 -+msgid "quiet operation" -+msgstr "ਚੁੱਪ-ਚਾਪ ਕਾਰਵਾਈ" -+ -+#: ../cli.py:1348 -+msgid "verbose operation" -+msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਕਾਰਵਾਈ" -+ -+#: ../cli.py:1350 -+msgid "answer yes for all questions" -+msgstr "ਸਭ ਸਵਾਲਾਂ ਦੇ ਜਵਾਬ ਹਾਂ" -+ -+#: ../cli.py:1352 -+msgid "show Yum version and exit" -+msgstr "ਯੱਮ ਵਰਜਨ ਵੇਖਾਓ ਅਤੇ ਬੰਦ ਕਰੋ" -+ -+#: ../cli.py:1353 -+msgid "set install root" -+msgstr "" -+ -+#: ../cli.py:1357 -+msgid "enable one or more repositories (wildcards allowed)" -+msgstr "ਇੱਕ ਜਾਂ ਵੱਧ ਰਿਪੋਜ਼ਟਰੀਆਂ ਚਾਲੂ ਕਰੋ (ਵਾਈਲਡਕਾਰਡ ਮਨਜ਼ੂਰ ਹਨ)" -+ -+#: ../cli.py:1361 -+msgid "disable one or more repositories (wildcards allowed)" -+msgstr "" -+ -+#: ../cli.py:1364 -+msgid "exclude package(s) by name or glob" -+msgstr "" -+ -+#: ../cli.py:1366 -+msgid "disable exclude from main, for a repo or for everything" -+msgstr "" -+ -+#: ../cli.py:1369 -+msgid "enable obsoletes processing during updates" -+msgstr "" -+ -+#: ../cli.py:1371 -+msgid "disable Yum plugins" -+msgstr "ਯੱਮ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ" -+ -+#: ../cli.py:1373 -+msgid "disable gpg signature checking" -+msgstr "" -+ -+#: ../cli.py:1375 -+msgid "disable plugins by name" -+msgstr "ਨਾਂ ਨਾਲ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ" -+ -+#: ../cli.py:1378 -+msgid "enable plugins by name" -+msgstr "ਪਲੱਗਇਨ ਨਾਂ ਨਾਲ ਚਾਲੂ ਕਰੋ" -+ -+#: ../cli.py:1381 -+msgid "skip packages with depsolving problems" -+msgstr "ਨਿਰਭਰਤਾ ਸਮੱਸਿਆਵਾਂ ਵਾਲੇ ਪੈਕੇਜ ਛੱਡ ਦਿਉ" -+ -+#: ../cli.py:1383 -+msgid "control whether color is used" -+msgstr "" -+ -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+ -+#: ../output.py:305 -+msgid "Jan" -+msgstr "ਜਨ" -+ -+#: ../output.py:305 -+msgid "Feb" -+msgstr "ਫਰ" -+ -+#: ../output.py:305 -+msgid "Mar" -+msgstr "ਮਾਰ" -+ -+#: ../output.py:305 -+msgid "Apr" -+msgstr "ਅਪ" -+ -+#: ../output.py:305 -+msgid "May" -+msgstr "ਮਈ" -+ -+#: ../output.py:305 -+msgid "Jun" -+msgstr "ਜੂਨ" -+ -+#: ../output.py:306 -+msgid "Jul" -+msgstr "ਜੁਲਾ" -+ -+#: ../output.py:306 -+msgid "Aug" -+msgstr "ਅਗ" -+ -+#: ../output.py:306 -+msgid "Sep" -+msgstr "ਸਤੰ" -+ -+#: ../output.py:306 -+msgid "Oct" -+msgstr "ਅਕ" -+ -+#: ../output.py:306 -+msgid "Nov" -+msgstr "ਨਵੰ" -+ -+#: ../output.py:306 -+msgid "Dec" -+msgstr "ਦਸੰ" -+ -+#: ../output.py:316 -+msgid "Trying other mirror." -+msgstr "ਹੋਰ ਮਿੱਰਰ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਜਾਰੀ" -+ -+#: ../output.py:534 -+#, python-format -+msgid "Name : %s%s%s" -+msgstr "ਨਾਂ : %s%s%s" -+ -+#: ../output.py:535 -+#, python-format -+msgid "Arch : %s" -+msgstr "ਢਾਂਚਾ : %s" -+ -+#: ../output.py:537 -+#, python-format -+msgid "Epoch : %s" -+msgstr "" -+ -+#: ../output.py:538 -+#, python-format -+msgid "Version : %s" -+msgstr "ਵਰਜਨ : %s" -+ -+#: ../output.py:539 -+#, python-format -+msgid "Release : %s" -+msgstr "ਰੀਲਿਜ਼ : %s" -+ -+#: ../output.py:540 -+#, python-format -+msgid "Size : %s" -+msgstr "ਸਾਈਜ਼ : %s" -+ -+#: ../output.py:541 -+#, python-format -+msgid "Repo : %s" -+msgstr "ਰਿਪੋ : %s" -+ -+#: ../output.py:543 -+#, python-format -+msgid "From repo : %s" -+msgstr "ਰਿਪੋ ਤੋਂ : %s" -+ -+#: ../output.py:545 -+#, python-format -+msgid "Committer : %s" -+msgstr "ਕਮਿੱਟਰ : %s" -+ -+#: ../output.py:546 -+#, python-format -+msgid "Committime : %s" -+msgstr "" -+ -+#: ../output.py:547 -+#, python-format -+msgid "Buildtime : %s" -+msgstr "ਬਿਲਡ ਸਮਾਂ : %s" -+ -+#: ../output.py:549 -+#, python-format -+msgid "Installtime: %s" -+msgstr "ਇੰਸਟਾਲ ਸਮਾਂ: %s" -+ -+#: ../output.py:550 -+msgid "Summary : " -+msgstr "ਸੰਖੇਪ : " -+ -+#: ../output.py:552 -+#, python-format -+msgid "URL : %s" -+msgstr "URL : %s" -+ -+#: ../output.py:553 -+msgid "License : " -+msgstr "ਲਾਈਸੈਂਸ : " -+ -+#: ../output.py:554 -+msgid "Description: " -+msgstr "ਵੇਰਵਾ: " -+ -+#: ../output.py:622 -+msgid "y" -+msgstr "y" -+ -+#: ../output.py:622 -+msgid "yes" -+msgstr "yes" -+ -+#: ../output.py:623 -+msgid "n" -+msgstr "n" -+ -+#: ../output.py:623 -+msgid "no" -+msgstr "no" -+ -+#: ../output.py:627 -+msgid "Is this ok [y/N]: " -+msgstr "ਕੀ ਇਹ ਠੀਕ ਹੈ [y/N]: " -+ -+#: ../output.py:715 -+#, python-format -+msgid "" -+"\n" -+"Group: %s" -+msgstr "" -+"\n" -+"ਗਰੁੱਪ: %s" -+ -+#: ../output.py:719 -+#, python-format -+msgid " Group-Id: %s" -+msgstr " ਗਰੁੱਪ-Id: %s" -+ -+#: ../output.py:724 -+#, python-format -+msgid " Description: %s" -+msgstr " ਵੇਰਵਾ: %s" -+ -+#: ../output.py:726 -+msgid " Mandatory Packages:" -+msgstr " ਲਾਜ਼ਮੀ ਪੈਕੇਜ:" -+ -+#: ../output.py:727 -+msgid " Default Packages:" -+msgstr " ਡਿਫਾਲਟ ਪੈਕੇਜ:" -+ -+#: ../output.py:728 -+msgid " Optional Packages:" -+msgstr " ਚੋਣਵੇਂ ਪੈਕੇਜ:" -+ -+#: ../output.py:729 -+msgid " Conditional Packages:" -+msgstr " ਸ਼ਰਤੀਆ ਪੈਕੇਜ:" -+ -+#: ../output.py:749 -+#, python-format -+msgid "package: %s" -+msgstr "ਪੈਕੇਜ: %s" -+ -+#: ../output.py:751 -+msgid " No dependencies for this package" -+msgstr " ਇਹ ਪੈਕੇਜ ਲਈ ਕੋਈ ਨਿਰਭਰਤਾ ਨਹੀਂ ਹੈ" -+ -+#: ../output.py:756 -+#, python-format -+msgid " dependency: %s" -+msgstr " ਨਿਰਭਰਤਾ: %s" -+ -+#: ../output.py:758 -+msgid " Unsatisfied dependency" -+msgstr "" -+ -+#: ../output.py:830 -+#, python-format -+msgid "Repo : %s" -+msgstr "ਰਿਪੋ : %s" -+ -+#: ../output.py:831 -+msgid "Matched from:" -+msgstr "" -+ -+#: ../output.py:840 -+msgid "Description : " -+msgstr "ਵੇਰਵਾ: " -+ -+#: ../output.py:843 -+#, python-format -+msgid "URL : %s" -+msgstr "URL : %s" -+ -+#: ../output.py:846 -+#, python-format -+msgid "License : %s" -+msgstr "ਲਾਈਸੈਂਸ : %s" -+ -+#: ../output.py:849 -+#, python-format -+msgid "Filename : %s" -+msgstr "ਫਾਇਲ ਨਾਂ : %s" -+ -+#: ../output.py:853 -+msgid "Other : " -+msgstr "ਹੋਰ : " -+ -+#: ../output.py:896 -+msgid "There was an error calculating total download size" -+msgstr "" -+ -+#: ../output.py:901 -+#, python-format -+msgid "Total size: %s" -+msgstr "ਕੁੱਲ ਸਾਈਜ਼: %s" -+ -+#: ../output.py:904 -+#, python-format -+msgid "Total download size: %s" -+msgstr "ਕੁੱਲ ਡਾਊਨਲੋਡ ਸਾਈਜ਼: %s" -+ -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "ਇੰਸਟਾਲ ਦਾ ਸਾਈਜ਼: %s" -+ -+#: ../output.py:949 -+msgid "Reinstalling" -+msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../output.py:950 -+msgid "Downgrading" -+msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../output.py:951 -+msgid "Installing for dependencies" -+msgstr "ਨਿਰਭਰਤਾ ਲਈ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../output.py:952 -+msgid "Updating for dependencies" -+msgstr "ਨਿਰਭਰਤਾ ਲਈ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../output.py:953 -+msgid "Removing for dependencies" -+msgstr "ਨਿਰਭਰਤਾ ਲਈ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../output.py:960 ../output.py:1072 -+msgid "Skipped (dependency problems)" -+msgstr "ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ (ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ)" -+ -+#: ../output.py:983 -+msgid "Package" -+msgstr "ਪੈਕੇਜ" -+ -+#: ../output.py:983 -+msgid "Arch" -+msgstr "ਢਾਂਚਾ" -+ -+#: ../output.py:984 -+msgid "Version" -+msgstr "ਵਰਜਨ" -+ -+#: ../output.py:984 -+msgid "Repository" -+msgstr "ਰਿਪੋਜ਼ਟਰੀ" -+ -+#: ../output.py:985 -+msgid "Size" -+msgstr "ਸਾਈਜ਼" -+ -+#: ../output.py:997 -+#, python-format -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " %s%s%s.%s %s ਨੂੰ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ\n" -+ -+#: ../output.py:1006 -+#, python-format -+msgid "" -+"\n" -+"Transaction Summary\n" -+"%s\n" -+msgstr "" -+"\n" -+"ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਖੇਪ\n" -+"%s\n" -+ -+#: ../output.py:1013 -+#, python-format -+msgid "" -+"Install %5.5s Package(s)\n" -+"Upgrade %5.5s Package(s)\n" -+msgstr "" -+"ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n" -+"ਅੱਪਗਰੇਡ %5.5s ਪੈਕੇਜ\n" -+ -+#: ../output.py:1022 -+#, python-format -+msgid "" -+"Remove %5.5s Package(s)\n" -+"Reinstall %5.5s Package(s)\n" -+"Downgrade %5.5s Package(s)\n" -+msgstr "" -+"ਹਟਾਏ %5.5s ਪੈਕੇਜ\n" -+"ਮੁੜ-ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n" -+"ਡਾਊਨਗਰੇਡ %5.5s ਪੈਕੇਜ\n" -+ -+#: ../output.py:1066 -+msgid "Removed" -+msgstr "ਹਟਾਏ" -+ -+#: ../output.py:1067 -+msgid "Dependency Removed" -+msgstr "ਨਿਰਭਰਤਾ ਹਟਾਈ" -+ -+#: ../output.py:1069 -+msgid "Dependency Installed" -+msgstr "ਨਿਰਭਰਤਾ ਇੰਸਟਾਲ" -+ -+#: ../output.py:1071 -+msgid "Dependency Updated" -+msgstr "ਨਿਰਭਰਤਾ ਅੱਪਡੇਟ" -+ -+#: ../output.py:1073 -+msgid "Replaced" -+msgstr "ਬਦਲੇ ਗਏ" -+ -+#: ../output.py:1074 -+msgid "Failed" -+msgstr "ਫੇਲ੍ਹ ਹੋਏ" -+ -+#. Delta between C-c's so we treat as exit -+#: ../output.py:1140 -+msgid "two" -+msgstr "ਦੋ" -+ -+#. For translators: This is output like: -+#. Current download cancelled, interrupt (ctrl-c) again within two seconds -+#. to exit. -+#. Where "interupt (ctrl-c) again" and "two" are highlighted. -+#: ../output.py:1151 -+#, python-format -+msgid "" -+"\n" -+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s " -+"seconds\n" -+"to exit.\n" -+msgstr "" -+"\n" -+" ਮੌਜੂਦਾ ਡਾਊਨਲੋਡ ਰੱਦ ਕੀਤਾ ਗਿਆ, ਬੰਦ ਕਰਨ ਲਈ %sinterrupt (ctrl-c) %s %s%s%s " -+"ਸਕਿੰਟ ਵਿੱਚ\n" -+"ਦਬਾਉ\n" -+ -+#: ../output.py:1162 -+msgid "user interrupt" -+msgstr "ਯੂਜ਼ਰ ਵਲੋਂ ਦਖ਼ਲ" -+ -+#: ../output.py:1180 -+msgid "Total" -+msgstr "ਕੁੱਲ" -+ -+#: ../output.py:1202 -+msgid "I" -+msgstr "I" -+ -+#: ../output.py:1203 -+msgid "O" -+msgstr "O" -+ -+#: ../output.py:1204 -+msgid "E" -+msgstr "E" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "R" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "D" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "U" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "<ਅਣ-ਸੈੱਟ>" -+ -+#: ../output.py:1218 -+msgid "System" -+msgstr "ਸਿਸਟਮ" -+ -+#: ../output.py:1254 -+msgid "Bad transaction IDs, or package(s), given" -+msgstr "" -+ -+#: ../output.py:1266 -+msgid "ID" -+msgstr "ID" -+ -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "ਲਾਗਇਨ ਯੂਜ਼ਰ" -+ -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "ਐਕਸ਼ਨ" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "ਬਦਲੇ" -+ -+#: ../output.py:1310 -+msgid "No transaction ID given" -+msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ID ਦਿੱਤਾ" -+ -+#: ../output.py:1336 -+msgid "Bad transaction ID given" -+msgstr "" -+ -+#: ../output.py:1341 -+msgid "Not found given transaction ID" -+msgstr "" -+ -+#: ../output.py:1349 -+msgid "Found more than one transaction ID!" -+msgstr "" -+ -+#: ../output.py:1370 -+msgid "No transaction ID, or package, given" -+msgstr "" -+ -+#: ../output.py:1396 -+msgid "Transaction ID :" -+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ID:" -+ -+#: ../output.py:1398 -+msgid "Begin time :" -+msgstr "ਸ਼ੁਰੂ ਸਮਾਂ :" -+ -+#: ../output.py:1401 ../output.py:1403 -+msgid "Begin rpmdb :" -+msgstr "rpmdb ਸ਼ੁਰੂ :" -+ -+#: ../output.py:1417 -+#, python-format -+msgid "(%s seconds)" -+msgstr "(%s ਸਕਿੰਟ)" -+ -+#: ../output.py:1418 -+msgid "End time :" -+msgstr "ਅੰਤ ਸਮਾਂ :" -+ -+#: ../output.py:1421 ../output.py:1423 -+msgid "End rpmdb :" -+msgstr "rpmdb ਅੰਤ :" -+ -+#: ../output.py:1424 -+msgid "User :" -+msgstr "ਯੂਜ਼ਰ :" -+ -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 -+msgid "Return-Code :" -+msgstr "" -+ -+#: ../output.py:1426 -+msgid "Aborted" -+msgstr "ਅਧੂਰਾ ਛੱਡਿਆ" -+ -+#: ../output.py:1428 -+msgid "Failure:" -+msgstr "ਫੇਲ੍ਹ:" -+ -+#: ../output.py:1430 -+msgid "Success" -+msgstr "ਸਫ਼ਲ" -+ -+#: ../output.py:1431 -+msgid "Transaction performed with:" -+msgstr "" -+ -+#: ../output.py:1444 ../output.py:1489 -+msgid "Downgraded" -+msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤੇ" -+ -+#. multiple versions installed, both older and newer -+#: ../output.py:1446 -+msgid "Weird" -+msgstr "" -+ -+#: ../output.py:1448 -+msgid "Packages Altered:" -+msgstr "ਪੈਕੇਜ ਬਦਲੇ:" -+ -+#: ../output.py:1451 -+msgid "Scriptlet output:" -+msgstr "" -+ -+#: ../output.py:1457 -+msgid "Errors:" -+msgstr "ਗਲਤੀਆਂ:" -+ -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "ਇੰਸਟਾਲ" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "ਨਿਰਭ-ਇੰਸਟਾਲ" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "ਸਾਫ਼" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "ਮੁੜ-ਇੰਸਟਾਲ" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "ਡਾਊਨਗਰੇਡ" -+ -+#: ../output.py:1490 -+msgid "Update" -+msgstr "ਅੱਪਡੇਟ" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "ਸਮਾਂ" -+ -+#: ../output.py:1547 -+msgid "Last day" -+msgstr "ਪਿਛਲੇ ਦਿਨ" -+ -+#: ../output.py:1548 -+msgid "Last week" -+msgstr "ਪਿਛਲੇ ਹਫ਼ਤੇ" -+ -+#: ../output.py:1549 -+msgid "Last 2 weeks" -+msgstr "ਪਿਛਲੇ ੨ ਹਫ਼ਤੇ" -+ -+#. US default :p -+#: ../output.py:1550 -+msgid "Last 3 months" -+msgstr "ਪਿਛਲੇ ੩ ਮਹੀਨੇ" -+ -+#: ../output.py:1551 -+msgid "Last 6 months" -+msgstr "ਪਿਛਲੇ ੬ ਮਹੀਨੇ" -+ -+#: ../output.py:1552 -+msgid "Last year" -+msgstr "ਪਿਛਲੇ ਸਾਲ" -+ -+#: ../output.py:1553 -+msgid "Over a year ago" -+msgstr "ਲਗਭਗ ਸਾਲ ਪਹਿਲਾਂ" -+ -+#: ../output.py:1585 -+msgid "installed" -+msgstr "ਇੰਸਟਾਲ ਕੀਤੇ" -+ -+#: ../output.py:1586 -+msgid "updated" -+msgstr "ਅੱਪਡੇਟ ਕੀਤੇ" -+ -+#: ../output.py:1587 -+msgid "obsoleted" -+msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ" -+ -+#: ../output.py:1588 -+msgid "erased" -+msgstr "ਸਾਫ਼ ਕੀਤੇ" -+ -+#: ../output.py:1592 -+#, python-format -+msgid "---> Package %s.%s %s:%s-%s set to be %s" -+msgstr "---> ਪੈਕੇਜ %s.%s %s:%s-%s ਨੂੰ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ %s" -+ -+#: ../output.py:1599 -+msgid "--> Running transaction check" -+msgstr "--> ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਜਾਰੀ ਹੈ" -+ -+#: ../output.py:1604 -+msgid "--> Restarting Dependency Resolution with new changes." -+msgstr "--> ਨਵੇਂ ਬਦਲਾਅ ਨਾਲ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਲਈ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -+ -+#: ../output.py:1609 -+msgid "--> Finished Dependency Resolution" -+msgstr "--> ਨਿਰਭਰਤਾ ਹੱਲ ਮੁਕੰਮਲ ਹੋਇਆ" -+ -+#: ../output.py:1614 ../output.py:1619 -+#, python-format -+msgid "--> Processing Dependency: %s for package: %s" -+msgstr "--> ਨਿਰਭਰਤਾ ਲਈ ਕਾਰਵਾਈ ਜਾਰੀ: %s ਪੈਕੇਜ ਲਈ: %s" -+ -+#: ../output.py:1623 -+#, python-format -+msgid "--> Unresolved Dependency: %s" -+msgstr "--> ਨਾ-ਹੱਲ਼ ਹੋਈ ਨਿਰਭਰਤਾ: %s" -+ -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "ਪੈਕੇਜ: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" ਚਾਹੀਦਾ ਹੈ: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "ਉਪਲੱਬਧ" -+ -+#: ../output.py:1665 ../output.py:1670 -+#, python-format -+msgid "--> Processing Conflict: %s conflicts %s" -+msgstr "--> ਅਪਵਾਦ ਹੱਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s ਦਾ %s ਨਾਲ ਟਕਰਾ" -+ -+#: ../output.py:1674 -+msgid "--> Populating transaction set with selected packages. Please wait." -+msgstr "--> ਚੁਣੇ ਪੈਕੇਜਾਂ ਲਈ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ ਪਾਪੂਲੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ।" -+ -+#: ../output.py:1678 -+#, python-format -+msgid "---> Downloading header for %s to pack into transaction set." -+msgstr "---> Downloading header for %s to pack into transaction set." -+ -+#: ../utils.py:93 -+msgid "Running" -+msgstr "ਚੱਲ ਰਿਹਾ ਹੈ" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "ਸਲੀਪਿੰਗ" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "ਜੋਮਬਿਈ" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "ਅਣਜਾਣ" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਹੈ: ਪੈਕੇਜਕਿੱਟ" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਹੈ: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " ਮੈਮੋਰੀ : %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " ਸ਼ੁਰੂ ਹੋਇਆ: %s - %s ਪਹਿਲਾਂ" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " ਹਾਲਤ : %s, pid: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "PluginExit ਗਲਤੀ: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "ਯੱਮ ਗਲਤੀ: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 -+msgid "" -+"\n" -+"\n" -+"Exiting on user cancel" -+msgstr "" -+"\n" -+"\n" -+"ਯੂਜ਼ਰ ਰੱਦ ਕਰਨ ਉੱਤੇ ਮੌਜੂਦ" -+ -+#: ../utils.py:241 ../yummain.py:48 -+msgid "" -+"\n" -+"\n" -+"Exiting on Broken Pipe" -+msgstr "" -+ -+#: ../utils.py:243 ../yummain.py:50 -+#, python-format -+msgid "" -+"\n" -+"\n" -+"%s" -+msgstr "" -+"\n" -+"\n" -+"%s" -+ -+#: ../utils.py:282 ../yummain.py:211 -+msgid "Complete!" -+msgstr "ਮੁਕੰਮਲ!" -+ -+#: ../yumcommands.py:43 -+msgid "You need to be root to perform this command." -+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਰੂਟ (root) ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।" -+ -+#: ../yumcommands.py:50 -+msgid "" -+"\n" -+"You have enabled checking of packages via GPG keys. This is a good thing. \n" -+"However, you do not have any GPG public keys installed. You need to " -+"download\n" -+"the keys for packages you wish to install and install them.\n" -+"You can do that by running the command:\n" -+" rpm --import public.gpg.key\n" -+"\n" -+"\n" -+"Alternatively you can specify the url to the key you would like to use\n" -+"for a repository in the 'gpgkey' option in a repository section and yum \n" -+"will install it for you.\n" -+"\n" -+"For more information contact your distribution or package provider.\n" -+msgstr "" -+ -+#: ../yumcommands.py:70 -+#, python-format -+msgid "Error: Need to pass a list of pkgs to %s" -+msgstr "" -+ -+#: ../yumcommands.py:76 -+msgid "Error: Need an item to match" -+msgstr "" -+ -+#: ../yumcommands.py:82 -+msgid "Error: Need a group or list of groups" -+msgstr "ਗਲਤੀ: ਗਰੁੱਪ ਜਾਂ ਗਰੁੱਪਾਂ ਦੀ ਲਿਸਟ ਦੀ ਲੋੜ ਹੈ" -+ -+#: ../yumcommands.py:91 -+#, python-format -+msgid "Error: clean requires an option: %s" -+msgstr "" -+ -+#: ../yumcommands.py:96 -+#, python-format -+msgid "Error: invalid clean argument: %r" -+msgstr "" -+ -+#: ../yumcommands.py:109 -+msgid "No argument to shell" -+msgstr "ਸ਼ੈੱਲ ਲਈ ਕੋਈ ਆਰਗੂਮੈਂਟ ਨਹੀਂ" -+ -+#: ../yumcommands.py:111 -+#, python-format -+msgid "Filename passed to shell: %s" -+msgstr "ਸ਼ੈੱਲ ਨੂੰ ਦੇਣ ਲਈ ਫਾਇਲ ਨਾਂ: %s" -+ -+#: ../yumcommands.py:115 -+#, python-format -+msgid "File %s given as argument to shell does not exist." -+msgstr "" -+ -+#: ../yumcommands.py:121 -+msgid "Error: more than one file given as argument to shell." -+msgstr "" -+ -+#: ../yumcommands.py:170 -+msgid "PACKAGE..." -+msgstr "ਪੈਕੇਜ..." -+ -+#: ../yumcommands.py:173 -+msgid "Install a package or packages on your system" -+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਉੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ" -+ -+#: ../yumcommands.py:181 -+msgid "Setting up Install Process" -+msgstr "ਇੰਸਟਾਲ ਕਾਰਵਾਈ ਸੈੱਟ ਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yumcommands.py:192 -+msgid "[PACKAGE...]" -+msgstr "[ਪੈਕੇਜ...]" -+ -+#: ../yumcommands.py:195 -+msgid "Update a package or packages on your system" -+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਉੱਤੇ ਪੈਕੇਜ ਅੱਪਡੇਟ ਕਰੋ" -+ -+#: ../yumcommands.py:202 -+msgid "Setting up Update Process" -+msgstr "ਅੱਪਡੇਟ ਕਾਰਵਾਈ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yumcommands.py:244 -+msgid "Display details about a package or group of packages" -+msgstr "ਪੈਕੇਜ ਜਾਂ ਪੈਕੇਜਾਂ ਦੇ ਗਰੁੱਪ ਬਾਰੇ ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਵੇਖੋ" -+ -+#: ../yumcommands.py:293 -+msgid "Installed Packages" -+msgstr "ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ" -+ -+#: ../yumcommands.py:301 -+msgid "Available Packages" -+msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ" -+ -+#: ../yumcommands.py:305 -+msgid "Extra Packages" -+msgstr "ਵਾਧੂ ਪੈਕੇਜ" -+ -+#: ../yumcommands.py:309 -+msgid "Updated Packages" -+msgstr "ਅੱਪਡੇਟ ਕੀਤੇ ਪੈਕੇਜ" -+ -+#. This only happens in verbose mode -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 -+msgid "Obsoleting Packages" -+msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਪੈਕੇਜ" -+ -+#: ../yumcommands.py:326 -+msgid "Recently Added Packages" -+msgstr "ਤਾਜ਼ਾ ਸ਼ਾਮਲ ਕੀਤੇ ਪੈਕੇਜ" -+ -+#: ../yumcommands.py:333 -+msgid "No matching Packages to list" -+msgstr "ਲਿਸਟ ਲਈ ਕੋਈ ਮਿਲਦਾ ਪੈਕੇਜ ਨਹੀਂ" -+ -+#: ../yumcommands.py:347 -+msgid "List a package or groups of packages" -+msgstr "ਪੈਕੇਜ ਜਾਂ ਪੈਕੇਜਾਂ ਦੇ ਗਰੁੱਪ ਦੀ ਲਿਸਟ" -+ -+#: ../yumcommands.py:359 -+msgid "Remove a package or packages from your system" -+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਤੋਂ ਪੈਕੇਜ ਹਟਾਓ" -+ -+#: ../yumcommands.py:366 -+msgid "Setting up Remove Process" -+msgstr "ਹਟਾਉਣ ਕਾਰਵਾਈ ਲਈ ਸੈਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yumcommands.py:380 -+msgid "Setting up Group Process" -+msgstr "ਗਰੁੱਪ ਕਾਰਵਾਈ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yumcommands.py:386 -+msgid "No Groups on which to run command" -+msgstr "ਕੋਈ ਗਰੁੱਪ ਨਹੀਂ, ਜਿਸ ਉੱਤੇ ਕਮਾਂਡ ਚਲਾਈ ਜਾ ਸਕੇ" -+ -+#: ../yumcommands.py:399 -+msgid "List available package groups" -+msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਗਰੁੱਪਾਂ ਦੀ ਲਿਸਟ" -+ -+#: ../yumcommands.py:416 -+msgid "Install the packages in a group on your system" -+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਉੱਤੇ ਗਰੁੱਪ ਵਿੱਚੋਂ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ" -+ -+#: ../yumcommands.py:438 -+msgid "Remove the packages in a group from your system" -+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਤੋਂ ਗਰੁੱਪ ਵਿੱਚੋਂ ਪੈਕੇਜ ਹਟਾਓ" -+ -+#: ../yumcommands.py:465 -+msgid "Display details about a package group" -+msgstr "ਪੈਕੇਜ ਗਰੁੱਪ ਬਾਰੇ ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਵੇਖੋ" -+ -+#: ../yumcommands.py:489 -+msgid "Generate the metadata cache" -+msgstr "ਮੇਟਾਡਾਟਾ ਕੈਸ਼ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yumcommands.py:495 -+msgid "Making cache files for all metadata files." -+msgstr "ਸਭ ਮੇਟਾਡਾਟਾ ਫਾਇਲਾਂ ਲਈ ਕੈਸ਼ ਫਾਇਲਾਂ ਬਣਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ।" -+ -+#: ../yumcommands.py:496 -+msgid "This may take a while depending on the speed of this computer" -+msgstr "ਇਹ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸਪੀਡ ਦੇ ਮੁਤਾਬਕ ਕੁਝ ਸਮਾਂ ਲੈ ਸਕਦਾ ਹੈ।" -+ -+#: ../yumcommands.py:517 -+msgid "Metadata Cache Created" -+msgstr "ਮੇਟਾਡਾਟਾ ਕੈਸ਼ ਬਣਾਈ ਗਈ" -+ -+#: ../yumcommands.py:531 -+msgid "Remove cached data" -+msgstr "ਕੈਸ਼ ਡਾਟਾ ਹਟਾਓ" -+ -+#: ../yumcommands.py:551 -+msgid "Find what package provides the given value" -+msgstr "ਲੱਭੋ ਕਿ ਕਿਹੜਾ ਪੈਕੇਜ ਦਿੱਤਾ ਮੁੱਲ ਦਿੰਦਾ ਹੈ" -+ -+#: ../yumcommands.py:571 -+msgid "Check for available package updates" -+msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਅੱਪਡੇਟ ਲਈ ਚੈੱਕ" -+ -+#: ../yumcommands.py:621 -+msgid "Search package details for the given string" -+msgstr "ਦਿੱਤੀ ਲਾਈਨ ਲਈ ਪੈਕੇਜ ਵੇਰਵਾ ਲੱਭੋ" -+ -+#: ../yumcommands.py:627 -+msgid "Searching Packages: " -+msgstr "ਪੈਕੇਜਾਂ ਲਈ ਖੋਜ ਜਾਰੀ: " -+ -+#: ../yumcommands.py:644 -+msgid "Update packages taking obsoletes into account" -+msgstr "" -+ -+#: ../yumcommands.py:652 -+msgid "Setting up Upgrade Process" -+msgstr "ਅੱਪਗਰੇਡ ਕਰਾਵਾਈ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yumcommands.py:666 -+msgid "Install a local RPM" -+msgstr "ਲੋਕਲ RPM ਇੰਸਟਾਲ ਕਰੋ" -+ -+#: ../yumcommands.py:674 -+msgid "Setting up Local Package Process" -+msgstr "ਲੋਕਲ ਪੈਕੇਜ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yumcommands.py:693 -+msgid "Determine which package provides the given dependency" -+msgstr "" -+ -+#: ../yumcommands.py:696 -+msgid "Searching Packages for Dependency:" -+msgstr "ਨਿਰਭਰਤਾ ਲਈ ਪੈਕੇਜਾਂ ਦੀ ਖੋਜ ਜਾਰੀ:" -+ -+#: ../yumcommands.py:710 -+msgid "Run an interactive yum shell" -+msgstr "" -+ -+#: ../yumcommands.py:716 -+msgid "Setting up Yum Shell" -+msgstr "ਯੱਮ ਸ਼ੈੱਲ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yumcommands.py:734 -+msgid "List a package's dependencies" -+msgstr "ਪੈਕੇਜਾਂ ਦੀ ਨਿਰਭਰਤਾ ਦੀ ਲਿਸਟ" -+ -+#: ../yumcommands.py:740 -+msgid "Finding dependencies: " -+msgstr "ਨਿਰਭਰਤਾ ਲੱਭੀ ਜਾ ਰਹੀ ਹੈ: " -+ -+#: ../yumcommands.py:756 -+msgid "Display the configured software repositories" -+msgstr "ਸੰਰਚਿਤ ਸਾਫਟਵੇਅਰ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵੇਖੋ" -+ -+#: ../yumcommands.py:822 ../yumcommands.py:823 -+msgid "enabled" -+msgstr "ਚਾਲੂ" -+ -+#: ../yumcommands.py:849 ../yumcommands.py:850 -+msgid "disabled" -+msgstr "ਬੰਦ" -+ -+#: ../yumcommands.py:866 -+msgid "Repo-id : " -+msgstr "ਰਿਪੋ-id : " -+ -+#: ../yumcommands.py:867 -+msgid "Repo-name : " -+msgstr "ਰਿਪੋ-ਨਾਂ : " -+ -+#: ../yumcommands.py:870 -+msgid "Repo-status : " -+msgstr "ਰਿਪੋ-ਹਾਲਤ : " -+ -+#: ../yumcommands.py:873 -+msgid "Repo-revision: " -+msgstr "ਰਿਪੋ-ਰੀਵਿਜ਼ਨ: " -+ -+#: ../yumcommands.py:877 -+msgid "Repo-tags : " -+msgstr "ਰਿਪੋ-ਟੈਗ : " -+ -+#: ../yumcommands.py:883 -+msgid "Repo-distro-tags: " -+msgstr "" -+ -+#: ../yumcommands.py:888 -+msgid "Repo-updated : " -+msgstr "ਰਿਪੋ-ਅੱਪਡੇਟ : " -+ -+#: ../yumcommands.py:890 -+msgid "Repo-pkgs : " -+msgstr "ਰਿਪੋ-ਪੈਕੇਜ : " -+ -+#: ../yumcommands.py:891 -+msgid "Repo-size : " -+msgstr "ਰਿਪੋ-ਸਾਈਜ਼ : " -+ -+#: ../yumcommands.py:898 -+msgid "Repo-baseurl : " -+msgstr "" -+ -+#: ../yumcommands.py:906 -+msgid "Repo-metalink: " -+msgstr "" -+ -+#: ../yumcommands.py:910 -+msgid " Updated : " -+msgstr " ਅੱਪਡੇਟ : " -+ -+#: ../yumcommands.py:913 -+msgid "Repo-mirrors : " -+msgstr "" -+ -+#: ../yumcommands.py:923 -+#, python-format -+msgid "Never (last: %s)" -+msgstr "ਕਦੇ ਨਹੀਂ (ਆਖਰੀ: %s)" -+ -+#: ../yumcommands.py:925 -+#, python-format -+msgid "Instant (last: %s)" -+msgstr "" -+ -+#: ../yumcommands.py:928 -+#, python-format -+msgid "%s second(s) (last: %s)" -+msgstr "%s ਸਕਿੰਟ (ਆਖਰੀ: %s)" -+ -+#: ../yumcommands.py:930 -+msgid "Repo-expire : " -+msgstr "" -+ -+#: ../yumcommands.py:933 -+msgid "Repo-exclude : " -+msgstr "" -+ -+#: ../yumcommands.py:937 -+msgid "Repo-include : " -+msgstr "" -+ -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "" -+ -+#. Work out the first (id) and last (enabled/disalbed/count), -+#. then chop the middle (name)... -+#: ../yumcommands.py:951 ../yumcommands.py:980 -+msgid "repo id" -+msgstr "repo id" -+ -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 -+msgid "status" -+msgstr "ਹਾਲਤ" -+ -+#: ../yumcommands.py:981 -+msgid "repo name" -+msgstr "ਰਿਪੋ ਨਾਂ" -+ -+#: ../yumcommands.py:1018 -+msgid "Display a helpful usage message" -+msgstr "" -+ -+#: ../yumcommands.py:1052 -+#, python-format -+msgid "No help available for %s" -+msgstr "%s ਲਈ ਕੋਈ ਮੱਦਦ ਉਪਲੱਬਧ ਨਹੀਂ" -+ -+#: ../yumcommands.py:1057 -+msgid "" -+"\n" -+"\n" -+"aliases: " -+msgstr "" -+"\n" -+"\n" -+"ਏਲੀਆਸ: " -+ -+#: ../yumcommands.py:1059 -+msgid "" -+"\n" -+"\n" -+"alias: " -+msgstr "" -+"\n" -+"\n" -+"ਏਲੀਆਸ: " -+ -+#: ../yumcommands.py:1087 -+msgid "Setting up Reinstall Process" -+msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yumcommands.py:1095 -+msgid "reinstall a package" -+msgstr "ਪੈਕੇਜ ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yumcommands.py:1113 -+msgid "Setting up Downgrade Process" -+msgstr "ਡਾਊਨਗਰੇਡ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yumcommands.py:1120 -+msgid "downgrade a package" -+msgstr "ਪੈਕੇਜ ਡਾਊਨਗਰੇਡ ਕਰੋ" -+ -+#: ../yumcommands.py:1134 -+msgid "Display a version for the machine and/or available repos." -+msgstr "" -+ -+#: ../yumcommands.py:1173 -+msgid " Yum version groups:" -+msgstr " ਯੱਮ ਵਰਜਨ ਗਰੁੱਪ:" -+ -+#: ../yumcommands.py:1183 -+msgid " Group :" -+msgstr " ਗਰੁੱਪ :" -+ -+#: ../yumcommands.py:1184 -+msgid " Packages:" -+msgstr " ਪੈਕੇਜ:" -+ -+#: ../yumcommands.py:1213 -+msgid "Installed:" -+msgstr "ਇੰਸਟਾਲ ਹੋਏ:" -+ -+#: ../yumcommands.py:1218 -+msgid "Group-Installed:" -+msgstr "ਗਰੁੱਪ-ਇੰਸਟਾਲ ਹੋਏ:" -+ -+#: ../yumcommands.py:1227 -+msgid "Available:" -+msgstr "ਉਪਲੱਬਧ:" -+ -+#: ../yumcommands.py:1233 -+msgid "Group-Available:" -+msgstr "ਉਪਲੱਬਧ-ਗਰੁੱਪ:" -+ -+#: ../yumcommands.py:1272 -+msgid "Display, or use, the transaction history" -+msgstr "" -+ -+#: ../yumcommands.py:1300 -+#, python-format -+msgid "Invalid history sub-command, use: %s." -+msgstr "" -+ -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "rpmdb ਵਿੱਚ ਸਮੱਸਿਆ ਲਈ ਚੈੱਕ ਕਰੋ" -+ -+#: ../yummain.py:102 -+msgid "" -+"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "" -+"ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਣ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; ਉਸ ਨੂੰ ਬੰਦ ਹੋਣ ਤੱਕ ਉਡੀਕ ਜਾਰੀ..." -+ -+#: ../yummain.py:130 ../yummain.py:169 -+#, python-format -+msgid "Error: %s" -+msgstr "ਗਲਤੀ: %s" -+ -+#: ../yummain.py:140 ../yummain.py:182 -+#, python-format -+msgid "Unknown Error(s): Exit Code: %d:" -+msgstr "ਅਣਜਾਣ ਗਲਤੀ: ਬੰਦ ਕਰੋ: %d:" -+ -+#. Depsolve stage -+#: ../yummain.py:147 -+msgid "Resolving Dependencies" -+msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yummain.py:173 -+msgid " You could try using --skip-broken to work around the problem" -+msgstr " ਤੁਸੀਂ ਸਮੱਸਿਆ ਨਾਲ ਨਿਪਟ ਲਈ --skip-broken ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੰਮ ਚਲਾ ਸਕਦੇ ਹੋ" -+ -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" -+msgstr " ਤੁਹਾਨੂੰ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ: rpm -Va --nofiles --nodigest" -+ -+#: ../yummain.py:188 -+msgid "" -+"\n" -+"Dependencies Resolved" -+msgstr "" -+"\n" -+"ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" -+ -+#: ../yummain.py:265 -+msgid "" -+"\n" -+"\n" -+"Exiting on user cancel." -+msgstr "" -+"\n" -+"\n" -+"ਯੂਜ਼ਰ ਵੱਲੋਂ ਬੰਦ ਕਰਨ ਉੱਤੇ ਬੰਦ।" -+ -+#: ../yum/depsolve.py:82 -+msgid "doTsSetup() will go away in a future version of Yum.\n" -+msgstr "" -+ -+#: ../yum/depsolve.py:97 -+msgid "Setting up TransactionSets before config class is up" -+msgstr "" -+ -+#: ../yum/depsolve.py:148 -+#, python-format -+msgid "Invalid tsflag in config file: %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:159 -+#, python-format -+msgid "Searching pkgSack for dep: %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:175 -+#, python-format -+msgid "Potential match for %s from %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:183 -+#, python-format -+msgid "Matched %s to require for %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:225 -+#, python-format -+msgid "Member: %s" -+msgstr "ਮੈਂਬਰ: %s" -+ -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 -+#, python-format -+msgid "%s converted to install" -+msgstr "" -+ -+#: ../yum/depsolve.py:246 -+#, python-format -+msgid "Adding Package %s in mode %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:256 -+#, python-format -+msgid "Removing Package %s" -+msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/depsolve.py:278 -+#, python-format -+msgid "%s requires: %s" -+msgstr "%s ਚਾਹੀਦਾ ਹੈ: %s" -+ -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s ਨੂੰ ਚਾਹੀਦਾ ਹੈ %s" -+ -+#: ../yum/depsolve.py:346 -+msgid "Needed Require has already been looked up, cheating" -+msgstr "" -+ -+#: ../yum/depsolve.py:356 -+#, python-format -+msgid "Needed Require is not a package name. Looking up: %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:363 -+#, python-format -+msgid "Potential Provider: %s" -+msgstr "ਸੰਭਾਵਿਤ ਦੇਣ ਵਾਲਾ: %s" -+ -+#: ../yum/depsolve.py:386 -+#, python-format -+msgid "Mode is %s for provider of %s: %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:390 -+#, python-format -+msgid "Mode for pkg providing %s: %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:394 -+#, python-format -+msgid "TSINFO: %s package requiring %s marked as erase" -+msgstr "" -+ -+#: ../yum/depsolve.py:407 -+#, python-format -+msgid "TSINFO: Obsoleting %s with %s to resolve dep." -+msgstr "" -+ -+#: ../yum/depsolve.py:410 -+#, python-format -+msgid "TSINFO: Updating %s to resolve dep." -+msgstr "" -+ -+#: ../yum/depsolve.py:418 -+#, python-format -+msgid "Cannot find an update path for dep for: %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:449 -+#, python-format -+msgid "Quick matched %s to require for %s" -+msgstr "" -+ -+#. is it already installed? -+#: ../yum/depsolve.py:491 -+#, python-format -+msgid "%s is in providing packages but it is already installed, removing." -+msgstr "" -+ -+#: ../yum/depsolve.py:507 -+#, python-format -+msgid "Potential resolving package %s has newer instance in ts." -+msgstr "" -+ -+#: ../yum/depsolve.py:518 -+#, python-format -+msgid "Potential resolving package %s has newer instance installed." -+msgstr "" -+ -+#: ../yum/depsolve.py:536 -+#, python-format -+msgid "%s already in ts, skipping this one" -+msgstr "" -+ -+#: ../yum/depsolve.py:578 -+#, python-format -+msgid "TSINFO: Marking %s as update for %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:586 -+#, python-format -+msgid "TSINFO: Marking %s as install for %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 -+msgid "Success - empty transaction" -+msgstr "ਸਫ਼ਲ - ਖਾਲੀ ਟਰਾਂਸੈਕਸ਼ਨ" -+ -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 -+msgid "Restarting Loop" -+msgstr "ਚੱਕਰ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/depsolve.py:760 -+msgid "Dependency Process ending" -+msgstr "ਨਿਰਭਰਤਾ ਕਾਰਵਾਈ ਖਤਮ ਹੋ ਰਹੀ ਹੈ" -+ -+#: ../yum/depsolve.py:774 -+#, python-format -+msgid "%s from %s has depsolving problems" -+msgstr "" -+ -+#: ../yum/depsolve.py:782 -+msgid "Success - deps resolved" -+msgstr "ਸਫ਼ਲ - ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" -+ -+#: ../yum/depsolve.py:796 -+#, python-format -+msgid "Checking deps for %s" -+msgstr "%s ਲਈ ਨਿਰਭਰਤਾ ਚੈੱਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yum/depsolve.py:874 -+#, python-format -+msgid "looking for %s as a requirement of %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1090 -+#, python-format -+msgid "Running compare_providers() for %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 -+#, python-format -+msgid "better arch in po %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1218 -+#, python-format -+msgid "%s obsoletes %s" -+msgstr "%s ਨੇ %s ਬਰਤਰਫ਼ ਕੀਤਾ" -+ -+#: ../yum/depsolve.py:1230 -+#, python-format -+msgid "" -+"archdist compared %s to %s on %s\n" -+" Winner: %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1237 -+#, python-format -+msgid "common sourcerpm %s and %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "ਬੇਸ ਪੈਕੇਜ %s %s ਲਈ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਂਦਾ ਹੈ" -+ -+#: ../yum/depsolve.py:1247 -+#, python-format -+msgid "common prefix of %s between %s and %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1256 -+#, python-format -+msgid "Best Order: %s" -+msgstr "ਵਧੀਆ ਕ੍ਰਮ: %s" -+ -+#: ../yum/__init__.py:192 -+msgid "doConfigSetup() will go away in a future version of Yum.\n" -+msgstr "" -+ -+#: ../yum/__init__.py:424 -+#, python-format -+msgid "Repository %r is missing name in configuration, using id" -+msgstr "" -+ -+#: ../yum/__init__.py:462 -+msgid "plugins already initialised" -+msgstr "ਪਲੱਗਇਨ ਪਹਿਲਾਂ ਹੀ ਚਾਲੂ ਹੈ" -+ -+#: ../yum/__init__.py:469 -+msgid "doRpmDBSetup() will go away in a future version of Yum.\n" -+msgstr "" -+ -+#: ../yum/__init__.py:480 -+msgid "Reading Local RPMDB" -+msgstr "ਲੋਕਲ RPMDB ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/__init__.py:504 -+msgid "doRepoSetup() will go away in a future version of Yum.\n" -+msgstr "" -+ -+#: ../yum/__init__.py:524 -+msgid "doSackSetup() will go away in a future version of Yum.\n" -+msgstr "" -+ -+#: ../yum/__init__.py:554 -+msgid "Setting up Package Sacks" -+msgstr "" -+ -+#: ../yum/__init__.py:599 -+#, python-format -+msgid "repo object for repo %s lacks a _resetSack method\n" -+msgstr "" -+ -+#: ../yum/__init__.py:600 -+msgid "therefore this repo cannot be reset.\n" -+msgstr "" -+ -+#: ../yum/__init__.py:605 -+msgid "doUpdateSetup() will go away in a future version of Yum.\n" -+msgstr "" -+ -+#: ../yum/__init__.py:617 -+msgid "Building updates object" -+msgstr "ਅੱਪਡੇਟ ਆਬਜੈਕਟ ਬਣਾਏ ਜਾ ਰਹੇ ਹਨ" -+ -+#: ../yum/__init__.py:652 -+msgid "doGroupSetup() will go away in a future version of Yum.\n" -+msgstr "" -+ -+#: ../yum/__init__.py:677 -+msgid "Getting group metadata" -+msgstr "ਗਰੁੱਪ ਮੇਟਾਡਾਟਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/__init__.py:703 -+#, python-format -+msgid "Adding group file from repository: %s" -+msgstr "%s: ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਗਰੁੱਪ ਫਾਇਲ ਸ਼ਾਮਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yum/__init__.py:712 -+#, python-format -+msgid "Failed to add groups file for repository: %s - %s" -+msgstr "%s - %s: ਰਿਪੋਜ਼ਟਰੀ ਲਈ ਗਰੁੱਪ ਫਾਇਲ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -+ -+#: ../yum/__init__.py:718 -+msgid "No Groups Available in any repository" -+msgstr "ਕਿਸੇ ਰਿਪੋਜ਼ਟਰੀ ਵਿੱਚ ਕੋਈ ਗਰੁੱਪ ਉਪਲੱਬਧ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "ਪੈਕੇਜਟੈਗ ਮੇਟਾਡਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਟੈਗ ਸ਼ਾਮਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "" -+ -+#: ../yum/__init__.py:827 -+msgid "Importing additional filelist information" -+msgstr "ਵਾਧੂ ਫਾਇਲ-ਲਿਸਟ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yum/__init__.py:841 -+#, python-format -+msgid "The program %s%s%s is found in the yum-utils package." -+msgstr "" -+ -+#: ../yum/__init__.py:849 -+msgid "" -+"There are unfinished transactions remaining. You might consider running yum-" -+"complete-transaction first to finish them." -+msgstr "" -+ -+#. Kind of hacky -+#: ../yum/__init__.py:922 -+#, python-format -+msgid "Skip-broken round %i" -+msgstr "" -+ -+#: ../yum/__init__.py:975 -+#, python-format -+msgid "Skip-broken took %i rounds " -+msgstr "" -+ -+#: ../yum/__init__.py:976 -+msgid "" -+"\n" -+"Packages skipped because of dependency problems:" -+msgstr "" -+ -+#: ../yum/__init__.py:980 -+#, python-format -+msgid " %s from %s" -+msgstr " %s %s ਤੋਂ" -+ -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "" -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "ਲੋੜੀਦੇ ਮੌਜੂਦ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "ਇੰਸਟਾਲ ਨਾਲ ਟਕਰਾ" -+ -+#: ../yum/__init__.py:1180 -+msgid "" -+"Warning: scriptlet or other non-fatal errors occurred during transaction." -+msgstr "" -+ -+#: ../yum/__init__.py:1198 -+#, python-format -+msgid "Failed to remove transaction file %s" -+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ %s ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ" -+ -+#. maybe a file log here, too -+#. but raising an exception is not going to do any good -+#: ../yum/__init__.py:1227 -+#, python-format -+msgid "%s was supposed to be installed but is not!" -+msgstr "" -+ -+#. maybe a file log here, too -+#. but raising an exception is not going to do any good -+#: ../yum/__init__.py:1266 -+#, python-format -+msgid "%s was supposed to be removed but is not!" -+msgstr "" -+ -+#. Whoa. What the heck happened? -+#: ../yum/__init__.py:1386 -+#, python-format -+msgid "Unable to check if PID %s is active" -+msgstr "" -+ -+#. Another copy seems to be running. -+#: ../yum/__init__.py:1390 -+#, python-format -+msgid "Existing lock %s: another copy is running as pid %s." -+msgstr "ਮੌਜੂਦਾ ਲਾਕ %s: pid %s ਵਜੋਂ ਹੋਰ ਕਾਪੀ ਚੱਲ ਰਹੀ ਹੈ।" -+ -+#. Whoa. What the heck happened? -+#: ../yum/__init__.py:1425 -+#, python-format -+msgid "Could not create lock at %s: %s " -+msgstr "%s ਲਈ ਲਾਕ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s " -+ -+#: ../yum/__init__.py:1470 -+msgid "" -+"Package does not match intended download. Suggestion: run yum clean metadata" -+msgstr "" -+ -+#: ../yum/__init__.py:1486 -+msgid "Could not perform checksum" -+msgstr "" -+ -+#: ../yum/__init__.py:1489 -+msgid "Package does not match checksum" -+msgstr "ਪੈਕੇਜ ਚੈਕਸਮ ਰਲਦਾ ਨਹੀਂ ਹੈ" -+ -+#: ../yum/__init__.py:1531 -+#, python-format -+msgid "package fails checksum but caching is enabled for %s" -+msgstr "" -+ -+#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 -+#, python-format -+msgid "using local copy of %s" -+msgstr "%s ਦੀ ਲੋਕਲ ਕਾਪੀ ਦੀ ਵਰਤੋਂ" -+ -+#: ../yum/__init__.py:1575 -+#, python-format -+msgid "" -+"Insufficient space in download directory %s\n" -+" * free %s\n" -+" * needed %s" -+msgstr "" -+"ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ %s ਵਿੱਚ ਨਾ-ਲੋੜੀਦੀ ਖਾਲੀ ਥਾਂ\n" -+" * ਖਾਲੀ %s\n" -+" * ਚਾਹੀਦੀ %s" -+ -+#: ../yum/__init__.py:1624 -+msgid "Header is not complete." -+msgstr "ਹੈੱਡਰ ਪੂਰਾ ਨਹੀਂ ਹੈ।" -+ -+#: ../yum/__init__.py:1661 -+#, python-format -+msgid "" -+"Header not in local cache and caching-only mode enabled. Cannot download %s" -+msgstr "" -+ -+#: ../yum/__init__.py:1716 -+#, python-format -+msgid "Public key for %s is not installed" -+msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ" -+ -+#: ../yum/__init__.py:1720 -+#, python-format -+msgid "Problem opening package %s" -+msgstr "ਪੈਕੇਜ %s ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਸਮੱਸਿਆ" -+ -+#: ../yum/__init__.py:1728 -+#, python-format -+msgid "Public key for %s is not trusted" -+msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਭਰੋਸੇਯੋਗ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:1732 -+#, python-format -+msgid "Package %s is not signed" -+msgstr "ਪੈਕੇਜ %s ਸਾਈਨ ਨਹੀਂ ਕੀਤਾ" -+ -+#: ../yum/__init__.py:1770 -+#, python-format -+msgid "Cannot remove %s" -+msgstr "%s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" -+ -+#: ../yum/__init__.py:1774 -+#, python-format -+msgid "%s removed" -+msgstr "%s ਹਟਾਇਆ" -+ -+#: ../yum/__init__.py:1820 -+#, python-format -+msgid "Cannot remove %s file %s" -+msgstr "%s ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ" -+ -+#: ../yum/__init__.py:1824 -+#, python-format -+msgid "%s file %s removed" -+msgstr "%s ਫਾਇਲ %s ਹਟਾਈ" -+ -+#: ../yum/__init__.py:1826 -+#, python-format -+msgid "%d %s files removed" -+msgstr "%d %s ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਗਈਆਂ" -+ -+#: ../yum/__init__.py:1895 -+#, python-format -+msgid "More than one identical match in sack for %s" -+msgstr "" -+ -+#: ../yum/__init__.py:1901 -+#, python-format -+msgid "Nothing matches %s.%s %s:%s-%s from update" -+msgstr "" -+ -+#: ../yum/__init__.py:2180 -+msgid "" -+"searchPackages() will go away in a future version of " -+"Yum. Use searchGenerator() instead. \n" -+msgstr "" -+ -+#: ../yum/__init__.py:2219 -+#, python-format -+msgid "Searching %d packages" -+msgstr "%d ਪੈਕੇਜਾਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" -+ -+#: ../yum/__init__.py:2223 -+#, python-format -+msgid "searching package %s" -+msgstr "ਪੈਕੇਜ %s ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" -+ -+#: ../yum/__init__.py:2235 -+msgid "searching in file entries" -+msgstr "ਫਾਇਲ ਐਂਟਰੀਆਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" -+ -+#: ../yum/__init__.py:2242 -+msgid "searching in provides entries" -+msgstr "" -+ -+#: ../yum/__init__.py:2275 -+#, python-format -+msgid "Provides-match: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:2324 -+msgid "No group data available for configured repositories" -+msgstr "ਸੰਰਚਿਤ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵਿੱਚ ਕੋਈ ਗਰੁੱਪ ਡਾਟਾ ਉਪਲੱਬਧ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 -+#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 -+#: ../yum/__init__.py:2814 -+#, python-format -+msgid "No Group named %s exists" -+msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 -+#, python-format -+msgid "package %s was not marked in group %s" -+msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਹੈ" -+ -+#: ../yum/__init__.py:2433 -+#, python-format -+msgid "Adding package %s from group %s" -+msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚੋਂ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/__init__.py:2437 -+#, python-format -+msgid "No package named %s available to be installed" -+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਨਾਂ ਦਾ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ" -+ -+#: ../yum/__init__.py:2539 -+#, python-format -+msgid "Package tuple %s could not be found in packagesack" -+msgstr "" -+ -+#: ../yum/__init__.py:2558 -+#, python-format -+msgid "Package tuple %s could not be found in rpmdb" -+msgstr "" -+ -+#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 -+msgid "Invalid version flag" -+msgstr "" -+ -+#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 -+#, python-format -+msgid "No Package found for %s" -+msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ" -+ -+#: ../yum/__init__.py:2855 -+msgid "Package Object was not a package object instance" -+msgstr "" -+ -+#: ../yum/__init__.py:2859 -+msgid "Nothing specified to install" -+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ ਦਿੱਤਾ" -+ -+#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 -+#, python-format -+msgid "Checking for virtual provide or file-provide for %s" -+msgstr "" -+ -+#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 -+#: ../yum/__init__.py:3658 -+#, python-format -+msgid "No Match for argument: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:2957 -+#, python-format -+msgid "Package %s installed and not available" -+msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੈ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:2960 -+msgid "No package(s) available to install" -+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:2972 -+#, python-format -+msgid "Package: %s - already in transaction set" -+msgstr "" -+ -+#: ../yum/__init__.py:2998 -+#, python-format -+msgid "Package %s is obsoleted by %s which is already installed" -+msgstr "ਪੈਕੇਜ %s ਨੂੰ %s ਵਲੋਂ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ, ਜੋ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ" -+ -+#: ../yum/__init__.py:3001 -+#, python-format -+msgid "Package %s is obsoleted by %s, trying to install %s instead" -+msgstr "" -+ -+#: ../yum/__init__.py:3009 -+#, python-format -+msgid "Package %s already installed and latest version" -+msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ ਅਤੇ ਨਵਾਂ ਵਰਜਨ ਹੈ" -+ -+#: ../yum/__init__.py:3023 -+#, python-format -+msgid "Package matching %s already installed. Checking for update." -+msgstr "%s ਨਾਲ ਮਿਲਦਾ ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ। ਅੱਪਡੇਟ ਲਈ ਚੈਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#. update everything (the easy case) -+#: ../yum/__init__.py:3126 -+msgid "Updating Everything" -+msgstr "ਹਰ ਚੀਜ਼ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 -+#: ../yum/__init__.py:3315 -+#, python-format -+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" -+msgstr "" -+ -+#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 -+#, python-format -+msgid "%s" -+msgstr "%s" -+ -+#: ../yum/__init__.py:3253 -+#, python-format -+msgid "Package is already obsoleted: %s.%s %s:%s-%s" -+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਬਰਤਰਫ਼ ਕੀਤਾ: %s.%s %s:%s-%s" -+ -+#: ../yum/__init__.py:3284 -+#, python-format -+msgid "Not Updating Package that is obsoleted: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 -+#, python-format -+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" -+msgstr "" -+ -+#: ../yum/__init__.py:3378 -+msgid "No package matched to remove" -+msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ" -+ -+#: ../yum/__init__.py:3412 -+#, python-format -+msgid "Cannot open: %s. Skipping." -+msgstr "" -+ -+#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 -+#, python-format -+msgid "Examining %s: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 -+#, python-format -+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3431 -+#, python-format -+msgid "" -+"Package %s not installed, cannot update it. Run yum install to install it " -+"instead." -+msgstr "" -+"ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਨੂੰ ਇੰਸਟਾਲ " -+"ਕਰਨ ਲਈ " -+"yum install ਚਲਾਓ।" -+ -+#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 -+#, python-format -+msgid "Excluding %s" -+msgstr "%s ਅੱਡ ਕੀਤਾ" -+ -+#: ../yum/__init__.py:3465 -+#, python-format -+msgid "Marking %s to be installed" -+msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/__init__.py:3471 -+#, python-format -+msgid "Marking %s as an update to %s" -+msgstr "%s ਨੂੰ %s ਦੇ ਲਈ ਅੱਪਡੇਟ ਵਜੋਂ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" -+ -+#: ../yum/__init__.py:3478 -+#, python-format -+msgid "%s: does not update installed package." -+msgstr "%s: ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੇ ਜਾਂਦੇ।" -+ -+#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "" -+ -+#: ../yum/__init__.py:3541 -+msgid "Problem in reinstall: no package matched to remove" -+msgstr "" -+ -+#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 -+#, python-format -+msgid "Package %s is allowed multiple installs, skipping" -+msgstr "" -+ -+#: ../yum/__init__.py:3575 -+#, python-format -+msgid "Problem in reinstall: no package %s matched to install" -+msgstr "" -+ -+#: ../yum/__init__.py:3678 -+msgid "No package(s) available to downgrade" -+msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ" -+ -+#: ../yum/__init__.py:3731 -+#, python-format -+msgid "No Match for available package: %s" -+msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਲਈ ਕੋਈ ਮੇਲ ਨਹੀਂ: %s" -+ -+#: ../yum/__init__.py:3738 -+#, python-format -+msgid "Only Upgrade available on package: %s" -+msgstr "%s: ਪੈਕੇਜ ਲਈ ਕੇਵਲ ਅੱਪਗਰੇਡ ਉਪਲੱਬਧ" -+ -+#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 -+#, python-format -+msgid "Failed to downgrade: %s" -+msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s" -+ -+#: ../yum/__init__.py:3877 -+#, python-format -+msgid "Retrieving GPG key from %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3897 -+msgid "GPG key retrieval failed: " -+msgstr "" -+ -+#: ../yum/__init__.py:3903 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3912 -+#, python-format -+msgid "GPG key parsing failed: key does not have value %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3944 -+#, python-format -+msgid "GPG key at %s (0x%s) is already installed" -+msgstr "" -+ -+#. Try installing/updating GPG key -+#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 -+#, python-format -+msgid "Importing GPG key 0x%s \"%s\" from %s" -+msgstr "" -+ -+#: ../yum/__init__.py:3966 -+msgid "Not installing key" -+msgstr "" -+ -+#: ../yum/__init__.py:3972 -+#, python-format -+msgid "Key import failed (code %d)" -+msgstr "" -+ -+#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 -+msgid "Key imported successfully" -+msgstr "" -+ -+#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 -+#, python-format -+msgid "" -+"The GPG keys listed for the \"%s\" repository are already installed but they " -+"are not correct for this package.\n" -+"Check that the correct key URLs are configured for this repository." -+msgstr "" -+ -+#: ../yum/__init__.py:3987 -+msgid "Import of key(s) didn't help, wrong key(s)?" -+msgstr "" -+ -+#: ../yum/__init__.py:4006 -+#, python-format -+msgid "GPG key at %s (0x%s) is already imported" -+msgstr "" -+ -+#: ../yum/__init__.py:4026 -+#, python-format -+msgid "Not installing key for repo %s" -+msgstr "" -+ -+#: ../yum/__init__.py:4031 -+msgid "Key import failed" -+msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਫੇਲ੍ਹ" -+ -+#: ../yum/__init__.py:4157 -+msgid "Unable to find a suitable mirror." -+msgstr "" -+ -+#: ../yum/__init__.py:4159 -+msgid "Errors were encountered while downloading packages." -+msgstr "" -+ -+#: ../yum/__init__.py:4209 -+#, python-format -+msgid "Please report this error at %s" -+msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ" -+ -+#: ../yum/__init__.py:4233 -+msgid "Test Transaction Errors: " -+msgstr "ਟੈਸਟ ਟਰਾਂਸੈਕਸ਼ਨ ਗਲਤੀਆਂ: " -+ -+#: ../yum/__init__.py:4334 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "" -+ -+#. Mostly copied from YumOutput._outKeyValFill() -+#: ../yum/plugins.py:202 -+msgid "Loaded plugins: " -+msgstr "ਲੋਡ ਕੀਤੀਆਂ ਪਲੱਗਇਨ: " -+ -+#: ../yum/plugins.py:216 ../yum/plugins.py:222 -+#, python-format -+msgid "No plugin match for: %s" -+msgstr "" -+ -+#: ../yum/plugins.py:252 -+#, python-format -+msgid "Not loading \"%s\" plugin, as it is disabled" -+msgstr "" -+ -+#. Give full backtrace: -+#: ../yum/plugins.py:264 -+#, python-format -+msgid "Plugin \"%s\" can't be imported" -+msgstr "" -+ -+#: ../yum/plugins.py:271 -+#, python-format -+msgid "Plugin \"%s\" doesn't specify required API version" -+msgstr "" -+ -+#: ../yum/plugins.py:276 -+#, python-format -+msgid "Plugin \"%s\" requires API %s. Supported API is %s." -+msgstr "" -+ -+#: ../yum/plugins.py:309 -+#, python-format -+msgid "Loading \"%s\" plugin" -+msgstr "\"%s\" ਪਲੱਗਇਨ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yum/plugins.py:316 -+#, python-format -+msgid "" -+"Two or more plugins with the name \"%s\" exist in the plugin search path" -+msgstr "" -+ -+#: ../yum/plugins.py:336 -+#, python-format -+msgid "Configuration file %s not found" -+msgstr "" -+ -+#. for -+#. Configuration files for the plugin not found -+#: ../yum/plugins.py:339 -+#, python-format -+msgid "Unable to find configuration file for plugin %s" -+msgstr "" -+ -+#: ../yum/plugins.py:501 -+msgid "registration of commands not supported" -+msgstr "" -+ -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s %s ਨਾਲ ਡੁਪਲੀਕੇਟ ਹੈ" -+ -+#: ../yum/rpmtrans.py:79 -+msgid "Repackaging" -+msgstr "" -+ -+#: ../rpmUtils/oldUtils.py:33 -+#, python-format -+msgid "Header cannot be opened or does not match %s, %s." -+msgstr "" -+ -+#: ../rpmUtils/oldUtils.py:53 -+#, python-format -+msgid "RPM %s fails md5 check" -+msgstr "" -+ -+#: ../rpmUtils/oldUtils.py:151 -+msgid "Could not open RPM database for reading. Perhaps it is already in use?" -+msgstr "" -+ -+#: ../rpmUtils/oldUtils.py:183 -+msgid "Got an empty Header, something has gone wrong" -+msgstr "" -+ -+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 -+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 -+#, python-format -+msgid "Damaged Header %s" -+msgstr "ਖਰਾਬ ਹੋਇਆ ਹੈੱਡਰ %s" -+ -+#: ../rpmUtils/oldUtils.py:281 -+#, python-format -+msgid "Error opening rpm %s - error %s" -+msgstr "" -+ -diff --git a/po/pl.po b/po/pl.po -index 087f8fb..b7b128c 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -5,41 +5,42 @@ msgid "" - msgstr "" - "Project-Id-Version: pl\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" --"PO-Revision-Date: 2009-12-19 09:43+0100\n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" -+"PO-Revision-Date: 2010-02-11 21:38+0100\n" - "Last-Translator: Piotr Drąg \n" --"Language-Team: Polish \n" -+"Language-Team: Polish \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "Aktualizowanie" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "Usuwanie" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "Instalowanie" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "Przestarzałe" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "Zaktualizowano" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "Usunięto" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "Zainstalowano" - -@@ -61,68 +62,74 @@ msgstr "Błąd: nieprawidłowy stan wyjścia: %s dla %s" - msgid "Erased: %s" - msgstr "Usunięto: %s" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "Usuwanie" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "Czyszczenie" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "Polecenie \"%s\" zostało już określone" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "Ustawianie repozytoriów" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "Błąd konfiguracji: %s" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "Błąd opcji: %s" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr " Zainstalowane: %s-%s o %s" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr " Zbudowane : %s o %s" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr " Wysłane: %s o %s" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "Należy podać polecenie" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "Nie ma takiego polecenia: %s. Proszę użyć %s --help" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "Wymagane miejsce na dysku:\n" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" --msgstr " Wymagane jest co najmniej %d MB w systemie plików %s.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" -+msgstr "" -+" Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" -@@ -130,65 +137,62 @@ msgstr "" - "Podsumowanie błędów\n" - "-------------------\n" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" --"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie pracy." -+"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie " -+"działania." - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" --msgstr "Kończenie pracy na polecenie użytkownika" -+msgstr "Kończenie działania na polecenie użytkownika" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "Pobieranie pakietów:" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "Błąd podczas pobierania pakietów:\n" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4195 - msgid "Running rpm_check_debug" - msgstr "Wykonywanie rpm_check_debug" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4204 - msgid "ERROR You need to update rpm to handle:" - msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4207 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "BŁĄD rpm_check_debug i rozwiązywania zależności:" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "Pakiet RPM musi zostać zaktualizowany" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "Proszę zgłosić ten błąd na %s" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "Wykonywanie testu transakcji" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "Ukończono test transakcji" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "Błąd podczas sprawdzania transakcji:\n" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "Test transakcji został ukończony powodzeniem" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "Wykonywanie transakcji" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." -@@ -197,79 +201,84 @@ msgstr "" - "uruchomienia.\n" - "Należy użyć \"-y\", aby wymusić." - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr " * Czy chodziło o: " - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "Pakiety %s%s%s są dostępne, ale nie są zainstalowane." - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "Nie ma pakietu %s%s%s." - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "Pakiety do zainstalowania" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "Nie ma niczego do zrobienia" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "%d pakietów oznaczonych do aktualizacji" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "Brak pakietów oznaczonych do aktualizacji" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "%d pakietów oznaczonych do usunięcia" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "Brak pakietów oznaczonych do usunięcia" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" --msgstr "Pakiety do instalacji starszej wersji" -+msgstr "Pakiety do instalacji poprzedniej wersji" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr " (z %s)" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny." - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "Pakiety do ponownego zainstalowania" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "Nie podano pakietów" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "Pasujące: %s" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "Ostrzeżenie: nie odnaleziono wyników dla: %s" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "Brak wyników" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" -@@ -278,108 +287,112 @@ msgstr "" - "Ostrzeżenie: wersje 3.0.x programu yum błędnie dopasowują nazwy plików.\n" - " Można użyć \"%s*/%s%s\" i/lub \"%s*bin/%s%s\", aby uzyskać to zachowanie" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "Nie odnaleziono pakietów dla %s" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "Czyszczenie wszystkiego" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "Czyszczenie nagłówków" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "Czyszczenie pakietów" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "Czytanie metadanych XML" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" --msgstr "Czyszczenie pamięci podręcznej bazy danych" -+msgstr "Czyszczenie bazy danych w pamięci podręcznej" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" --msgstr "Czytanie metadanych wygasłej pamięci podręcznej" -+msgstr "Czyszczenie metadanych wygasłej pamięci podręcznej" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "Czyszczenie bazy danych RPM w pamięci podręcznej" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "Czyszczenie wtyczek" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "Zainstalowane grupy:" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "Dostępne grupy:" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "Ukończono" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "Ostrzeżenie: grupa %s nie istnieje." - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" - msgstr "" - "Brak pakietów dostępnych do instalacji lub aktualizacji w żadnej z żądanych " - "grup" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "%d pakietów do instalacji" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2800 - #, python-format - msgid "No group named %s exists" - msgstr "Grupa o nazwie %s nie istnieje" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "Brak pakietów do usunięcia z grup" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "%d pakietów do usunięcia" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "Pakiet %s jest już zainstalowany, pomijanie" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "Odrzucanie pakietu %s.%s, którego nie można porównać" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "Opcje wtyczki" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "Błąd wiersza poleceń: %s" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -390,106 +403,116 @@ msgstr "" - "\n" - "%s: opcja %s wymaga parametru" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "--color przyjmuje jedną z: auto, always, never" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "wyświetla ten komunikat pomocy i kończy pracę" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "toleruje błędy" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" --msgstr "uruchamia wyłącznie z pamięci podręcznej i nie aktualizuje jej" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" -+msgstr "uruchamia wyłącznie z pamięci podręcznej systemu i nie aktualizuje jej" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "położenie pliku konfiguracji" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "maksymalny czas oczekiwania na polecenie" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "poziom wyjścia debugowania" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "poziom wyjścia błędów" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "poziom wyjścia debugowania dla programu RPM" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "mało komunikatów" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "dużo komunikatów" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "odpowiada tak na wszystkie pytania" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "wyświetla wersję programu yum i kończy pracę" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "ustawia roota instalacji" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "wyłącza wtyczki programu yum" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "wyłącza sprawdzanie podpisu GPG" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "wyłącza wtyczki po nazwie" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "włącza wtyczki po nazwie" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "pomija pakiety mające problemy z rozwiązaniem zależności" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "kontroluje użycie kolorów" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+"ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach " -+"repozytoriów" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "sty" -@@ -542,105 +565,104 @@ msgstr "gru" - msgid "Trying other mirror." - msgstr "Próbowanie innego serwera lustrzanego." - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "Nazwa : %s%s%s" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "Architektura : %s" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "Epoka : %s" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "Wersja : %s" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "Wydanie : %s" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "Rozmiar : %s" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "Repozytorium : %s" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "Z repozytorium : %s" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "Twórca : %s" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "Czas wysłania : %s" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "Czas zbudowania : %s" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "Czas zainstalowania: %s" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "Podsumowanie : " - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "Adres URL : %s" - --#: ../output.py:557 --#, python-format --msgid "License : %s" --msgstr "Licencja : %s" -+#: ../output.py:553 -+msgid "License : " -+msgstr "Licencja : " - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "Opis : " - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "t" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "tak" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "n" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "nie" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "W porządku? [t/N]: " - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" -@@ -649,150 +671,151 @@ msgstr "" - "\n" - "Grupa: %s" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr " Identyfikator grupy: %s" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr " Opis: %s" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr " Pakiety obowiązkowe:" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr " Domyślne pakiety:" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr " Pakiety opcjonalne:" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr " Pakiety warunkowe:" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "pakiet: %s" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr " Brak zależności dla tego pakietu" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr " zależność: %s" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr " Nierozwiązana zależność" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "Repozytorium: %s" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "Dopasowano z:" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "Opis : " - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "Adres URL : %s" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "Licencja : %s" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "Nazwa pliku : %s" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "Inne : " - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "Wystąpił błąd podczas obliczania całkowitego rozmiaru pobierania" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "Całkowity rozmiar: %s" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "Całkowity rozmiar pobierania: %s" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "Rozmiar po zainstalowaniu: %s" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "Ponowne instalowanie" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" --msgstr "Instalowanie starszej wersji" -+msgstr "Instalowanie poprzedniej wersji" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "Instalowanie, aby rozwiązać zależności" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "Aktualizowanie, aby rozwiązać zależności" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "Usuwanie, aby rozwiązać zależności" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "Pominięto (problemy z zależnościami)" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "Pakiet" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "Architektura" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "Wersja" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "Repozytorium" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "Rozmiar" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" --msgstr "" --" zastępuje %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" -+msgstr " zastępuje %s%s%s.%s %s\n" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -803,7 +826,7 @@ msgstr "" - "Podsumowanie transakcji\n" - "%s\n" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" -@@ -812,43 +835,43 @@ msgstr "" - "Instalacja %5.5s pakiet(y)\n" - "Aktualizacja %5.5s pakiet(y)\n" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" - "Reinstall %5.5s Package(s)\n" - "Downgrade %5.5s Package(s)\n" - msgstr "" --"Usunięcie %5.5s pakiet(y)\n" --"Ponowna instalacja %5.5s pakiet(y)\n" --"Instalacja starszej wersji %5.5s pakiet(y)\n" -+"Usunięcie %5.5s pakiet(y)\n" -+"Ponowna instalacja %5.5s pakiet(y)\n" -+"Instalacja poprzedniej wersji %5.5s pakiet(y)\n" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "Usunięto" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "Usunięto zależność" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "Zainstalowano zależność" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "Zaktualizowano zależność" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "Zastąpiono" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "Nie powiodło się" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "dwóch" - -@@ -856,7 +879,7 @@ msgstr "dwóch" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" -@@ -868,209 +891,364 @@ msgstr "" - " Obecne pobieranie zostało anulowane, należy %sprzerwać (Ctrl-C) ponownie%s " - "w ciągu %s%s%s sekund, aby zakończyć pracę.\n" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "przerwane przez użytkownika" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "Razem" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "I" -+ - #: ../output.py:1203 --msgid "" --msgstr "" -+msgid "O" -+msgstr "O" - - #: ../output.py:1204 -+msgid "E" -+msgstr "E" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "R" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "D" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "U" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "" -+ -+#: ../output.py:1218 - msgid "System" - msgstr "System" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "Podano błędne identyfikatory transakcji lub pakietów" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." --msgstr "" --"Ostrzeżenie: baza danych RPM została zmieniona od ostatniej transakcji " --"programu yum." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "Identyfikator" - --#: ../output.py:1289 -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" -+msgstr "Zalogowany użytkownik" -+ -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "Data i czas" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "Czynności" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "Zmieniono" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "Nie podano identyfikatora transakcji" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "Podano błędny identyfikator transakcji" - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "Nie odnaleziono podanego identyfikatora transakcji" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "Odnaleziono więcej niż jeden identyfikator transakcji." - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "Podano błędny identyfikator transakcji lub pakietu" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "Identyfikator transakcji :" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "Czas rozpoczęcia :" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "Rozpoczęcie bazy danych RPM:" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "%s sekundy)" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "Czas ukończenia :" - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" - msgstr "Ukończenie bazy danych RPM :" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "Użytkownik :" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" - msgstr "Kod zwrotny :" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "Przerwano" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "Niepowodzenie:" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "Powodzenie" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "Wykonano transakcję za pomocą:" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" --msgstr "Zainstalowano starszą wersję" -+msgstr "Zainstalowano poprzednią wersję" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "Dziwne" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "Zmienione pakiety:" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "Wyjście skryptu:" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "Błędy:" - --#: ../output.py:1489 -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "Instalacja" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "Instalacja zależności" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "Zastępowanie" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "Usunięcie" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "Ponowna instalacja" -+ -+#: ../output.py:1488 -+msgid "Downgrade" -+msgstr "Instalacja poprzedniej wersji" -+ -+#: ../output.py:1490 -+msgid "Update" -+msgstr "Aktualizacja" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "Czas" -+ -+#: ../output.py:1547 - msgid "Last day" - msgstr "Ostatni dzień" - --#: ../output.py:1490 -+#: ../output.py:1548 - msgid "Last week" - msgstr "Ostatni tydzień" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "Ostatnie dwa tygodnie" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "Ostatnie trzy miesiące" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "Ostatnie pół roku" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "Ostatni rok" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "Ponad rok temu" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "zainstalowany" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "zaktualizowany" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "zastąpiony" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "usunięty" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "--> Wykonywanie sprawdzania transakcji" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." - msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami." - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "--> Ukończono rozwiązywanie zależności" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "--> Nierozwiązana zależność: %s" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "Pakiet: %s" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+"\n" -+" Wymaga: %s" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+"\n" -+" %s: %s (%s)" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "Dostępne" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." - msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji." - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:93 -+msgid "Running" -+msgstr "Wykonywanie" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "Zasypianie" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "Nie można przerywać" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "Zombie" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "Śledzone/zatrzymane" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "Nieznane" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr " Inna aplikacja to PackageKit" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr " Inna aplikacja to: %s" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr " Pamięć: %5s RSS (%5sB VSZ)" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr " Uruchomiono: %s - %s temu" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr " Stan: %s, PID: %d" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "Błąd wyjścia wtyczki: %s" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "Błąd programu yum: %s" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" -@@ -1078,9 +1256,9 @@ msgid "" - msgstr "" - "\n" - "\n" --"Kończenie pracy na polecenie użytkownika" -+"Kończenie działania na polecenie użytkownika" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" -@@ -1088,9 +1266,9 @@ msgid "" - msgstr "" - "\n" - "\n" --"Kończenie pracy z powodu przerwanego potoku" -+"Kończenie działania z powodu przerwanego potoku" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1101,15 +1279,15 @@ msgstr "" - "\n" - "%s" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "Ukończono." - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "Należy być zalogowanym jako root, aby wykonać to polecenie." - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1140,335 +1318,335 @@ msgstr "" - "Aby dowiedzieć się więcej, proszę skontaktować się z dostawcą dystrybucji\n" - "lub pakietu.\n" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "Błąd: wymagane jest przekazanie listy pakietów do %s" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "Błąd: wymagany jest parametr do dopasowania" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "Błąd: wymagana jest grupa lub lista grup" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "Błąd: czyszczenie wymaga opcji: %s" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "Błąd: nieprawidłowy parametr czyszczenia: %r" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "Brak parametrów dla powłoki" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "Przekazano nazwę pliku do powłoki: %s" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "Plik %s podany powłoce jako parametr nie istnieje." - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "Błąd: podano powłoce więcej niż jeden plik jako parametr." - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "PAKIET..." - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "Instaluje pakiet lub pakiety w systemie" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "Ustawianie procesu instalacji" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "[PAKIET...]" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "Aktualizuje pakiet lub pakiety w systemie" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "Ustawianie procesu aktualizacji" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "Wyświetla szczegóły o pakiecie lub grupie pakietów" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "Zainstalowane pakiety" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "Dostępne pakiety" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "Dodatkowe pakiety" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "Zaktualizowane pakiety" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "Zastępowanie przestarzałych pakietów" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "Ostatnio dodane pakiety" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "Brak pakietów pasujących do listy" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "Wyświetla listę pakietów lub grup pakietów" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "Usuwa pakiet lub pakiety z systemu" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "Ustawianie procesu usuwania" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "Ustawianie procesu grup" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "Brak grup, na których można wykonać polecenie" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "Wyświetla listę dostępnych grup pakietów" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "Instaluje pakiety z grupy w systemie" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "Usuwa pakiety z grupy z systemu" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "Wyświetla szczegóły o grupie pakietów" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "Utworzy pamięć podręczną metadanych" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "Tworzenie plików pamięci podręcznej ze wszystkich plików metadanych." - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" - msgstr "Może to chwilę zająć, z zależności od prędkości komputera" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "Utworzono pamięć podręczną metadanych" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "Usuwa dane z pamięci podręcznej" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "Wyszukuje pakiet dostarczający podaną wartość" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "Sprawdza dostępne aktualizacje pakietów" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "Wyszukuje szczegóły pakietów dla podanego ciągu" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "Wyszukiwanie pakietów: " - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "Aktualizuje pakiety, w tym przestarzałe" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "Ustawianie procesu aktualizacji" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "Instaluje lokalny pakiet RPM" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "Ustawianie procesu lokalnego pakietu" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "Określa, który pakiet dostarcza podaną zależność" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "Wyszukiwanie pakietów dla zależności:" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "Uruchamia interaktywną powłokę programu yum" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "Ustawianie powłoki programu yum" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "Wyświetla listę zależności pakietu" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "Wyszukiwanie zależności: " - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "Wyświetla skonfigurowane repozytoria oprogramowania" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "włączone" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "wyłączone" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "Identyfikator repozytorium : " - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "Nazwa repozytorium : " - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "Stan repozytorium : " - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "Wersja repozytorium : " - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "Znaczniki repozytorium : " - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "Znaczniki dystrybucji repozytorium: " - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "Aktualizacje repozytorium : " - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "Pakiety repozytorium : " - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "Rozmiar repozytorium : " - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "Podstawowy adres URL repozytorium : " - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "Metaodnośnik repozytorium : " - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr " Zaktualizowano : " - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "Serwery lustrzane repozytorium : " - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "Nieznane" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "Nigdy (ostatnio: %s)" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "Natychmiast (ostatnio: %s)" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "%s sekundy (ostatnio: %s)" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "Wygaszenie repozytorium : " - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "Wykluczenia z repozytorium : " - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "Dołączone z repozytorium : " - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "Wykluczenia z repozytorium : " -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "identyfikator repozytorium" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "stan" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "nazwa repozytorium" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "Wyświetla pomocny komunikat o używaniu" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "Brak dostępnej pomocy dla %s" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" -@@ -1478,7 +1656,7 @@ msgstr "" - "\n" - "aliasy: " - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" -@@ -1488,143 +1666,97 @@ msgstr "" - "\n" - "alias: " - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "Ustawianie procesu ponownej instalacji" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "Ponownie instaluje pakiet" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" --msgstr "Ustawianie procesu instalacji starszej wersji pakietu" -+msgstr "Ustawianie procesu instalacji poprzedniej wersji pakietu" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" --msgstr "Instaluje starszą wersję pakietu" -+msgstr "Instaluje poprzednią wersję pakietu" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "Wyświetla wersję dla komputera i/lub dostępnych repozytoriów." - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr " Grupy wersji programu yum:" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr " Grupa :" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr " Pakiety:" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "Zainstalowano:" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "Zainstalowana grupa:" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "Dostępne:" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "Dostępne grupy:" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "Wyświetla lub używa historii transakcji" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "Nieprawidłowe podpolecenie historii, należy użyć: %s." - --#: ../yummain.py:128 --msgid "Running" --msgstr "Wykonywanie" -- --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "Zasypianie" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "Nie można przerywać" -- --#: ../yummain.py:131 --msgid "Zombie" --msgstr "Zombie" -- --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "Śledzone/zatrzymane" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr " Inna aplikacja to PackageKit" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr " Inna aplikacja to: %s" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr " Pamięć: %5s RSS (%5sB VSZ)" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr " Uruchomiono: %s - %s temu" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" -+msgstr "Proszę sprawdzić, czy występują problemy w bazie danych RPM" - --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr " Stan: %s, PID: %d" -- --#: ../yummain.py:173 -+#: ../yummain.py:102 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej zakończenie..." - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "Błąd: %s" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "Nieznane błędy: kod wyjścia: %d:" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "Rozwiązywanie zależności" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr " Można spróbować użyć --skip-broken, aby obejść problem" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" --msgstr "" --" Można spróbować wykonać: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" -+msgstr " Można spróbować wykonać polecenie: rpm -Va --nofiles --nodigest" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" -@@ -1632,7 +1764,7 @@ msgstr "" - "\n" - "Rozwiązano zależności" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1640,7 +1772,7 @@ msgid "" - msgstr "" - "\n" - "\n" --"Kończenie pracy na polecenie użytkownika." -+"Kończenie działania na polecenie użytkownika." - - #: ../yum/depsolve.py:82 - msgid "doTsSetup() will go away in a future version of Yum.\n" -@@ -1670,172 +1802,167 @@ msgstr "Potencjalny wynik dla %s z %s" - msgid "Matched %s to require for %s" - msgstr "%s pasuje jako wymaganie dla %s" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "Element: %s" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "%s przekonwertowano do zainstalowania" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "Dodawanie pakietu %s w trybie %s" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "Usuwanie pakietu %s" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "%s wymaga: %s" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "%s wymaga %s" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "Wymagana zależność została już odnaleziona, oszukiwanie" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "Wymagana zależność nie jest nazwą pakietu. Wyszukiwanie: %s" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "Potencjalny dostawca: %s" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "Tryb to %s dla dostawcy %s: %s" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "Tryb dla pakietu dostarczającego %s: %s" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "TSINFO: pakiet %s wymagający %s został oznaczony jako do usunięcia" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: zastępowanie przestarzałego pakietu %s pakietem %s, aby rozwiązać " - "zależność." - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność." - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" - msgstr "Nie można odnaleźć ścieżki aktualizacji dla zależności dla: %s" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "Nie można rozwiązać wymagania %s dla %s" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "Szybko dopasowano %s jako wymaganie %s" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s jest w dostarczających pakietach, ale jest już zainstalowany, usuwanie." - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - "Pakiet %s potencjalnie rozwiązujący ma nowszą wersję w zestawie transakcji." - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." - msgstr "Pakiet %s potencjalnie rozwiązujący ma zainstalowaną nowszą wersję." - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "%s jest już w zestawie transakcji, pomijanie" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "Powodzenie - pusta transakcja" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "Ponowne uruchamianie pętli" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "Kończenie procesu zależności" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "%s z %s ma problemy z rozwiązywaniem zależności" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "Powodzenie - rozwiązano zależności" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "Sprawdzanie zależności dla %s" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "wyszukiwanie %s jako wymagania %s" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "Wykonywanie compare_providers() dla %s" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "lepsze arch w po %s" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "%s zastępuje %s" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" -@@ -1844,124 +1971,144 @@ msgstr "" - "archdist porównało %s do %s na %s\n" - " Zwycięzca: %s" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "wspólny źródłowy pakiet RPM %s i %s" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "podstawowy pakiet %s jest zainstalowany dla %s" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "wspólny przedrostek %s dla %s i %s" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "Najlepszy porządek: %s" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "" - "doConfigSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "" - "Repozytorium %r nie posiada nazwy w konfiguracji, używanie identyfikatora" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "wtyczki zostały już zainicjowane" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "doRpmDBSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "Odczytywanie lokalnej bazy danych RPM" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "doRepoSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "doSackSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "Ustawianie zestawów pakietów" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "obiekt repozytorium %s nie posiada metody _resetSack\n" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "więc to repozytorium nie może zostać przywrócone.\n" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "" - "doUpdateSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "Budowanie obiektu aktualizacji" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "doGroupSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "Pobieranie metadanych grup" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "Dodawanie pliku grup z repozytorium: %s" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "Dodanie pliku grup dla repozytorium nie powiodło się: %s - %s" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "Brak dostępnych grup we wszystkich repozytoriach" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "Pobieranie metadanych znaczników pakietów" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "Dodawanie znaczników z repozytorium: %s" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "Dodanie znaczników pakietów dla repozytorium nie powiodło się: %s - %s" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "Importowanie dodatkowych informacji o liście plików" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "Program %s%s%s można odnaleźć w pakiecie yum-utils." - --#: ../yum/__init__.py:785 -+#: ../yum/__init__.py:849 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." - msgstr "" --"Pozostały nieukończone transakcje. Można rozważyć wykonanie yum-complete-" --"transaction, aby najpierw je ukończyć." -+"Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw " -+"polecenia yum-complete-transaction, aby je ukończyć." - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "Pierwsza runda pomijania uszkodzonych %i" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "Pomijanie uszkodzonych zajęło %i rund " - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" -@@ -1969,79 +2116,94 @@ msgstr "" - "\n" - "Pakiety pominięto z powodu problemów z zależnościami:" - --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr " %s z %s" - --#: ../yum/__init__.py:1083 -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "Ostrzeżenie: baza danych RPM została zmieniona poza programem yum." -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "brak wymaganych" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "zainstalowano konflikt" -+ -+#: ../yum/__init__.py:1180 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne błędy." - --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "Usunięcie pliku transakcji %s nie powiodło się" - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "%s miało zostać zainstalowane, ale nie zostało." - - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 - #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "%s miało zostać usunięte, ale nie zostało." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Nie można sprawdzić, czy PID %s jest aktywny" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 - #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s." - - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 - #, python-format - msgid "Could not create lock at %s: %s " - msgstr "Nie można utworzyć blokady na %s: %s " - --#: ../yum/__init__.py:1373 --msgid "Package does not match intended download" --msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem" -+#: ../yum/__init__.py:1470 -+msgid "" -+"Package does not match intended download. Suggestion: run yum clean metadata" -+msgstr "" -+"Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać " -+"polecenie yum clean metadata" - --#: ../yum/__init__.py:1388 -+#: ../yum/__init__.py:1486 - msgid "Could not perform checksum" - msgstr "Nie można wykonać sprawdzenia sum kontrolnych" - --#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1489 - msgid "Package does not match checksum" - msgstr "Sumy kontrolne pakietu nie zgadzają się" - --#: ../yum/__init__.py:1433 -+#: ../yum/__init__.py:1531 - #, python-format - msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w " - "pamięci podręcznej dla %s jest włączone" - --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 -+#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 - #, python-format - msgid "using local copy of %s" - msgstr "używanie lokalnej kopii %s" - --#: ../yum/__init__.py:1477 -+#: ../yum/__init__.py:1575 - #, python-format - msgid "" - "Insufficient space in download directory %s\n" -@@ -2052,11 +2214,11 @@ msgstr "" - " * wolne %s\n" - " * wymagane %s" - --#: ../yum/__init__.py:1526 -+#: ../yum/__init__.py:1624 - msgid "Header is not complete." - msgstr "Nagłówek nie jest pełny." - --#: ../yum/__init__.py:1563 -+#: ../yum/__init__.py:1661 - #, python-format - msgid "" - "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2064,62 +2226,62 @@ msgstr "" - "Nagłówek nie jest w lokalnej pamięci podręcznej, a tryb używania tylko " - "pamięci podręcznej jest włączony. Nie można pobrać %s" - --#: ../yum/__init__.py:1618 -+#: ../yum/__init__.py:1716 - #, python-format - msgid "Public key for %s is not installed" - msgstr "Klucz publiczny dla %s nie jest zainstalowany" - --#: ../yum/__init__.py:1622 -+#: ../yum/__init__.py:1720 - #, python-format - msgid "Problem opening package %s" - msgstr "Wystąpił problem podczas otwierania pakietu %s" - --#: ../yum/__init__.py:1630 -+#: ../yum/__init__.py:1728 - #, python-format - msgid "Public key for %s is not trusted" - msgstr "Klucz publiczny dla %s nie jest zaufany" - --#: ../yum/__init__.py:1634 -+#: ../yum/__init__.py:1732 - #, python-format - msgid "Package %s is not signed" - msgstr "Pakiet %s nie jest podpisany" - --#: ../yum/__init__.py:1672 -+#: ../yum/__init__.py:1770 - #, python-format - msgid "Cannot remove %s" - msgstr "Nie można usunąć %s" - --#: ../yum/__init__.py:1676 -+#: ../yum/__init__.py:1774 - #, python-format - msgid "%s removed" - msgstr "Usunięto %s" - --#: ../yum/__init__.py:1712 -+#: ../yum/__init__.py:1820 - #, python-format - msgid "Cannot remove %s file %s" - msgstr "Nie można usunąć %s pliku %s" - --#: ../yum/__init__.py:1716 -+#: ../yum/__init__.py:1824 - #, python-format - msgid "%s file %s removed" - msgstr "Usunięto %s plik %s" - --#: ../yum/__init__.py:1718 -+#: ../yum/__init__.py:1826 - #, python-format - msgid "%d %s files removed" - msgstr "Usunięto %d %s plików" - --#: ../yum/__init__.py:1787 -+#: ../yum/__init__.py:1895 - #, python-format - msgid "More than one identical match in sack for %s" - msgstr "Więcej niż jeden identyczny wynik znajduje się w zestawie dla %s" - --#: ../yum/__init__.py:1793 -+#: ../yum/__init__.py:1901 - #, python-format - msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "Nic nie pasuje do %s.%s %s:%s-%s z aktualizacji" - --#: ../yum/__init__.py:2026 -+#: ../yum/__init__.py:2180 - msgid "" - "searchPackages() will go away in a future version of " - "Yum. Use searchGenerator() instead. \n" -@@ -2127,285 +2289,295 @@ msgstr "" - "searchPackages() zostanie usunięte w przyszłych wersjach programu " - "yum. Zamiast tego należy użyć searchGenerator(). \n" - --#: ../yum/__init__.py:2065 -+#: ../yum/__init__.py:2219 - #, python-format - msgid "Searching %d packages" - msgstr "Wyszukiwanie %d pakietów" - --#: ../yum/__init__.py:2069 -+#: ../yum/__init__.py:2223 - #, python-format - msgid "searching package %s" - msgstr "wyszukiwanie pakietu %s" - --#: ../yum/__init__.py:2081 -+#: ../yum/__init__.py:2235 - msgid "searching in file entries" - msgstr "wyszukiwanie we wpisach plików" - --#: ../yum/__init__.py:2088 -+#: ../yum/__init__.py:2242 - msgid "searching in provides entries" - msgstr "wyszukiwanie we wpisach dostarczania" - --#: ../yum/__init__.py:2121 -+#: ../yum/__init__.py:2275 - #, python-format - msgid "Provides-match: %s" - msgstr "Wyniki dostarczania: %s" - --#: ../yum/__init__.py:2170 -+#: ../yum/__init__.py:2324 - msgid "No group data available for configured repositories" - msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów" - --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 -+#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 -+#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 -+#: ../yum/__init__.py:2814 - #, python-format - msgid "No Group named %s exists" - msgstr "Grupa o nazwie %s nie istnieje" - --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 -+#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 - #, python-format - msgid "package %s was not marked in group %s" - msgstr "pakiet %s nie został oznaczony w grupie %s" - --#: ../yum/__init__.py:2279 -+#: ../yum/__init__.py:2433 - #, python-format - msgid "Adding package %s from group %s" - msgstr "Dodawanie pakietu %s z grupy %s" - --#: ../yum/__init__.py:2283 -+#: ../yum/__init__.py:2437 - #, python-format - msgid "No package named %s available to be installed" - msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania" - --#: ../yum/__init__.py:2380 -+#: ../yum/__init__.py:2539 - #, python-format - msgid "Package tuple %s could not be found in packagesack" - msgstr "Nie można odnaleźć krotki pakietu %s w zestawie pakietów" - --#: ../yum/__init__.py:2399 -+#: ../yum/__init__.py:2558 - #, python-format - msgid "Package tuple %s could not be found in rpmdb" - msgstr "Nie można odnaleźć krotki pakietu %s w bazie danych RPM" - --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 -+#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 - msgid "Invalid version flag" - msgstr "Nieprawidłowa flaga wersji" - --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 -+#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 - #, python-format - msgid "No Package found for %s" - msgstr "Nie odnaleziono pakietu %s" - --#: ../yum/__init__.py:2696 -+#: ../yum/__init__.py:2855 - msgid "Package Object was not a package object instance" - msgstr "Obiekt pakietu nie był instancją obiektu pakietu" - --#: ../yum/__init__.py:2700 -+#: ../yum/__init__.py:2859 - msgid "Nothing specified to install" - msgstr "Nie podano nic do zainstalowania" - --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 -+#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 - #, python-format - msgid "Checking for virtual provide or file-provide for %s" - msgstr "Sprawdzanie wirtualnych zależności lub plików dla %s" - --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 -+#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 -+#: ../yum/__init__.py:3658 - #, python-format - msgid "No Match for argument: %s" - msgstr "Brak wyników dla parametru: %s" - --#: ../yum/__init__.py:2798 -+#: ../yum/__init__.py:2957 - #, python-format - msgid "Package %s installed and not available" - msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny" - --#: ../yum/__init__.py:2801 -+#: ../yum/__init__.py:2960 - msgid "No package(s) available to install" - msgstr "Brak pakietów dostępnych do instalacji" - --#: ../yum/__init__.py:2813 -+#: ../yum/__init__.py:2972 - #, python-format - msgid "Package: %s - already in transaction set" - msgstr "Pakiet: %s - jest już w zestawie transakcji" - --#: ../yum/__init__.py:2839 -+#: ../yum/__init__.py:2998 - #, python-format - msgid "Package %s is obsoleted by %s which is already installed" - msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany" - --#: ../yum/__init__.py:2842 -+#: ../yum/__init__.py:3001 - #, python-format - msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego" - --#: ../yum/__init__.py:2850 -+#: ../yum/__init__.py:3009 - #, python-format - msgid "Package %s already installed and latest version" - msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji" - --#: ../yum/__init__.py:2864 -+#: ../yum/__init__.py:3023 - #, python-format - msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji." - - #. update everything (the easy case) --#: ../yum/__init__.py:2966 -+#: ../yum/__init__.py:3126 - msgid "Updating Everything" - msgstr "Aktualizowanie wszystkiego" - --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 -+#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 -+#: ../yum/__init__.py:3315 - #, python-format - msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 -+#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 - #, python-format - msgid "%s" - msgstr "%s" - --#: ../yum/__init__.py:3093 -+#: ../yum/__init__.py:3253 - #, python-format - msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "Pakiet został już zastąpiony: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3124 -+#: ../yum/__init__.py:3284 - #, python-format - msgid "Not Updating Package that is obsoleted: %s" - msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s" - --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 -+#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 - #, python-format - msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "Już zaktualizowany pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" - --#: ../yum/__init__.py:3218 -+#: ../yum/__init__.py:3378 - msgid "No package matched to remove" - msgstr "Brak pasujących pakietów do usunięcia" - --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 -+#: ../yum/__init__.py:3412 - #, python-format --msgid "Cannot open file: %s. Skipping." --msgstr "Nie można otworzyć pliku: %s. Pomijanie." -+msgid "Cannot open: %s. Skipping." -+msgstr "Nie można otworzyć: %s. Pomijanie." - --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 -+#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 - #, python-format - msgid "Examining %s: %s" - msgstr "Sprawdzanie %s: %s" - --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 -+#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 - #, python-format - msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "Nie można dodać pakietu %s do transakcji. Niezgodna architektura: %s" - --#: ../yum/__init__.py:3270 -+#: ../yum/__init__.py:3431 - #, python-format - msgid "" - "Package %s not installed, cannot update it. Run yum install to install it " - "instead." - msgstr "" --"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Należy wykonać " -+"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać " - "polecenie yum install, aby go zainstalować." - --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 -+#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 - #, python-format - msgid "Excluding %s" - msgstr "Wykluczanie %s" - --#: ../yum/__init__.py:3304 -+#: ../yum/__init__.py:3465 - #, python-format - msgid "Marking %s to be installed" - msgstr "Oznaczanie %s do zainstalowania" - --#: ../yum/__init__.py:3310 -+#: ../yum/__init__.py:3471 - #, python-format - msgid "Marking %s as an update to %s" - msgstr "Oznaczanie %s jako aktualizacji %s" - --#: ../yum/__init__.py:3317 -+#: ../yum/__init__.py:3478 - #, python-format - msgid "%s: does not update installed package." - msgstr "%s: nie aktualizuj zainstalowanego pakietu." - --#: ../yum/__init__.py:3379 -+#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "Nie można otworzyć pliku: %s. Pomijanie." -+ -+#: ../yum/__init__.py:3541 - msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do " - "usunięcia" - --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 -+#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 - #, python-format - msgid "Package %s is allowed multiple installs, skipping" - msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie" - --#: ../yum/__init__.py:3413 -+#: ../yum/__init__.py:3575 - #, python-format - msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego " - "do zainstalowania" - --#: ../yum/__init__.py:3515 -+#: ../yum/__init__.py:3678 - msgid "No package(s) available to downgrade" --msgstr "Brak pakietów dostępnych do instalacji starszej wersji" -+msgstr "Brak pakietów dostępnych do instalacji poprzedniej wersji" - --#: ../yum/__init__.py:3559 -+#: ../yum/__init__.py:3731 - #, python-format - msgid "No Match for available package: %s" - msgstr "Brak wyników dla dostępnych pakietów: %s" - --#: ../yum/__init__.py:3565 -+#: ../yum/__init__.py:3738 - #, python-format - msgid "Only Upgrade available on package: %s" - msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s" - --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 -+#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 - #, python-format - msgid "Failed to downgrade: %s" --msgstr "Zainstalowanie starszej wersji nie powiodło się: %s" -+msgstr "Zainstalowanie poprzedniej wersji nie powiodło się: %s" - --#: ../yum/__init__.py:3704 -+#: ../yum/__init__.py:3877 - #, python-format - msgid "Retrieving GPG key from %s" - msgstr "Pobieranie klucza GPG z %s" - --#: ../yum/__init__.py:3724 -+#: ../yum/__init__.py:3897 - msgid "GPG key retrieval failed: " - msgstr "Pobranie klucza GPG nie powiodło się: " - --#: ../yum/__init__.py:3735 -+#: ../yum/__init__.py:3903 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "Nieprawidłowy klucz GPG z %s: %s" -+ -+#: ../yum/__init__.py:3912 - #, python-format - msgid "GPG key parsing failed: key does not have value %s" - msgstr "" - "Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s" - --#: ../yum/__init__.py:3767 -+#: ../yum/__init__.py:3944 - #, python-format - msgid "GPG key at %s (0x%s) is already installed" - msgstr "Klucz GPG %s (0x%s) jest już zainstalowany" - - #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 -+#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 - #, python-format - msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s" - --#: ../yum/__init__.py:3789 -+#: ../yum/__init__.py:3966 - msgid "Not installing key" - msgstr "Klucz nie zostanie zainstalowany" - --#: ../yum/__init__.py:3795 -+#: ../yum/__init__.py:3972 - #, python-format - msgid "Key import failed (code %d)" - msgstr "Zaimportowanie klucza nie powiodło się (kod %d)" - --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 -+#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 - msgid "Key imported successfully" - msgstr "Klucz został pomyślnie zaimportowany" - --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 -+#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 - #, python-format - msgid "" - "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2417,41 +2589,46 @@ msgstr "" - "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne " - "adresy URL do kluczy." - --#: ../yum/__init__.py:3810 -+#: ../yum/__init__.py:3987 - msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?" - --#: ../yum/__init__.py:3829 -+#: ../yum/__init__.py:4006 - #, python-format - msgid "GPG key at %s (0x%s) is already imported" - msgstr "Klucz GPG %s (0x%s) został już zaimportowany" - --#: ../yum/__init__.py:3849 -+#: ../yum/__init__.py:4026 - #, python-format - msgid "Not installing key for repo %s" - msgstr "Klucz dla repozytorium %s nie zostanie zainstalowany" - --#: ../yum/__init__.py:3854 -+#: ../yum/__init__.py:4031 - msgid "Key import failed" - msgstr "Zaimportowanie klucza nie powiodło się" - --#: ../yum/__init__.py:3976 -+#: ../yum/__init__.py:4157 - msgid "Unable to find a suitable mirror." - msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego." - --#: ../yum/__init__.py:3978 -+#: ../yum/__init__.py:4159 - msgid "Errors were encountered while downloading packages." - msgstr "Wystąpiły błędy podczas pobierania pakietów." - --#: ../yum/__init__.py:4028 -+#: ../yum/__init__.py:4209 - #, python-format - msgid "Please report this error at %s" - msgstr "Proszę zgłosić ten błąd na %s" - --#: ../yum/__init__.py:4052 -+#: ../yum/__init__.py:4233 - msgid "Test Transaction Errors: " - msgstr "Błędy testu transakcji: " - -+#: ../yum/__init__.py:4334 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "Nie można ustawić katalogu pamięci podręcznej: %s " -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2512,7 +2689,20 @@ msgstr "Nie można odnaleźć pliku konfiguracji dla wtyczki %s" - msgid "registration of commands not supported" - msgstr "rejestracja poleceń nie jest obsługiwana" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "posiada brakujące wymagania" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "posiada zainstalowane konflikty" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "%s jest duplikatem %s" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "Ponowne tworzenie pakietu" - -diff --git a/po/yum.pot b/po/yum.pot -index eaeb80c..f9a1d35 100644 ---- a/po/yum.pot -+++ b/po/yum.pot -@@ -8,7 +8,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-10-15 15:45+0200\n" -+"POT-Creation-Date: 2010-02-11 10:54-0500\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -16,33 +16,34 @@ msgstr "" - "Content-Type: text/plain; charset=CHARSET\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71 -+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72 - msgid "Updating" - msgstr "" - --#: ../callback.py:49 ../yum/rpmtrans.py:72 -+#: ../callback.py:49 ../yum/rpmtrans.py:73 - msgid "Erasing" - msgstr "" - --#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939 --#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76 -+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946 -+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75 -+#: ../yum/rpmtrans.py:77 - msgid "Installing" - msgstr "" - --#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75 -+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76 - msgid "Obsoleted" - msgstr "" - --#: ../callback.py:54 ../output.py:1063 ../output.py:1403 -+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491 - msgid "Updated" - msgstr "" - --#: ../callback.py:55 ../output.py:1399 -+#: ../callback.py:55 ../output.py:1438 - msgid "Erased" - msgstr "" - --#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061 --#: ../output.py:1395 -+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068 -+#: ../output.py:1434 ../output.py:1646 - msgid "Installed" - msgstr "" - -@@ -64,314 +65,324 @@ msgstr "" - msgid "Erased: %s" - msgstr "" - --#: ../callback.py:217 ../output.py:941 -+#: ../callback.py:217 ../output.py:948 ../output.py:1648 - msgid "Removing" - msgstr "" - --#: ../callback.py:219 ../yum/rpmtrans.py:77 -+#: ../callback.py:219 ../yum/rpmtrans.py:78 - msgid "Cleanup" - msgstr "" - --#: ../cli.py:106 -+#: ../cli.py:107 - #, python-format - msgid "Command \"%s\" already defined" - msgstr "" - --#: ../cli.py:118 -+#: ../cli.py:119 - msgid "Setting up repositories" - msgstr "" - --#: ../cli.py:129 -+#: ../cli.py:130 - msgid "Reading repository metadata in from local files" - msgstr "" - --#: ../cli.py:192 ../utils.py:107 -+#: ../cli.py:194 ../utils.py:193 - #, python-format - msgid "Config Error: %s" - msgstr "" - --#: ../cli.py:195 ../cli.py:1251 ../utils.py:110 -+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196 - #, python-format - msgid "Options Error: %s" - msgstr "" - --#: ../cli.py:223 -+#: ../cli.py:227 - #, python-format - msgid " Installed: %s-%s at %s" - msgstr "" - --#: ../cli.py:225 -+#: ../cli.py:229 - #, python-format - msgid " Built : %s at %s" - msgstr "" - --#: ../cli.py:227 -+#: ../cli.py:231 - #, python-format - msgid " Committed: %s at %s" - msgstr "" - --#: ../cli.py:266 -+#: ../cli.py:270 - msgid "You need to give some command" - msgstr "" - --#: ../cli.py:309 -+#: ../cli.py:284 -+#, python-format -+msgid "No such command: %s. Please use %s --help" -+msgstr "" -+ -+#: ../cli.py:314 - msgid "Disk Requirements:\n" - msgstr "" - --#: ../cli.py:311 -+#: ../cli.py:316 - #, python-format --msgid " At least %dMB needed on the %s filesystem.\n" -+msgid " At least %dMB more space needed on the %s filesystem.\n" - msgstr "" - - #. TODO: simplify the dependency errors? - #. Fixup the summary --#: ../cli.py:316 -+#: ../cli.py:321 - msgid "" - "Error Summary\n" - "-------------\n" - msgstr "" - --#: ../cli.py:359 -+#: ../cli.py:364 - msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - --#: ../cli.py:395 -+#: ../cli.py:403 - msgid "Exiting on user Command" - msgstr "" - --#: ../cli.py:399 -+#: ../cli.py:407 - msgid "Downloading Packages:" - msgstr "" - --#: ../cli.py:404 -+#: ../cli.py:412 - msgid "Error Downloading Packages:\n" - msgstr "" - --#: ../cli.py:418 ../yum/__init__.py:4014 -+#: ../cli.py:426 ../yum/__init__.py:4195 - msgid "Running rpm_check_debug" - msgstr "" - --#: ../cli.py:427 ../yum/__init__.py:4023 -+#: ../cli.py:435 ../yum/__init__.py:4204 - msgid "ERROR You need to update rpm to handle:" - msgstr "" - --#: ../cli.py:429 ../yum/__init__.py:4026 -+#: ../cli.py:437 ../yum/__init__.py:4207 - msgid "ERROR with rpm_check_debug vs depsolve:" - msgstr "" - --#: ../cli.py:435 -+#: ../cli.py:443 - msgid "RPM needs to be updated" - msgstr "" - --#: ../cli.py:436 -+#: ../cli.py:444 - #, python-format - msgid "Please report this error in %s" - msgstr "" - --#: ../cli.py:442 -+#: ../cli.py:450 - msgid "Running Transaction Test" - msgstr "" - --#: ../cli.py:458 --msgid "Finished Transaction Test" --msgstr "" -- --#: ../cli.py:460 -+#: ../cli.py:466 - msgid "Transaction Check Error:\n" - msgstr "" - --#: ../cli.py:467 -+#: ../cli.py:473 - msgid "Transaction Test Succeeded" - msgstr "" - --#: ../cli.py:489 -+#: ../cli.py:495 - msgid "Running Transaction" - msgstr "" - --#: ../cli.py:519 -+#: ../cli.py:525 - msgid "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." - msgstr "" - --#: ../cli.py:538 ../cli.py:572 -+#: ../cli.py:544 ../cli.py:578 - msgid " * Maybe you meant: " - msgstr "" - --#: ../cli.py:555 ../cli.py:563 -+#: ../cli.py:561 ../cli.py:569 - #, python-format - msgid "Package(s) %s%s%s available, but not installed." - msgstr "" - --#: ../cli.py:569 ../cli.py:600 ../cli.py:678 -+#: ../cli.py:575 ../cli.py:607 ../cli.py:687 - #, python-format - msgid "No package %s%s%s available." - msgstr "" - --#: ../cli.py:605 ../cli.py:738 -+#: ../cli.py:612 ../cli.py:748 - msgid "Package(s) to install" - msgstr "" - --#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739 --#: ../yumcommands.py:159 -+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749 -+#: ../yumcommands.py:160 - msgid "Nothing to do" - msgstr "" - --#: ../cli.py:639 -+#: ../cli.py:647 - #, python-format - msgid "%d packages marked for Update" - msgstr "" - --#: ../cli.py:642 -+#: ../cli.py:650 - msgid "No Packages marked for Update" - msgstr "" - --#: ../cli.py:656 -+#: ../cli.py:664 - #, python-format - msgid "%d packages marked for removal" - msgstr "" - --#: ../cli.py:659 -+#: ../cli.py:667 - msgid "No Packages marked for removal" - msgstr "" - --#: ../cli.py:683 -+#: ../cli.py:692 - msgid "Package(s) to downgrade" - msgstr "" - --#: ../cli.py:707 -+#: ../cli.py:717 - #, python-format - msgid " (from %s)" - msgstr "" - --#: ../cli.py:709 -+#: ../cli.py:719 - #, python-format - msgid "Installed package %s%s%s%s not available." - msgstr "" - --#: ../cli.py:716 -+#: ../cli.py:726 - msgid "Package(s) to reinstall" - msgstr "" - --#: ../cli.py:729 -+#: ../cli.py:739 - msgid "No Packages Provided" - msgstr "" - --#: ../cli.py:813 -+#: ../cli.py:818 -+#, python-format -+msgid "Matched: %s" -+msgstr "" -+ -+#: ../cli.py:825 - #, python-format - msgid "Warning: No matches found for: %s" - msgstr "" - --#: ../cli.py:816 -+#: ../cli.py:828 - msgid "No Matches found" - msgstr "" - --#: ../cli.py:855 -+#: ../cli.py:868 - #, python-format - msgid "" - "Warning: 3.0.x versions of yum would erroneously match against filenames.\n" - " You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour" - msgstr "" - --#: ../cli.py:871 -+#: ../cli.py:884 - #, python-format - msgid "No Package Found for %s" - msgstr "" - --#: ../cli.py:883 -+#: ../cli.py:896 - msgid "Cleaning up Everything" - msgstr "" - --#: ../cli.py:897 -+#: ../cli.py:912 - msgid "Cleaning up Headers" - msgstr "" - --#: ../cli.py:900 -+#: ../cli.py:915 - msgid "Cleaning up Packages" - msgstr "" - --#: ../cli.py:903 -+#: ../cli.py:918 - msgid "Cleaning up xml metadata" - msgstr "" - --#: ../cli.py:906 -+#: ../cli.py:921 - msgid "Cleaning up database cache" - msgstr "" - --#: ../cli.py:909 -+#: ../cli.py:924 - msgid "Cleaning up expire-cache metadata" - msgstr "" - --#: ../cli.py:912 -+#: ../cli.py:927 -+msgid "Cleaning up cached rpmdb data" -+msgstr "" -+ -+#: ../cli.py:930 - msgid "Cleaning up plugins" - msgstr "" - --#: ../cli.py:937 -+#: ../cli.py:955 - msgid "Installed Groups:" - msgstr "" - --#: ../cli.py:949 -+#: ../cli.py:967 - msgid "Available Groups:" - msgstr "" - --#: ../cli.py:959 -+#: ../cli.py:977 - msgid "Done" - msgstr "" - --#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629 -+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 - #, python-format - msgid "Warning: Group %s does not exist." - msgstr "" - --#: ../cli.py:998 -+#: ../cli.py:1016 - msgid "No packages in any requested group available to install or update" - msgstr "" - --#: ../cli.py:1000 -+#: ../cli.py:1018 - #, python-format - msgid "%d Package(s) to Install" - msgstr "" - --#: ../cli.py:1010 ../yum/__init__.py:2641 -+#: ../cli.py:1028 ../yum/__init__.py:2800 - #, python-format - msgid "No group named %s exists" - msgstr "" - --#: ../cli.py:1016 -+#: ../cli.py:1034 - msgid "No packages to remove from groups" - msgstr "" - --#: ../cli.py:1018 -+#: ../cli.py:1036 - #, python-format - msgid "%d Package(s) to remove" - msgstr "" - --#: ../cli.py:1060 -+#: ../cli.py:1078 - #, python-format - msgid "Package %s is already installed, skipping" - msgstr "" - --#: ../cli.py:1071 -+#: ../cli.py:1089 - #, python-format - msgid "Discarding non-comparable pkg %s.%s" - msgstr "" - - #. we've not got any installed that match n or n+a --#: ../cli.py:1097 -+#: ../cli.py:1115 - #, python-format - msgid "No other %s installed, adding to list for potential install" - msgstr "" - --#: ../cli.py:1117 -+#: ../cli.py:1135 - msgid "Plugin Options" - msgstr "" - --#: ../cli.py:1125 -+#: ../cli.py:1143 - #, python-format - msgid "Command line error: %s" - msgstr "" - --#: ../cli.py:1138 -+#: ../cli.py:1156 - #, python-format - msgid "" - "\n" -@@ -379,106 +390,114 @@ msgid "" - "%s: %s option requires an argument" - msgstr "" - --#: ../cli.py:1191 -+#: ../cli.py:1209 - msgid "--color takes one of: auto, always, never" - msgstr "" - --#: ../cli.py:1298 -+#: ../cli.py:1319 - msgid "show this help message and exit" - msgstr "" - --#: ../cli.py:1302 -+#: ../cli.py:1323 - msgid "be tolerant of errors" - msgstr "" - --#: ../cli.py:1304 --msgid "run entirely from cache, don't update cache" -+#: ../cli.py:1326 -+msgid "run entirely from system cache, don't update cache" - msgstr "" - --#: ../cli.py:1306 -+#: ../cli.py:1329 - msgid "config file location" - msgstr "" - --#: ../cli.py:1308 -+#: ../cli.py:1332 - msgid "maximum command wait time" - msgstr "" - --#: ../cli.py:1310 -+#: ../cli.py:1334 - msgid "debugging output level" - msgstr "" - --#: ../cli.py:1314 -+#: ../cli.py:1338 - msgid "show duplicates, in repos, in list/search commands" - msgstr "" - --#: ../cli.py:1316 -+#: ../cli.py:1340 - msgid "error output level" - msgstr "" - --#: ../cli.py:1319 -+#: ../cli.py:1343 -+msgid "debugging output level for rpm" -+msgstr "" -+ -+#: ../cli.py:1346 - msgid "quiet operation" - msgstr "" - --#: ../cli.py:1321 -+#: ../cli.py:1348 - msgid "verbose operation" - msgstr "" - --#: ../cli.py:1323 -+#: ../cli.py:1350 - msgid "answer yes for all questions" - msgstr "" - --#: ../cli.py:1325 -+#: ../cli.py:1352 - msgid "show Yum version and exit" - msgstr "" - --#: ../cli.py:1326 -+#: ../cli.py:1353 - msgid "set install root" - msgstr "" - --#: ../cli.py:1330 -+#: ../cli.py:1357 - msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - --#: ../cli.py:1334 -+#: ../cli.py:1361 - msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - --#: ../cli.py:1337 -+#: ../cli.py:1364 - msgid "exclude package(s) by name or glob" - msgstr "" - --#: ../cli.py:1339 -+#: ../cli.py:1366 - msgid "disable exclude from main, for a repo or for everything" - msgstr "" - --#: ../cli.py:1342 -+#: ../cli.py:1369 - msgid "enable obsoletes processing during updates" - msgstr "" - --#: ../cli.py:1344 -+#: ../cli.py:1371 - msgid "disable Yum plugins" - msgstr "" - --#: ../cli.py:1346 -+#: ../cli.py:1373 - msgid "disable gpg signature checking" - msgstr "" - --#: ../cli.py:1348 -+#: ../cli.py:1375 - msgid "disable plugins by name" - msgstr "" - --#: ../cli.py:1351 -+#: ../cli.py:1378 - msgid "enable plugins by name" - msgstr "" - --#: ../cli.py:1354 -+#: ../cli.py:1381 - msgid "skip packages with depsolving problems" - msgstr "" - --#: ../cli.py:1356 -+#: ../cli.py:1383 - msgid "control whether color is used" - msgstr "" - -+#: ../cli.py:1385 -+msgid "set value of $releasever in yum config and repo files" -+msgstr "" -+ - #: ../output.py:305 - msgid "Jan" - msgstr "" -@@ -531,253 +550,255 @@ msgstr "" - msgid "Trying other mirror." - msgstr "" - --#: ../output.py:538 -+#: ../output.py:534 - #, python-format - msgid "Name : %s%s%s" - msgstr "" - --#: ../output.py:539 -+#: ../output.py:535 - #, python-format - msgid "Arch : %s" - msgstr "" - --#: ../output.py:541 -+#: ../output.py:537 - #, python-format - msgid "Epoch : %s" - msgstr "" - --#: ../output.py:542 -+#: ../output.py:538 - #, python-format - msgid "Version : %s" - msgstr "" - --#: ../output.py:543 -+#: ../output.py:539 - #, python-format - msgid "Release : %s" - msgstr "" - --#: ../output.py:544 -+#: ../output.py:540 - #, python-format - msgid "Size : %s" - msgstr "" - --#: ../output.py:545 -+#: ../output.py:541 - #, python-format - msgid "Repo : %s" - msgstr "" - --#: ../output.py:547 -+#: ../output.py:543 - #, python-format - msgid "From repo : %s" - msgstr "" - --#: ../output.py:549 -+#: ../output.py:545 - #, python-format - msgid "Committer : %s" - msgstr "" - --#: ../output.py:550 -+#: ../output.py:546 - #, python-format - msgid "Committime : %s" - msgstr "" - --#: ../output.py:551 -+#: ../output.py:547 - #, python-format - msgid "Buildtime : %s" - msgstr "" - --#: ../output.py:553 -+#: ../output.py:549 - #, python-format - msgid "Installtime: %s" - msgstr "" - --#: ../output.py:554 -+#: ../output.py:550 - msgid "Summary : " - msgstr "" - --#: ../output.py:556 -+#: ../output.py:552 - #, python-format - msgid "URL : %s" - msgstr "" - --#: ../output.py:557 --#, python-format --msgid "License : %s" -+#: ../output.py:553 -+msgid "License : " - msgstr "" - --#: ../output.py:558 -+#: ../output.py:554 - msgid "Description: " - msgstr "" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "y" - msgstr "" - --#: ../output.py:626 -+#: ../output.py:622 - msgid "yes" - msgstr "" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "n" - msgstr "" - --#: ../output.py:627 -+#: ../output.py:623 - msgid "no" - msgstr "" - --#: ../output.py:631 -+#: ../output.py:627 - msgid "Is this ok [y/N]: " - msgstr "" - --#: ../output.py:722 -+#: ../output.py:715 - #, python-format - msgid "" - "\n" - "Group: %s" - msgstr "" - --#: ../output.py:726 -+#: ../output.py:719 - #, python-format - msgid " Group-Id: %s" - msgstr "" - --#: ../output.py:731 -+#: ../output.py:724 - #, python-format - msgid " Description: %s" - msgstr "" - --#: ../output.py:733 -+#: ../output.py:726 - msgid " Mandatory Packages:" - msgstr "" - --#: ../output.py:734 -+#: ../output.py:727 - msgid " Default Packages:" - msgstr "" - --#: ../output.py:735 -+#: ../output.py:728 - msgid " Optional Packages:" - msgstr "" - --#: ../output.py:736 -+#: ../output.py:729 - msgid " Conditional Packages:" - msgstr "" - --#: ../output.py:756 -+#: ../output.py:749 - #, python-format - msgid "package: %s" - msgstr "" - --#: ../output.py:758 -+#: ../output.py:751 - msgid " No dependencies for this package" - msgstr "" - --#: ../output.py:763 -+#: ../output.py:756 - #, python-format - msgid " dependency: %s" - msgstr "" - --#: ../output.py:765 -+#: ../output.py:758 - msgid " Unsatisfied dependency" - msgstr "" - --#: ../output.py:837 -+#: ../output.py:830 - #, python-format - msgid "Repo : %s" - msgstr "" - --#: ../output.py:838 -+#: ../output.py:831 - msgid "Matched from:" - msgstr "" - --#: ../output.py:847 -+#: ../output.py:840 - msgid "Description : " - msgstr "" - --#: ../output.py:850 -+#: ../output.py:843 - #, python-format - msgid "URL : %s" - msgstr "" - --#: ../output.py:853 -+#: ../output.py:846 - #, python-format - msgid "License : %s" - msgstr "" - --#: ../output.py:856 -+#: ../output.py:849 - #, python-format - msgid "Filename : %s" - msgstr "" - --#: ../output.py:860 -+#: ../output.py:853 - msgid "Other : " - msgstr "" - --#: ../output.py:893 -+#: ../output.py:896 - msgid "There was an error calculating total download size" - msgstr "" - --#: ../output.py:898 -+#: ../output.py:901 - #, python-format - msgid "Total size: %s" - msgstr "" - --#: ../output.py:901 -+#: ../output.py:904 - #, python-format - msgid "Total download size: %s" - msgstr "" - --#: ../output.py:942 -+#: ../output.py:908 -+#, python-format -+msgid "Installed size: %s" -+msgstr "" -+ -+#: ../output.py:949 - msgid "Reinstalling" - msgstr "" - --#: ../output.py:943 -+#: ../output.py:950 - msgid "Downgrading" - msgstr "" - --#: ../output.py:944 -+#: ../output.py:951 - msgid "Installing for dependencies" - msgstr "" - --#: ../output.py:945 -+#: ../output.py:952 - msgid "Updating for dependencies" - msgstr "" - --#: ../output.py:946 -+#: ../output.py:953 - msgid "Removing for dependencies" - msgstr "" - --#: ../output.py:953 ../output.py:1065 -+#: ../output.py:960 ../output.py:1072 - msgid "Skipped (dependency problems)" - msgstr "" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Package" - msgstr "" - --#: ../output.py:976 -+#: ../output.py:983 - msgid "Arch" - msgstr "" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Version" - msgstr "" - --#: ../output.py:977 -+#: ../output.py:984 - msgid "Repository" - msgstr "" - --#: ../output.py:978 -+#: ../output.py:985 - msgid "Size" - msgstr "" - --#: ../output.py:990 -+#: ../output.py:997 - #, python-format --msgid "" --" replacing %s%s%s.%s %s\n" --"\n" -+msgid " replacing %s%s%s.%s %s\n" - msgstr "" - --#: ../output.py:999 -+#: ../output.py:1006 - #, python-format - msgid "" - "\n" -@@ -785,14 +806,14 @@ msgid "" - "%s\n" - msgstr "" - --#: ../output.py:1006 -+#: ../output.py:1013 - #, python-format - msgid "" - "Install %5.5s Package(s)\n" - "Upgrade %5.5s Package(s)\n" - msgstr "" - --#: ../output.py:1015 -+#: ../output.py:1022 - #, python-format - msgid "" - "Remove %5.5s Package(s)\n" -@@ -800,32 +821,32 @@ msgid "" - "Downgrade %5.5s Package(s)\n" - msgstr "" - --#: ../output.py:1059 -+#: ../output.py:1066 - msgid "Removed" - msgstr "" - --#: ../output.py:1060 -+#: ../output.py:1067 - msgid "Dependency Removed" - msgstr "" - --#: ../output.py:1062 -+#: ../output.py:1069 - msgid "Dependency Installed" - msgstr "" - --#: ../output.py:1064 -+#: ../output.py:1071 - msgid "Dependency Updated" - msgstr "" - --#: ../output.py:1066 -+#: ../output.py:1073 - msgid "Replaced" - msgstr "" - --#: ../output.py:1067 -+#: ../output.py:1074 - msgid "Failed" - msgstr "" - - #. Delta between C-c's so we treat as exit --#: ../output.py:1133 -+#: ../output.py:1140 - msgid "two" - msgstr "" - -@@ -833,7 +854,7 @@ msgstr "" - #. Current download cancelled, interrupt (ctrl-c) again within two seconds - #. to exit. - #. Where "interupt (ctrl-c) again" and "two" are highlighted. --#: ../output.py:1144 -+#: ../output.py:1151 - #, python-format - msgid "" - "\n" -@@ -842,221 +863,374 @@ msgid "" - "to exit.\n" - msgstr "" - --#: ../output.py:1155 -+#: ../output.py:1162 - msgid "user interrupt" - msgstr "" - --#: ../output.py:1173 -+#: ../output.py:1180 - msgid "Total" - msgstr "" - -+#: ../output.py:1202 -+msgid "I" -+msgstr "" -+ - #: ../output.py:1203 --msgid "" -+msgid "O" - msgstr "" - - #: ../output.py:1204 -+msgid "E" -+msgstr "" -+ -+#: ../output.py:1205 -+msgid "R" -+msgstr "" -+ -+#: ../output.py:1206 -+msgid "D" -+msgstr "" -+ -+#: ../output.py:1207 -+msgid "U" -+msgstr "" -+ -+#: ../output.py:1217 -+msgid "" -+msgstr "" -+ -+#: ../output.py:1218 - msgid "System" - msgstr "" - --#: ../output.py:1240 -+#: ../output.py:1254 - msgid "Bad transaction IDs, or package(s), given" - msgstr "" - --#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067 --msgid "Warning: RPMDB has been altered since the last yum transaction." -+#: ../output.py:1266 -+msgid "ID" -+msgstr "" -+ -+#: ../output.py:1267 ../output.py:1520 -+msgid "Login user" - msgstr "" - --#: ../output.py:1289 -+#: ../output.py:1268 -+msgid "Date and time" -+msgstr "" -+ -+#: ../output.py:1269 ../output.py:1522 -+msgid "Action(s)" -+msgstr "" -+ -+#: ../output.py:1270 ../output.py:1523 -+msgid "Altered" -+msgstr "" -+ -+#: ../output.py:1310 - msgid "No transaction ID given" - msgstr "" - --#: ../output.py:1297 -+#: ../output.py:1336 - msgid "Bad transaction ID given" - msgstr "" - --#: ../output.py:1302 -+#: ../output.py:1341 - msgid "Not found given transaction ID" - msgstr "" - --#: ../output.py:1310 -+#: ../output.py:1349 - msgid "Found more than one transaction ID!" - msgstr "" - --#: ../output.py:1331 -+#: ../output.py:1370 - msgid "No transaction ID, or package, given" - msgstr "" - --#: ../output.py:1357 -+#: ../output.py:1396 - msgid "Transaction ID :" - msgstr "" - --#: ../output.py:1359 -+#: ../output.py:1398 - msgid "Begin time :" - msgstr "" - --#: ../output.py:1362 ../output.py:1364 -+#: ../output.py:1401 ../output.py:1403 - msgid "Begin rpmdb :" - msgstr "" - --#: ../output.py:1378 -+#: ../output.py:1417 - #, python-format - msgid "(%s seconds)" - msgstr "" - --#: ../output.py:1379 -+#: ../output.py:1418 - msgid "End time :" - msgstr "" - --#: ../output.py:1382 ../output.py:1384 -+#: ../output.py:1421 ../output.py:1423 - msgid "End rpmdb :" - msgstr "" - --#: ../output.py:1385 -+#: ../output.py:1424 - msgid "User :" - msgstr "" - --#: ../output.py:1387 ../output.py:1389 ../output.py:1391 -+#: ../output.py:1426 ../output.py:1428 ../output.py:1430 - msgid "Return-Code :" - msgstr "" - --#: ../output.py:1387 -+#: ../output.py:1426 - msgid "Aborted" - msgstr "" - --#: ../output.py:1389 -+#: ../output.py:1428 - msgid "Failure:" - msgstr "" - --#: ../output.py:1391 -+#: ../output.py:1430 - msgid "Success" - msgstr "" - --#: ../output.py:1392 -+#: ../output.py:1431 - msgid "Transaction performed with:" - msgstr "" - --#: ../output.py:1405 -+#: ../output.py:1444 ../output.py:1489 - msgid "Downgraded" - msgstr "" - - #. multiple versions installed, both older and newer --#: ../output.py:1407 -+#: ../output.py:1446 - msgid "Weird" - msgstr "" - --#: ../output.py:1409 -+#: ../output.py:1448 - msgid "Packages Altered:" - msgstr "" - --#: ../output.py:1412 -+#: ../output.py:1451 - msgid "Scriptlet output:" - msgstr "" - --#: ../output.py:1418 -+#: ../output.py:1457 - msgid "Errors:" - msgstr "" - --#: ../output.py:1489 --msgid "Last day" -+#: ../output.py:1481 ../output.py:1482 -+msgid "Install" -+msgstr "" -+ -+#: ../output.py:1483 -+msgid "Dep-Install" -+msgstr "" -+ -+#: ../output.py:1485 -+msgid "Obsoleting" -+msgstr "" -+ -+#: ../output.py:1486 -+msgid "Erase" -+msgstr "" -+ -+#: ../output.py:1487 -+msgid "Reinstall" -+msgstr "" -+ -+#: ../output.py:1488 -+msgid "Downgrade" - msgstr "" - - #: ../output.py:1490 -+msgid "Update" -+msgstr "" -+ -+#: ../output.py:1521 -+msgid "Time" -+msgstr "" -+ -+#: ../output.py:1547 -+msgid "Last day" -+msgstr "" -+ -+#: ../output.py:1548 - msgid "Last week" - msgstr "" - --#: ../output.py:1491 -+#: ../output.py:1549 - msgid "Last 2 weeks" - msgstr "" - - #. US default :p --#: ../output.py:1492 -+#: ../output.py:1550 - msgid "Last 3 months" - msgstr "" - --#: ../output.py:1493 -+#: ../output.py:1551 - msgid "Last 6 months" - msgstr "" - --#: ../output.py:1494 -+#: ../output.py:1552 - msgid "Last year" - msgstr "" - --#: ../output.py:1495 -+#: ../output.py:1553 - msgid "Over a year ago" - msgstr "" - --#: ../output.py:1524 -+#: ../output.py:1585 - msgid "installed" - msgstr "" - --#: ../output.py:1525 -+#: ../output.py:1586 - msgid "updated" - msgstr "" - --#: ../output.py:1526 -+#: ../output.py:1587 - msgid "obsoleted" - msgstr "" - --#: ../output.py:1527 -+#: ../output.py:1588 - msgid "erased" - msgstr "" - --#: ../output.py:1531 -+#: ../output.py:1592 - #, python-format - msgid "---> Package %s.%s %s:%s-%s set to be %s" - msgstr "" - --#: ../output.py:1538 -+#: ../output.py:1599 - msgid "--> Running transaction check" - msgstr "" - --#: ../output.py:1543 -+#: ../output.py:1604 - msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - --#: ../output.py:1548 -+#: ../output.py:1609 - msgid "--> Finished Dependency Resolution" - msgstr "" - --#: ../output.py:1553 ../output.py:1558 -+#: ../output.py:1614 ../output.py:1619 - #, python-format - msgid "--> Processing Dependency: %s for package: %s" - msgstr "" - --#: ../output.py:1562 -+#: ../output.py:1623 - #, python-format - msgid "--> Unresolved Dependency: %s" - msgstr "" - --#: ../output.py:1568 ../output.py:1573 -+#: ../output.py:1634 -+#, python-format -+msgid "Package: %s" -+msgstr "" -+ -+#: ../output.py:1636 -+#, python-format -+msgid "" -+"\n" -+" Requires: %s" -+msgstr "" -+ -+#: ../output.py:1649 ../output.py:1660 -+#, python-format -+msgid "" -+"\n" -+" %s: %s (%s)" -+msgstr "" -+ -+#: ../output.py:1657 -+msgid "Available" -+msgstr "" -+ -+#: ../output.py:1665 ../output.py:1670 - #, python-format - msgid "--> Processing Conflict: %s conflicts %s" - msgstr "" - --#: ../output.py:1577 -+#: ../output.py:1674 - msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - --#: ../output.py:1581 -+#: ../output.py:1678 - #, python-format - msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - --#: ../utils.py:137 ../yummain.py:42 -+#: ../utils.py:93 -+msgid "Running" -+msgstr "" -+ -+#: ../utils.py:94 -+msgid "Sleeping" -+msgstr "" -+ -+#: ../utils.py:95 -+msgid "Uninterruptible" -+msgstr "" -+ -+#: ../utils.py:96 -+msgid "Zombie" -+msgstr "" -+ -+#: ../utils.py:97 -+msgid "Traced/Stopped" -+msgstr "" -+ -+#: ../utils.py:98 ../yumcommands.py:917 -+msgid "Unknown" -+msgstr "" -+ -+#: ../utils.py:109 -+msgid " The other application is: PackageKit" -+msgstr "" -+ -+#: ../utils.py:111 -+#, python-format -+msgid " The other application is: %s" -+msgstr "" -+ -+#: ../utils.py:114 -+#, python-format -+msgid " Memory : %5s RSS (%5sB VSZ)" -+msgstr "" -+ -+#: ../utils.py:119 -+#, python-format -+msgid " Started: %s - %s ago" -+msgstr "" -+ -+#: ../utils.py:121 -+#, python-format -+msgid " State : %s, pid: %d" -+msgstr "" -+ -+#: ../utils.py:199 -+#, python-format -+msgid "PluginExit Error: %s" -+msgstr "" -+ -+#: ../utils.py:202 -+#, python-format -+msgid "Yum Error: %s" -+msgstr "" -+ -+#: ../utils.py:235 ../yummain.py:42 - msgid "" - "\n" - "\n" - "Exiting on user cancel" - msgstr "" - --#: ../utils.py:143 ../yummain.py:48 -+#: ../utils.py:241 ../yummain.py:48 - msgid "" - "\n" - "\n" - "Exiting on Broken Pipe" - msgstr "" - --#: ../utils.py:145 ../yummain.py:50 -+#: ../utils.py:243 ../yummain.py:50 - #, python-format - msgid "" - "\n" -@@ -1064,15 +1238,15 @@ msgid "" - "%s" - msgstr "" - --#: ../utils.py:184 ../yummain.py:273 -+#: ../utils.py:282 ../yummain.py:211 - msgid "Complete!" - msgstr "" - --#: ../yumcommands.py:42 -+#: ../yumcommands.py:43 - msgid "You need to be root to perform this command." - msgstr "" - --#: ../yumcommands.py:49 -+#: ../yumcommands.py:50 - msgid "" - "\n" - "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1090,487 +1264,444 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" - --#: ../yumcommands.py:69 -+#: ../yumcommands.py:70 - #, python-format - msgid "Error: Need to pass a list of pkgs to %s" - msgstr "" - --#: ../yumcommands.py:75 -+#: ../yumcommands.py:76 - msgid "Error: Need an item to match" - msgstr "" - --#: ../yumcommands.py:81 -+#: ../yumcommands.py:82 - msgid "Error: Need a group or list of groups" - msgstr "" - --#: ../yumcommands.py:90 -+#: ../yumcommands.py:91 - #, python-format - msgid "Error: clean requires an option: %s" - msgstr "" - --#: ../yumcommands.py:95 -+#: ../yumcommands.py:96 - #, python-format - msgid "Error: invalid clean argument: %r" - msgstr "" - --#: ../yumcommands.py:108 -+#: ../yumcommands.py:109 - msgid "No argument to shell" - msgstr "" - --#: ../yumcommands.py:110 -+#: ../yumcommands.py:111 - #, python-format - msgid "Filename passed to shell: %s" - msgstr "" - --#: ../yumcommands.py:114 -+#: ../yumcommands.py:115 - #, python-format - msgid "File %s given as argument to shell does not exist." - msgstr "" - --#: ../yumcommands.py:120 -+#: ../yumcommands.py:121 - msgid "Error: more than one file given as argument to shell." - msgstr "" - --#: ../yumcommands.py:169 -+#: ../yumcommands.py:170 - msgid "PACKAGE..." - msgstr "" - --#: ../yumcommands.py:172 -+#: ../yumcommands.py:173 - msgid "Install a package or packages on your system" - msgstr "" - --#: ../yumcommands.py:180 -+#: ../yumcommands.py:181 - msgid "Setting up Install Process" - msgstr "" - --#: ../yumcommands.py:191 -+#: ../yumcommands.py:192 - msgid "[PACKAGE...]" - msgstr "" - --#: ../yumcommands.py:194 -+#: ../yumcommands.py:195 - msgid "Update a package or packages on your system" - msgstr "" - --#: ../yumcommands.py:201 -+#: ../yumcommands.py:202 - msgid "Setting up Update Process" - msgstr "" - --#: ../yumcommands.py:246 -+#: ../yumcommands.py:244 - msgid "Display details about a package or group of packages" - msgstr "" - --#: ../yumcommands.py:295 -+#: ../yumcommands.py:293 - msgid "Installed Packages" - msgstr "" - --#: ../yumcommands.py:303 -+#: ../yumcommands.py:301 - msgid "Available Packages" - msgstr "" - --#: ../yumcommands.py:307 -+#: ../yumcommands.py:305 - msgid "Extra Packages" - msgstr "" - --#: ../yumcommands.py:311 -+#: ../yumcommands.py:309 - msgid "Updated Packages" - msgstr "" - - #. This only happens in verbose mode --#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603 -+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601 - msgid "Obsoleting Packages" - msgstr "" - --#: ../yumcommands.py:328 -+#: ../yumcommands.py:326 - msgid "Recently Added Packages" - msgstr "" - --#: ../yumcommands.py:335 -+#: ../yumcommands.py:333 - msgid "No matching Packages to list" - msgstr "" - --#: ../yumcommands.py:349 -+#: ../yumcommands.py:347 - msgid "List a package or groups of packages" - msgstr "" - --#: ../yumcommands.py:361 -+#: ../yumcommands.py:359 - msgid "Remove a package or packages from your system" - msgstr "" - --#: ../yumcommands.py:368 -+#: ../yumcommands.py:366 - msgid "Setting up Remove Process" - msgstr "" - --#: ../yumcommands.py:382 -+#: ../yumcommands.py:380 - msgid "Setting up Group Process" - msgstr "" - --#: ../yumcommands.py:388 -+#: ../yumcommands.py:386 - msgid "No Groups on which to run command" - msgstr "" - --#: ../yumcommands.py:401 -+#: ../yumcommands.py:399 - msgid "List available package groups" - msgstr "" - --#: ../yumcommands.py:418 -+#: ../yumcommands.py:416 - msgid "Install the packages in a group on your system" - msgstr "" - --#: ../yumcommands.py:440 -+#: ../yumcommands.py:438 - msgid "Remove the packages in a group from your system" - msgstr "" - --#: ../yumcommands.py:467 -+#: ../yumcommands.py:465 - msgid "Display details about a package group" - msgstr "" - --#: ../yumcommands.py:491 -+#: ../yumcommands.py:489 - msgid "Generate the metadata cache" - msgstr "" - --#: ../yumcommands.py:497 -+#: ../yumcommands.py:495 - msgid "Making cache files for all metadata files." - msgstr "" - --#: ../yumcommands.py:498 -+#: ../yumcommands.py:496 - msgid "This may take a while depending on the speed of this computer" - msgstr "" - --#: ../yumcommands.py:519 -+#: ../yumcommands.py:517 - msgid "Metadata Cache Created" - msgstr "" - --#: ../yumcommands.py:533 -+#: ../yumcommands.py:531 - msgid "Remove cached data" - msgstr "" - --#: ../yumcommands.py:553 -+#: ../yumcommands.py:551 - msgid "Find what package provides the given value" - msgstr "" - --#: ../yumcommands.py:573 -+#: ../yumcommands.py:571 - msgid "Check for available package updates" - msgstr "" - --#: ../yumcommands.py:623 -+#: ../yumcommands.py:621 - msgid "Search package details for the given string" - msgstr "" - --#: ../yumcommands.py:629 -+#: ../yumcommands.py:627 - msgid "Searching Packages: " - msgstr "" - --#: ../yumcommands.py:646 -+#: ../yumcommands.py:644 - msgid "Update packages taking obsoletes into account" - msgstr "" - --#: ../yumcommands.py:654 -+#: ../yumcommands.py:652 - msgid "Setting up Upgrade Process" - msgstr "" - --#: ../yumcommands.py:668 -+#: ../yumcommands.py:666 - msgid "Install a local RPM" - msgstr "" - --#: ../yumcommands.py:676 -+#: ../yumcommands.py:674 - msgid "Setting up Local Package Process" - msgstr "" - --#: ../yumcommands.py:695 -+#: ../yumcommands.py:693 - msgid "Determine which package provides the given dependency" - msgstr "" - --#: ../yumcommands.py:698 -+#: ../yumcommands.py:696 - msgid "Searching Packages for Dependency:" - msgstr "" - --#: ../yumcommands.py:712 -+#: ../yumcommands.py:710 - msgid "Run an interactive yum shell" - msgstr "" - --#: ../yumcommands.py:718 -+#: ../yumcommands.py:716 - msgid "Setting up Yum Shell" - msgstr "" - --#: ../yumcommands.py:736 -+#: ../yumcommands.py:734 - msgid "List a package's dependencies" - msgstr "" - --#: ../yumcommands.py:742 -+#: ../yumcommands.py:740 - msgid "Finding dependencies: " - msgstr "" - --#: ../yumcommands.py:758 -+#: ../yumcommands.py:756 - msgid "Display the configured software repositories" - msgstr "" - --#: ../yumcommands.py:810 ../yumcommands.py:811 -+#: ../yumcommands.py:822 ../yumcommands.py:823 - msgid "enabled" - msgstr "" - --#: ../yumcommands.py:819 ../yumcommands.py:820 -+#: ../yumcommands.py:849 ../yumcommands.py:850 - msgid "disabled" - msgstr "" - --#: ../yumcommands.py:834 -+#: ../yumcommands.py:866 - msgid "Repo-id : " - msgstr "" - --#: ../yumcommands.py:835 -+#: ../yumcommands.py:867 - msgid "Repo-name : " - msgstr "" - --#: ../yumcommands.py:836 -+#: ../yumcommands.py:870 - msgid "Repo-status : " - msgstr "" - --#: ../yumcommands.py:838 -+#: ../yumcommands.py:873 - msgid "Repo-revision: " - msgstr "" - --#: ../yumcommands.py:842 -+#: ../yumcommands.py:877 - msgid "Repo-tags : " - msgstr "" - --#: ../yumcommands.py:848 -+#: ../yumcommands.py:883 - msgid "Repo-distro-tags: " - msgstr "" - --#: ../yumcommands.py:853 -+#: ../yumcommands.py:888 - msgid "Repo-updated : " - msgstr "" - --#: ../yumcommands.py:855 -+#: ../yumcommands.py:890 - msgid "Repo-pkgs : " - msgstr "" - --#: ../yumcommands.py:856 -+#: ../yumcommands.py:891 - msgid "Repo-size : " - msgstr "" - --#: ../yumcommands.py:863 -+#: ../yumcommands.py:898 - msgid "Repo-baseurl : " - msgstr "" - --#: ../yumcommands.py:871 -+#: ../yumcommands.py:906 - msgid "Repo-metalink: " - msgstr "" - --#: ../yumcommands.py:875 -+#: ../yumcommands.py:910 - msgid " Updated : " - msgstr "" - --#: ../yumcommands.py:878 -+#: ../yumcommands.py:913 - msgid "Repo-mirrors : " - msgstr "" - --#: ../yumcommands.py:882 ../yummain.py:133 --msgid "Unknown" --msgstr "" -- --#: ../yumcommands.py:888 -+#: ../yumcommands.py:923 - #, python-format - msgid "Never (last: %s)" - msgstr "" - --#: ../yumcommands.py:890 -+#: ../yumcommands.py:925 - #, python-format - msgid "Instant (last: %s)" - msgstr "" - --#: ../yumcommands.py:893 -+#: ../yumcommands.py:928 - #, python-format - msgid "%s second(s) (last: %s)" - msgstr "" - --#: ../yumcommands.py:895 -+#: ../yumcommands.py:930 - msgid "Repo-expire : " - msgstr "" - --#: ../yumcommands.py:898 -+#: ../yumcommands.py:933 - msgid "Repo-exclude : " - msgstr "" - --#: ../yumcommands.py:902 -+#: ../yumcommands.py:937 - msgid "Repo-include : " - msgstr "" - -+#: ../yumcommands.py:941 -+msgid "Repo-excluded: " -+msgstr "" -+ - #. Work out the first (id) and last (enabled/disalbed/count), - #. then chop the middle (name)... --#: ../yumcommands.py:912 ../yumcommands.py:938 -+#: ../yumcommands.py:951 ../yumcommands.py:980 - msgid "repo id" - msgstr "" - --#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941 -+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987 - msgid "status" - msgstr "" - --#: ../yumcommands.py:939 -+#: ../yumcommands.py:981 - msgid "repo name" - msgstr "" - --#: ../yumcommands.py:965 -+#: ../yumcommands.py:1018 - msgid "Display a helpful usage message" - msgstr "" - --#: ../yumcommands.py:999 -+#: ../yumcommands.py:1052 - #, python-format - msgid "No help available for %s" - msgstr "" - --#: ../yumcommands.py:1004 -+#: ../yumcommands.py:1057 - msgid "" - "\n" - "\n" - "aliases: " - msgstr "" - --#: ../yumcommands.py:1006 -+#: ../yumcommands.py:1059 - msgid "" - "\n" - "\n" - "alias: " - msgstr "" - --#: ../yumcommands.py:1034 -+#: ../yumcommands.py:1087 - msgid "Setting up Reinstall Process" - msgstr "" - --#: ../yumcommands.py:1042 -+#: ../yumcommands.py:1095 - msgid "reinstall a package" - msgstr "" - --#: ../yumcommands.py:1060 -+#: ../yumcommands.py:1113 - msgid "Setting up Downgrade Process" - msgstr "" - --#: ../yumcommands.py:1067 -+#: ../yumcommands.py:1120 - msgid "downgrade a package" - msgstr "" - --#: ../yumcommands.py:1081 -+#: ../yumcommands.py:1134 - msgid "Display a version for the machine and/or available repos." - msgstr "" - --#: ../yumcommands.py:1111 -+#: ../yumcommands.py:1173 - msgid " Yum version groups:" - msgstr "" - --#: ../yumcommands.py:1121 -+#: ../yumcommands.py:1183 - msgid " Group :" - msgstr "" - --#: ../yumcommands.py:1122 -+#: ../yumcommands.py:1184 - msgid " Packages:" - msgstr "" - --#: ../yumcommands.py:1152 -+#: ../yumcommands.py:1213 - msgid "Installed:" - msgstr "" - --#: ../yumcommands.py:1157 -+#: ../yumcommands.py:1218 - msgid "Group-Installed:" - msgstr "" - --#: ../yumcommands.py:1166 -+#: ../yumcommands.py:1227 - msgid "Available:" - msgstr "" - --#: ../yumcommands.py:1172 -+#: ../yumcommands.py:1233 - msgid "Group-Available:" - msgstr "" - --#: ../yumcommands.py:1211 -+#: ../yumcommands.py:1272 - msgid "Display, or use, the transaction history" - msgstr "" - --#: ../yumcommands.py:1239 -+#: ../yumcommands.py:1300 - #, python-format - msgid "Invalid history sub-command, use: %s." - msgstr "" - --#: ../yummain.py:128 --msgid "Running" --msgstr "" -- --#: ../yummain.py:129 --msgid "Sleeping" --msgstr "" -- --#: ../yummain.py:130 --msgid "Uninteruptable" --msgstr "" -- --#: ../yummain.py:131 --msgid "Zombie" -+#: ../yumcommands.py:1345 -+msgid "Check for problems in the rpmdb" - msgstr "" - --#: ../yummain.py:132 --msgid "Traced/Stopped" --msgstr "" -- --#: ../yummain.py:137 --msgid " The other application is: PackageKit" --msgstr "" -- --#: ../yummain.py:139 --#, python-format --msgid " The other application is: %s" --msgstr "" -- --#: ../yummain.py:142 --#, python-format --msgid " Memory : %5s RSS (%5sB VSZ)" --msgstr "" -- --#: ../yummain.py:146 --#, python-format --msgid " Started: %s - %s ago" --msgstr "" -- --#: ../yummain.py:148 --#, python-format --msgid " State : %s, pid: %d" --msgstr "" -- --#: ../yummain.py:173 -+#: ../yummain.py:102 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - --#: ../yummain.py:201 ../yummain.py:240 -+#: ../yummain.py:130 ../yummain.py:169 - #, python-format - msgid "Error: %s" - msgstr "" - --#: ../yummain.py:211 ../yummain.py:253 -+#: ../yummain.py:140 ../yummain.py:182 - #, python-format - msgid "Unknown Error(s): Exit Code: %d:" - msgstr "" - - #. Depsolve stage --#: ../yummain.py:218 -+#: ../yummain.py:147 - msgid "Resolving Dependencies" - msgstr "" - --#: ../yummain.py:242 -+#: ../yummain.py:173 - msgid " You could try using --skip-broken to work around the problem" - msgstr "" - --#: ../yummain.py:243 --msgid "" --" You could try running: package-cleanup --problems\n" --" package-cleanup --dupes\n" --" rpm -Va --nofiles --nodigest" -+#: ../yummain.py:175 ../yummain.py:208 -+msgid " You could try running: rpm -Va --nofiles --nodigest" - msgstr "" - --#: ../yummain.py:259 -+#: ../yummain.py:188 - msgid "" - "\n" - "Dependencies Resolved" - msgstr "" - --#: ../yummain.py:326 -+#: ../yummain.py:265 - msgid "" - "\n" - "\n" -@@ -1605,362 +1736,390 @@ msgstr "" - msgid "Matched %s to require for %s" - msgstr "" - --#: ../yum/depsolve.py:224 -+#: ../yum/depsolve.py:225 - #, python-format - msgid "Member: %s" - msgstr "" - --#: ../yum/depsolve.py:238 ../yum/depsolve.py:749 -+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754 - #, python-format - msgid "%s converted to install" - msgstr "" - --#: ../yum/depsolve.py:245 -+#: ../yum/depsolve.py:246 - #, python-format - msgid "Adding Package %s in mode %s" - msgstr "" - --#: ../yum/depsolve.py:255 -+#: ../yum/depsolve.py:256 - #, python-format - msgid "Removing Package %s" - msgstr "" - --#: ../yum/depsolve.py:277 -+#: ../yum/depsolve.py:278 - #, python-format - msgid "%s requires: %s" - msgstr "" - --#: ../yum/depsolve.py:335 -+#: ../yum/depsolve.py:319 -+#, python-format -+msgid "%s requires %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:346 - msgid "Needed Require has already been looked up, cheating" - msgstr "" - --#: ../yum/depsolve.py:345 -+#: ../yum/depsolve.py:356 - #, python-format - msgid "Needed Require is not a package name. Looking up: %s" - msgstr "" - --#: ../yum/depsolve.py:352 -+#: ../yum/depsolve.py:363 - #, python-format - msgid "Potential Provider: %s" - msgstr "" - --#: ../yum/depsolve.py:375 -+#: ../yum/depsolve.py:386 - #, python-format - msgid "Mode is %s for provider of %s: %s" - msgstr "" - --#: ../yum/depsolve.py:379 -+#: ../yum/depsolve.py:390 - #, python-format - msgid "Mode for pkg providing %s: %s" - msgstr "" - --#: ../yum/depsolve.py:383 -+#: ../yum/depsolve.py:394 - #, python-format - msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" - --#: ../yum/depsolve.py:396 -+#: ../yum/depsolve.py:407 - #, python-format - msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - --#: ../yum/depsolve.py:399 -+#: ../yum/depsolve.py:410 - #, python-format - msgid "TSINFO: Updating %s to resolve dep." - msgstr "" - --#: ../yum/depsolve.py:407 -+#: ../yum/depsolve.py:418 - #, python-format - msgid "Cannot find an update path for dep for: %s" - msgstr "" - --#: ../yum/depsolve.py:417 --#, python-format --msgid "Unresolvable requirement %s for %s" --msgstr "" -- --#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:449 - #, python-format - msgid "Quick matched %s to require for %s" - msgstr "" - - #. is it already installed? --#: ../yum/depsolve.py:482 -+#: ../yum/depsolve.py:491 - #, python-format - msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - --#: ../yum/depsolve.py:498 -+#: ../yum/depsolve.py:507 - #, python-format - msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - --#: ../yum/depsolve.py:509 -+#: ../yum/depsolve.py:518 - #, python-format - msgid "Potential resolving package %s has newer instance installed." - msgstr "" - --#: ../yum/depsolve.py:517 ../yum/depsolve.py:563 --#, python-format --msgid "Missing Dependency: %s is needed by package %s" --msgstr "" -- --#: ../yum/depsolve.py:530 -+#: ../yum/depsolve.py:536 - #, python-format - msgid "%s already in ts, skipping this one" - msgstr "" - --#: ../yum/depsolve.py:573 -+#: ../yum/depsolve.py:578 - #, python-format - msgid "TSINFO: Marking %s as update for %s" - msgstr "" - --#: ../yum/depsolve.py:581 -+#: ../yum/depsolve.py:586 - #, python-format - msgid "TSINFO: Marking %s as install for %s" - msgstr "" - --#: ../yum/depsolve.py:685 ../yum/depsolve.py:767 -+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781 - msgid "Success - empty transaction" - msgstr "" - --#: ../yum/depsolve.py:724 ../yum/depsolve.py:739 -+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744 - msgid "Restarting Loop" - msgstr "" - --#: ../yum/depsolve.py:755 -+#: ../yum/depsolve.py:760 - msgid "Dependency Process ending" - msgstr "" - --#: ../yum/depsolve.py:761 -+#: ../yum/depsolve.py:774 - #, python-format - msgid "%s from %s has depsolving problems" - msgstr "" - --#: ../yum/depsolve.py:768 -+#: ../yum/depsolve.py:782 - msgid "Success - deps resolved" - msgstr "" - --#: ../yum/depsolve.py:782 -+#: ../yum/depsolve.py:796 - #, python-format - msgid "Checking deps for %s" - msgstr "" - --#: ../yum/depsolve.py:865 -+#: ../yum/depsolve.py:874 - #, python-format - msgid "looking for %s as a requirement of %s" - msgstr "" - --#: ../yum/depsolve.py:1007 -+#: ../yum/depsolve.py:1090 - #, python-format - msgid "Running compare_providers() for %s" - msgstr "" - --#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047 -+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123 - #, python-format - msgid "better arch in po %s" - msgstr "" - --#: ../yum/depsolve.py:1142 -+#: ../yum/depsolve.py:1218 - #, python-format - msgid "%s obsoletes %s" - msgstr "" - --#: ../yum/depsolve.py:1154 -+#: ../yum/depsolve.py:1230 - #, python-format - msgid "" - "archdist compared %s to %s on %s\n" - " Winner: %s" - msgstr "" - --#: ../yum/depsolve.py:1161 -+#: ../yum/depsolve.py:1237 - #, python-format - msgid "common sourcerpm %s and %s" - msgstr "" - --#: ../yum/depsolve.py:1167 -+#: ../yum/depsolve.py:1241 -+#, python-format -+msgid "base package %s is installed for %s" -+msgstr "" -+ -+#: ../yum/depsolve.py:1247 - #, python-format - msgid "common prefix of %s between %s and %s" - msgstr "" - --#: ../yum/depsolve.py:1175 -+#: ../yum/depsolve.py:1256 - #, python-format - msgid "Best Order: %s" - msgstr "" - --#: ../yum/__init__.py:187 -+#: ../yum/__init__.py:192 - msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:412 -+#: ../yum/__init__.py:424 - #, python-format - msgid "Repository %r is missing name in configuration, using id" - msgstr "" - --#: ../yum/__init__.py:450 -+#: ../yum/__init__.py:462 - msgid "plugins already initialised" - msgstr "" - --#: ../yum/__init__.py:457 -+#: ../yum/__init__.py:469 - msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:468 -+#: ../yum/__init__.py:480 - msgid "Reading Local RPMDB" - msgstr "" - --#: ../yum/__init__.py:489 -+#: ../yum/__init__.py:504 - msgid "doRepoSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:509 -+#: ../yum/__init__.py:524 - msgid "doSackSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:539 -+#: ../yum/__init__.py:554 - msgid "Setting up Package Sacks" - msgstr "" - --#: ../yum/__init__.py:584 -+#: ../yum/__init__.py:599 - #, python-format - msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "" - --#: ../yum/__init__.py:585 -+#: ../yum/__init__.py:600 - msgid "therefore this repo cannot be reset.\n" - msgstr "" - --#: ../yum/__init__.py:590 -+#: ../yum/__init__.py:605 - msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:602 -+#: ../yum/__init__.py:617 - msgid "Building updates object" - msgstr "" - --#: ../yum/__init__.py:637 -+#: ../yum/__init__.py:652 - msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "" - --#: ../yum/__init__.py:662 -+#: ../yum/__init__.py:677 - msgid "Getting group metadata" - msgstr "" - --#: ../yum/__init__.py:688 -+#: ../yum/__init__.py:703 - #, python-format - msgid "Adding group file from repository: %s" - msgstr "" - --#: ../yum/__init__.py:697 -+#: ../yum/__init__.py:712 - #, python-format - msgid "Failed to add groups file for repository: %s - %s" - msgstr "" - --#: ../yum/__init__.py:703 -+#: ../yum/__init__.py:718 - msgid "No Groups Available in any repository" - msgstr "" - --#: ../yum/__init__.py:763 -+#: ../yum/__init__.py:730 -+msgid "Getting pkgtags metadata" -+msgstr "" -+ -+#: ../yum/__init__.py:740 -+#, python-format -+msgid "Adding tags from repository: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:749 -+#, python-format -+msgid "Failed to add Pkg Tags for repository: %s - %s" -+msgstr "" -+ -+#: ../yum/__init__.py:827 - msgid "Importing additional filelist information" - msgstr "" - --#: ../yum/__init__.py:777 -+#: ../yum/__init__.py:841 - #, python-format - msgid "The program %s%s%s is found in the yum-utils package." - msgstr "" - --#: ../yum/__init__.py:785 -+#: ../yum/__init__.py:849 - msgid "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." - msgstr "" - --#: ../yum/__init__.py:853 -+#. Kind of hacky -+#: ../yum/__init__.py:922 - #, python-format - msgid "Skip-broken round %i" - msgstr "" - --#: ../yum/__init__.py:906 -+#: ../yum/__init__.py:975 - #, python-format - msgid "Skip-broken took %i rounds " - msgstr "" - --#: ../yum/__init__.py:907 -+#: ../yum/__init__.py:976 - msgid "" - "\n" - "Packages skipped because of dependency problems:" +From cc5d13a39dcefbc401255d224c8700f4f907f285 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Mon, 22 Mar 2010 19:31:43 +0200 +Subject: [PATCH 01/18] Fix unknown syslog facility mapping. + +--- + yum/logginglevels.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/yum/logginglevels.py b/yum/logginglevels.py +index 6c23f88..3d82b55 100644 +--- a/yum/logginglevels.py ++++ b/yum/logginglevels.py +@@ -75,7 +75,7 @@ def syslogFacilityMap(facility): + elif (facility.upper().startswith("LOG_") and + facility[4:].upper() in _syslog_facility_map): + return _syslog_facility_map[facility[4:].upper()] +- return syslog.LOG_USER ++ return syslog_module.LOG_USER + + def logLevelFromErrorLevel(error_level): + """ Convert an old-style error logging level to the new style. """ +-- +1.6.6.1 + + +From 11dfde5e065e21c5bdb25a087501b90afe0b0dab Mon Sep 17 00:00:00 2001 +From: Seth Vidal +Date: Tue, 23 Mar 2010 10:09:20 -0400 +Subject: [PATCH 02/18] make sure we aren't overwriting the value of 'keys' + +this determines how many args we pass back in our yielded results +never noticed it b/c nothing in yum uses keys=True - but it broke PK +--- + yum/__init__.py | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/yum/__init__.py b/yum/__init__.py +index ea73549..0aaa819 100644 +--- a/yum/__init__.py ++++ b/yum/__init__.py +@@ -2163,10 +2163,10 @@ class YumBase(depsolve.Depsolve): + + # do the ones we already have + for item in sorted_lists.values(): +- for pkg, keys, values in item: ++ for pkg, k, v in item: + if pkg not in results_by_pkg: + results_by_pkg[pkg] = [] +- results_by_pkg[pkg].append((keys,values)) ++ results_by_pkg[pkg].append((k,v)) + + # take our existing dict-by-pkg and make the dict-by-count for + # this bizarro sorted_lists format +@@ -2175,9 +2175,9 @@ class YumBase(depsolve.Depsolve): + for pkg in results_by_pkg: + totkeys = [] + totvals = [] +- for (keys, values) in results_by_pkg[pkg]: +- totkeys.extend(keys) +- totvals.extend(values) ++ for (k, v) in results_by_pkg[pkg]: ++ totkeys.extend(k) ++ totvals.extend(v) + + totkeys = misc.unique(totkeys) + totvals = misc.unique(totvals) +-- +1.6.6.1 + + +From c6f4d336bd6be5cdb575c94628da2eb7bcb900f4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Mon, 22 Mar 2010 19:56:44 +0200 +Subject: [PATCH 03/18] Use LOG_USER as default syslog facility everywhere in base. + +--- + yum/config.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/yum/config.py b/yum/config.py +index ad8db7e..cb01306 100644 +--- a/yum/config.py ++++ b/yum/config.py +@@ -601,7 +601,7 @@ class StartupConf(BaseConfig): + pluginconfpath = ListOption(['/etc/yum/pluginconf.d']) + gaftonmode = BoolOption(False) + syslog_ident = Option() +- syslog_facility = Option('LOG_DAEMON') ++ syslog_facility = Option('LOG_USER') + persistdir = Option('/var/lib/yum') + + class YumConf(StartupConf): +-- +1.6.6.1 + + +From 40a53f0d3a8dd8ad4fb4802890e4f30b0214f3f9 Mon Sep 17 00:00:00 2001 +From: Ville-Pekka Vainio +Date: Wed, 24 Mar 2010 12:37:03 +0000 +Subject: [PATCH 04/18] l10n: Updates to Finnish (fi) translation + +Transmitted-via: Transifex (www.transifex.net) +--- + po/fi.po | 203 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 103 insertions(+), 100 deletions(-) + +diff --git a/po/fi.po b/po/fi.po +index 4347eba..4240973 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -6,8 +6,8 @@ msgid "" msgstr "" + "Project-Id-Version: yum\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2010-02-10 10:43-0500\n" +-"PO-Revision-Date: 2010-02-11 21:50+0200\n" ++"POT-Creation-Date: 2010-02-11 10:54-0500\n" ++"PO-Revision-Date: 2010-03-24 14:36+0200\n" + "Last-Translator: Ville-Pekka Vainio \n" + "Language-Team: Finnish \n" + "MIME-Version: 1.0\n" +@@ -156,15 +156,15 @@ msgstr "Ladataan paketteja:" + msgid "Error Downloading Packages:\n" + msgstr "Virhe pakettien latauksessa:\n" --#: ../yum/__init__.py:911 -+#: ../yum/__init__.py:980 - #, python-format - msgid " %s from %s" - msgstr "" +-#: ../cli.py:426 ../yum/__init__.py:4194 ++#: ../cli.py:426 ../yum/__init__.py:4195 + msgid "Running rpm_check_debug" + msgstr "Suoritetaan rpm_check_debug" --#: ../yum/__init__.py:1083 -+#: ../yum/__init__.py:1121 -+msgid "Warning: RPMDB altered outside of yum." -+msgstr "" -+ -+#: ../yum/__init__.py:1126 -+msgid "missing requires" -+msgstr "" -+ -+#: ../yum/__init__.py:1127 -+msgid "installed conflict" -+msgstr "" -+ -+#: ../yum/__init__.py:1180 - msgid "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" +-#: ../cli.py:435 ../yum/__init__.py:4203 ++#: ../cli.py:435 ../yum/__init__.py:4204 + msgid "ERROR You need to update rpm to handle:" + msgstr "VIRHE RPM on päivitettävä, jotta se osaa käsitellä:" --#: ../yum/__init__.py:1101 -+#: ../yum/__init__.py:1198 - #, python-format - msgid "Failed to remove transaction file %s" - msgstr "" +-#: ../cli.py:437 ../yum/__init__.py:4206 ++#: ../cli.py:437 ../yum/__init__.py:4207 + msgid "ERROR with rpm_check_debug vs depsolve:" + msgstr "VIRHE rpm_check_debugin ja riippuvuuksien tarkistuksen välillä:" - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1130 -+#: ../yum/__init__.py:1227 - #, python-format - msgid "%s was supposed to be installed but is not!" - msgstr "" +@@ -339,7 +339,7 @@ msgstr "Saatavilla olevat ryhmät:" + msgid "Done" + msgstr "Valmis" - #. maybe a file log here, too - #. but raising an exception is not going to do any good --#: ../yum/__init__.py:1169 -+#: ../yum/__init__.py:1266 +-#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2787 ++#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788 #, python-format - msgid "%s was supposed to be removed but is not!" - msgstr "" + msgid "Warning: Group %s does not exist." + msgstr "Varoitus: Ryhmää %s ei ole olemassa." +@@ -355,7 +355,7 @@ msgstr "" + msgid "%d Package(s) to Install" + msgstr "%d pakettia asennettavana" - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1289 -+#: ../yum/__init__.py:1386 +-#: ../cli.py:1028 ../yum/__init__.py:2799 ++#: ../cli.py:1028 ../yum/__init__.py:2800 #, python-format - msgid "Unable to check if PID %s is active" - msgstr "" - - #. Another copy seems to be running. --#: ../yum/__init__.py:1293 -+#: ../yum/__init__.py:1390 + msgid "No group named %s exists" + msgstr "Ryhmää nimeltä %s ei ole olemassa" +@@ -767,7 +767,7 @@ msgstr "Koko yhteensä: %s" + #: ../output.py:904 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "" + msgid "Total download size: %s" +-msgstr "Latausmäärä yhteensä: %s" ++msgstr "Ladattavaa yhteensä: %s" - #. Whoa. What the heck happened? --#: ../yum/__init__.py:1328 -+#: ../yum/__init__.py:1425 + #: ../output.py:908 #, python-format - msgid "Could not create lock at %s: %s " - msgstr "" +@@ -2187,29 +2187,32 @@ msgid "Could not create lock at %s: %s " + msgstr "Ei voitu luoda lukkoa sijaintiin %s: %s" --#: ../yum/__init__.py:1373 + #: ../yum/__init__.py:1470 -msgid "Package does not match intended download" -+#: ../yum/__init__.py:1470 +-msgstr "Paketti ei vastaa aiottua latausta" +msgid "" +"Package does not match intended download. Suggestion: run yum clean metadata" - msgstr "" ++msgstr "" ++"Paketti ei vastaa aiottua latausta. Kannattaa ehkä suorittaa komento yum " ++"clean metadata" --#: ../yum/__init__.py:1388 +-#: ../yum/__init__.py:1485 +#: ../yum/__init__.py:1486 msgid "Could not perform checksum" - msgstr "" + msgstr "Ei voitu laskea tarkistussummaa" --#: ../yum/__init__.py:1391 +-#: ../yum/__init__.py:1488 +#: ../yum/__init__.py:1489 msgid "Package does not match checksum" - msgstr "" + msgstr "Paketti ei vastaa tarkistussummaa" --#: ../yum/__init__.py:1433 +-#: ../yum/__init__.py:1530 +#: ../yum/__init__.py:1531 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" + "paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s" --#: ../yum/__init__.py:1436 ../yum/__init__.py:1465 +-#: ../yum/__init__.py:1533 ../yum/__init__.py:1562 +#: ../yum/__init__.py:1534 ../yum/__init__.py:1563 #, python-format msgid "using local copy of %s" - msgstr "" + msgstr "käytetään paikallista kopiota paketista %s" --#: ../yum/__init__.py:1477 +-#: ../yum/__init__.py:1574 +#: ../yum/__init__.py:1575 #, python-format msgid "" "Insufficient space in download directory %s\n" -@@ -1968,347 +2127,357 @@ msgid "" - " * needed %s" - msgstr "" +@@ -2220,11 +2223,11 @@ msgstr "" + " * vapaana %s\n" + " * tarvitaan %s" --#: ../yum/__init__.py:1526 +-#: ../yum/__init__.py:1623 +#: ../yum/__init__.py:1624 msgid "Header is not complete." - msgstr "" + msgstr "Otsake ei ole täydellinen." --#: ../yum/__init__.py:1563 +-#: ../yum/__init__.py:1660 +#: ../yum/__init__.py:1661 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" - msgstr "" +@@ -2232,62 +2235,62 @@ msgstr "" + "Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva " + "tila on käytössä. Ei voida ladata otsaketta %s" --#: ../yum/__init__.py:1618 +-#: ../yum/__init__.py:1715 +#: ../yum/__init__.py:1716 #, python-format msgid "Public key for %s is not installed" - msgstr "" + msgstr "Julkista avainta pakettia %s varten ei ole asennettu" --#: ../yum/__init__.py:1622 +-#: ../yum/__init__.py:1719 +#: ../yum/__init__.py:1720 #, python-format msgid "Problem opening package %s" - msgstr "" + msgstr "Ongelma paketin %s avaamisessa" --#: ../yum/__init__.py:1630 +-#: ../yum/__init__.py:1727 +#: ../yum/__init__.py:1728 #, python-format msgid "Public key for %s is not trusted" - msgstr "" + msgstr "Paketin %s julkiseen avaimeen ei luoteta" --#: ../yum/__init__.py:1634 +-#: ../yum/__init__.py:1731 +#: ../yum/__init__.py:1732 #, python-format msgid "Package %s is not signed" - msgstr "" + msgstr "Pakettia %s ei ole allekirjoitettu" --#: ../yum/__init__.py:1672 +-#: ../yum/__init__.py:1769 +#: ../yum/__init__.py:1770 #, python-format msgid "Cannot remove %s" - msgstr "" + msgstr "Ei voida poistaa tiedostoa %s" --#: ../yum/__init__.py:1676 +-#: ../yum/__init__.py:1773 +#: ../yum/__init__.py:1774 #, python-format msgid "%s removed" - msgstr "" + msgstr "tiedosto %s on poistettu" --#: ../yum/__init__.py:1712 +-#: ../yum/__init__.py:1819 +#: ../yum/__init__.py:1820 #, python-format msgid "Cannot remove %s file %s" - msgstr "" + msgstr "Ei voida poistaa %s-tyyppistä tiedostoa %s" --#: ../yum/__init__.py:1716 +-#: ../yum/__init__.py:1823 +#: ../yum/__init__.py:1824 #, python-format msgid "%s file %s removed" - msgstr "" + msgstr "%s-tyyppinen tiedosto %s on poistettu" --#: ../yum/__init__.py:1718 +-#: ../yum/__init__.py:1825 +#: ../yum/__init__.py:1826 #, python-format msgid "%d %s files removed" - msgstr "" + msgstr "%d %s-tyyppistä tiedostoa on poistettu" --#: ../yum/__init__.py:1787 +-#: ../yum/__init__.py:1894 +#: ../yum/__init__.py:1895 #, python-format msgid "More than one identical match in sack for %s" - msgstr "" + msgstr "Säkissä on useampi kuin yksi identtinen vastaavuus haulle %s" --#: ../yum/__init__.py:1793 +-#: ../yum/__init__.py:1900 +#: ../yum/__init__.py:1901 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "" + msgstr "Mikään ei vastaa päivityksen pakettia %s.%s %s:%s-%s" --#: ../yum/__init__.py:2026 +-#: ../yum/__init__.py:2179 +#: ../yum/__init__.py:2180 msgid "" "searchPackages() will go away in a future version of " "Yum. Use searchGenerator() instead. \n" - msgstr "" +@@ -2295,181 +2298,181 @@ msgstr "" + "searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen " + "sijaan searchGenerator()-metodia.\n" --#: ../yum/__init__.py:2065 +-#: ../yum/__init__.py:2218 +#: ../yum/__init__.py:2219 #, python-format msgid "Searching %d packages" - msgstr "" + msgstr "Etsitään %d pakettia" --#: ../yum/__init__.py:2069 +-#: ../yum/__init__.py:2222 +#: ../yum/__init__.py:2223 #, python-format msgid "searching package %s" - msgstr "" + msgstr "etsitään pakettia %s" --#: ../yum/__init__.py:2081 +-#: ../yum/__init__.py:2234 +#: ../yum/__init__.py:2235 msgid "searching in file entries" - msgstr "" + msgstr "etsitään tiedostoista" --#: ../yum/__init__.py:2088 +-#: ../yum/__init__.py:2241 +#: ../yum/__init__.py:2242 msgid "searching in provides entries" - msgstr "" + msgstr "etsitään tarjoajista" --#: ../yum/__init__.py:2121 +-#: ../yum/__init__.py:2274 +#: ../yum/__init__.py:2275 #, python-format msgid "Provides-match: %s" - msgstr "" + msgstr "Tarjoajavastaavuus: %s" --#: ../yum/__init__.py:2170 +-#: ../yum/__init__.py:2323 +#: ../yum/__init__.py:2324 msgid "No group data available for configured repositories" - msgstr "" + msgstr "Asetetuille asennuslähteille ei ole saatavilla ryhmädataa" --#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251 --#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340 --#: ../yum/__init__.py:2655 +-#: ../yum/__init__.py:2354 ../yum/__init__.py:2373 ../yum/__init__.py:2404 +-#: ../yum/__init__.py:2410 ../yum/__init__.py:2492 ../yum/__init__.py:2496 +-#: ../yum/__init__.py:2813 +#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405 +#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497 +#: ../yum/__init__.py:2814 #, python-format msgid "No Group named %s exists" - msgstr "" + msgstr "Ryhmää nimeltä %s ei ole olemassa" --#: ../yum/__init__.py:2232 ../yum/__init__.py:2353 +-#: ../yum/__init__.py:2385 ../yum/__init__.py:2512 +#: ../yum/__init__.py:2386 ../yum/__init__.py:2513 #, python-format msgid "package %s was not marked in group %s" - msgstr "" + msgstr "pakettia %s ei ollut merkitty kuuluvaksi ryhmään %s" --#: ../yum/__init__.py:2279 +-#: ../yum/__init__.py:2432 +#: ../yum/__init__.py:2433 #, python-format msgid "Adding package %s from group %s" - msgstr "" + msgstr "Lisätään paketti %s ryhmästä %s" --#: ../yum/__init__.py:2283 +-#: ../yum/__init__.py:2436 +#: ../yum/__init__.py:2437 #, python-format msgid "No package named %s available to be installed" - msgstr "" + msgstr "Pakettia nimeltä %s ei ole saatavilla asennusta varten" --#: ../yum/__init__.py:2380 +-#: ../yum/__init__.py:2538 +#: ../yum/__init__.py:2539 #, python-format msgid "Package tuple %s could not be found in packagesack" - msgstr "" + msgstr "Paketti-tuplea %s ei löytynyt pakettisäkistä" --#: ../yum/__init__.py:2399 +-#: ../yum/__init__.py:2557 +#: ../yum/__init__.py:2558 #, python-format msgid "Package tuple %s could not be found in rpmdb" - msgstr "" + msgstr "Paketti-tuplea %s ei löytynyt RPM-tietokannasta" --#: ../yum/__init__.py:2455 ../yum/__init__.py:2505 +-#: ../yum/__init__.py:2613 ../yum/__init__.py:2663 +#: ../yum/__init__.py:2614 ../yum/__init__.py:2664 msgid "Invalid version flag" - msgstr "" + msgstr "Virheellinen versiolippu" --#: ../yum/__init__.py:2475 ../yum/__init__.py:2480 +-#: ../yum/__init__.py:2633 ../yum/__init__.py:2638 +#: ../yum/__init__.py:2634 ../yum/__init__.py:2639 #, python-format msgid "No Package found for %s" - msgstr "" + msgstr "Riippuvuudelle %s ei löytynyt pakettia" --#: ../yum/__init__.py:2696 +-#: ../yum/__init__.py:2854 +#: ../yum/__init__.py:2855 msgid "Package Object was not a package object instance" - msgstr "" + msgstr "Pakettiolio ei ollutkaan pakettiolioinstanssi" --#: ../yum/__init__.py:2700 +-#: ../yum/__init__.py:2858 +#: ../yum/__init__.py:2859 msgid "Nothing specified to install" - msgstr "" + msgstr "Mitään ei määritelty asennettavaksi" --#: ../yum/__init__.py:2716 ../yum/__init__.py:3489 +-#: ../yum/__init__.py:2874 ../yum/__init__.py:3651 +#: ../yum/__init__.py:2875 ../yum/__init__.py:3652 #, python-format msgid "Checking for virtual provide or file-provide for %s" - msgstr "" + msgstr "Etsitään virtuaalista tai tiedostotarjoajaa argumentille %s" --#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205 --#: ../yum/__init__.py:3495 +-#: ../yum/__init__.py:2880 ../yum/__init__.py:3196 ../yum/__init__.py:3364 +-#: ../yum/__init__.py:3657 +#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365 +#: ../yum/__init__.py:3658 #, python-format msgid "No Match for argument: %s" - msgstr "" + msgstr "Mikään ei vastaa argumenttia: %s" --#: ../yum/__init__.py:2798 +-#: ../yum/__init__.py:2956 +#: ../yum/__init__.py:2957 #, python-format msgid "Package %s installed and not available" - msgstr "" + msgstr "Paketti %s on asennettu, mutta ei saatavilla" --#: ../yum/__init__.py:2801 +-#: ../yum/__init__.py:2959 +#: ../yum/__init__.py:2960 msgid "No package(s) available to install" - msgstr "" + msgstr "Yhtään pakettia ei ole saatavilla asennettavaksi" --#: ../yum/__init__.py:2813 +-#: ../yum/__init__.py:2971 +#: ../yum/__init__.py:2972 #, python-format msgid "Package: %s - already in transaction set" - msgstr "" + msgstr "Paketti: %s – on jo transaktiojoukossa" --#: ../yum/__init__.py:2839 +-#: ../yum/__init__.py:2997 +#: ../yum/__init__.py:2998 #, python-format msgid "Package %s is obsoleted by %s which is already installed" - msgstr "" + msgstr "Paketin %s vanhentaa paketti %s, joka on jo asennettuna" --#: ../yum/__init__.py:2842 +-#: ../yum/__init__.py:3000 +#: ../yum/__init__.py:3001 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" + msgstr "Paketin %s vanhentaa paketti %s, yritetään paketti %s sen sijaan" --#: ../yum/__init__.py:2850 +-#: ../yum/__init__.py:3008 +#: ../yum/__init__.py:3009 #, python-format msgid "Package %s already installed and latest version" - msgstr "" + msgstr "Paketti %s on jo asennettuna ja uusin versio" --#: ../yum/__init__.py:2864 +-#: ../yum/__init__.py:3022 +#: ../yum/__init__.py:3023 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" + "Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset." #. update everything (the easy case) --#: ../yum/__init__.py:2966 +-#: ../yum/__init__.py:3125 +#: ../yum/__init__.py:3126 msgid "Updating Everything" - msgstr "" + msgstr "Päivitetään kaikki" --#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129 --#: ../yum/__init__.py:3155 +-#: ../yum/__init__.py:3146 ../yum/__init__.py:3261 ../yum/__init__.py:3288 +-#: ../yum/__init__.py:3314 +#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289 +#: ../yum/__init__.py:3315 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "" + msgstr "Vanhennettua pakettia ei päivitetä: %s.%s %s:%s-%s" --#: ../yum/__init__.py:3022 ../yum/__init__.py:3202 +-#: ../yum/__init__.py:3181 ../yum/__init__.py:3361 +#: ../yum/__init__.py:3182 ../yum/__init__.py:3362 #, python-format msgid "%s" - msgstr "" + msgstr "%s" --#: ../yum/__init__.py:3093 +-#: ../yum/__init__.py:3252 +#: ../yum/__init__.py:3253 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" - msgstr "" + msgstr "Paketti on jo vanhennettu: %s.%s %s:%s-%s" --#: ../yum/__init__.py:3124 +-#: ../yum/__init__.py:3283 +#: ../yum/__init__.py:3284 #, python-format msgid "Not Updating Package that is obsoleted: %s" - msgstr "" + msgstr "Ei päivitetä vanhennettua pakettia: %s" --#: ../yum/__init__.py:3133 ../yum/__init__.py:3159 +-#: ../yum/__init__.py:3292 ../yum/__init__.py:3318 +#: ../yum/__init__.py:3293 ../yum/__init__.py:3319 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" + msgstr "Jo päivitettyä pakettia ei enää päivitetä: %s.%s %s:%s-%s" --#: ../yum/__init__.py:3218 +-#: ../yum/__init__.py:3377 +#: ../yum/__init__.py:3378 msgid "No package matched to remove" - msgstr "" + msgstr "Yhtään poistopyyntöä vastaavaa pakettia ei ole" --#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432 +-#: ../yum/__init__.py:3411 +#: ../yum/__init__.py:3412 #, python-format --msgid "Cannot open file: %s. Skipping." -+msgid "Cannot open: %s. Skipping." - msgstr "" + msgid "Cannot open: %s. Skipping." + msgstr "Ei voida avata pakettia: %s. Ohitetaan." --#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435 +-#: ../yum/__init__.py:3414 ../yum/__init__.py:3513 ../yum/__init__.py:3597 +#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598 #, python-format msgid "Examining %s: %s" - msgstr "" + msgstr "Tutkitaan %s: %s" --#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438 +-#: ../yum/__init__.py:3422 ../yum/__init__.py:3516 ../yum/__init__.py:3600 +#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601 #, python-format msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" + "Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva: " + "%s" --#: ../yum/__init__.py:3270 +-#: ../yum/__init__.py:3430 +#: ../yum/__init__.py:3431 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " - "instead." - msgstr "" +@@ -2478,109 +2481,109 @@ msgstr "" + "Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install -" + "komento paketin asentamiseksi." --#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443 +-#: ../yum/__init__.py:3459 ../yum/__init__.py:3521 ../yum/__init__.py:3605 +#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606 #, python-format msgid "Excluding %s" - msgstr "" + msgstr "Ohitetaan paketti %s" --#: ../yum/__init__.py:3304 +-#: ../yum/__init__.py:3464 +#: ../yum/__init__.py:3465 #, python-format msgid "Marking %s to be installed" - msgstr "" + msgstr "Merkitään paketti %s asennettavaksi" --#: ../yum/__init__.py:3310 +-#: ../yum/__init__.py:3470 +#: ../yum/__init__.py:3471 #, python-format msgid "Marking %s as an update to %s" - msgstr "" + msgstr "Merkitään paketti %s päivitykseksi paketille %s" --#: ../yum/__init__.py:3317 +-#: ../yum/__init__.py:3477 +#: ../yum/__init__.py:3478 #, python-format msgid "%s: does not update installed package." - msgstr "" + msgstr "%s: ei päivitä asennettua pakettia" --#: ../yum/__init__.py:3379 +-#: ../yum/__init__.py:3510 ../yum/__init__.py:3594 +#: ../yum/__init__.py:3511 ../yum/__init__.py:3595 -+#, python-format -+msgid "Cannot open file: %s. Skipping." -+msgstr "" -+ + #, python-format + msgid "Cannot open file: %s. Skipping." + msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." + +-#: ../yum/__init__.py:3540 +#: ../yum/__init__.py:3541 msgid "Problem in reinstall: no package matched to remove" - msgstr "" + msgstr "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" --#: ../yum/__init__.py:3392 ../yum/__init__.py:3523 +-#: ../yum/__init__.py:3553 ../yum/__init__.py:3685 +#: ../yum/__init__.py:3554 ../yum/__init__.py:3686 #, python-format msgid "Package %s is allowed multiple installs, skipping" - msgstr "" + msgstr "Paketille %s sallitaan useita asennuksia, ohitetaan." --#: ../yum/__init__.py:3413 +-#: ../yum/__init__.py:3574 +#: ../yum/__init__.py:3575 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" + "Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" --#: ../yum/__init__.py:3515 +-#: ../yum/__init__.py:3677 +#: ../yum/__init__.py:3678 msgid "No package(s) available to downgrade" - msgstr "" + msgstr "Yhtään pakettia ei ole saatavilla varhennettavaksi" --#: ../yum/__init__.py:3559 +-#: ../yum/__init__.py:3730 +#: ../yum/__init__.py:3731 #, python-format msgid "No Match for available package: %s" - msgstr "" + msgstr "Ei vastaavuutta saatavilla olevalle paketille: %s" --#: ../yum/__init__.py:3565 +-#: ../yum/__init__.py:3737 +#: ../yum/__init__.py:3738 #, python-format msgid "Only Upgrade available on package: %s" - msgstr "" + msgstr "Vain päivitys saatavilla paketille: %s" --#: ../yum/__init__.py:3635 ../yum/__init__.py:3672 +-#: ../yum/__init__.py:3807 ../yum/__init__.py:3844 +#: ../yum/__init__.py:3808 ../yum/__init__.py:3845 #, python-format msgid "Failed to downgrade: %s" - msgstr "" + msgstr "Varhentaminen epäonnistui: %s" --#: ../yum/__init__.py:3704 +-#: ../yum/__init__.py:3876 +#: ../yum/__init__.py:3877 #, python-format msgid "Retrieving GPG key from %s" - msgstr "" + msgstr "Noudetaan GPG-avain osoitteesta %s" --#: ../yum/__init__.py:3724 +-#: ../yum/__init__.py:3896 +#: ../yum/__init__.py:3897 msgid "GPG key retrieval failed: " - msgstr "" + msgstr "GPG-avaimen nouto epäonnistui: " --#: ../yum/__init__.py:3735 +-#: ../yum/__init__.py:3902 +#: ../yum/__init__.py:3903 -+#, python-format -+msgid "Invalid GPG Key from %s: %s" -+msgstr "" -+ + #, python-format + msgid "Invalid GPG Key from %s: %s" + msgstr "Virheellinen GPG-avain osoitteesta %s: %s" + +-#: ../yum/__init__.py:3911 +#: ../yum/__init__.py:3912 #, python-format msgid "GPG key parsing failed: key does not have value %s" - msgstr "" + msgstr "GPG-avaimen jäsentäminen epäonnistui: avaimessa ei ole arvoa %s" --#: ../yum/__init__.py:3767 +-#: ../yum/__init__.py:3943 +#: ../yum/__init__.py:3944 #, python-format msgid "GPG key at %s (0x%s) is already installed" - msgstr "" + msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo asennetuna" #. Try installing/updating GPG key --#: ../yum/__init__.py:3772 ../yum/__init__.py:3834 +-#: ../yum/__init__.py:3948 ../yum/__init__.py:4010 +#: ../yum/__init__.py:3949 ../yum/__init__.py:4011 #, python-format msgid "Importing GPG key 0x%s \"%s\" from %s" - msgstr "" + msgstr "Tuodaan GPG-avain 0x%s ”%s” osoitteesta %s" --#: ../yum/__init__.py:3789 +-#: ../yum/__init__.py:3965 +#: ../yum/__init__.py:3966 msgid "Not installing key" - msgstr "" + msgstr "Avainta ei asenneta" --#: ../yum/__init__.py:3795 +-#: ../yum/__init__.py:3971 +#: ../yum/__init__.py:3972 #, python-format msgid "Key import failed (code %d)" - msgstr "" + msgstr "Avaimen tuonti epäonnistui (koodi %d)" --#: ../yum/__init__.py:3796 ../yum/__init__.py:3855 +-#: ../yum/__init__.py:3972 ../yum/__init__.py:4031 +#: ../yum/__init__.py:3973 ../yum/__init__.py:4032 msgid "Key imported successfully" - msgstr "" + msgstr "Avaimen tuonti onnistui" --#: ../yum/__init__.py:3801 ../yum/__init__.py:3860 +-#: ../yum/__init__.py:3977 ../yum/__init__.py:4036 +#: ../yum/__init__.py:3978 ../yum/__init__.py:4037 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2316,41 +2485,46 @@ msgid "" - "Check that the correct key URLs are configured for this repository." - msgstr "" +@@ -2591,42 +2594,42 @@ msgstr "" + "vastaa tätä pakettia.\n" + "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." --#: ../yum/__init__.py:3810 +-#: ../yum/__init__.py:3986 +#: ../yum/__init__.py:3987 msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "" + msgstr "Avainten tuonti ei auttanut, ovatko avaimet vääriä?" --#: ../yum/__init__.py:3829 +-#: ../yum/__init__.py:4005 +#: ../yum/__init__.py:4006 #, python-format msgid "GPG key at %s (0x%s) is already imported" - msgstr "" + msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo tuotu" --#: ../yum/__init__.py:3849 +-#: ../yum/__init__.py:4025 +#: ../yum/__init__.py:4026 #, python-format msgid "Not installing key for repo %s" - msgstr "" + msgstr "Ei asenneta avainta asennuslähteelle %s" --#: ../yum/__init__.py:3854 +-#: ../yum/__init__.py:4030 +#: ../yum/__init__.py:4031 msgid "Key import failed" - msgstr "" + msgstr "Avaimen tuonti epäonnistui" --#: ../yum/__init__.py:3976 +-#: ../yum/__init__.py:4156 +#: ../yum/__init__.py:4157 msgid "Unable to find a suitable mirror." - msgstr "" + msgstr "Sopivaa peilipalvelinta ei löytynyt." --#: ../yum/__init__.py:3978 +-#: ../yum/__init__.py:4158 +#: ../yum/__init__.py:4159 msgid "Errors were encountered while downloading packages." - msgstr "" + msgstr "Paketteja ladatessa tapahtui virheitä." --#: ../yum/__init__.py:4028 +-#: ../yum/__init__.py:4208 +#: ../yum/__init__.py:4209 #, python-format msgid "Please report this error at %s" - msgstr "" + msgstr "Ilmoita tästä ongelmasta: %s" --#: ../yum/__init__.py:4052 +-#: ../yum/__init__.py:4232 +#: ../yum/__init__.py:4233 msgid "Test Transaction Errors: " - msgstr "" + msgstr "Testitransaktion virheitä: " +-#: ../yum/__init__.py:4333 +#: ../yum/__init__.py:4334 -+#, python-format -+msgid "Could not set cachedir: %s" -+msgstr "" -+ - #. Mostly copied from YumOutput._outKeyValFill() - #: ../yum/plugins.py:202 - msgid "Loaded plugins: " -@@ -2409,7 +2583,20 @@ msgstr "" - msgid "registration of commands not supported" - msgstr "" - --#: ../yum/rpmtrans.py:78 -+#: ../yum/rpmsack.py:102 -+msgid "has missing requires of" -+msgstr "" -+ -+#: ../yum/rpmsack.py:105 -+msgid "has installed conflicts" -+msgstr "" -+ -+#: ../yum/rpmsack.py:114 -+#, python-format -+msgid "%s is a duplicate with %s" -+msgstr "" -+ -+#: ../yum/rpmtrans.py:79 - msgid "Repackaging" - msgstr "" + #, python-format + msgid "Could not set cachedir: %s" + msgstr "Välimuistihakemiston asettaminen epäonnistui %s" +-- +1.6.6.1 + + +From 2d8c8f210292766cc5389ac5700c3fa7fe1c8342 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 24 Mar 2010 18:25:35 +0200 +Subject: [PATCH 05/18] Fix syslog_indent and syslog_facility settings, improve syslog format. + +--- + yum/logginglevels.py | 22 +++++++++------------- + 1 files changed, 9 insertions(+), 13 deletions(-) + +diff --git a/yum/logginglevels.py b/yum/logginglevels.py +index 3d82b55..3a62945 100644 +--- a/yum/logginglevels.py ++++ b/yum/logginglevels.py +@@ -45,7 +45,7 @@ logging.addLevelName(DEBUG_4, "DEBUG_4") + __NO_LOGGING = 100 + logging.raiseExceptions = False + +-import syslog as syslog_module ++from logging.handlers import SysLogHandler as syslog_module + + syslog = None + +@@ -75,7 +75,7 @@ def syslogFacilityMap(facility): + elif (facility.upper().startswith("LOG_") and + facility[4:].upper() in _syslog_facility_map): + return _syslog_facility_map[facility[4:].upper()] +- return syslog_module.LOG_USER ++ return _syslog_facility_map["USER"] + + def logLevelFromErrorLevel(error_level): + """ Convert an old-style error logging level to the new style. """ +@@ -140,7 +140,6 @@ def doLoggingSetup(debuglevel, errorlevel, + return + + plainformatter = logging.Formatter("%(message)s") +- syslogformatter = logging.Formatter("yum: %(message)s") + + console_stdout = logging.StreamHandler(sys.stdout) + console_stdout.setFormatter(plainformatter) +@@ -158,20 +157,17 @@ def doLoggingSetup(debuglevel, errorlevel, + filelogger.setLevel(logging.INFO) + filelogger.propagate = False + +- log_dev = syslog_device + global syslog +- if os.path.exists(log_dev): ++ if os.path.exists(syslog_device): + try: +- syslog = logging.handlers.SysLogHandler(log_dev) +- syslog.setFormatter(syslogformatter) +- filelogger.addHandler(syslog) +- if syslog_ident is not None or syslog_facility is not None: +- ident = syslog_ident or '' +- facil = syslog_facility or 'LOG_USER' +- syslog_module.openlog(ident, 0, syslogFacilityMap(facil)) ++ facil = syslogFacilityMap(syslog_facility or "USER") ++ syslog = logging.handlers.SysLogHandler(syslog_device, facil) + except socket.error: + if syslog is not None: + syslog.close() ++ else: ++ setLoggingApp(syslog_ident or "yum") ++ filelogger.addHandler(syslog) + _added_handlers = True + + if debuglevel is not None: +@@ -201,5 +197,5 @@ def setFileLog(uid, logfile): + + def setLoggingApp(app): + if syslog: +- syslogformatter = logging.Formatter("yum(%s): "% (app,) + "%(message)s") ++ syslogformatter = logging.Formatter(app + "[%(process)d]: %(message)s") + syslog.setFormatter(syslogformatter) +-- +1.6.6.1 + + +From a479fa2fca23ca0173cc06f7e4e24305df0db3cc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 24 Mar 2010 19:19:30 +0200 +Subject: [PATCH 06/18] Add support for remote syslogs with host:port values for syslog_device. + +--- + yum/logginglevels.py | 27 +++++++++++++++++---------- + 1 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/yum/logginglevels.py b/yum/logginglevels.py +index 3a62945..1ab11db 100644 +--- a/yum/logginglevels.py ++++ b/yum/logginglevels.py +@@ -158,16 +158,23 @@ def doLoggingSetup(debuglevel, errorlevel, + filelogger.propagate = False + + global syslog +- if os.path.exists(syslog_device): +- try: +- facil = syslogFacilityMap(syslog_facility or "USER") +- syslog = logging.handlers.SysLogHandler(syslog_device, facil) +- except socket.error: +- if syslog is not None: +- syslog.close() +- else: +- setLoggingApp(syslog_ident or "yum") +- filelogger.addHandler(syslog) ++ if syslog_device: ++ address = None ++ if ":" in syslog_device: ++ address = syslog_device.rsplit(":", 1) ++ address = (address[0], int(address[1])) ++ elif os.path.exists(syslog_device): ++ address = syslog_device ++ if address: ++ try: ++ facil = syslogFacilityMap(syslog_facility or "USER") ++ syslog = logging.handlers.SysLogHandler(address, facil) ++ except socket.error: ++ if syslog is not None: ++ syslog.close() ++ else: ++ setLoggingApp(syslog_ident or "yum") ++ filelogger.addHandler(syslog) + _added_handlers = True + + if debuglevel is not None: +-- +1.6.6.1 + + +From b9484bfd83e3c0f83389a649a4cfd7b50b8c2b8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 24 Mar 2010 22:04:35 +0200 +Subject: [PATCH 07/18] Document syslog_ident and syslog_facility config parameters. + +--- + docs/yum.conf.5 | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 +index cca3db7..a4789da 100644 +--- a/docs/yum.conf.5 ++++ b/docs/yum.conf.5 +@@ -304,11 +304,11 @@ on the command line (eg. "update foo bar baz quux"). None of the short options + + .IP + \fBsyslog_ident \fR +-XXX not implemented yet ++Identification (program name) for syslog messages. + + .IP + \fBsyslog_facility \fR +-XXX not implemented yet ++Facility name for syslog messages, see syslog(3). Default is `LOG_USER'. + + .IP + \fBproxy \fR +-- +1.6.6.1 + + +From 311221f71bba055a623565996e981156265789ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 24 Mar 2010 23:31:28 +0200 +Subject: [PATCH 08/18] Make syslog_device configurable. + +--- + docs/yum.conf.5 | 6 ++++++ + yum/__init__.py | 7 +++++-- + yum/config.py | 1 + + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 +index a4789da..cb6f340 100644 +--- a/docs/yum.conf.5 ++++ b/docs/yum.conf.5 +@@ -311,6 +311,12 @@ Identification (program name) for syslog messages. + Facility name for syslog messages, see syslog(3). Default is `LOG_USER'. + + .IP ++\fBsyslog_device \fR ++Where to log syslog messages. Can be a local device (path) or a host:port ++string to use a remote syslog. If empty or points to a nonexistent device, ++syslog logging is disabled. Default is `/dev/log'. ++ ++.IP + \fBproxy \fR + URL to the proxy server that yum should use. -diff --git a/utils.py b/utils.py -index 2b0f655..dd6b642 100644 ---- a/utils.py -+++ b/utils.py -@@ -92,7 +92,7 @@ def get_process_info(pid): - ps['start_time'] = boot_time + jiffies_to_seconds(ps_stat[21]) - ps['state'] = {'R' : _('Running'), - 'S' : _('Sleeping'), -- 'D' : _('Uninteruptable'), -+ 'D' : _('Uninterruptible'), - 'Z' : _('Zombie'), - 'T' : _('Traced/Stopped') - }.get(ps_stat[2], _('Unknown')) diff --git a/yum/__init__.py b/yum/__init__.py -index d0bd4cc..7de65b1 100644 +index 0aaa819..7b84a61 100644 --- a/yum/__init__.py +++ b/yum/__init__.py -@@ -624,7 +624,11 @@ class YumBase(depsolve.Depsolve): - - if self.conf.obsoletes: - obs_init = time.time() -- self._up.rawobsoletes = self.pkgSack.returnObsoletes() -+ # Note: newest=True here is semi-required for repos. with multiple -+ # versions. The problem is that if pkgA-2 _accidentally_ obsoletes -+ # pkgB-1, and we keep all versions, we want to release a pkgA-3 -+ # that doesn't do the obsoletes ... and thus. not obsolete pkgB-1. -+ self._up.rawobsoletes = self.pkgSack.returnObsoletes(newest=True) - self.verbose_logger.debug('up:Obs Init time: %0.3f' % (time.time() - obs_init)) - - self._up.myarch = self.arch.canonarch -@@ -862,20 +866,16 @@ class YumBase(depsolve.Depsolve): - # works for downloads / mirror failover etc. - self.rpmdb.ts = None - -- # if depsolve failed and skipbroken is enabled -- # The remove the broken packages from the transactions and -- # Try another depsolve -- if self.conf.skip_broken and rescode==1: -- self.skipped_packages = [] # reset the public list of skipped packages. -- sb_st = time.time() -- rescode, restring = self._skipPackagesWithProblems(rescode, restring) -- self._printTransaction() -- self.verbose_logger.debug('Skip-Broken time: %0.3f' % (time.time() - sb_st)) -+ # do the skip broken magic, if enabled and problems exist -+ (rescode, restring) = self._doSkipBroken(rescode, restring) - - self.plugins.run('postresolve', rescode=rescode, restring=restring) - - if self.tsInfo.changed: - (rescode, restring) = self.resolveDeps(rescode == 1) -+ # If transaction was changed by postresolve plugins then we should run skipbroken again -+ (rescode, restring) = self._doSkipBroken(rescode, restring, clear_skipped=False ) -+ - if self.tsInfo.pkgSack is not None: # rm Transactions don't have pkgSack - self.tsInfo.pkgSack.dropCachedData() - self.rpmdb.dropCachedData() -@@ -883,6 +883,21 @@ class YumBase(depsolve.Depsolve): - self.verbose_logger.debug('Depsolve time: %0.3f' % (time.time() - ds_st)) - return rescode, restring - -+ def _doSkipBroken(self,rescode, restring, clear_skipped=True): -+ ''' do skip broken if it is enabled ''' -+ # if depsolve failed and skipbroken is enabled -+ # The remove the broken packages from the transactions and -+ # Try another depsolve -+ if self.conf.skip_broken and rescode==1: -+ if clear_skipped: -+ self.skipped_packages = [] # reset the public list of skipped packages. -+ sb_st = time.time() -+ rescode, restring = self._skipPackagesWithProblems(rescode, restring) -+ self._printTransaction() -+ self.verbose_logger.debug('Skip-Broken time: %0.3f' % (time.time() - sb_st)) -+ return (rescode, restring) -+ -+ - def _skipPackagesWithProblems(self, rescode, restring): - ''' Remove the packages with depsolve errors and depsolve again ''' - -@@ -979,7 +994,7 @@ class YumBase(depsolve.Depsolve): - for po in skipped_list: - msg = _(" %s from %s") % (str(po),po.repo.id) - self.verbose_logger.info(msg) -- self.skipped_packages = skipped_list # make the skipped packages public -+ self.skipped_packages.extend(skipped_list) # make the skipped packages public - else: - # If we cant solve the problems the show the original error messages. - self.verbose_logger.info("Skip-broken could not solve problems") -@@ -1467,7 +1482,8 @@ class YumBase(depsolve.Depsolve): - os.unlink(fo) - - if raiseError: -- raise URLGrabError(-1, _('Package does not match intended download')) -+ msg = _('Package does not match intended download. Suggestion: run yum clean metadata') -+ raise URLGrabError(-1, msg) - else: - return False - -@@ -1514,6 +1530,16 @@ class YumBase(depsolve.Depsolve): - def adderror(po, msg): - errors.setdefault(po, []).append(msg) - -+ # We close the history DB here because some plugins (presto) use -+ # threads. And sqlite really doesn't like threads. And while I don't -+ # think it should matter, we've had some reports of history DB -+ # corruption, and it was implied that it happened just after C-c -+ # at download time and this is a safe thing to do. -+ # Note that manual testing shows that history is not connected by -+ # this point, from the cli with no plugins. So this really does -+ # nothing *sigh*. -+ self.history.close() -+ - self.plugins.run('predownload', pkglist=pkglist) - repo_cached = False - remote_pkgs = [] -@@ -2591,30 +2617,7 @@ class YumBase(depsolve.Depsolve): - """Pass in a generic [build]require string and this function will - pass back the packages it finds providing that dep.""" - -- results = [] -- # parse the string out -- # either it is 'dep (some operator) e:v-r' -- # or /file/dep -- # or packagename -- # or a full dep tuple -- if type(depstring) == types.TupleType: -- (depname, depflags, depver) = depstring -- else: -- depname = depstring -- depflags = None -- depver = None -- -- if depstring[0] != '/': -- # not a file dep - look at it for being versioned -- dep_split = depstring.split() -- if len(dep_split) == 3: -- depname, flagsymbol, depver = dep_split -- if not flagsymbol in SYMBOLFLAGS: -- raise Errors.YumBaseError, _('Invalid version flag') -- depflags = SYMBOLFLAGS[flagsymbol] -- -- sack = self.whatProvides(depname, depflags, depver) -- results = sack.returnPackages() -+ results = self.pkgSack.searchProvides(depstring) - return results - - -@@ -3726,7 +3729,8 @@ class YumBase(depsolve.Depsolve): - break - - if lipkg is None: -- if na not in warned_nas and not doing_group_pkgs: -+ if (na not in warned_nas and not doing_group_pkgs and -+ pkg.name not in latest_installed_n): - msg = _('No Match for available package: %s') % pkg - self.logger.critical(msg) - warned_nas.add(na) -@@ -4101,7 +4105,7 @@ class YumBase(depsolve.Depsolve): - numleft -= 1 - - for po,rel in toremove: -- txmbr = self.tsInfo.addErase(toremove) -+ txmbr = self.tsInfo.addErase(po) - # Add a dep relation to the new version of the package, causing this one to be erased - # this way skipbroken, should clean out the old one, if the new one is skipped - txmbr.depends_on.append(rel) -diff --git a/yum/depsolve.py b/yum/depsolve.py -index c1e90c5..11c9f29 100644 ---- a/yum/depsolve.py -+++ b/yum/depsolve.py -@@ -158,30 +158,7 @@ class Depsolve(object): - - self.verbose_logger.log(logginglevels.DEBUG_1, _('Searching pkgSack for dep: %s'), - name) -- pkgs = self.pkgSack.searchProvides(name) -- -- -- if flags == 0: -- flags = None -- if type(version) in (types.StringType, types.NoneType, types.UnicodeType): -- (r_e, r_v, r_r) = rpmUtils.miscutils.stringToVersion(version) -- elif type(version) in (types.TupleType, types.ListType): # would this ever be a ListType? -- (r_e, r_v, r_r) = version -- -- defSack = ListPackageSack() # holder for items definitely providing this dep -- -- for po in pkgs: -- self.verbose_logger.log(logginglevels.DEBUG_2, -- _('Potential match for %s from %s'), name, po) -- if misc.re_filename(name) and r_v is None: -- # file dep add all matches to the defSack -- defSack.addPackage(po) -- continue -- -- if po.checkPrco('provides', (name, flags, (r_e, r_v, r_r))): -- defSack.addPackage(po) -- self.verbose_logger.debug(_('Matched %s to require for %s'), po, name) -- -+ defSack = ListPackageSack(self.pkgSack.searchProvides((name, flags, version))) - return defSack - - def allowedMultipleInstalls(self, po): -diff --git a/yum/history.py b/yum/history.py -index 8de7459..2707cac 100644 ---- a/yum/history.py -+++ b/yum/history.py -@@ -22,7 +22,7 @@ import os, os.path - import glob - from weakref import proxy as weakref - --from sqlutils import sqlite, executeSQL -+from sqlutils import sqlite, executeSQL, sql_esc, sql_esc_glob - import yum.misc as misc - import yum.constants - from yum.constants import * -@@ -56,30 +56,6 @@ _sttxt2stcode = {'Update' : TS_UPDATE, - 'Obsoleting' : TS_OBSOLETING} - - # ---- horrible Copy and paste from sqlitesack ---- --def _sql_esc(pattern): -- """ Apply SQLite escaping, if needed. Returns pattern and esc. """ -- esc = '' -- if "_" in pattern or "%" in pattern: -- esc = ' ESCAPE "!"' -- pattern = pattern.replace("!", "!!") -- pattern = pattern.replace("%", "!%") -- pattern = pattern.replace("_", "!_") -- return (pattern, esc) -- --def _sql_esc_glob(patterns): -- """ Converts patterns to SQL LIKE format, if required (or gives up if -- not possible). """ -- ret = [] -- for pattern in patterns: -- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. -- return [] # So Load everything -- -- # Convert to SQL LIKE format -- (pattern, esc) = _sql_esc(pattern) -- pattern = pattern.replace("*", "%") -- pattern = pattern.replace("?", "_") -- ret.append((pattern, esc)) -- return ret - - def _setupHistorySearchSQL(patterns=None, ignore_case=False): - """Setup need_full and patterns for _yieldSQLDataList, also see if -@@ -104,7 +80,7 @@ def _setupHistorySearchSQL(patterns=None, ignore_case=False): - if len(patterns) > pat_max: - patterns = [] - if ignore_case: -- patterns = _sql_esc_glob(patterns) -+ patterns = sql_esc_glob(patterns) - else: - tmp = [] - need_glob = False -diff --git a/yum/i18n.py b/yum/i18n.py -index 6b9eab5..9889bf6 100755 ---- a/yum/i18n.py -+++ b/yum/i18n.py -@@ -452,7 +452,16 @@ def to_str(obj): - obj = str(obj) - return obj - -- -+def str_eq(a, b): -+ """ convert between unicode and not and compare them, w/o warning or being annoying""" -+ if isinstance(a, unicode) == isinstance(b, unicode): -+ if a == b: # stupid python... -+ return True -+ elif to_utf8(a) == to_utf8(b): -+ return True -+ -+ return False -+ - try: - ''' - Setup the yum translation domain and make _() and P_() translation wrappers -diff --git a/yum/misc.py b/yum/misc.py -index d63993b..66b0653 100644 ---- a/yum/misc.py -+++ b/yum/misc.py -@@ -11,6 +11,7 @@ import struct - import re - import errno - import Errors -+import constants - import pgpmsg - import tempfile - import glob -@@ -18,6 +19,7 @@ import pwd - import fnmatch - import bz2 - import gzip -+from rpmUtils.miscutils import stringToVersion, flagToString - from stat import * - try: - import gpgme -@@ -77,6 +79,8 @@ def unshare_data(): - _re_compiled_glob_match = None - def re_glob(s): - """ Tests if a string is a shell wildcard. """ -+ # TODO/FIXME maybe consider checking if it is a stringsType before going on - otherwise -+ # returning None - global _re_compiled_glob_match - if _re_compiled_glob_match is None: - _re_compiled_glob_match = re.compile('[*?]|\[.+\]').search -@@ -628,7 +632,40 @@ def prco_tuple_to_string(prcoTuple): - return name - - return '%s %s %s' % (name, flags[flag], version_tuple_to_string(evr)) -+ -+def string_to_prco_tuple(prcoString): -+ """returns a prco tuple (name, flags, (e, v, r)) for a string""" -+ -+ if type(prcoString) == types.TupleType: -+ (n, f, v) = prcoString -+ else: -+ n = prcoString -+ f = v = None -+ -+ if n[0] != '/': -+ # not a file dep - look at it for being versioned -+ prco_split = n.split() -+ if len(prco_split) == 3: -+ n, f, v = prco_split +@@ -102,7 +102,7 @@ class _YumPreBaseConf: + self.enabled_plugins = None + self.syslog_ident = None + self.syslog_facility = None +- self.syslog_device = '/dev/log' ++ self.syslog_device = None + self.arch = None + self.releasever = None + self.uuid = None +@@ -270,12 +270,15 @@ class YumBase(depsolve.Depsolve): + startupconf.syslog_ident = syslog_ident + if syslog_facility != None: + startupconf.syslog_facility = syslog_facility ++ if syslog_device != None: ++ startupconf.syslog_device = syslog_device + if releasever != None: + startupconf.releasever = releasever + + self.doLoggingSetup(startupconf.debuglevel, startupconf.errorlevel, + startupconf.syslog_ident, +- startupconf.syslog_facility, syslog_device) ++ startupconf.syslog_facility, ++ startupconf.syslog_device) + + if init_plugins and startupconf.plugins: + self.doPluginSetup(optparser, plugin_types, startupconf.pluginpath, +diff --git a/yum/config.py b/yum/config.py +index cb01306..c82fabc 100644 +--- a/yum/config.py ++++ b/yum/config.py +@@ -602,6 +602,7 @@ class StartupConf(BaseConfig): + gaftonmode = BoolOption(False) + syslog_ident = Option() + syslog_facility = Option('LOG_USER') ++ syslog_device = Option('/dev/log') + persistdir = Option('/var/lib/yum') -+ # now we have 'n, f, v' where f and v could be None and None -+ if f is not None and f not in constants.LETTERFLAGS: -+ if f not in constants.SYMBOLFLAGS: -+ try: -+ f = flagToString(int(f)) -+ except (ValueError,TypeError), e: -+ raise Errors.MiscError, 'Invalid version flag: %s' % f -+ else: -+ f = constants.SYMBOLFLAGS[f] -+ -+ if type(v) in (types.StringType, types.NoneType, types.UnicodeType): -+ (prco_e, prco_v, prco_r) = stringToVersion(v) -+ elif type(v) in (types.TupleType, types.ListType): -+ (prco_e, prco_v, prco_r) = v -+ -+ #now we have (n, f, (e, v, r)) for the thing specified -+ return (n, f, (prco_e, prco_v, prco_r)) -+ - def refineSearchPattern(arg): - """Takes a search string from the cli for Search or Provides - and cleans it up so it doesn't make us vomit""" -diff --git a/yum/packageSack.py b/yum/packageSack.py -index 95b278a..1278cba 100644 ---- a/yum/packageSack.py -+++ b/yum/packageSack.py -@@ -255,7 +255,6 @@ class PackageSackBase(object): - def searchAll(self, arg, query_type): - raise NotImplementedError() - -- # FIXME: This needs to be merged with how "yum list" works. - def matchPackageNames(self, pkgspecs): - """take a list strings and match the packages in the sack against it - this will match against: -@@ -281,8 +280,11 @@ class PackageSackBase(object): - specs[p] = re.compile(restring) - else: - specs[p] = p -- -- for pkgtup in self.simplePkgList(): -+ -+ # We don't use simplePkgList() here because that loads all of the -+ # rpmdb, if we are Eg. doing a "remove PackageKit". -+ pkgs = self.returnPackages(patterns=unmatched) -+ for pkgtup in [pkg.pkgtup for pkg in pkgs]: - (n,a,e,v,r) = pkgtup - names = set(( - n, -@@ -430,22 +432,20 @@ class MetaSack(PackageSackBase): - if not newest: - return self._computeAggregateDictResult("returnObsoletes") - -- # FIXME - this is slooooooooooooooooooooooooooooooow -- # get the dict back - obsdict = self._computeAggregateDictResult("returnObsoletes") - -- newest_tups = set((pkg.pkgtup for pkg in self.returnNewestByName())) -- -- # go through each of the keys of the obs dict and see if it is in the -- # sack of newest pkgs - if it is not - remove the entry -- togo = [] -- for obstup in obsdict: -- if obstup not in newest_tups: -- togo.append(obstup) -- for obstup in togo: -- del obsdict[obstup] -- -- return obsdict -+ names = set((obstup[0] for obstup in obsdict)) -+ nobsdict = {} -+ last_name = '' -+ last_pkg = None -+ for pkg in reversed(sorted(self.searchNames(names))): -+ if last_name == pkg.name and not pkg.verEQ(last_pkg): + class YumConf(StartupConf): +-- +1.6.6.1 + + +From 203a39125e1de20500739c94e7c92d074d19790f Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Thu, 4 Mar 2010 17:17:30 -0500 +Subject: [PATCH 09/18] Add distro-sync command, to "force update" to the latest versions. + + This should be safe to go in for 3.2.27, as it's an entirely self +contained command ... I've tried it here going on multiple directions, +and it WMF(tm). +--- + cli.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + yumcommands.py | 22 +++++++++++++++++++ + 2 files changed, 85 insertions(+), 0 deletions(-) + +diff --git a/cli.py b/cli.py +index f5ed53d..a34d205 100644 +--- a/cli.py ++++ b/cli.py +@@ -100,6 +100,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): + self.registerCommand(yumcommands.VersionCommand()) + self.registerCommand(yumcommands.HistoryCommand()) + self.registerCommand(yumcommands.CheckRpmdbCommand()) ++ self.registerCommand(yumcommands.DistroSyncCommand()) + + def registerCommand(self, command): + for name in command.getNames(): +@@ -649,6 +650,68 @@ class YumBaseCli(yum.YumBase, output.YumOutput): + else: + return 0, [_('No Packages marked for Update')] + ++ # Note that we aren't in __init__ yet for a couple of reasons, but we ++ # probably will get there for 3.2.28. ++ def distroSyncPkgs(self, userlist): ++ """ This does either upgrade/downgrade, depending on if the latest ++ installed version is older or newer. We allow "selection" but not ++ local packages (use tmprepo, or something). """ ++ ++ dupdates = [] ++ ipkgs = {} ++ for pkg in sorted(self.rpmdb.returnPackages(patterns=userlist)): ++ ipkgs[pkg.name] = pkg ++ ++ obsoletes = [] ++ if self.conf.obsoletes: ++ obsoletes = self.up.getObsoletesTuples(newest=1) ++ ++ for (obsoleting, installed) in obsoletes: ++ if installed[0] not in ipkgs: + continue -+ last_name = pkg.name -+ last_pkg = pkg -+ if pkg.pkgtup in obsdict: -+ nobsdict[pkg.pkgtup] = obsdict[pkg.pkgtup] -+ return nobsdict - - def searchFiles(self, name): - """return list of packages by filename""" -@@ -702,42 +702,50 @@ class PackageSack(PackageSackBase): - result[po] = hits - return result - -+ def searchPrco(self, name, prcotype): -+ self._checkIndexes(failure='build') -+ prcodict = getattr(self, prcotype) -+ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) -+ -+ basic_results = [] -+ results = [] -+ if n in prcodict: -+ basic_results.extend(prcodict[n]) -+ -+ for po in basic_results: -+ if po.checkPrco(prcotype, (n, f, (e,v,r))): -+ results.append(po) -+ -+ if prcotype != "provides": -+ return results -+ -+ if not misc.re_filename(n): -+ return results -+ -+ results.extend(self.searchFiles(n)) -+ return misc.unique(results) -+ -+ - def searchRequires(self, name): -- """return list of package requiring the name (any evr and flag)""" -- self._checkIndexes(failure='build') -- if self.requires.has_key(name): -- return self.requires[name] -- else: -- return [] -+ """return list of package requiring the item requested""" -+ -+ return self.searchPrco(name, 'requires') - - def searchProvides(self, name): -- """return list of package providing the name (any evr and flag)""" -- # FIXME - should this do a pkgobj.checkPrco((name, flag, (e,v,r,))?? -- # has to do a searchFiles and a searchProvides for things starting with / -- self._checkIndexes(failure='build') -- returnList = [] -- if name[0] == '/': -- returnList.extend(self.searchFiles(name)) -- if self.provides.has_key(name): -- returnList.extend(self.provides[name]) -- return returnList -+ """return list of package providing the item requested""" -+ -+ return self.searchPrco(name, 'provides') - - def searchConflicts(self, name): -- """return list of package conflicting with the name (any evr and flag)""" -- self._checkIndexes(failure='build') -- if self.conflicts.has_key(name): -- return self.conflicts[name] -- else: -- return [] -- -+ """return list of package conflicting with item requested""" -+ -+ return self.searchPrco(name, 'conflicts') -+ - def searchObsoletes(self, name): -- """return list of package obsoleting the name (any evr and flag)""" -- self._checkIndexes(failure='build') -- if self.obsoletes.has_key(name): -- return self.obsoletes[name] -- else: -- return [] -+ """return list of package obsoleting the item requested""" - -+ return self.searchPrco(name, 'obsoletes') -+ - def returnObsoletes(self, newest=False): - """returns a dict of obsoletes dict[obsoleting pkgtuple] = [list of obs]""" - obs = {} -diff --git a/yum/packages.py b/yum/packages.py -index ba10136..33cbc39 100644 ---- a/yum/packages.py -+++ b/yum/packages.py -@@ -23,6 +23,7 @@ import rpm - import os - import os.path - import misc -+import i18n - import re - import fnmatch - import stat -@@ -289,6 +290,9 @@ class PackageObject(object): - return True - return False - -+ def __getitem__(self, key): -+ return getattr(self, key) -+ - def verEQ(self, other): - """ Compare package to another one, only rpm-version equality. """ - if not other: -@@ -414,7 +418,7 @@ class RpmBase(object): - return self.inPrcoRange(prcotype, prcotuple) - else: - for (n, f, (e, v, r)) in self.returnPrco(prcotype): -- if reqn == n: -+ if i18n.str_eq(reqn, n): - return 1 - - return 0 -@@ -430,10 +434,7 @@ class RpmBase(object): - # find the named entry in pkgobj, do the comparsion - result = [] - for (n, f, (e, v, r)) in self.returnPrco(prcotype): -- if isinstance(reqn, unicode) == isinstance(n, unicode): -- if reqn != n: # stupid python... -- continue -- elif misc.to_utf8(reqn) != misc.to_utf8(n): -+ if not i18n.str_eq(reqn, n): - continue - - if f == '=': -diff --git a/yum/pkgtag_db.py b/yum/pkgtag_db.py -index eddf175..d2836e4 100644 ---- a/yum/pkgtag_db.py -+++ b/yum/pkgtag_db.py -@@ -17,8 +17,7 @@ - - # parse sqlite tag database - # return pkgnames and tag that was matched --import sqlite3 as sqlite --from sqlutils import executeSQL -+from sqlutils import sqlite, executeSQL, sql_esc, sql_esc_glob - from Errors import PkgTagsError - import sqlutils - import sys -@@ -68,8 +67,9 @@ class PackageTagDB(object): - """Search by tag name/glob - Return dict of dict[packagename] = [stringmatched, stringmatched, ...]""" - res = {} -- tag = '%%%s%%' % tag -- query = "SELECT name, tag, score FROM packagetags where tag like ?" -+ (tag, esc) = sql_esc(tag) -+ query = "SELECT name, tag, score FROM packagetags where tag like ? %s" % esc -+ tag = '%' + tag + '%' - rows = self._sql_exec(query, (tag,)) - for (name, tag, score) in rows: - if name not in res: -@@ -82,8 +82,9 @@ class PackageTagDB(object): - """Search by package name/glob. - Return dict of dict[packagename] = [tag1, tag2, tag3, tag4, ...]""" - res = {} -- name = '%%%s%%' % name -- query = "SELECT name, tag, score FROM packagetags where name like ?" -+ (name, esc) = sql_esc(tag) -+ query = "SELECT name, tag, score FROM packagetags where name like ?%s " % esc -+ name = '%' + name + '%' - rows = self._sql_exec(query, (name,)) - for (name, tag, score) in rows: - if name not in res: -diff --git a/yum/rpmsack.py b/yum/rpmsack.py -index b45f315..8289cd2 100644 ---- a/yum/rpmsack.py -+++ b/yum/rpmsack.py -@@ -282,18 +282,28 @@ class RPMDBPackageSack(PackageSackBase): - result = self._cache[prcotype].get(name) - if result is not None: - return result -- -+ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) -+ glob = False -+ -+ if misc.re_glob(n): -+ glob = True -+ - ts = self.readOnlyTS() - result = {} - tag = self.DEP_TABLE[prcotype][0] -- mi = ts.dbMatch(tag, misc.to_utf8(name)) -+ mi = ts.dbMatch(tag, misc.to_utf8(n)) - for hdr in mi: - if hdr['name'] == 'gpg-pubkey': - continue - po = self._makePackageObject(hdr, mi.instance()) -- result[po.pkgid] = po -+ if not glob: -+ if po.checkPrco(prcotype, (n, f, (e,v,r))): -+ result[po.pkgid] = po -+ else: -+ result[po.pkgid] = po - del mi - -+ - # If it's not a provides or filename, we are done - if prcotype == 'provides' and name[0] == '/': - fileresults = self.searchFiles(name) -@@ -518,6 +528,10 @@ class RPMDBPackageSack(PackageSackBase): - data = self._trans_cache_store['file-requires'] - self._write_file_requires(rpmdbv, data) - -+ if 'yumdb-package-checksums' in self._trans_cache_store: -+ data = self._trans_cache_store['yumdb-package-checksums'] -+ self._write_package_checksums(rpmdbv, data) -+ - self._trans_cache_store = {} - - def transactionReset(self): -@@ -689,6 +703,80 @@ class RPMDBPackageSack(PackageSackBase): - os.rename(self._cachedir + '/file-requires.tmp', - self._cachedir + '/file-requires') - -+ def preloadPackageChecksums(self): -+ """ As simpleVersion() et. al. requires it, we "cache" this yumdb data -+ as part of our rpmdb cache. We cache it with rpmdb data, even -+ though someone _could_ use yumdb to alter it without changing the -+ rpmdb ... don't do that. """ -+ if not self.__cache_rpmdb__: -+ return -+ -+ if not os.path.exists(self._cachedir + '/yumdb-package-checksums'): -+ return -+ -+ def _read_str(fo): -+ return fo.readline()[:-1] -+ -+ rpmdbv = self.simpleVersion(main_only=True)[0] -+ fo = open(self._cachedir + '/yumdb-package-checksums') -+ frpmdbv = fo.readline() -+ if not frpmdbv or rpmdbv != frpmdbv[:-1]: -+ return -+ -+ checksum_data = {} -+ try: -+ # Read the checksums... -+ pkgtups_num = int(_read_str(fo)) -+ while pkgtups_num > 0: -+ pkgtups_num -= 1 -+ -+ # n, a, e, v, r -+ pkgtup = (_read_str(fo), _read_str(fo), -+ _read_str(fo), _read_str(fo), _read_str(fo)) -+ int(pkgtup[2]) # Check epoch is valid -+ -+ T = _read_str(fo) -+ D = _read_str(fo) -+ checksum_data[pkgtup] = (T, D) -+ -+ if fo.readline() != '': # Should be EOF -+ return -+ except ValueError: -+ return -+ -+ for pkgtup in checksum_data: -+ (n, a, e, v, r) = pkgtup -+ pkg = self.searchNevra(n, e, v, r, a)[0] -+ (T, D) = checksum_data[pkgtup] -+ if ('checksum_type' in pkg.yumdb_info._read_cached_data or -+ 'checksum_data' in pkg.yumdb_info._read_cached_data): ++ dupdates.extend(self.update(pkgtup=installed)) ++ for (obsoleting, installed) in obsoletes: ++ if installed[0] not in ipkgs: + continue -+ pkg.yumdb_info._read_cached_data['checksum_type'] = T -+ pkg.yumdb_info._read_cached_data['checksum_data'] = D ++ del ipkgs[installed[0]] + -+ def transactionCachePackageChecksums(self, pkg_checksum_tups): -+ if not self.__cache_rpmdb__: -+ return -+ -+ self._trans_cache_store['yumdb-package-checksums'] = pkg_checksum_tups ++ apkgs = {} ++ for pkg in self.pkgSack.returnNewestByName(): ++ if pkg.name not in ipkgs: ++ continue ++ apkgs[pkg.name] = pkg + -+ def _write_package_checksums(self, rpmdbversion, data): -+ if not os.access(self._cachedir, os.W_OK): -+ return ++ for ipkgname in ipkgs: ++ if ipkgname not in apkgs: ++ continue + -+ pkg_checksum_tups = data -+ fo = open(self._cachedir + '/yumdb-package-checksums.tmp', 'w') -+ fo.write("%s\n" % rpmdbversion) -+ fo.write("%u\n" % len(pkg_checksum_tups)) -+ for pkgtup, TD in sorted(pkg_checksum_tups): -+ for var in pkgtup: -+ fo.write("%s\n" % var) -+ for var in TD: -+ fo.write("%s\n" % var) -+ fo.close() -+ os.rename(self._cachedir + '/yumdb-package-checksums.tmp', -+ self._cachedir + '/yumdb-package-checksums') ++ ipkg = ipkgs[ipkgname] ++ apkg = apkgs[ipkgname] ++ if ipkg.verEQ(apkg): ++ continue ++ if self.allowedMultipleInstalls(apkg): ++ found = False ++ for napkg in self.rpmdb.searchNames([apkg.name]): ++ if napkg.verEQ(apkg): ++ found = True ++ elif napkg.verGT(apkg): ++ dupdates.extend(self.remove(po=napkg)) ++ if found: ++ continue ++ dupdates.extend(self.install(pattern=apkg.name)) ++ elif ipkg.verLT(apkg): ++ n,a,e,v,r = apkg.pkgtup ++ dupdates.extend(self.update(name=n, epoch=e, ver=v, rel=r)) ++ else: ++ n,a,e,v,r = apkg.pkgtup ++ dupdates.extend(self.downgrade(name=n, epoch=e, ver=v, rel=r)) + - def _get_cached_simpleVersion_main(self): - """ Return the cached string of the main rpmdbv. """ - if self._have_cached_rpmdbv_data is not None: -@@ -1190,7 +1278,10 @@ class RPMDBAdditionalData(object): - else: - if os.access(self.conf.db_path, os.W_OK): - self.conf.writable = True -+ # Don't call _load_all_package_paths to preload, as it's expensive -+ # if the dirs. aren't in cache. - -+ def _load_all_package_paths(self): - # glob the path and get a dict of pkgs to their subdir - glb = '%s/*/*/' % self.conf.db_path - pkgdirs = glob.glob(glb) -diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py -index bf0cea9..1d6c764 100644 ---- a/yum/sqlitesack.py -+++ b/yum/sqlitesack.py -@@ -28,7 +28,7 @@ from packages import PackageObject, RpmBase, YumAvailablePackage, parsePackages - import Errors - import misc - --from sqlutils import executeSQL -+from sqlutils import executeSQL, sql_esc, sql_esc_glob - import rpmUtils.miscutils - import sqlutils - import constants -@@ -812,32 +812,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - pkgs.append(pkg) - return pkgs - -- @staticmethod -- def _sql_esc(pattern): -- """ Apply SQLite escaping, if needed. Returns pattern and esc. """ -- esc = '' -- if "_" in pattern or "%" in pattern: -- esc = ' ESCAPE "!"' -- pattern = pattern.replace("!", "!!") -- pattern = pattern.replace("%", "!%") -- pattern = pattern.replace("_", "!_") -- return (pattern, esc) -- -- def _sql_esc_glob(self, patterns): -- """ Converts patterns to SQL LIKE format, if required (or gives up if -- not possible). """ -- ret = [] -- for pattern in patterns: -- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. -- return [] # So Load everything -- -- # Convert to SQL LIKE format -- (pattern, esc) = self._sql_esc(pattern) -- pattern = pattern.replace("*", "%") -- pattern = pattern.replace("?", "_") -- ret.append((pattern, esc)) -- return ret -- - def _skip_all(self): - """ Are we going to skip every package in all our repos? """ - skip_all = True -@@ -917,12 +891,12 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - sql_params = [] - dirname_check = "" - if not glob: -- (pattern, esc) = self._sql_esc(filename) -+ (pattern, esc) = sql_esc(filename) - dirname_check = "dirname = ? and filenames LIKE ? %s and " % esc - sql_params.append(dirname) - sql_params.append('%' + pattern + '%') - elif not file_glob: -- (pattern, esc) = self._sql_esc(filename) -+ (pattern, esc) = sql_esc(filename) - dirname_check = "dirname GLOB ? and filenames LIKE ? %s and " % esc - sql_params.append(dirname) - sql_params.append('%' + pattern + '%') -@@ -996,7 +970,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - return result - - searchstring = searchstring.replace("'", "''") -- (searchstring, esc) = self._sql_esc(searchstring) -+ (searchstring, esc) = sql_esc(searchstring) - sql = "select DISTINCT pkgKey from packages where %s like '%%%s%%'%s " % (fields[0], searchstring, esc) - - for f in fields[1:]: -@@ -1042,7 +1016,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - - for s in searchstrings: - s = s.replace("'", "''") -- (s, esc) = self._sql_esc(s) -+ (s, esc) = sql_esc(s) - sql="select pkgKey,1 AS cumul from packages where %s like '%%%s%%'%s " % (fields[0], s, esc) - for f in fields[1:]: - sql = "%s or %s like '%%%s%%'%s " % (sql, f, s, esc) -@@ -1289,38 +1263,61 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - - @catchSqliteException - def searchPrco(self, name, prcotype): -- """return list of packages having prcotype name (any evr and flag)""" -+ """return list of packages matching name and prcotype """ -+ # we take name to be a string of some kind -+ # we parse the string to see if it is a foo > 1.1 or if it is just 'foo' -+ # or what - so we can answer correctly -+ - if self._skip_all(): - return [] ++ if dupdates: ++ msg = _('%d packages marked for Distribution Synchronization') % len(dupdates) ++ return 2, [msg] ++ else: ++ return 0, [_('No Packages marked for Distribution Synchronization')] ++ + def erasePkgs(self, userlist): + """take user commands and populate a transaction wrapper with packages + to be erased/removed""" +diff --git a/yumcommands.py b/yumcommands.py +index 35bd97c..88c047f 100644 +--- a/yumcommands.py ++++ b/yumcommands.py +@@ -205,6 +205,28 @@ class UpdateCommand(YumCommand): + except yum.Errors.YumBaseError, e: + return 1, [str(e)] + ++class DistroSyncCommand(YumCommand): ++ def getNames(self): ++ return ['distribution-synchronization', 'distro-sync'] ++ ++ def getUsage(self): ++ return _("[PACKAGE...]") ++ ++ def getSummary(self): ++ return _("Synchronize installed packages to the latest available versions") ++ ++ def doCheck(self, base, basecmd, extcmds): ++ checkRootUID(base) ++ checkGPGKey(base) ++ ++ def doCommand(self, base, basecmd, extcmds): ++ self.doneCommand(base, _("Setting up Distribution Synchronization Process")) + try: -+ (n,f,(e,v,r)) = misc.string_to_prco_tuple(name) -+ except Errors.MiscError, e: -+ raise Errors.PackageSackError, to_unicode(e) ++ base.conf.obsoletes = 1 ++ return base.distroSyncPkgs(extcmds) ++ except yum.Errors.YumBaseError, e: ++ return 1, [str(e)] ++ + def _add_pkg_simple_list_lens(data, pkg, indent=''): + """ Get the length of each pkg's column. Add that to data. + This "knows" about simpleList and printVer. """ +-- +1.6.6.1 + + +From cb59d97fba6765d03a908219d5258b3896f2ecb1 Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Thu, 11 Mar 2010 11:54:41 -0500 +Subject: [PATCH 10/18] Add documentation for distro-sync command. + +--- + docs/yum.8 | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/docs/yum.8 b/docs/yum.8 +index 8d42d9d..ff7ed8f 100644 +--- a/docs/yum.8 ++++ b/docs/yum.8 +@@ -27,6 +27,8 @@ gnome\-packagekit application\&. + .br + .I \fR * upgrade [package1] [package2] [\&.\&.\&.] + .br ++.I \fR * distribution-synchronization [package1] [package2] [\&.\&.\&.] ++.br + .I \fR * remove | erase package1 [package2] [\&.\&.\&.] + .br + .I \fR * list [\&.\&.\&.] +@@ -119,6 +121,13 @@ Running in verbose mode also shows obsoletes. + Is the same as the update command with the \-\-obsoletes flag set. See update + for more details. + .IP ++.IP "\fBdistribution-synchronization\fP" "\fBdistro-sync\fP" ++Synchronizes the installed package set with the latest packages available, this ++is done by either obsoleting, upgrading or downgrading as appropriate. This will ++"normally" do the same thing as the upgrade command however if you have the ++package FOO installed at version 4, and the latest available is only ++version 3, then this command will \fBdowngrade\fP FOO to version 3. ++.IP + .IP "\fBremove\fP or \fBerase\fP" + Are used to remove the specified packages from the system + as well as removing any packages which depend on the package being +-- +1.6.6.1 + + +From a33aa64f23ac3c197871e9100c99e9cccc3f58b1 Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Thu, 11 Mar 2010 11:47:33 -0500 +Subject: [PATCH 11/18] Add a little more documentation to get_applicable_notices() + +--- + yum/update_md.py | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/yum/update_md.py b/yum/update_md.py +index 54d4cd7..fc051b0 100644 +--- a/yum/update_md.py ++++ b/yum/update_md.py +@@ -335,13 +335,15 @@ class UpdateMetadata(object): + # has a BZ fix notice. All you can see is the BZ notice for the new "pkg-3" + # with the above. + # So now instead you lookup based on the _installed_ pkg.pkgtup, and get +- # two notices, in order: [(pkg-3, notice), (pkg-2, notice)] ++ # two notices, in order: [(pkgtup-3, notice), (pkgtup-2, notice)] + # the reason for the sorting order is that the first match will give you + # the minimum pkg you need to move to. + def get_applicable_notices(self, pkgtup): + """ + Retrieve any update notices which are newer than a + given std. pkgtup (name, arch, epoch, version, release) tuple. ++ Returns: list of (pkgtup, notice) that are newer than the given pkgtup, ++ in the order of newest pkgtups first. + """ + oldpkgtup = pkgtup + name = oldpkgtup[0] +-- +1.6.6.1 + + +From 008d74a13173bcb7005e7150ebc1367720078452 Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Thu, 11 Mar 2010 14:47:40 -0500 +Subject: [PATCH 12/18] Return an error code if yum can't install any of the specified packages + + People want a bash scriptable way to say "X should be installed". So +with this patch: + +. If _any_ package specified: is installed already; or is found and will +be installed == yum returns 0 (or at least goes into depchecking etc.) + +. If _all_ package(s) are "not found", yum turns the message "Nothing to do" +into an error (returns 1, atm). + +...thus: + +1. yum install -y a b && echo worked + +This will echo "worked" if _either_ a or b is installed after yum +finishes, but tries to install both. + +2. yum install a && yum install b && echo worked + +This will echo "worked" if both are installed (and if a is not +available, b will not even try to be installed). +--- + cli.py | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/cli.py b/cli.py +index a34d205..cebbae3 100644 +--- a/cli.py ++++ b/cli.py +@@ -595,6 +595,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput): -- name = to_unicode(name) -+ n = to_unicode(n) -+ - glob = True - querytype = 'glob' -- if not misc.re_glob(name): -+ if not misc.re_glob(n): - glob = False - querytype = '=' - -+ basic_results = [] - results = [] - for (rep,cache) in self.primarydb.items(): - cur = cache.cursor() -- executeSQL(cur, "select DISTINCT pkgKey from %s where name %s ?" % (prcotype,querytype), (name,)) -- self._sql_pkgKey2po(rep, cur, results) -+ executeSQL(cur, "select DISTINCT pkgKey from %s where name %s ?" % (prcotype,querytype), (n,)) -+ self._sql_pkgKey2po(rep, cur, basic_results) + oldcount = len(self.tsInfo) -+ # now we have a list of items matching just the name - let's match them out -+ for po in basic_results: -+ if misc.re_filename(n) and v is None: -+ # file dep add all matches to the results -+ results.append(po) -+ continue -+ -+ if not glob: -+ if po.checkPrco(prcotype, (n, f, (e,v,r))): -+ results.append(po) ++ done = False + for arg in userlist: + if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or + os.path.exists(arg))): +@@ -609,8 +610,13 @@ class YumBaseCli(yum.YumBase, output.YumOutput): + self.term.MODE['bold'], arg, + self.term.MODE['normal']) + self._maybeYouMeant(arg) + else: -+ # if it is a glob we can't really get any closer to checking it -+ results.append(po) - # If it's not a provides or a filename, we are done - if prcotype != "provides": - return results -- if not misc.re_filename(name): -+ if not misc.re_filename(n): - return results - - # If it is a filename, search the primary.xml file info -- results.extend(self._search_primary_files(name)) -+ results.extend(self._search_primary_files(n)) - - # if its in the primary.xml files then skip the other check -- if misc.re_primary_filename(name) and not glob: -+ if misc.re_primary_filename(n) and not glob: - return misc.unique(results) - - # If it is a filename, search the files.xml file info -- results.extend(self.searchFiles(name)) -+ results.extend(self.searchFiles(n)) - return misc.unique(results) ++ done = True + if len(self.tsInfo) > oldcount: + return 2, [_('Package(s) to install')] ++ ++ if not done: ++ return 1, [_('Nothing to do')] + return 0, [_('Nothing to do')] + def updatePkgs(self, userlist, quiet=0): +-- +1.6.6.1 + + +From b3ca56aed8f2949b73d07bf3c1aa90ae20793848 Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Tue, 16 Mar 2010 17:37:04 -0400 +Subject: [PATCH 13/18] Add the provides data for each pkg, to format_missing_requires. Add relations. + +--- + output.py | 38 +++++++++++++++++++++++++++++++++----- + 1 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/output.py b/output.py +index b09730a..aa5dc4d 100755 +--- a/output.py ++++ b/output.py +@@ -1660,24 +1660,52 @@ class DepSolveProgressCallBack: + if not yb: + return msg -@@ -1516,7 +1513,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack): - if len(patterns) > pat_max: - patterns = [] - if ignore_case: -- patterns = self._sql_esc_glob(patterns) -+ patterns = sql_esc_glob(patterns) - else: - tmp = [] - need_glob = False -diff --git a/yum/sqlutils.py b/yum/sqlutils.py -index 4326910..4d7e36e 100644 ---- a/yum/sqlutils.py -+++ b/yum/sqlutils.py -@@ -173,3 +173,27 @@ else: - executeSQL = executeSQLPyFormat - - -+def sql_esc(pattern): -+ """ Apply SQLite escaping, if needed. Returns pattern and esc. """ -+ esc = '' -+ if "_" in pattern or "%" in pattern: -+ esc = ' ESCAPE "!"' -+ pattern = pattern.replace("!", "!!") -+ pattern = pattern.replace("%", "!%") -+ pattern = pattern.replace("_", "!_") -+ return (pattern, esc) -+ -+def sql_esc_glob(patterns): -+ """ Converts patterns to SQL LIKE format, if required (or gives up if -+ not possible). """ -+ ret = [] -+ for pattern in patterns: -+ if '[' in pattern: # LIKE only has % and _, so [abc] can't be done. -+ return [] # So Load everything -+ -+ # Convert to SQL LIKE format -+ (pattern, esc) = sql_esc(pattern) -+ pattern = pattern.replace("*", "%") -+ pattern = pattern.replace("?", "_") -+ ret.append((pattern, esc)) -+ return ret -diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py -index 30a2625..e7b60de 100644 ---- a/yum/transactioninfo.py -+++ b/yum/transactioninfo.py -@@ -577,12 +577,15 @@ class TransactionData: - _reinstalled_pkgtups[txmbr.po.pkgtup] = txmbr.po - pkgs.append(txmbr.po) - -+ self.rpmdb.preloadPackageChecksums() - main = PackageSackVersion() -+ pkg_checksum_tups = [] - for pkg in sorted(pkgs): - if pkg.repoid != 'installed': - # Paste from PackageSackBase.simpleVersion() - csum = pkg.returnIdSum() - main.update(pkg, csum) -+ pkg_checksum_tups.append((pkg.pkgtup, csum)) ++ def _msg_pkg(action, pkg, needname): ++ " Add a package to the message, including any provides matches. " ++ msg = _('\n %s: %s (%s)') % (action, pkg, pkg.ui_from_repo) ++ needtup = (needname, None, (None, None, None)) ++ done = False ++ for pkgtup in pkg.matchingPrcos('provides', needtup): ++ done = True ++ msg += _('\n %s') % yum.misc.prco_tuple_to_string(pkgtup) ++ if not done: ++ msg += _('\n Not found') ++ return msg ++ + ipkgs = set() + for pkg in sorted(yb.rpmdb.getProvides(needname)): +- ipkgs.add(pkg.pkgtup) ++ nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release) ++ ipkgs.add(nevr) + action = _('Installed') +- if yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES): ++ rmed = yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES) ++ if rmed: + action = _('Removing') +- msg += _('\n %s: %s (%s)') % (action, pkg, pkg.ui_from_repo) ++ msg += _msg_pkg(action, pkg, needname) ++ # These should be the only three things we care about: ++ relmap = {'updatedby' : _('Updated By'), ++ 'downgradedby' : _('Downgraded By'), ++ 'obsoletedby' : _('Obsoleted By'), ++ } ++ for txmbr in rmed: ++ for (rpkg, rtype) in txmbr.relatedto: ++ if rtype not in relmap: ++ continue ++ nevr = (rpkg.name, rpkg.epoch, rpkg.version, rpkg.release) ++ ipkgs.add(nevr) ++ msg += _msg_pkg(relmap[rtype], rpkg, needname) ++ + last = None + for pkg in sorted(yb.pkgSack.getProvides(needname)): + # We don't want to see installed packages, or N packages of the + # same version, from different repos. +- if pkg.pkgtup in ipkgs or pkg.verEQ(last): ++ nevr = (pkg.name, pkg.epoch, pkg.version, pkg.release) ++ if nevr in ipkgs or (pkg.verEQ(last) and pkg.arch == last.arch): continue - - # Installed pkg, see if it's about to die -@@ -597,7 +600,11 @@ class TransactionData: - csum = None - if 'checksum_type' in ydbi and 'checksum_data' in ydbi: - csum = (ydbi.checksum_type, ydbi.checksum_data) -+ pkg_checksum_tups.append((pkg.pkgtup, csum)) - main.update(pkg, csum) -+ -+ self.rpmdb.transactionCachePackageChecksums(pkg_checksum_tups) + last = pkg + action = _('Available') + if yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_INSTALL_STATES): + action = _('Installing') +- msg += _('\n %s: %s (%s)') % (action, pkg, pkg.repoid) ++ msg += _msg_pkg(action, pkg, needname) + return msg + + def procConflict(self, name, confname): +-- +1.6.6.1 + + +From f2c3967ea8185541a3c68fad754d19b2dfd71d35 Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Mon, 22 Mar 2010 14:21:11 -0400 +Subject: [PATCH 14/18] Don't traceback when we can't open the history DB (non-root users by default + now), BZ 575917. + Provide a .readable interface for callers to check. + +--- + yum/history.py | 34 ++++++++++++++++++++++++++++++++-- + 1 files changed, 32 insertions(+), 2 deletions(-) + +diff --git a/yum/history.py b/yum/history.py +index 2707cac..3ef5f74 100644 +--- a/yum/history.py ++++ b/yum/history.py +@@ -178,6 +178,7 @@ class YumHistory: + self.conf = yum.misc.GenericHolder() + self.conf.db_path = os.path.normpath(root + '/' + db_path) + self.conf.writable = False ++ self.conf.readable = True + + if not os.path.exists(self.conf.db_path): + try: +@@ -214,7 +215,15 @@ class YumHistory: + + def _get_cursor(self): + if self._conn is None: +- self._conn = sqlite.connect(self._db_file) ++ if not self.conf.readable: ++ return None + - return main - - class ConditionalTransactionData(TransactionData): ++ try: ++ self._conn = sqlite.connect(self._db_file) ++ except sqlite.OperationalError: ++ self.conf.readable = False ++ return None ++ + return self._conn.cursor() + def _commit(self): + return self._conn.commit() +@@ -291,6 +300,8 @@ class YumHistory: + + def trans_with_pid(self, pid): + cur = self._get_cursor() ++ if cur is None: ++ return None + res = executeSQL(cur, + """INSERT INTO trans_with_pkgs + (tid, pkgtupid) +@@ -302,6 +313,8 @@ class YumHistory: + if not hasattr(self, '_tid') or state is None: + return # Not configured to run + cur = self._get_cursor() ++ if cur is None: ++ return # Should never happen, due to above + res = executeSQL(cur, + """INSERT INTO trans_data_pkgs + (tid, pkgtupid, state) +@@ -313,6 +326,8 @@ class YumHistory: + return # Not configured to run + + cur = self._get_cursor() ++ if cur is None: ++ return # Should never happen, due to above + res = executeSQL(cur, + """UPDATE trans_data_pkgs SET done = ? + WHERE tid = ? AND pkgtupid = ? AND state = ? +@@ -322,6 +337,8 @@ class YumHistory: + + def beg(self, rpmdb_version, using_pkgs, txmbrs): + cur = self._get_cursor() ++ if cur is None: ++ return + res = executeSQL(cur, + """INSERT INTO trans_beg + (timestamp, rpmdb_version, loginuid) +@@ -343,6 +360,8 @@ class YumHistory: + + def _log_errors(self, errors): + cur = self._get_cursor() ++ if cur is None: ++ return + for error in errors: + error = to_unicode(error) + executeSQL(cur, +@@ -356,6 +375,8 @@ class YumHistory: + return # Not configured to run + + cur = self._get_cursor() ++ if cur is None: ++ return # Should never happen, due to above + for error in msg.split('\n'): + error = to_unicode(error) + executeSQL(cur, +@@ -387,7 +408,11 @@ class YumHistory: + + def end(self, rpmdb_version, return_code, errors=None): + assert return_code or not errors ++ if not hasattr(self, '_tid'): ++ return # Failed at beg() time + cur = self._get_cursor() ++ if cur is None: ++ return # Should never happen, due to above + res = executeSQL(cur, + """INSERT INTO trans_end + (tid, timestamp, rpmdb_version, return_code) +@@ -444,6 +469,8 @@ class YumHistory: + """ Return a list of the last transactions, note that this includes + partial transactions (ones without an end transaction). """ + cur = self._get_cursor() ++ if cur is None: ++ return [] + sql = """SELECT tid, + trans_beg.timestamp AS beg_ts, + trans_beg.rpmdb_version AS beg_rv, +@@ -551,6 +578,10 @@ class YumHistory: + packages al. la. "yum list". Returns transaction ids. """ + # Search packages ... kind of sucks that it's search not list, pkglist? + ++ cur = self._get_cursor() ++ if cur is None: ++ return set() ++ + data = _setupHistorySearchSQL(patterns, ignore_case) + (need_full, patterns, fields, names) = data + +@@ -559,7 +590,6 @@ class YumHistory: + for row in self._yieldSQLDataList(patterns, fields, ignore_case): + pkgtupids.add(row[0]) + +- cur = self._get_cursor() + sql = """SELECT tid FROM trans_data_pkgs WHERE pkgtupid IN """ + sql += "(%s)" % ",".join(['?'] * len(pkgtupids)) + params = list(pkgtupids) +-- +1.6.6.1 + + +From 7d04b0e6816cfb27e769bb19f44811f88523ed2b Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Mon, 22 Mar 2010 17:43:25 -0400 +Subject: [PATCH 15/18] Minor description fixup + +--- + yum.spec | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/yum.spec b/yum.spec +index 29870e5..3a724cd 100644 +--- a/yum.spec ++++ b/yum.spec +@@ -29,7 +29,7 @@ Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0 + %description + Yum is a utility that can check for and automatically download and + install updated RPM packages. Dependencies are obtained and downloaded +-automatically prompting the user as necessary. ++automatically, prompting the user for permission as necessary. + + %package updatesd + Summary: Update notification daemon +-- +1.6.6.1 + + +From 1c2b28e36ef1d7051428ea57446cf800b388f36e Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Thu, 25 Mar 2010 11:29:06 -0400 +Subject: [PATCH 16/18] Show if transactions have error output, in history list + +--- + docs/yum.8 | 2 ++ + output.py | 3 +++ + 2 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/docs/yum.8 b/docs/yum.8 +index ff7ed8f..00bfd53 100644 +--- a/docs/yum.8 ++++ b/docs/yum.8 +@@ -289,6 +289,8 @@ if there was something not good with the transaction. + .br + .I \fB#\fR - The transaction completed, but with a non-zero status. + .br ++.I \fBE\fR - The transaction completed fine, but had warning/error output during the transaction. ++.br + + .IP + .IP "\fBcheck\fP" +diff --git a/output.py b/output.py +index aa5dc4d..c4fde7c 100755 +--- a/output.py ++++ b/output.py +@@ -1310,6 +1310,9 @@ to exit. + rmark = lmark = '*' + elif old.return_code: + rmark = lmark = '#' ++ # We don't check .errors, because return_code will be non-0 ++ elif old.output: ++ rmark = lmark = 'E' + if old.altered_lt_rpmdb: + rmark = '<' + if old.altered_gt_rpmdb: +-- +1.6.6.1 + + +From 5579a905155a6be3171f6968a24e691bafcac40b Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Thu, 25 Mar 2010 11:53:51 -0400 +Subject: [PATCH 17/18] Fix login user column output length, for history summary + +--- + output.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/output.py b/output.py +index c4fde7c..7b09695 100755 +--- a/output.py ++++ b/output.py +@@ -1590,7 +1590,7 @@ to exit. + count, uiacts = self._history_uiactions(hpkgs) + uperiod = _period2user[period] + # Should probably use columns here, esp. for uiacts? +- print fmt % (utf8_width_fill(name, 22, 22), ++ print fmt % (utf8_width_fill(name, 26, 26), + utf8_width_fill(uperiod, 19, 19), + utf8_width_fill(uiacts, 16, 16), count) + +-- +1.6.6.1 + + +From 9c3b0e9ae6b86cd96ee8751fc9e131e063724b23 Mon Sep 17 00:00:00 2001 +From: James Antill +Date: Thu, 25 Mar 2010 15:57:24 -0400 +Subject: [PATCH 18/18] Add groupremove_leaf_only option + +--- + docs/yum.8 | 3 +++ + docs/yum.conf.5 | 8 ++++++++ + output.py | 4 ++++ + yum/config.py | 1 + + yum/depsolve.py | 11 +++++++++++ + 5 files changed, 27 insertions(+), 0 deletions(-) + +diff --git a/docs/yum.8 b/docs/yum.8 +index 00bfd53..c6b8c42 100644 +--- a/docs/yum.8 ++++ b/docs/yum.8 +@@ -189,6 +189,9 @@ Is used to remove all of the packages in a group, unlike "groupinstall" this + will remove everything regardless of group_package_types. It is worth pointing + out that packages can be in more than one group, so "groupinstall X Y" followed + by "groupremove Y" does not do give you the same result as "groupinstall X". ++ ++The groupremove_leaf_only configuration changes the behaviour of this command ++to only remove packages which aren't required by something else. + .IP + .IP "\fBgroupinfo\fP" + Is used to give the description and package list of a group (and which type +diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 +index cb6f340..fe195af 100644 +--- a/docs/yum.conf.5 ++++ b/docs/yum.conf.5 +@@ -167,6 +167,14 @@ repository will be used. If \fBoverwrite_groups\fR is `0' then the groups + from all matching repositories will be merged together as one large group. + + .IP ++\fBgroupremove_leaf_only \fR ++Either `0' or `1'. Used to determine yum's behaviour when the groupremove ++command is run. If \fBgroupremove_leaf_only\fR is `0' (default) then ++all packages in the group will be removed. If \fBgroupremove_leaf_only\fR is ++`1' then only those packages in the group that aren't required by another ++package will be removed. ++ ++.IP + \fBenable_group_conditionals\fR + Either `0' or `1'. Determines whether yum will allow the use of conditionals + packages. Default is `1' (package conditionals are allowed). +diff --git a/output.py b/output.py +index 7b09695..452f8a2 100755 +--- a/output.py ++++ b/output.py +@@ -1642,6 +1642,10 @@ class DepSolveProgressCallBack: + _('--> Processing Dependency: %s for package: %s'), formatted_req, + po) + ++ def groupRemoveReq(self, po, hits): ++ self.verbose_logger.log(logginglevels.INFO_2, ++ _('---> Keeping package: %s'), po) ++ + def unresolved(self, msg): + self.verbose_logger.log(logginglevels.INFO_2, _('--> Unresolved Dependency: %s'), + msg) +diff --git a/yum/config.py b/yum/config.py +index c82fabc..e51e46f 100644 +--- a/yum/config.py ++++ b/yum/config.py +@@ -657,6 +657,7 @@ class YumConf(StartupConf): + enabled = BoolOption(True) + enablegroups = BoolOption(True) + enable_group_conditionals = BoolOption(True) ++ groupremove_leaf_only = BoolOption(False) + group_package_types = ListOption(['mandatory', 'default']) + + timeout = FloatOption(30.0) # FIXME: Should use variation of SecondsOption +diff --git a/yum/depsolve.py b/yum/depsolve.py +index 11c9f29..f654d84 100644 +--- a/yum/depsolve.py ++++ b/yum/depsolve.py +@@ -886,6 +886,17 @@ class Depsolve(object): + # FIXME: This is probably the best place to fix the postfix rename + # problem long term (post .21) ... see compare_providers. + for pkg, hits in self.tsInfo.getRequires(*prov).iteritems(): ++ # See the docs, this is to make groupremove "more useful". ++ if (self.conf.groupremove_leaf_only and txmbr.groups and ++ txmbr.output_state == TS_ERASE): ++ cb = self.dsCallback ++ if cb and hasattr(cb, 'groupRemoveReq'): ++ cb.groupRemoveReq(pkg, hits) ++ # We don't undo anything else here ... hopefully that's ++ # fine. ++ self.tsInfo.remove(txmbr.pkgtup) ++ return [] ++ + for hit in hits: + # See if the update solves the problem... + found = False +-- +1.6.6.1 + diff --git a/yum.spec b/yum.spec index a8c4a16..b2f1bbe 100644 --- a/yum.spec +++ b/yum.spec @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.27 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -16,7 +16,6 @@ Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch Patch6: yum-HEAD.patch -Patch7: yum-do-not-overwrite-keys.patch URL: http://yum.baseurl.org/ BuildArch: noarch @@ -60,8 +59,7 @@ can notify you when they are available via email, syslog or dbus. %patch3 -p0 %patch4 -p0 %patch5 -p1 -#%%%patch6 -p1 -%patch7 -p1 +%patch6 -p1 %build make @@ -112,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Fri Mar 26 2010 James Antill - 3.2.27-3 +- Latest yum-3_2_X head. + * Tue Mar 23 2010 Seth Vidal - 3.2.27-2 - broke searching in PK, this patch fixes it.